From ed1510c4a7badd6fc0fd7b5f09632f2ed70bf714 Mon Sep 17 00:00:00 2001 From: Greg Taylor Date: Sun, 15 Jun 2008 04:40:14 +0000 Subject: [PATCH] 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. --- apps/{news => helpsys/managers}/__init__.py | 0 settings_common.py | 38 ++++++++++----------- {apps/website => webapps}/__init__.py | 0 webapps/news/__init__.py | 0 {apps => webapps}/news/models.py | 0 {apps => webapps}/news/urls.py | 2 +- {apps => webapps}/news/views.py | 2 +- webapps/website/__init__.py | 0 {apps => webapps}/website/models.py | 0 {apps => webapps}/website/urls.py | 2 +- {apps => webapps}/website/views.py | 2 +- {apps => webapps}/website/webcontext.py | 0 12 files changed, 23 insertions(+), 23 deletions(-) rename apps/{news => helpsys/managers}/__init__.py (100%) mode change 100755 => 100644 rename {apps/website => webapps}/__init__.py (100%) create mode 100755 webapps/news/__init__.py rename {apps => webapps}/news/models.py (100%) rename {apps => webapps}/news/urls.py (82%) rename {apps => webapps}/news/views.py (98%) create mode 100644 webapps/website/__init__.py rename {apps => webapps}/website/models.py (100%) rename {apps => webapps}/website/urls.py (59%) rename {apps => webapps}/website/views.py (97%) rename {apps => webapps}/website/webcontext.py (100%) diff --git a/apps/news/__init__.py b/apps/helpsys/managers/__init__.py old mode 100755 new mode 100644 similarity index 100% rename from apps/news/__init__.py rename to apps/helpsys/managers/__init__.py diff --git a/settings_common.py b/settings_common.py index a4918fea1f..2c6d5e0598 100644 --- a/settings_common.py +++ b/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', +) diff --git a/apps/website/__init__.py b/webapps/__init__.py similarity index 100% rename from apps/website/__init__.py rename to webapps/__init__.py diff --git a/webapps/news/__init__.py b/webapps/news/__init__.py new file mode 100755 index 0000000000..e69de29bb2 diff --git a/apps/news/models.py b/webapps/news/models.py similarity index 100% rename from apps/news/models.py rename to webapps/news/models.py diff --git a/apps/news/urls.py b/webapps/news/urls.py similarity index 82% rename from apps/news/urls.py rename to webapps/news/urls.py index f0a2b6190f..535c744661 100755 --- a/apps/news/urls.py +++ b/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\d+)/$', 'show_news'), (r'^archive/$', 'news_archive'), (r'^search/$', 'search_form'), diff --git a/apps/news/views.py b/webapps/news/views.py similarity index 98% rename from apps/news/views.py rename to webapps/news/views.py index 7885e005a0..933c2d42cb 100755 --- a/apps/news/views.py +++ b/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. diff --git a/webapps/website/__init__.py b/webapps/website/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/website/models.py b/webapps/website/models.py similarity index 100% rename from apps/website/models.py rename to webapps/website/models.py diff --git a/apps/website/urls.py b/webapps/website/urls.py similarity index 59% rename from apps/website/urls.py rename to webapps/website/urls.py index 12ec613809..1868098887 100644 --- a/apps/website/urls.py +++ b/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'), ) diff --git a/apps/website/views.py b/webapps/website/views.py similarity index 97% rename from apps/website/views.py rename to webapps/website/views.py index 3f5bba8d87..473d4a3c5b 100644 --- a/apps/website/views.py +++ b/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 """ diff --git a/apps/website/webcontext.py b/webapps/website/webcontext.py similarity index 100% rename from apps/website/webcontext.py rename to webapps/website/webcontext.py