Merge branch 'saclay' into saclay-v2.2

Conflicts:
	templates/chimere/detail.html

7 files changed, 28 insertions, 16 deletions

diff --git a/static/saclay/css/saclay.css b/static/saclay/css/saclay.css
index c94d90b..9bf32e4 100644
--- a/static/saclay/css/saclay.css
+++ b/static/saclay/css/saclay.css
@@ -188,14 +188,6 @@
     background-image:url('../images/subcategories/bala_2_on.png');
 }
 
-/*17 - Sport et loisirs - Terrains de sport*/
-#li_sub_17 label{
-    background-image:url('../images/subcategories/spor_3_off.png');
-}
-
-#li_sub_17 .selected label{
-    background-image:url('../images/subcategories/spor_3_on.png');
-}
 
 /*18 - Sport et loisirs - Parcs et jardins*/
 #li_sub_18 label{
@@ -215,13 +207,13 @@
     background-image:url('../images/subcategories/spor_5_on.png');
 }
 
-/*20 - Sport et loisirs - Salles de sport*/
+/*20 - Sport et loisirs - Equipements sportifs */
 #li_sub_20 label{
-    background-image:url('../images/subcategories/spor_1_off.png');
+    background-image:url('../images/subcategories/spor_3_off.png');
 }
 
 #li_sub_20 .selected label{
-    background-image:url('../images/subcategories/spor_1_on.png');
+    background-image:url('../images/subcategories/spor_3_on.png');
 }
 
 /*22 - Balades - Points étapes*/
@@ -262,11 +254,11 @@
 
 /*30 - Agri-cultures - Ventes en circuits courts*/
 #li_sub_30 label{
-    background-image:url('../images/subcategories/agri_1_off.png');
+    background-image:url('../images/subcategories/agri_4_off.png');
 }
 
 #li_sub_30 .selected label{
-    background-image:url('../images/subcategories/agri_1_on.png');
+    background-image:url('../images/subcategories/agri_4_on.png');
 }
 
 /*31 - Agri-cultures - Exploitations agricoles*/
@@ -500,11 +492,11 @@
 
 /*61 - Agri-cultures - Ventes à la ferme*/
 #li_sub_61 label{
-    background-image:url('../images/subcategories/agri_4_off.png');
+    background-image:url('../images/subcategories/agri_ventealaferme_off.png');
 }
 
 #li_sub_61 .selected label{
-    background-image:url('../images/subcategories/agri_4_on.png');
+    background-image:url('../images/subcategories/agri_ventealaferme_on.png');
 }
 
 /*62 - Événements - Expositions*/
@@ -615,4 +607,12 @@
     background-image:url('../images/subcategories/patri_forets_on.png');
 }
 
+/*81 - Ressources pratiques - Hébergement*/
+#li_sub_81 label{
+    background-image:url('../images/subcategories/ress_heberg_off.png');
+}
+
+#li_sub_81 .selected label{
+    background-image:url('../images/subcategories/ress_heberg_on.png');
+}
 
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 724228b..6046bb2 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -1184,7 +1184,8 @@ ul.share {
     position:absolute;
     width:276px;
     height:22px;
-    border-right:1px solid;
+    border-right:1px solid #999;
+    border-left:1px solid #999;
 }
 
 .sidebar-handler{
diff --git a/static/saclay/images/subcategories/agri_ventealaferme_off.png b/static/saclay/images/subcategories/agri_ventealaferme_off.png
new file mode 100644
index 0000000..2aecffb
--- /dev/null
+++ b/static/saclay/images/subcategories/agri_ventealaferme_off.png
diff --git a/static/saclay/images/subcategories/agri_ventealaferme_on.png b/static/saclay/images/subcategories/agri_ventealaferme_on.png
new file mode 100644
index 0000000..04944cd
--- /dev/null
+++ b/static/saclay/images/subcategories/agri_ventealaferme_on.png
diff --git a/static/saclay/images/subcategories/ress_heberg_off.png b/static/saclay/images/subcategories/ress_heberg_off.png
new file mode 100644
index 0000000..b8e14dc
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_heberg_off.png
diff --git a/static/saclay/images/subcategories/ress_heberg_on.png b/static/saclay/images/subcategories/ress_heberg_on.png
new file mode 100644
index 0000000..b4f2ed2
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_heberg_on.png
diff --git a/static/saclay/json/limites.json b/static/saclay/json/limites.json
new file mode 100644
index 0000000..c4bd374
--- /dev/null
+++ b/static/saclay/json/limites.json
@@ -0,0 +1,11 @@
+{
+"type": "FeatureCollection",
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+                                                                                
+"features": [
+{ "type": "Feature", "properties": { "id": 2 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 1.415367733044637, 49.146755062646641 ], [ 1.910690386864486, 49.150093445860122 ], [ 1.903186849198962, 48.835273024038308 ], [ 1.904075446728196, 48.642725738777457 ], [ 1.902387807685004, 48.319876279125701 ], [ 1.406722596398787, 48.324208966009472 ], [ 1.415367733044637, 49.146755062646641 ] ] ] } },
+{ "type": "Feature", "properties": { "id": 3 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 2.332812437502604, 49.14879263981846 ], [ 2.825963733102833, 49.149887858037772 ], [ 2.868637641079677, 48.309477652615946 ], [ 2.327778583840803, 48.322815269690658 ], [ 2.308802961286472, 48.644265672631498 ], [ 2.3084639891017, 48.834849987186722 ], [ 2.332812437502604, 49.14879263981846 ] ] ] } },
+{ "type": "Feature", "properties": { "id": 4 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 1.910690386864491, 49.150093445860115 ], [ 2.332812437502604, 49.14879263981846 ], [ 2.3084639891017, 48.834849987186722 ], [ 1.903186849198962, 48.835273024038308 ], [ 1.910690386864491, 49.150093445860115 ] ] ] } },
+{ "type": "Feature", "properties": { "id": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 1.904075446728196, 48.642725738777457 ], [ 2.308802961286472, 48.644265672631498 ], [ 2.327778583840808, 48.322815269690643 ], [ 1.902387807684997, 48.31987627912568 ], [ 1.904075446728196, 48.642725738777457 ] ] ] } }
+]
+}