diff options
| -rw-r--r-- | module/web/settings.py | 9 | ||||
| -rw-r--r-- | module/web/templates/default/settings.html | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/module/web/settings.py b/module/web/settings.py index 760ace9f4..81d6cb8e8 100644 --- a/module/web/settings.py +++ b/module/web/settings.py @@ -4,8 +4,9 @@ DEBUG = True
TEMPLATE_DEBUG = DEBUG
-import os.path
+import os
import sys
+import django
SERVER_VERSION = "0.3.2"
@@ -75,7 +76,11 @@ DATABASE_PORT = '' # Set to empty string for default. Not used with # although not all choices may be available on all operating systems.
# If running in a Windows environment this must be set to the same as your
# system time zone.
-TIME_ZONE = 'Europe'
+if (django.VERSION[0] > 1 or django.VERSION[1] > 1) and os.name != "nt":
+ zone = None
+else:
+ zone = 'Europe'
+TIME_ZONE = zone
# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html index 518bb3f9e..d7c7f78a4 100644 --- a/module/web/templates/default/settings.html +++ b/module/web/templates/default/settings.html @@ -74,9 +74,7 @@ <ul id="toptabs" class="tabs"> {% for configname, config in conf.iteritems %} - {% if config|length > 0 %} - <li><a href="#{{configname}}">{{configname}}</a></li> - {% endif %} + <li><a href="#{{configname}}">{{configname}}</a></li> {% endfor %} </ul> |