diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-25 23:19:10 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-25 23:19:10 +0200 |
| commit | 4042ec5465d3284c5a63364c6916908abdc0ef70 (patch) | |
| tree | da37e0ac809bfd97b5d493d9f02b4f7fe29427fb | |
| parent | aab1bd4a31372455f61a9c951b2316a530590c58 (diff) | |
| download | Chimère - projet Saclay-4042ec5465d3284c5a63364c6916908abdc0ef70.tar.bz2 Chimère - projet Saclay-4042ec5465d3284c5a63364c6916908abdc0ef70.zip | |
Fix template and settings for mobile
| -rw-r--r-- | settings.py | 10 | ||||
| -rw-r--r-- | static/saclay/css/mobile.css | 8 | ||||
| -rw-r--r-- | templates/chimere/base.html | 2 | ||||
| -rw-r--r-- | templates/chimere/blocks/map.html | 1 | ||||
| -rw-r--r-- | templates/chimere/main_map.html | 2 |
5 files changed, 15 insertions, 8 deletions
diff --git a/settings.py b/settings.py index c65f505..b9968f4 100644 --- a/settings.py +++ b/settings.py @@ -20,8 +20,6 @@ CONTACT_EMAIL = '' STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' -STATICFILES_DIRS = (ROOT_PATH + 'project_static',) - TINYMCE_URL = '/tinymce/' EXTRA_CSS = [] JQUERY_JS_URLS = ('/javascript/jquery/jquery.js', @@ -309,7 +307,7 @@ if 'OSM_JS_URLS' not in globals(): STATIC_URL + "openlayers/SimplePanZoom.js", "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] if 'OSM_MOBILE_JS_URLS' not in globals(): - global OSM_MOBILE_URLS - OSM_JS_MOBILE_URLS = [STATIC_URL + "openlayers/OpenLayers.mobile.js", - STATIC_URL + "openlayers/SimplePanZoom.js", - "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] + global OSM_MOBILE_JS_URLS + OSM_MOBILE_JS_URLS = [STATIC_URL + "openlayers/OpenLayers.mobile.js", + "http://www.openstreetmap.org/openlayers/OpenStreetMap.js" + ] diff --git a/static/saclay/css/mobile.css b/static/saclay/css/mobile.css index 5f3b3bf..ee31e25 100644 --- a/static/saclay/css/mobile.css +++ b/static/saclay/css/mobile.css @@ -1 +1,9 @@ /* sample css file for mobile */ + +.cloud, .close_img{ + width:200px; +} + +#detail_content{ + max-height:100px; +} diff --git a/templates/chimere/base.html b/templates/chimere/base.html index 6d7083e..bab159f 100644 --- a/templates/chimere/base.html +++ b/templates/chimere/base.html @@ -10,7 +10,7 @@ {% if MOBILE %} <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/mobile.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/mobile.css" /> -<script src="{{ STATIC_URL }}chimere/js/mobile.chimere.js" type="text/javascript"></script>{%endif%} +<script src="{{ STATIC_URL }}chimere/js/mobile.chimere.js" type="text/javascript"></script> <script src="{{ STATIC_URL }}saclay/js/mobile.chimere.js" type="text/javascript"></script>{%endif%} {% if css_area %} <link rel="stylesheet" href="{{ css_area }}" />{% endif %} diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html index df14aba..e24fc83 100644 --- a/templates/chimere/blocks/map.html +++ b/templates/chimere/blocks/map.html @@ -43,6 +43,7 @@ {% if single_category %} $(function() {$('#panel').hide()});{% endif %} var chimere_init_options = {}; + {% if MOBILE %}chimere_init_options["mobile"] = true;{% endif %} chimere_init_options["routing_panel_open"] = routing_panel_open; chimere_init_options["category_accordion"] = false; chimere_init_options["cluster_icon"] = new OpenLayers.Icon( diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html index 9b1bef9..3f04fc6 100644 --- a/templates/chimere/main_map.html +++ b/templates/chimere/main_map.html @@ -1,7 +1,6 @@ {% extends "chimere/base.html" %} {% load i18n unlocalize_point chimere_tags %} {% block extra_head %} -{{ block.super }} {% head_jquery %} {% head_chimere %} {% head_jme %} @@ -19,6 +18,7 @@ // --> </script> <script src="{{ STATIC_URL }}saclay/js/interface.js" type="text/javascript"></script> +{{ block.super }} {% endblock %} {% block message_edit %}{% endblock %} {% block sidebar %} |