diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-23 13:13:40 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-23 13:13:40 +0100 |
| commit | b4dd6850d5bbe0e75bdcdfdd7d06ff28d3ebfc99 (patch) | |
| tree | 30aba2cf351641d5fe1effb49c82a60612e5c742 /example_project | |
| parent | 7f9d0d320f905d22a60089b9d19919f9d30bcd81 (diff) | |
| download | Ishtar-b4dd6850d5bbe0e75bdcdfdd7d06ff28d3ebfc99.tar.bz2 Ishtar-b4dd6850d5bbe0e75bdcdfdd7d06ff28d3ebfc99.zip | |
Work on operation document generation
Diffstat (limited to 'example_project')
| -rw-r--r-- | example_project/local_settings.py.sample | 6 | ||||
| -rw-r--r-- | example_project/settings.py | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample index 901c7d3a8..f8f0f3e75 100644 --- a/example_project/local_settings.py.sample +++ b/example_project/local_settings.py.sample @@ -23,9 +23,11 @@ DATABASES = { }, } +BASE_URL = "http://mydomain/" + ROOT_URLCONF = 'example_project.urls' -STATIC_URL = 'http://mydomain/static/' -MEDIA_URL = 'http://mydomain/media/' +STATIC_URL = BASE_URL + 'static/' +MEDIA_URL = BASE_URL + 'mydomain/media/' DEBUG = False DEBUG_TOOLBAR = False diff --git a/example_project/settings.py b/example_project/settings.py index 753c21a07..68ceab74b 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -17,11 +17,10 @@ THUMB_MAX_SIZE = (300, 300) ROOT_PATH = os.path.abspath(os.path.curdir) + os.path.sep STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' +BASE_URL = "" URL_PATH = "" -JQUERY_URL = "http://localhost/javascript/jquery/jquery.js" -JQUERY_UI_URL = "http://localhost/javascript/jquery-ui/" -XHTML2ODT_PATH = ROOT_PATH + "../xhtml2odt" +XHTML2ODT_PATH = "/usr/local/lib/" ODT_TEMPLATE = ROOT_PATH + "../ishtar_common/static/template.odt" @@ -201,6 +200,12 @@ INSTALLED_APPS += EXTRA_APPS INTERNAL_IPS = ('127.0.0.1',) +if 'JQUERY_URL' not in globals(): + JQUERY_URL = BASE_URL + "javascript/jquery/jquery.js" +if 'JQUERY_UI_URL' not in globals(): + JQUERY_UI_URL = BASE_URL + "javascript/jquery-ui/" + + if DEBUG_TOOLBAR: global DEBUG_TOOLBAR_PANELS global DEBUG_TOOLBAR_CONFIG |