[svn r8324] Weeks of local changes.

- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
This commit is contained in:
cucc
2009-05-03 07:56:03 +02:00
parent cf70fd1c6e
commit c24359cb87
25 changed files with 544 additions and 270 deletions

View File

@@ -35,7 +35,7 @@ USE_I18N = True
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/troggle/media-admin/'
PHOTOS_ROOT = os.path.join(EXPOWEB, 'photos')
#MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/')
MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/')
SURVEYS_URL = urlparse.urljoin(URL_ROOT , '/survey_scans/')
PHOTOS_URL = urlparse.urljoin(URL_ROOT , '/photos/')
SVX_URL = urlparse.urljoin(URL_ROOT , '/survex/')
@@ -80,6 +80,7 @@ INSTALLED_APPS = (
'django.contrib.redirects',
#'photologue',
#'troggle.reversion',
'django_evolution',
'troggle.registration',
'troggle.profiles',
'troggle.expo'