summaryrefslogtreecommitdiffstats
path: root/virtualenv/pffedportal
diff options
context:
space:
mode:
authorThomas NOEL <tnoel@entrouvert.com>2013-03-22 13:56:10 (GMT)
committerThomas NOEL <tnoel@entrouvert.com>2013-03-22 13:56:10 (GMT)
commitdeec571f781a4a6d2eaa1b0a50f0c531ac6ac2be (patch)
treef02cd660f1edb46e8aa4d3011f8b2061cd164c70 /virtualenv/pffedportal
parent80ee6ce194e024a874a1fc0bdebc5ecbac1464e5 (diff)
downloadunivnautes-old-deec571f781a4a6d2eaa1b0a50f0c531ac6ac2be.zip
univnautes-old-deec571f781a4a6d2eaa1b0a50f0c531ac6ac2be.tar.gz
univnautes-old-deec571f781a4a6d2eaa1b0a50f0c531ac6ac2be.tar.bz2
start_bounds in templates (and start_zoom is useless)
Diffstat (limited to 'virtualenv/pffedportal')
-rw-r--r--virtualenv/pffedportal/base/views.py1
-rw-r--r--virtualenv/pffedportal/settings.py5
-rw-r--r--virtualenv/pffedportal/templates/login0.html2
3 files changed, 7 insertions, 1 deletions
diff --git a/virtualenv/pffedportal/base/views.py b/virtualenv/pffedportal/base/views.py
index 3eea246..8b1efc9 100644
--- a/virtualenv/pffedportal/base/views.py
+++ b/virtualenv/pffedportal/base/views.py
@@ -106,6 +106,7 @@ def login(request):
'https_hostname': settings.HTTPS_HOSTNAME,
'disco_stores_read': settings.DISCO_STORES_READ,
'disco_stores_write': settings.DISCO_STORES_WRITE,
+ 'start_bounds': settings.GEO_START_BOUNDS,
},
context_instance=RequestContext(request))
diff --git a/virtualenv/pffedportal/settings.py b/virtualenv/pffedportal/settings.py
index df46ade..1b975e9 100644
--- a/virtualenv/pffedportal/settings.py
+++ b/virtualenv/pffedportal/settings.py
@@ -293,6 +293,11 @@ try:
except:
EMAIL_USE_TLS = True
+try:
+ GEO_START_BOUNDS = root.find('installedpackages/univnautestexts/config/start_bounds').text
+except:
+ GEO_START_BOUNDS = "[[41.1,-5.53],[51.5,9.91]]"
+
# local_settings.py can be used to override environment-specific settings
# like database and email that differ between development and production.
diff --git a/virtualenv/pffedportal/templates/login0.html b/virtualenv/pffedportal/templates/login0.html
index ec31308..10bea3e 100644
--- a/virtualenv/pffedportal/templates/login0.html
+++ b/virtualenv/pffedportal/templates/login0.html
@@ -113,7 +113,7 @@
<script>
var start_bounds = {% if start_bounds %}{{ start_bounds }}{% else %}[[41.1, -5.53], [51.5, 9.91]]{% endif %};
- var start_zoom = {% if start_zoom %}{{ start_zoom }}{% else %}6{% endif %};
+ var start_zoom = 6;
</script>
<script src="{{ MEDIA_URL }}univnautes/js/univnautes.js"></script>