mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2025-12-10 15:47:10 +00:00
[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:
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user