Moved src/gen/web to src/web

svn: r13547
This commit is contained in:
Doug Blank 2009-11-10 14:23:19 +00:00
parent 08d8861048
commit f90c2db4cd
22 changed files with 27 additions and 25 deletions

View File

@ -137,7 +137,7 @@ RULE_GLADE = os.path.join(GLADE_DIR, "rule.glade")
PLUGINS_DIR = os.path.join(ROOT_DIR, "plugins") PLUGINS_DIR = os.path.join(ROOT_DIR, "plugins")
DATA_DIR = os.path.join(ROOT_DIR, "data") DATA_DIR = os.path.join(ROOT_DIR, "data")
WEB_DIR = os.path.join(os.path.join(ROOT_DIR, 'gen'), 'web') WEB_DIR = os.path.join(ROOT_DIR, 'web')
#SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml") #SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml")
TIP_DATA = os.path.join(DATA_DIR, "tips.xml") TIP_DATA = os.path.join(DATA_DIR, "tips.xml")

View File

@ -59,14 +59,14 @@ _ = translator.gettext
ngettext = translator.ngettext ngettext = translator.ngettext
from django.conf import settings from django.conf import settings
import gen.web.settings as default_settings import web.settings as default_settings
try: try:
settings.configure(default_settings, DEBUG=True) settings.configure(default_settings, DEBUG=True)
except RuntimeError: except RuntimeError:
# already configured; ignore # already configured; ignore
pass pass
from gen.web.libdjango import DjangoInterface from web.libdjango import DjangoInterface
def export_all(database, filename, option_box=None, callback=None): def export_all(database, filename, option_box=None, callback=None):
if not callable(callback): if not callable(callback):

View File

@ -1,19 +1,19 @@
# Initialize GRAMPS Django site # Initialize GRAMPS Django site
update: grampsdb/fixtures/initial_data.json update: grampsdb/fixtures/initial_data.json
PYTHONPATH=../../../src python manage.py syncdb PYTHONPATH=../../src python manage.py syncdb
grampsdb/fixtures/initial_data.json: grampsdb/fixtures/initial_data.json:
PYTHONPATH=../../../src python init.py > grampsdb/fixtures/initial_data.json PYTHONPATH=../../src python init.py > grampsdb/fixtures/initial_data.json
init_gramps: init_gramps:
PYTHONPATH=../../../src python init_gramps.py # clear primary and secondary tables PYTHONPATH=../../src python init_gramps.py # clear primary and secondary tables
run: run:
PYTHONPATH=../../../src python manage.py runserver PYTHONPATH=../../src python manage.py runserver
sql: sql:
PYTHONPATH=../../../src python manage.py sqlall > gramps_sql.txt PYTHONPATH=../../src python manage.py sqlall > gramps_sql.txt
docs: docs:
mkdir -p docs mkdir -p docs

View File

@ -1,6 +1,7 @@
import web
import gen import gen
from gen.db import GrampsDbBase from gen.db import GrampsDbBase
from gen.web.libdjango import DjangoInterface from web.libdjango import DjangoInterface
import Utils import Utils
# class Trans(object): # class Trans(object):

View File

@ -1,7 +1,7 @@
# forms.py forms for Django project gen.web # forms.py forms for Django web project
from django import forms from django import forms
from gen.web.grampsdb.models import * from web.grampsdb.models import *
from django.forms.models import inlineformset_factory from django.forms.models import inlineformset_factory
from django.forms.models import BaseModelFormSet from django.forms.models import BaseModelFormSet
import datetime import datetime

View File

@ -1,4 +1,4 @@
from gen.web.grampsdb.models import * from web.grampsdb.models import *
from django.contrib import admin from django.contrib import admin
for type_name in get_tables("all"): for type_name in get_tables("all"):

View File

@ -18,7 +18,7 @@
"setting" : "db_created" , "setting" : "db_created" ,
"description" : "database creation date/time" , "description" : "database creation date/time" ,
"value_type" : "str" , "value_type" : "str" ,
"value" : "2009-11-10 08:08" "value" : "2009-11-10 09:20"
} }
}, },
{ {

View File

@ -1,7 +1,7 @@
from django.template import escape, Library from django.template import escape, Library
from gen.web import libdjango from web import libdjango
from gen.web import djangodb from web import djangodb
import gen.web.grampsdb.models as models import web.grampsdb.models as models
from gen.lib.date import Date as GDate, Today from gen.lib.date import Date as GDate, Today
import DateHandler import DateHandler

View File

@ -8,9 +8,9 @@ from django.shortcuts import get_object_or_404, render_to_response
from django.template import Context, RequestContext, escape from django.template import Context, RequestContext, escape
from django.db.models import Q from django.db.models import Q
import gen import web
from gen.web.grampsdb.models import * from web.grampsdb.models import *
from gen.web.settings import VIEWS from web.settings import VIEWS
def get_views(): def get_views():
''' '''
@ -21,7 +21,7 @@ def get_views():
def main_page(request): def main_page(request):
context = RequestContext(request) context = RequestContext(request)
context["views"] = [(pair[0], pair[1], context["views"] = [(pair[0], pair[1],
getattr(gen.web.grampsdb.models, pair[2]).objects.count()) getattr(web.grampsdb.models, pair[2]).objects.count())
for pair in get_views()] for pair in get_views()]
context["view"] = 'home' context["view"] = 'home'
context["cview"] = 'Home' context["cview"] = 'Home'

View File

@ -1,7 +1,8 @@
import time import time
import gen.web.grampsdb.models as models import web.grampsdb.models as models
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
import web
import gen import gen
# To get a django person from a django database: # To get a django person from a django database:

View File

@ -37,7 +37,7 @@ MIDDLEWARE_CLASSES = (
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
) )
ROOT_URLCONF = 'gen.web.urls' ROOT_URLCONF = 'web.urls'
TEMPLATE_DIRS = ( TEMPLATE_DIRS = (
# Use absolute paths, not relative paths. # Use absolute paths, not relative paths.
@ -50,7 +50,7 @@ INSTALLED_APPS = (
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.sites', 'django.contrib.sites',
'django.contrib.admin', 'django.contrib.admin',
'gen.web.grampsdb', 'web.grampsdb',
# 'django_extensions', # 'django_extensions',
) )

View File

@ -6,7 +6,7 @@ from django.conf.urls.defaults import *
from django.contrib import admin from django.contrib import admin
admin.autodiscover() admin.autodiscover()
from gen.web.grampsdb.views import (main_page, user_page, logout_page, from web.grampsdb.views import (main_page, user_page, logout_page,
view, view_detail) view, view_detail)
urlpatterns = patterns('', urlpatterns = patterns('',