From d2eac17b4f0843e478d6182a5ea8a262d9ecb390 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 15 Oct 2011 20:30:34 +0000 Subject: [PATCH] Moved src/web to src/webapp svn: r18329 --- src/const.py.in | 2 +- src/webapp/grampsdb/admin.py | 2 +- src/webapp/grampsdb/forms.py | 2 +- src/webapp/grampsdb/models.py | 2 +- src/webapp/grampsdb/views.py | 12 ++++++------ src/webapp/reports.py | 2 +- src/webapp/settings.py | 6 +++--- src/webapp/urls.py | 6 +++--- src/webapp/utils.py | 8 ++++---- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/const.py.in b/src/const.py.in index e87dfbdd8..acb4e8093 100644 --- a/src/const.py.in +++ b/src/const.py.in @@ -178,7 +178,7 @@ RULE_GLADE = os.path.join(GLADE_DIR, "rule.glade") PLUGINS_DIR = os.path.join(ROOT_DIR, "plugins") DATA_DIR = os.path.join(ROOT_DIR, "data") -WEB_DIR = os.path.join(ROOT_DIR, 'web') +WEB_DIR = os.path.join(ROOT_DIR, 'webapp') #SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml") TIP_DATA = os.path.join(DATA_DIR, "tips.xml") WEBSTUFF_DIR = os.path.join(PLUGINS_DIR, "webstuff") diff --git a/src/webapp/grampsdb/admin.py b/src/webapp/grampsdb/admin.py index a947ac0cc..8355f09bd 100644 --- a/src/webapp/grampsdb/admin.py +++ b/src/webapp/grampsdb/admin.py @@ -1,4 +1,4 @@ -from web.grampsdb.models import * +from webapp.grampsdb.models import * from django.contrib import admin for type_name in get_tables("all"): diff --git a/src/webapp/grampsdb/forms.py b/src/webapp/grampsdb/forms.py index 0da5a6d84..4ab359ff1 100644 --- a/src/webapp/grampsdb/forms.py +++ b/src/webapp/grampsdb/forms.py @@ -1,7 +1,7 @@ # forms.py forms for Django web project from django import forms -from web.grampsdb.models import * +from webapp.grampsdb.models import * from django.forms.models import inlineformset_factory from django.forms.models import BaseModelFormSet from django.forms.widgets import TextInput diff --git a/src/webapp/grampsdb/models.py b/src/webapp/grampsdb/models.py index ff18ca541..db574bf68 100644 --- a/src/webapp/grampsdb/models.py +++ b/src/webapp/grampsdb/models.py @@ -36,7 +36,7 @@ from django.contrib.contenttypes import generic from gen.lib.date import Date as GDate, Today from Utils import create_id, create_uid -from web.grampsdb.profile import Profile +from webapp.grampsdb.profile import Profile #--------------------------------------------------------------------------- # diff --git a/src/webapp/grampsdb/views.py b/src/webapp/grampsdb/views.py index 66c556541..cc768897b 100644 --- a/src/webapp/grampsdb/views.py +++ b/src/webapp/grampsdb/views.py @@ -41,10 +41,10 @@ from django.db.models import Q # Gramps Modules # #------------------------------------------------------------------------ -import web -from web.grampsdb.models import * -from web.grampsdb.forms import * -from web.dbdjango import DbDjango +import webapp +from webapp.grampsdb.models import * +from webapp.grampsdb.forms import * +from webapp.dbdjango import DbDjango import gen.proxy from Utils import create_id @@ -248,8 +248,8 @@ def send_file(request, filename, mimetype): return response def process_action(request, view, handle, action): - from web.reports import import_file - from web.reports import export_file + from webapp.reports import import_file + from webapp.reports import export_file from cli.plug import run_report db = DbDjango() if view == "report": diff --git a/src/webapp/reports.py b/src/webapp/reports.py index 6e203f399..99d214b0d 100644 --- a/src/webapp/reports.py +++ b/src/webapp/reports.py @@ -9,7 +9,7 @@ import os # ------------------------------ # from cli.plug import run_report # from django.conf import settings -# import web.settings as default_settings +# import webapp.settings as default_settings # try: # settings.configure(default_settings) # except: diff --git a/src/webapp/settings.py b/src/webapp/settings.py index 3fa576d3f..7541c69bc 100644 --- a/src/webapp/settings.py +++ b/src/webapp/settings.py @@ -71,7 +71,7 @@ MIDDLEWARE_CLASSES = ( # 'debug_toolbar.middleware.DebugToolbarMiddleware', ) -ROOT_URLCONF = 'web.urls' +ROOT_URLCONF = 'webapp.urls' TEMPLATE_DIRS = ( # Use absolute paths, not relative paths. @@ -83,7 +83,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( # "django.core.context_processors.debug", "django.core.context_processors.i18n", "django.core.context_processors.media", - "web.grampsdb.views.context_processor", + "webapp.grampsdb.views.context_processor", ) INSTALLED_APPS = ( @@ -92,7 +92,7 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.admin', - 'web.grampsdb', + 'webapp.grampsdb', # 'django_extensions', # 'debug_toolbar', ) diff --git a/src/webapp/urls.py b/src/webapp/urls.py index 0591e35d9..f50016328 100644 --- a/src/webapp/urls.py +++ b/src/webapp/urls.py @@ -38,9 +38,9 @@ from django.conf.urls.defaults import * from django.contrib import admin admin.autodiscover() -from web.grampsdb.views import (main_page, user_page, logout_page, - process_action, view, view_detail, - view_name_detail) +from webapp.grampsdb.views import (main_page, user_page, logout_page, + process_action, view, view_detail, + view_name_detail) urlpatterns = patterns('', # Specific matches first: diff --git a/src/webapp/utils.py b/src/webapp/utils.py index 914ea4844..2116fff87 100644 --- a/src/webapp/utils.py +++ b/src/webapp/utils.py @@ -43,10 +43,10 @@ from django.contrib.contenttypes.models import ContentType # Gramps-Connect Modules # #------------------------------------------------------------------------ -import web.grampsdb.models as models -import web.grampsdb.forms as forms -from web import libdjango -from web.dbdjango import DbDjango +import webapp.grampsdb.models as models +import webapp.grampsdb.forms as forms +from webapp import libdjango +from webapp.dbdjango import DbDjango #------------------------------------------------------------------------ #