Splitting web stuff off into a separate apps directory. This stuff will end up being replaced/re-written, it's ancient and really badly done.

settings_common.py

@@ -1,38 +1,38 @@
-"""
-Common settings that don't change very much. This allows us to update things
-like apps through subversion without developers having to modify their
-settings.py file, which is not versioned.
-"""
-
-# 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',
-)
+"""
+Common settings that don't change very much. This allows us to update things
+like apps through subversion without developers having to modify their
+settings.py file, which is not versioned.
+"""
+
+# 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',
+)
 
 # Context processors define context variables, generally for the template
-# system to use.
+# system to use.
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
     'apps.website.webcontext.general_context',
-)
+)
 
 # MiddleWare are semi-transparent extensions to Django's functionality.
 # see http://www.djangoproject.com/documentation/middleware/ for a more detailed
-# explanation.
+# explanation.
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
-)
+)
 
 # Global and Evennia-specific apps. This ties everything together so we can
-# refer to app models and perform DB syncs.
+# refer to app models and perform DB syncs.
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.sites',
@@ -44,6 +44,6 @@ INSTALLED_APPS = (
     'apps.objects',
     'apps.helpsys',
     'apps.genperms',
-    'apps.news',
-    'apps.website',
-)
+    'webapps.news',
+    'webapps.website',
+)

webapps/news/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('apps.news.views',
+urlpatterns = patterns('webapps.news.views',
      (r'^show/(?P<entry_id>\d+)/$', 'show_news'),
      (r'^archive/$', 'news_archive'),
      (r'^search/$', 'search_form'),

webapps/news/views.py

@@ -13,7 +13,7 @@ from django.contrib.auth.models import User
 from django import newforms as forms
 from django.db.models import Q
 
-from apps.news.models import NewsTopic, NewsEntry
+from webapps.news.models import NewsTopic, NewsEntry
 
 # The sidebar text to be included as a variable on each page. There's got to
 # be a better, cleaner way to include this on every page.

webapps/website/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('apps.website.views',
+urlpatterns = patterns('webapps.website.views',
      (r'^$', 'page_index'),
 )

webapps/website/views.py

@@ -2,7 +2,7 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.contrib.auth.models import User
 
-from apps.news.models import NewsEntry
+from webapps.news.models import NewsEntry
 import functions_db
 
 """