Merge branch 'saclay' of ssh://kubo.niadomo.net/home/etienne/git/chimere_saclay into saclay

Conflicts:
	templates/chimere/blocks/map.html

3 files changed, 86 insertions, 8 deletions

diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 111eba2..cdc6977 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -193,6 +193,7 @@ div#panel{
 
 html, body{
     height:100%;
+    overflow:hidden;
 }
 
 .ui-button,
@@ -591,6 +592,62 @@ a#ui-active-menuitem.ui-state-hover{
     background-image:url("../images/menu/icon_center.png");
 }
 
+.simple #permalink{
+    display:none;
+}
+
+.simple #layer_selection{
+    top:10px;
+    right:10px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanNorthItemInactive,
+.simple #main-map .olControlPanPanel .olControlPanWestItemInactive,
+.simple #main-map .olControlPanPanel .olControlPanEastItemInactive,
+.simple #main-map .olControlPanPanel .olControlPanSouthItemInactive {
+    position: absolute;
+    height:20px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanNorthItemInactive {
+    right:-9px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanEastItemInactive,
+.simple #main-map .olControlPanPanel .olControlPanWestItemInactive {
+    height:20px;
+    top:18px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanEastItemInactive{
+    right:-9px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanWestItemInactive {
+    right:16px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanSouthItemInactive {
+    right:-9px;
+    top:36px;
+    height:30px;
+}
+
+.simple #sidebar{
+    top:0;
+}
+
+.simple #panel{
+    top:0;
+    overflow:auto;
+    overflow-x: hidden;
+    height:100%;
+}
+
+.simple #panel #categories {
+    display:block;
+}
+
 #content{
     border:none;
     padding:0;
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 9e37b3f..63b0639 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -27,16 +27,15 @@ $(function(){
     <!--
     //LIB iOS
     var connectWebViewJavascriptBridge = function(callback) {
-   		if (window.WebViewJavascriptBridge) {
-        	callback(WebViewJavascriptBridge);
-    	} else {
-       		document.addEventListener('WebViewJavascriptBridgeReady', function() {
-          		callback(WebViewJavascriptBridge);
-        	}, false);
-   	}
+        if (window.WebViewJavascriptBridge) {
+            callback(WebViewJavascriptBridge);
+        } else {
+        document.addEventListener('WebViewJavascriptBridgeReady', function() {
+                callback(WebViewJavascriptBridge);
+            }, false);
+        }
     };
     //fin  lib ios
-        
     var routing_panel_open = function(){
         $('#frm_categories').hide();
         $('#chimere_itinerary_panel').show();
diff --git a/templates/chimere/main_map_simple.html b/templates/chimere/main_map_simple.html
new file mode 100644
index 0000000..dd81d39
--- /dev/null
+++ b/templates/chimere/main_map_simple.html
@@ -0,0 +1,22 @@
+{% extends "chimere/main_map.html" %}
+{% load i18n %}
+{% block body_class %}class='simple'{% endblock %}
+{% block body_id %}id='simple'{% endblock %}
+{% block menu %}{# no menu in simple mode #}{% endblock %}
+{% block message_edit %}{% endblock %}
+{% block sidebar %}
+    <div id='panel'>
+        <a>
+            <h2>{% trans "Categories"%}</h2>
+        </a>
+        <form method='post' name='frm_categories' id='frm_categories'>
+        <div id='categories' name='categories'></div>
+        </form>
+    </div>
+{% endblock %}
+{% block content %}
+    <script type='text/javascript'><!--
+        var simple = true;
+    // --></script>
+    {{ block.super }}
+{% endblock %}