Merge lp:~pydjwiki-dev/pydjwiki/no-proj into lp:pydjwiki

[M. Nesvold]

[M. Nesvold (mdnesvold)]

You probably want to double-check me that the installation instructions actually work.

[lp:~pydjwiki-dev/pydjwiki/no-proj]

33. By M. Nesvold on 2009-05-11

Fixed fatal typo in installation instructions

34. By Louis Wilson <email address hidden> on 2009-05-16

Updated the documentation build system to use Make

35. By Louis Wilson <email address hidden> on 2009-05-16

Changed two docstrings to refer to non-deprecated functions

36. By Louis Wilson <email address hidden> on 2009-05-16

Updated installation documentation

[Louis Wilson (louis-wins)]

Installation instructions seem to be lacking. I fixed what I could, but could not figure out how to get it to use the CSS file. For some reason PYDJWIKI_MEDIA_ROOT is not being defined, and I'm not really sure how that Middleware is supposed to work.
Also, as far as I can tell, the user has to add "${SITE_PACKAGES_DIR}/pydjwiki/templates" to their TEMPLATE_DIRS variable (unless this can be added to the included settings.py somehow), which seems bad to me. This still doesn't fix the previous issue, though.
I'll add this as a bug.

review: Needs Fixing

[lp:~pydjwiki-dev/pydjwiki/no-proj]

37. By M. Nesvold on 2009-05-18

Fixed autoloading of default data fixture on first syncdb

38. By M. Nesvold on 2009-05-19

Updated installation instructions to include installing humanize

39. By M. Nesvold on 2009-07-08

Added patch for bug #377492

=== renamed file 'wiki/pydjwiki/__init__.py' => '__init__.py'
=== renamed file 'wiki/pydjwiki/admin.py' => 'admin.py'
=== renamed file 'wiki/pydjwiki/deprecation.py' => 'deprecation.py'
=== renamed file 'wiki/pydjwiki/djhooks.py' => 'djhooks.py'
=== renamed directory 'wiki/pydjwiki/doc' => 'doc'
=== added file 'doc/Installation.tex'
--- doc/Installation.tex	1970-01-01 00:00:00 +0000
+++ doc/Installation.tex	2009-05-11 17:55:38 +0000
@@ -0,0 +1,65 @@
+\documentclass{article}
+
+\usepackage{fullpage}
+
+\begin{document}
+\title{PyDjWiki Installation Guide}
+\author{}
+\date{}
+\maketitle
+
+\begin{abstract}
+This document describes the steps necessary to get the PyDjWiki app running on a Django project.
+\end{abstract}
+
+\section{Start your project}
+
+If you haven't done so already, start a project using \texttt{django-admin.py startproject}.
+
+\section{Download PyDjWiki}
+
+If you're reading this document, you've probably already done that. You can put the download wherever you want; you can either put it directly in your \texttt{site-packages} directory (as long as you name the folder \texttt{pydjwiki}), or somewhere else and put a symbolic link in \texttt{site-packages}:
+
+\begin{verbatim}
+ln -s path/to/download path/to/site-packages/pydjwiki
+\end{verbatim}
+
+\subsection{Finding \texttt{site-packages}}
+
+You can find out where your \texttt{site-packages} directory is located by typing the following into a shell prompt:
+
+\begin{verbatim}
+python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+\end{verbatim}
+
+\section{Install the app}
+
+Now you have to tell your site project to use the PyDjWiki app.
+
+\subsection{Modify \texttt{settings.py}}
+
+In your project's \texttt{settings.py}, make the following changes:
+
+\begin{enumerate}
+\item Add the string \texttt{"pydjwiki.djhooks.PyDjWikiMiddleware"} to the beginning of your \texttt{MIDDLEWARE\_{}CLASSES} setting.
+\item Add the string \texttt{"pydjwiki.djhooks.context\_{}processor\_{}pydjwiki"} to your \texttt{TEMPLATE\_{}CONTEXT\_{}PROCESSORS} settings.
+\item Anywhere in the file, preferably near the top, add the line \texttt{from pydjwiki.settings import *} to import default PyDjWiki settings. (This will also set \texttt{LOGIN\_{}URL} and \texttt{LOGIN\_{}REDIRECT\_{}URL} if they aren't defined elsewhere in your settings file.)
+\end{enumerate}
+
+\subsection{Modify your URLConf}
+
+Add the following to your \texttt{urls.py} file:
+
+\begin{verbatim}
+urlpatterns += patterns("",
+    (r"^%s" % settings.PYDJWIKI_URL_ROOT[1:], include("pydjwiki.urls")),
+)
+\end{verbatim}
+
+\subsection{Sync your database}
+
+From the directory with your project's \texttt{manage.py} file, enter \texttt{python manage.py syncdb} into a shell prompt to create PyDjWiki's tables.
+
+The first time you do this with PyDjWiki installed, entries will be automatically created in the Namespace, Title, and Revision tables to provide a default front page (\texttt{meta/Front Page}) with sample content. This happens when PyDjWiki detects those three tables being created in the same \texttt{syncdb} run. If, for some reason, not all the tables are created at the same time, don't worry. The default data is stored in a fixture, so make sure all the necessary tables have been created and invoke \texttt{python manage.py loaddata pydjwikistart.xml} to load it in.
+
+%\end{document}
\ No newline at end of file

=== modified file 'doc/Wikitext Extensibility.tex'
--- wiki/pydjwiki/doc/Wikitext Extensibility.tex	2009-05-10 21:31:13 +0000
+++ doc/Wikitext Extensibility.tex	2009-05-11 17:56:14 +0000
@@ -88,7 +88,8 @@
 In this case, the revelant node becomes
 
 \begin{verbatim}
-ExtensionNode (name="CHLOROPLETH" args={"base": "United States", ...} data="AL=9\nAK=3...")
+ExtensionNode (name="CHLOROPLETH" args={"base": "United States", ...}
+               data="AL=9\nAK=3...")
 \end{verbatim}
 
 Which evaluates to
@@ -96,9 +97,9 @@
 \begin{verbatim}
 DocumentNode
 |--- ParagraphNode
-|    |--- TextNode (text="The distribution of electoral votes is shown on the right.")
+|    |--- TextNode (text="The distribution ... is shown on the right.")
 |--- FloatNode (class="Figure")
-|    |--- ImageNode (src="ext/chloropleth/United-States-c5dd1b2697720fe692c529688d3f4f8d.svg")
+|    |--- ImageNode (src="ext/chloropleth/United-States-hash.svg")
 \end{verbatim}
 
 \section{Handler methods}

=== renamed file 'wiki/pydjwiki/dpr.py' => 'dpr.py'
=== renamed directory 'wiki/pydjwiki/dynamic' => 'dynamic'
=== added directory 'fixtures'
=== added file 'fixtures/pydjwikistart.xml'
--- fixtures/pydjwikistart.xml	1970-01-01 00:00:00 +0000
+++ fixtures/pydjwikistart.xml	2009-05-11 17:56:48 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0"><object pk="1" model="pydjwiki.title"><field to="pydjwiki.namespace" name="namespace" rel="ManyToOneRel">1</field><field type="CharField" name="name">Front_Page</field><field type="BooleanField" name="active">True</field></object><object pk="1" model="pydjwiki.namespace"><field type="CharField" name="name">meta</field><field type="CharField" name="renderer">pydjwiki.render.parsers.creoleadd.CreoleAdditionsParser</field></object><object pk="1" model="pydjwiki.revision"><field to="pydjwiki.title" name="title" rel="ManyToOneRel">1</field><field type="DateTimeField" name="timestamp">2009-01-01 00:00:00</field><field to="auth.user" name="user" rel="ManyToOneRel">1</field><field type="TextField" name="content">== Welcome! ==
+
+Your wiki is up and running!</field><field type="CharField" name="comment">Wiki creation</field><field type="BooleanField" name="is_minor">False</field></object><object pk="4" model="pydjwiki.dynamicpage"><field type="SlugField" name="url">allpages</field><field type="SlugField" name="key">all_pages</field><field type="CharField" name="view">pydjwiki.dynamic.allpages.view</field><field type="TextField" name="description"></field><field type="CharField" name="title">All pages</field><field type="BooleanField" name="index">True</field></object><object pk="2" model="pydjwiki.dynamicpage"><field type="SlugField" name="url">archive</field><field type="SlugField" name="key">archive</field><field type="CharField" name="view">pydjwiki.dynamic.archive.view</field><field type="TextField" name="description"></field><field type="CharField" name="title">Archive</field><field type="BooleanField" name="index">False</field></object><object pk="6" model="pydjwiki.dynamicpage"><field type="SlugField" name="url">edit</field><field type="SlugField" name="key">edit</field><field type="CharField" name="view">pydjwiki.dynamic.edit.view</field><field type="TextField" name="description"></field><field type="CharField" name="title">Edit</field><field type="BooleanField" name="index">False</field></object><object pk="1" model="pydjwiki.dynamicpage"><field type="SlugField" name="url">history</field><field type="SlugField" name="key">edit_history</field><field type="CharField" name="view">pydjwiki.dynamic.edithistory.view</field><field type="TextField" name="description">Displays the edit history for a page.</field><field type="CharField" name="title">Edit history</field><field type="BooleanField" name="index">False</field></object><object pk="5" model="pydjwiki.dynamicpage"><field type="SlugField" name="url">index</field><field type="SlugField" name="key">index</field><field type="CharField" name="view">pydjwiki.dynamic.index.view</field><field type="TextField" name="description"></field><field type="CharField" name="title">Dynamic pages</field><field type="BooleanField" name="index">True</field></object><object pk="3" model="pydjwiki.dynamicpage"><field type="SlugField" name="url">linkindex</field><field type="SlugField" name="key">link_index</field><field type="CharField" name="view">pydjwiki.dynamic.linkindex.view</field><field type="TextField" name="description"></field><field type="CharField" name="title">Index of links</field><field type="BooleanField" name="index">False</field></object><object pk="7" model="pydjwiki.dynamicpage"><field type="SlugField" name="url">linkshere</field><field type="SlugField" name="key">links_here</field><field type="CharField" name="view">pydjwiki.dynamic.linkshere.view</field><field type="TextField" name="description"></field><field type="CharField" name="title">Links to Page</field><field type="BooleanField" name="index">False</field></object></django-objects>

=== renamed file 'wiki/pydjwiki/lib.py' => 'lib.py'
=== renamed directory 'wiki/pydjwiki/management' => 'management'
=== modified file 'management/__init__.py'
--- wiki/pydjwiki/management/__init__.py	2009-02-13 00:00:19 +0000
+++ management/__init__.py	2009-05-11 02:42:53 +0000
@@ -0,0 +1,33 @@
+from datetime import datetime
+
+from django.db.models.signals import post_syncdb
+
+from pydjwiki import models
+
+
+def handle_syncdb(**kwargs):
+    from django.core.management import call_command
+    from django.contrib.auth.models import User
+    from pydjwiki.models import Namespace, Title, Revision
+    classes = Namespace, Title, Revision
+    if not all([m in kwargs['created_models'] for m in classes]):
+        return
+#    ns = Namespace(name='meta',
+#        renderer='pydjwiki.render.parsers.creoleadd.CreoleAdditionsParser')
+#    ns.save()
+#    title = Title(namespace=ns, name='Front_Page', active=False)
+#    title.save()
+#    content = '== Welcome! ==\n\nYour wiki is up and running!'
+#    user = User.objects.order_by('id')[0]
+#    rev = Revision(title=title, timestamp=datetime(2009, 1, 1),
+#                   user=user, content=content, comment='Wiki creation')
+#    rev.save()
+#    title.active = True
+#    title.save()
+#    
+#    call_command('loaddata', 'dynamics.yaml')
+    call_command('loaddata', 'pydjwiki_start.xml')
+
+
+post_syncdb.connect(handle_syncdb, sender=models,
+                    dispatch_uid='pydjwiki.management.handle_syncdb')
\ No newline at end of file

=== renamed file 'wiki/pydjwiki/models.py' => 'models.py'
--- wiki/pydjwiki/models.py	2009-05-10 19:49:55 +0000
+++ models.py	2009-05-11 02:42:53 +0000
@@ -265,10 +265,16 @@
 
 def update_revision_links(sender, **kwargs):
     """Update Link table every time a Revision object is saved."""
-    kwargs['instance'].title.rebuild_links()
+    try:
+        kwargs['instance'].title.rebuild_links()
+    except Exception:
+        pass
 post_save.connect(update_revision_links, sender=Revision)
 
 def remove_inactive_title_links(sender, **kwargs):
     """Update Link table every time a Title object is saved."""
-    kwargs['instance'].rebuild_links()
+    try:
+        kwargs['instance'].rebuild_links()
+    except Exception:
+        pass
 post_save.connect(remove_inactive_title_links, sender=Title)

=== renamed directory 'wiki/pydjwiki/render' => 'render'
=== added file 'settings.py'
--- settings.py	1970-01-01 00:00:00 +0000
+++ settings.py	2009-05-11 02:42:53 +0000
@@ -0,0 +1,35 @@
+PYDJWIKI_NAMESPACE_REGEX = r'[a-z]+'
+PYDJWIKI_TITLE_REGEX = r'[^\t\n\r\f\v?#]+'
+PYDJWIKI_URL_REGEX = r'(?P<namespace>%s)/(?P<title>%s)(?:#(?P<anchor>.*))?$' \
+                     % (PYDJWIKI_NAMESPACE_REGEX, PYDJWIKI_TITLE_REGEX)
+PYDJWIKI_MEDIA_PSEUDONS = 'pydj-media'
+PYDJWIKI_SYSTEM_PSEUDONS = 'dynamic-page'
+PYDJWIKI_DEFAULT_NS = 'dev'
+PYDJWIKI_URL_ROOT = '/pydjwiki/'
+PYDJWIKI_WIKI_NAME = 'PyDjWiki Development Wiki'
+PYDJWIKI_FRONT_PAGE = 'meta/Front Page'
+PYDJWIKI_FRONT_PAGE_URL = ''.join((PYDJWIKI_URL_ROOT, PYDJWIKI_FRONT_PAGE))
+PYDJWIKI_SPACE_FRIENDLY_USER_AGENTS = (
+    # Modifying this setting requires a server restart. (Maybe.)
+    r'Firefox/3',
+    r'Opera',
+)
+PYDJWIKI_MAIN_NS = 'article'
+PYDJWIKI_SILENT_NAMESPACES = set((
+    PYDJWIKI_MAIN_NS,
+    PYDJWIKI_SYSTEM_PSEUDONS,
+))
+PYDJWIKI_SIDEBAR_TEMPLATES = (
+    'pydjwiki/sidebar/welcome.html',
+    'pydjwiki/sidebar/links.html',
+    'pydjwiki/sidebar/toc.html',
+)
+PYDJWIKI_LOGIN_PAGE = '%s/login/' % PYDJWIKI_SYSTEM_PSEUDONS
+PYDJWIKI_LOGOUT_PAGE = '%s/logout/' % PYDJWIKI_SYSTEM_PSEUDONS
+PYDJWIKI_EDIT_PAGE = '%s/edit/' % PYDJWIKI_SYSTEM_PSEUDONS
+
+from pydjwiki.dpr import _DynamicURLRegistry
+PYDJWIKI_DYNAMICS = _DynamicURLRegistry()
+
+LOGIN_URL = ''.join((PYDJWIKI_URL_ROOT, PYDJWIKI_LOGIN_PAGE))
+LOGIN_REDIRECT_URL = ''.join((PYDJWIKI_URL_ROOT, PYDJWIKI_FRONT_PAGE))
\ No newline at end of file

=== renamed directory 'wiki/pydjwiki/templates' => 'templates'
=== added file 'templates/base.html'
--- templates/base.html	1970-01-01 00:00:00 +0000
+++ templates/base.html	2009-05-11 02:42:53 +0000
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>{% block title %}{% endblock %}</title>
+{% block extrahead %}{% endblock %}</head>
+<body>
+{% block content %}{% endblock %}
+</body>
+</html>

=== renamed directory 'wiki/pydjwiki/templatetags' => 'templatetags'
=== renamed file 'wiki/pydjwiki/urls.py' => 'urls.py'
=== renamed file 'wiki/pydjwiki/views.py' => 'views.py'
=== removed directory 'wiki'
=== removed file 'wiki/__init__.py'
=== removed file 'wiki/database'
Binary files wiki/database	2009-03-01 04:12:40 +0000 and wiki/database	1970-01-01 00:00:00 +0000 differ
=== removed file 'wiki/manage.py'
--- wiki/manage.py	2009-03-11 03:25:19 +0000
+++ wiki/manage.py	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-from django.core.management import execute_manager
-
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the "
-                     "directory containing %r. It appears you've customized "
-                     "things.\nYou'll have to run django-admin.py, passing "
-                     "it your settings module.\n(If the file settings.py "
-                     "does indeed exist, it's causing an ImportError "
-                     "somehow.)\n" % __file__)
-    sys.exit(1)
-
-if __name__ == '__main__':
-    execute_manager(settings)

=== removed directory 'wiki/pydjwiki'
=== removed file 'wiki/settings.py'
--- wiki/settings.py	2009-03-09 20:04:00 +0000
+++ wiki/settings.py	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-# Django settings for wiki project.
-
-def _relative(stub):
-    import os.path
-    dir = os.path.dirname(__file__)
-    return os.path.normpath(u'%s/%s' % (dir, stub))
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    ('Michael Nesvold', '[e-mail]'),
-    ('Louis Wilson', '[e-mail]'),
-    # ('Your Name', '[e-mail]'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql',
-                            # 'sqlite3' or 'oracle'.
-DATABASE_NAME = _relative('database')
-DATABASE_USER = ''          # Not used with sqlite3.
-DATABASE_PASSWORD = ''      # Not used with sqlite3.
-DATABASE_HOST = ''          # Set to empty string for localhost.
-                            # Not used with sqlite3.
-DATABASE_PORT = ''          # Set to empty string for default.
-                            # Not used with sqlite3.
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# If running in a Windows environment this must be set to the same as
-# your system time zone.
-TIME_ZONE = 'America/Phoenix'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as
-# not to load the internationalization machinery.
-USE_I18N = False
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure
-# to use a trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'gc%)t_l7ey9dpga(*4z+5nae+-%f%i6)#u85ps_=t=0j@pkndf'
-
-# List of callables that know how to import templates from various
-# sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'pydjwiki.djhooks.PyDjWikiMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-)
-
-ROOT_URLCONF = 'wiki.urls'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or
-    # "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    _relative('templates'),
-    _relative('pydjwiki/templates'),
-    _relative('pydjwiki/dev/templates'),
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.auth',  # specified in default value
-    'django.core.context_processors.debug', # specified in default value
-    'django.core.context_processors.i18n',  # specified in default value
-    'django.core.context_processors.media', # specified in default value
-    'pydjwiki.djhooks.context_processor_pydjwiki',
-)
-
-INSTALLED_APPS = (
-    'django.contrib.admin',
-    'django.contrib.admindocs',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.humanize',
-    'django.contrib.sessions',
-#    'django.contrib.sites',
-    'wiki.pydjwiki',
-)
-
-PYDJWIKI_NAMESPACE_REGEX = r'[a-z]+'
-PYDJWIKI_TITLE_REGEX = r'[^\t\n\r\f\v?#]+'
-PYDJWIKI_URL_REGEX = r'(?P<namespace>%s)/(?P<title>%s)(?:#(?P<anchor>.*))?$' \
-                     % (PYDJWIKI_NAMESPACE_REGEX, PYDJWIKI_TITLE_REGEX)
-PYDJWIKI_MEDIA_PSEUDONS = 'pydj-media'
-PYDJWIKI_SYSTEM_PSEUDONS = 'dynamic-page'
-PYDJWIKI_DEFAULT_NS = 'dev'
-PYDJWIKI_URL_ROOT = '/pydjwiki/'
-PYDJWIKI_WIKI_NAME = 'PyDjWiki Development Wiki'
-PYDJWIKI_FRONT_PAGE = 'meta/Front Page'
-PYDJWIKI_FRONT_PAGE_URL = ''.join((PYDJWIKI_URL_ROOT, PYDJWIKI_FRONT_PAGE))
-PYDJWIKI_SPACE_FRIENDLY_USER_AGENTS = (
-    # Modifying this setting requires a server restart. (Maybe.)
-    r'Firefox/3',
-    r'Opera',
-)
-PYDJWIKI_MAIN_NS = 'article'
-PYDJWIKI_SILENT_NAMESPACES = set((
-    PYDJWIKI_MAIN_NS,
-    PYDJWIKI_SYSTEM_PSEUDONS,
-))
-PYDJWIKI_SIDEBAR_TEMPLATES = (
-    'pydjwiki/sidebar/welcome.html',
-    'pydjwiki/sidebar/links.html',
-    'pydjwiki/sidebar/toc.html',
-)
-PYDJWIKI_LOGIN_PAGE = '%s/login/' % PYDJWIKI_SYSTEM_PSEUDONS
-PYDJWIKI_LOGOUT_PAGE = '%s/logout/' % PYDJWIKI_SYSTEM_PSEUDONS
-PYDJWIKI_EDIT_PAGE = '%s/edit/' % PYDJWIKI_SYSTEM_PSEUDONS
-
-from pydjwiki.dpr import _DynamicURLRegistry
-PYDJWIKI_DYNAMICS = _DynamicURLRegistry()
-
-LOGIN_URL = ''.join((PYDJWIKI_URL_ROOT, PYDJWIKI_LOGIN_PAGE))
-LOGIN_REDIRECT_URL = ''.join((PYDJWIKI_URL_ROOT, PYDJWIKI_FRONT_PAGE))

=== removed directory 'wiki/templates'
=== removed directory 'wiki/templates/admin'
=== removed file 'wiki/templates/admin/base.html'
--- wiki/templates/admin/base.html	2008-12-12 07:03:52 +0000
+++ wiki/templates/admin/base.html	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
-<head>
-<title>{% block title %}{% endblock %}</title>
-<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" />
-{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" />{% endif %}
-{% block extrastyle %}{% endblock %}
-{% block extrahead %}{% endblock %}
-{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
-</head>
-{% load i18n %}
-
-<body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
-
-<!-- Container -->
-<div id="container">
-
-    {% if not is_popup %}
-    <!-- Header -->
-    <div id="header">
-        <div id="branding">
-        {% block branding %}{% endblock %}
-        </div>
-        {% if user.is_authenticated and user.is_staff %}
-        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}<a href="{{ root_path }}password_change/">{% trans 'Change password' %}</a> / <a href="{{ root_path }}logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
-        {% endif %}
-        {% block nav-global %}{% endblock %}
-    </div>
-    <!-- END Header -->
-    {% block breadcrumbs %}<div class="breadcrumbs"><a href="/">{% trans 'Home' %}</a>{% if title %} &rsaquo; {{ title|escape }}{% endif %}</div>{% endblock %}
-    {% endif %}
-
-        {% if messages %}
-        <ul class="messagelist">{% for message in messages %}<li>{{ message|escape }}</li>{% endfor %}</ul>
-        {% endif %}
-
-    <!-- Content -->
-    <div id="content" class="{% block coltype %}colM{% endblock %}">
-        {% block pretitle %}{% endblock %}
-        {% block content_title %}{% if title %}<h1>{{ title|escape }}</h1>{% endif %}{% endblock %}
-        {% block content %}
-        {% block object-tools %}{% endblock %}
-        {{ content }}
-        {% endblock %}
-        {% block sidebar %}{% endblock %}
-        <br class="clear" />
-    </div>
-    <!-- END Content -->
-
-    {% block footer %}<div id="footer"></div>{% endblock %}
-</div>
-<!-- END Container -->
-
-</body>
-</html>

=== removed file 'wiki/templates/admin/base_site.html'
--- wiki/templates/admin/base_site.html	2008-12-12 07:03:52 +0000
+++ wiki/templates/admin/base_site.html	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-{% extends "admin/base.html" %}
-{% load i18n %}
-
-{% block title %}{{ title }} | {% trans 'PyDjWiki admin' %}{% endblock %}
-
-{% block branding %}
-<h1 id="site-name">{% trans 'PyDjWiki administration' %}</h1>
-{% endblock %}
-
-{% block nav-global %}{% endblock %}

=== removed file 'wiki/templates/base.html'
--- wiki/templates/base.html	2009-02-16 20:48:55 +0000
+++ wiki/templates/base.html	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>{% block title %}{% endblock %}</title>
-{% block extrahead %}{% endblock %}</head>
-<body>
-{% block content %}{% endblock %}
-</body>
-</html>

=== removed file 'wiki/urls.py'
--- wiki/urls.py	2009-03-08 21:09:32 +0000
+++ wiki/urls.py	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-from django.conf import settings
-from django.conf.urls.defaults import *
-
-# Documentation
-urlpatterns = patterns('',
-    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    (r'^%s' % settings.PYDJWIKI_URL_ROOT[1:], include('wiki.pydjwiki.urls')),
-)
-
-# Redirect to /pydjwiki by default
-urlpatterns += patterns('django.views.generic.simple',
-        (r'^$', 'redirect_to', {'url': '/pydjwiki/'}),
-)
-
-# Admin site
-from django.contrib import admin
-admin.autodiscover()
-urlpatterns += patterns('',
-    (r'^admin/(.*)', admin.site.root)
-)