From 0785455bac092d060cdb7e92fb16fd3e35bedcd2 Mon Sep 17 00:00:00 2001 From: expo Date: Sun, 5 Aug 2012 02:33:48 +0200 Subject: [PATCH] FIx base template so admin link, expoweb link work and use consistent base URL --- localsettingsubuntu.py | 8 ++++---- templates/base.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py index 0a1d5e8..420d06a 100644 --- a/localsettingsubuntu.py +++ b/localsettingsubuntu.py @@ -29,18 +29,18 @@ FILES = REPOS_ROOT_PATH + 'expoimages' PYTHON_PATH = '/home/expo/expofiles/troggle/' #URL_ROOT = 'http://127.0.0.1:8000' -URL_ROOT = "http://expobox/" +URL_ROOT = "http://expoweb/" DIR_ROOT = ''#this should end in / if a value is given -EXPOWEB_URL = 'http://expobox/' -SURVEYS_URL = 'http://expobox/survey_scans/' +EXPOWEB_URL = '/' +SURVEYS_URL = '/survey_scans/' MEDIA_URL = URL_ROOT + DIR_ROOT + '/site_media/' MEDIA_ROOT = '/home/expo/expofiles/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/' TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' -TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/' +TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + '/tinymce_media/' TEMPLATE_DIRS = ( "/home/expo/expofiles/troggle/templates", diff --git a/templates/base.html b/templates/base.html index 0d12d45..3fa9245 100644 --- a/templates/base.html +++ b/templates/base.html @@ -16,10 +16,9 @@