Merge branch 'saclay' of ssh://lysithea.proxience.net/home/proxience/git/chimere_saclay into saclay

17 files changed, 96 insertions, 142 deletions

diff --git a/static/saclay/css/saclay.css b/static/saclay/css/saclay.css
index 5d52b0f..892110a 100644
--- a/static/saclay/css/saclay.css
+++ b/static/saclay/css/saclay.css
@@ -152,16 +152,7 @@
     color:#d38fac;
 }
 
-/*5 - Ressources pratiques - Commerces et services nocturnes*/
-#li_sub_5 label{
-    background-image:url('../images/subcategories/ress_5_off.png');
-}
-
-#li_sub_5 .selected label{
-    background-image:url('../images/subcategories/ress_5_on.png');
-}
-
-/*7 - Culture - Cinéma*/
+/*7 - Cultures - Cinéma*/
 #li_sub_7 label{
     background-image:url('../images/subcategories/cult_2_off.png');
 }
@@ -170,7 +161,7 @@
     background-image:url('../images/subcategories/cult_2_on.png');
 }
 
-/*11 - Agri-cultures - Jardins partagés*/
+/*11 - Agri-cultures - Jardinages citoyens*/
 #li_sub_11 label{
     background-image:url('../images/subcategories/agri_6_off.png');
 }
@@ -188,7 +179,7 @@
     background-image:url('../images/subcategories/patri_4_on.png');
 }
 
-/*15 - Balades - Balades pour tous*/
+/*15 - Balades - Balades à pied*/
 #li_sub_15 label{
     background-image:url('../images/subcategories/bala_2_off.png');
 }
@@ -197,16 +188,7 @@
     background-image:url('../images/subcategories/bala_2_on.png');
 }
 
-/*16 - Balades - Randonnées*/
-#li_sub_16 label{
-    background-image:url('../images/subcategories/bala_3_off.png');
-}
-
-#li_sub_16 .selected label{
-    background-image:url('../images/subcategories/bala_3_on.png');
-}
-
-/*17 - Sport et loisirs - Terrains de sport extérieurs*/
+/*17 - Sport et loisirs - Terrains de sport*/
 #li_sub_17 label{
     background-image:url('../images/subcategories/spor_3_off.png');
 }
@@ -224,7 +206,7 @@
     background-image:url('../images/subcategories/spor_6_on.png');
 }
 
-/*19 - Sport et loisirs - Espaces jeux enfants et ados*/
+/*19 - Sport et loisirs - Espaces de jeux*/
 #li_sub_19 label{
     background-image:url('../images/subcategories/spor_5_off.png');
 }
@@ -233,7 +215,7 @@
     background-image:url('../images/subcategories/spor_5_on.png');
 }
 
-/*20 - Sport et loisirs - Salles et équipements sportifs*/
+/*20 - Sport et loisirs - Salles de sport*/
 #li_sub_20 label{
     background-image:url('../images/subcategories/spor_1_off.png');
 }
@@ -242,16 +224,7 @@
     background-image:url('../images/subcategories/spor_1_on.png');
 }
 
-/*21 - Ressources pratiques - Petit creux et dépannage*/
-#li_sub_21 label{
-    background-image:url('../images/subcategories/ress_2_off.png');
-}
-
-#li_sub_21 .selected label{
-    background-image:url('../images/subcategories/ress_2_on.png');
-}
-
-/*22 - Balades - Pique-nique et points d'eau*/
+/*22 - Balades - Points étapes*/
 #li_sub_22 label{
     background-image:url('../images/subcategories/bala_6_off.png');
 }
@@ -260,7 +233,7 @@
     background-image:url('../images/subcategories/bala_6_on.png');
 }
 
-/*24 - Culture - Arts vivants*/
+/*24 - Cultures - Salles de spectacle*/
 #li_sub_24 label{
     background-image:url('../images/subcategories/cult_1_off.png');
 }
@@ -278,16 +251,7 @@
     background-image:url('../images/subcategories/patri_1_on.png');
 }
 
-/*26 - Ressources pratiques - Besoins et soins quotidiens*/
-#li_sub_26 label{
-    background-image:url('../images/subcategories/ress_1_off.png');
-}
-
-#li_sub_26 .selected label{
-    background-image:url('../images/subcategories/ress_1_on.png');
-}
-
-/*27 - Ressources pratiques - Jeter et recycler*/
+/*27 - Ressources pratiques - Collecte et recyclage des déchets*/
 #li_sub_27 label{
     background-image:url('../images/subcategories/ress_3_off.png');
 }
@@ -296,16 +260,7 @@
     background-image:url('../images/subcategories/ress_3_on.png');
 }
 
-/*29 - Culture - Visiter et voir*/
-#li_sub_29 label{
-    background-image:url('../images/subcategories/cult_5_off.png');
-}
-
-#li_sub_29 .selected label{
-    background-image:url('../images/subcategories/cult_5_on.png');
-}
-
-/*30 - Agri-cultures - AMAPs*/
+/*30 - Agri-cultures - Ventes en circuits courts*/
 #li_sub_30 label{
     background-image:url('../images/subcategories/agri_1_off.png');
 }
@@ -332,16 +287,7 @@
     background-image:url('../images/subcategories/agri_5_on.png');
 }
 
-/*33 - Agri-cultures - Pour jardiner*/
-#li_sub_33 label{
-    background-image:url('../images/subcategories/agri_2_off.png');
-}
-
-#li_sub_33 .selected label{
-    background-image:url('../images/subcategories/agri_2_on.png');
-}
-
-/*34 - Mobilités - Boutique et location vélos*/
+/*34 - Mobilités - Boutiques et locations de vélo*/
 #li_sub_34 label{
     background-image:url('../images/subcategories/mob_1_off.png');
 }
@@ -350,7 +296,7 @@
     background-image:url('../images/subcategories/mob_1_on.png');
 }
 
-/*35 - Culture - Bibliothèques*/
+/*35 - Cultures - Bibliothèques et médiathèques*/
 #li_sub_35 label{
     background-image:url('../images/subcategories/cult_3_off.png');
 }
@@ -378,7 +324,7 @@
     background-image:url('../images/subcategories/even_2_on.png');
 }
 
-/*38 - Événements - Sports*/
+/*38 - Événements - Manifestations sportives*/
 #li_sub_38 label{
     background-image:url('../images/subcategories/even_3_off.png');
 }
@@ -423,7 +369,7 @@
     background-image:url('../images/subcategories/even_7_on.png');
 }
 
-/*43 - Culture - Apprendre et pratiquer*/
+/*43 - Cultures - Apprentissage des arts*/
 #li_sub_43 label{
     background-image:url('../images/subcategories/cult_4_off.png');
 }
@@ -432,7 +378,7 @@
     background-image:url('../images/subcategories/cult_4_on.png');
 }
 
-/*44 - Culture - Campus ouvert*/
+/*44 - Cultures - Campus ouverts*/
 #li_sub_44 label{
     background-image:url('../images/subcategories/cult_6_off.png');
 }
@@ -441,7 +387,7 @@
     background-image:url('../images/subcategories/cult_6_on.png');
 }
 
-/*45 - Patrimoines - Bio-diversité*/
+/*45 - Patrimoines - Biodiversité*/
 #li_sub_45 label{
     background-image:url('../images/subcategories/patri_2_off.png');
 }
@@ -450,7 +396,7 @@
     background-image:url('../images/subcategories/patri_2_on.png');
 }
 
-/*46 - Patrimoines - Eau et rigoles*/
+/*46 - Patrimoines - Patrimoine hydraulique*/
 #li_sub_46 label{
     background-image:url('../images/subcategories/patri_3_off.png');
 }
@@ -459,33 +405,6 @@
     background-image:url('../images/subcategories/patri_3_on.png');
 }
 
-/*47 - Patrimoines - Paysages*/
-#li_sub_47 label{
-    background-image:url('../images/subcategories/patri_5_off.png');
-}
-
-#li_sub_47 .selected label{
-    background-image:url('../images/subcategories/patri_5_on.png');
-}
-
-/*48 - Patrimoines - Récits et témoignages*/
-#li_sub_48 label{
-    background-image:url('../images/subcategories/patri_6_off.png');
-}
-
-#li_sub_48 .selected label{
-    background-image:url('../images/subcategories/patri_6_on.png');
-}
-
-/*49 - Sport et loisirs - Pistes et parcours sportifs*/
-#li_sub_49 label{
-    background-image:url('../images/subcategories/spor_2_off.png');
-}
-
-#li_sub_49 .selected label{
-    background-image:url('../images/subcategories/spor_2_on.png');
-}
-
 /*50 - Sport et loisirs - Associations et clubs de sport*/
 #li_sub_50 label{
     background-image:url('../images/subcategories/spor_4_off.png');
@@ -513,20 +432,18 @@
     background-image:url('../images/subcategories/mob_2_on.png');
 }
 
-/*53 - Mobilités - Lignes et stations bus et cars*/
+/*53 - Mobilités - Lignes et stations de bus*/
 #li_sub_53 label{
-    /*background-image:url('../images/subcategories/mob_3_off.png');*/
-    background-image:url('../images/subcategories/mob_3_disabled.png');
+    background-image:url('../images/subcategories/mob_3_off.png');
     color:#ccc;
 }
 
 #ul_categories .subcategories #li_sub_53 .selected label{
-    /*background-image:url('../images/subcategories/mob_3_on.png');*/
-    background-image:url('../images/subcategories/mob_3_disabled.png');
+    background-image:url('../images/subcategories/mob_3_on.png');
     color:#ccc;
 }
 
-/*54 - Mobilités - Lignes et stations RER*/
+/*54 - Mobilités - Lignes et stations de RER*/
 #li_sub_54 label{
     background-image:url('../images/subcategories/mob_4_off.png');
 }
@@ -553,7 +470,7 @@
     background-image:url('../images/subcategories/mob_6_on.png');
 }
 
-/*57 - Balades - Sentiers découvertes*/
+/*57 - Balades - Sentiers découvertes de Terre et Cité*/
 #li_sub_57 label{
     background-image:url('../images/subcategories/bala_1_off.png');
 }
@@ -563,7 +480,7 @@
 }
 
 
-/*58 - Balades - Vélo*/
+/*58 - Balades - Balades à vélo*/
 #li_sub_58 label{
     background-image:url('../images/subcategories/bala_4_off.png');
 }
@@ -572,7 +489,7 @@
     background-image:url('../images/subcategories/bala_4_on.png');
 }
 
-/*59 - Balades - Équestre*/
+/*59 - Balades - Balades à cheval*/
 #li_sub_59 label{
     background-image:url('../images/subcategories/bala_5_off.png');
 }
@@ -581,16 +498,7 @@
     background-image:url('../images/subcategories/bala_5_on.png');
 }
 
-/*60 - Ressources pratiques - Wifi, courrier et espèces*/
-#li_sub_60 label{
-    background-image:url('../images/subcategories/ress_4_off.png');
-}
-
-#li_sub_60 .selected label{
-    background-image:url('../images/subcategories/ress_4_on.png');
-}
-
-/*61 - Agri-cultures - Marché et vente à la ferme*/
+/*61 - Agri-cultures - Ventes à la ferme*/
 #li_sub_61 label{
     background-image:url('../images/subcategories/agri_4_off.png');
 }
@@ -599,7 +507,7 @@
     background-image:url('../images/subcategories/agri_4_on.png');
 }
 
-/*62 - Événements - Exposition*/
+/*62 - Événements - Expositions*/
 #li_sub_62 label{
     background-image:url('../images/subcategories/even_8_off.png');
 }
@@ -608,16 +516,7 @@
     background-image:url('../images/subcategories/even_8_on.png');
 }
 
-/*64 - Événements - Salles publiques */
-#li_sub_64 label{
-    background-image:url('../images/subcategories/even_9_off.png');
-}
-
-#li_sub_64 .selected label{
-    background-image:url('../images/subcategories/even_9_on.png');
-}
-
-/*65 - Événements - Festival */
+/*65 - Événements - Festivals */
 #li_sub_65 label{
     background-image:url('../images/subcategories/even_10_off.png');
 }
@@ -626,16 +525,7 @@
     background-image:url('../images/subcategories/even_10_on.png');
 }
 
-/*66 - Mobilités - Chantiers en cours */
-#li_sub_66 label{
-    background-image:url('../images/subcategories/mob_7_off.png');
-}
-
-#li_sub_66 .selected label{
-    background-image:url('../images/subcategories/mob_7_on.png');
-}
-
-/*67 - Ressources pratiques - ESS */
+/*67 - Ressources pratiques - Économie Sociale et Solidaire */
 #li_sub_67 label{
     background-image:url('../images/subcategories/ress_6_off.png');
 }
@@ -643,3 +533,67 @@
 #li_sub_67 .selected label{
     background-image:url('../images/subcategories/ress_6_on.png');
 }
+
+/*68 - Cultures - Recherche */
+#li_sub_68 label{
+    background-image:url('../images/subcategories/cult_7_off.png');
+}
+
+#li_sub_68 .selected label{
+    background-image:url('../images/subcategories/cult_7_on.png');
+}
+
+/*69 - Patrimoines - Musées et galeries d'art */
+#li_sub_69 label{
+    background-image:url('../images/subcategories/patri_voir_off.png');
+}
+
+#li_sub_69 .selected label{
+    background-image:url('../images/subcategories/patri_voir_on.png');
+}
+
+/*70 - Ressources pratiques - Mairies */
+#li_sub_70 label{
+    background-image:url('../images/subcategories/ress_mairies_off.png');
+}
+
+#li_sub_70 .selected label{
+    background-image:url('../images/subcategories/ress_mairies_on.png');
+}
+
+/*71 - Ressources pratiques - Salles publiques */
+#li_sub_71 label{
+    background-image:url('../images/subcategories/ress_sallespb_off.png');
+}
+
+#li_sub_71 .selected label{
+    background-image:url('../images/subcategories/ress_sallespb_on.png');
+}
+
+/*72 - Ressources pratiques - Vie locale */
+#li_sub_72 label{
+    background-image:url('../images/subcategories/ress_vieloc_off.png');
+}
+
+#li_sub_72 .selected label{
+    background-image:url('../images/subcategories/ress_vieloc_on.png');
+}
+
+/*75 - Balades - Points de restauration */
+#li_sub_75 label{
+    background-image:url('../images/subcategories/bala_restau_off.png');
+}
+
+#li_sub_75 .selected label{
+    background-image:url('../images/subcategories/bala_restau_on.png');
+}
+
+/*76 - Mobilités - Chantiers en cours*/
+#li_sub_76 label{
+    background-image:url('../images/subcategories/mob_7_off.png');
+}
+
+#li_sub_76 .selected label{
+    background-image:url('../images/subcategories/mob_7_on.png');
+}
+
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 5925998..291c44d 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -1215,7 +1215,7 @@ ul#ul_categories{
 
 #id_transport_it span,
 #id_transport.ui-buttonset label{
-    width:122px;
+    width:90px;
     height:25px;
     border-radius:0;
     -webkit-border-radius:0;
diff --git a/static/saclay/images/subcategories/bala_restau_off.png b/static/saclay/images/subcategories/bala_restau_off.png
new file mode 100644
index 0000000..2d7a5fa
--- /dev/null
+++ b/static/saclay/images/subcategories/bala_restau_off.png
diff --git a/static/saclay/images/subcategories/bala_restau_on.png b/static/saclay/images/subcategories/bala_restau_on.png
new file mode 100644
index 0000000..67a707c
--- /dev/null
+++ b/static/saclay/images/subcategories/bala_restau_on.png
diff --git a/static/saclay/images/subcategories/cult_7_off.png b/static/saclay/images/subcategories/cult_7_off.png
new file mode 100644
index 0000000..1cef866
--- /dev/null
+++ b/static/saclay/images/subcategories/cult_7_off.png
diff --git a/static/saclay/images/subcategories/cult_7_on.png b/static/saclay/images/subcategories/cult_7_on.png
new file mode 100644
index 0000000..8fae71b
--- /dev/null
+++ b/static/saclay/images/subcategories/cult_7_on.png
diff --git a/static/saclay/images/subcategories/patri_voir_off.png b/static/saclay/images/subcategories/patri_voir_off.png
new file mode 100644
index 0000000..4e70b8a
--- /dev/null
+++ b/static/saclay/images/subcategories/patri_voir_off.png
diff --git a/static/saclay/images/subcategories/patri_voir_on.png b/static/saclay/images/subcategories/patri_voir_on.png
new file mode 100644
index 0000000..7cf8d80
--- /dev/null
+++ b/static/saclay/images/subcategories/patri_voir_on.png
diff --git a/static/saclay/images/subcategories/ress_1_off.png b/static/saclay/images/subcategories/ress_1_off.png
index 5af2567..1e4b193 100644
--- a/static/saclay/images/subcategories/ress_1_off.png
+++ b/static/saclay/images/subcategories/ress_1_off.png
diff --git a/static/saclay/images/subcategories/ress_1_on.png b/static/saclay/images/subcategories/ress_1_on.png
index d4cad53..0d8b928 100644
--- a/static/saclay/images/subcategories/ress_1_on.png
+++ b/static/saclay/images/subcategories/ress_1_on.png
diff --git a/static/saclay/images/subcategories/ress_mairies_off.png b/static/saclay/images/subcategories/ress_mairies_off.png
new file mode 100644
index 0000000..ffcdf53
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_mairies_off.png
diff --git a/static/saclay/images/subcategories/ress_mairies_on.png b/static/saclay/images/subcategories/ress_mairies_on.png
new file mode 100644
index 0000000..936c35e
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_mairies_on.png
diff --git a/static/saclay/images/subcategories/ress_sallespb_off.png b/static/saclay/images/subcategories/ress_sallespb_off.png
new file mode 100644
index 0000000..f574156
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_sallespb_off.png
diff --git a/static/saclay/images/subcategories/ress_sallespb_on.png b/static/saclay/images/subcategories/ress_sallespb_on.png
new file mode 100644
index 0000000..90a7cb4
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_sallespb_on.png
diff --git a/static/saclay/images/subcategories/ress_vieloc_off.png b/static/saclay/images/subcategories/ress_vieloc_off.png
new file mode 100644
index 0000000..fd09886
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_vieloc_off.png
diff --git a/static/saclay/images/subcategories/ress_vieloc_on.png b/static/saclay/images/subcategories/ress_vieloc_on.png
new file mode 100644
index 0000000..2fe24c9
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_vieloc_on.png
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index e2e8292..783adcb 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -34,7 +34,7 @@ $(function(){
                 callback(WebViewJavascriptBridge);
             }, false);
         }
-    }
+    };
     //fin  lib ios
     var routing_panel_open = function(){
         $('#frm_categories').hide();
@@ -58,7 +58,7 @@ $(function(){
     	$('#sidebar').hide();
     	// Added for mobile - START //
 		//iOS
-		methods.connectWebViewJavascriptBridge(
+		connectWebViewJavascriptBridge(
 			function(bridge) {
   				if(!bridge){
   				  	bridge.init(function(message, responseCallback) {
@@ -74,7 +74,7 @@ $(function(){
     	$('#sidebar').show();
     	// Added for mobile - START //
 		//iOS
-		methods.connectWebViewJavascriptBridge(
+		connectWebViewJavascriptBridge(
 			function(bridge) {
   				if(!bridge){
   				  	bridge.init(function(message, responseCallback) {