summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--locale/fr/LC_MESSAGES/django.po2
-rw-r--r--settings.py9
-rw-r--r--static/saclay/css/saclay.css618
-rw-r--r--static/saclay/css/styles.css4
-rw-r--r--static/saclay/images/logo.pngbin0 -> 33297 bytes
-rw-r--r--static/saclay/images/logos/CapEEDD_Graine_CMJN.jpgbin0 -> 29297 bytes
-rw-r--r--static/saclay/images/logos/Logo_Conseil_general_de_l'Essonne.svg132
-rw-r--r--static/saclay/images/logos/region-ile-de-france.svg89
-rw-r--r--static/saclay/images/popup/home_title.pngbin0 -> 12063 bytes
-rw-r--r--static/saclay/images/popup/welcome_logo-chronos.pngbin0 -> 3690 bytes
-rw-r--r--static/saclay/images/popup/welcome_logo-paris-malaquais.pngbin0 -> 3015 bytes
-rw-r--r--static/saclay/images/popup/welcome_logo-terre-et-cite.pngbin0 -> 4305 bytes
-rw-r--r--static/saclay/images/popup/welcome_logos.pngbin0 -> 9620 bytes
-rw-r--r--static/saclay/images/subcategories/bala_restau_off.pngbin0 -> 3470 bytes
-rw-r--r--static/saclay/images/subcategories/bala_restau_on.pngbin0 -> 3517 bytes
-rw-r--r--static/saclay/images/subcategories/cult_7_off.pngbin0 -> 305 bytes
-rw-r--r--static/saclay/images/subcategories/cult_7_on.pngbin0 -> 305 bytes
-rw-r--r--static/saclay/images/subcategories/even_10_off.pngbin0 -> 323 bytes
-rw-r--r--static/saclay/images/subcategories/even_10_on.pngbin0 -> 323 bytes
-rw-r--r--static/saclay/images/subcategories/even_9_off.pngbin0 -> 288 bytes
-rw-r--r--static/saclay/images/subcategories/even_9_on.pngbin0 -> 288 bytes
-rw-r--r--static/saclay/images/subcategories/even_format_off.pngbin0 -> 3480 bytes
-rw-r--r--static/saclay/images/subcategories/even_format_on.pngbin0 -> 3489 bytes
-rw-r--r--static/saclay/images/subcategories/mob_7_off.pngbin0 -> 330 bytes
-rw-r--r--static/saclay/images/subcategories/mob_7_on.pngbin0 -> 323 bytes
-rw-r--r--static/saclay/images/subcategories/patri_forets_off.pngbin0 -> 3907 bytes
-rw-r--r--static/saclay/images/subcategories/patri_forets_on.pngbin0 -> 3353 bytes
-rw-r--r--static/saclay/images/subcategories/patri_voir_off.pngbin0 -> 3388 bytes
-rw-r--r--static/saclay/images/subcategories/patri_voir_on.pngbin0 -> 3370 bytes
-rw-r--r--static/saclay/images/subcategories/ress_1_off.pngbin347 -> 294 bytes
-rw-r--r--static/saclay/images/subcategories/ress_1_on.pngbin347 -> 294 bytes
-rw-r--r--static/saclay/images/subcategories/ress_6_off.pngbin0 -> 703 bytes
-rw-r--r--static/saclay/images/subcategories/ress_6_on.pngbin0 -> 367 bytes
-rw-r--r--static/saclay/images/subcategories/ress_mairies_off.pngbin0 -> 3414 bytes
-rw-r--r--static/saclay/images/subcategories/ress_mairies_on.pngbin0 -> 3441 bytes
-rw-r--r--static/saclay/images/subcategories/ress_sallespb_off.pngbin0 -> 3443 bytes
-rw-r--r--static/saclay/images/subcategories/ress_sallespb_on.pngbin0 -> 3506 bytes
-rw-r--r--static/saclay/images/subcategories/ress_vieloc_off.pngbin0 -> 3423 bytes
-rw-r--r--static/saclay/images/subcategories/ress_vieloc_on.pngbin0 -> 3474 bytes
-rw-r--r--static/saclay/images/welcome_logo_chronos.pngbin0 -> 5446 bytes
-rw-r--r--static/saclay/images/welcome_logo_malaquais.pngbin0 -> 5306 bytes
-rw-r--r--static/saclay/images/welcome_logo_terre_et_cite.pngbin0 -> 6152 bytes
-rw-r--r--templates/chimere/base.html16
-rw-r--r--templates/chimere/blocks/map.html46
-rw-r--r--templates/chimere/blocks/welcome.html33
-rw-r--r--templates/chimere/detail.html4
-rw-r--r--xslt/magny-les-hameaux.xslt21
-rw-r--r--xslt/villiers-le-bacle-detail.xslt19
-rw-r--r--xslt/villiers-le-bacle.xslt17
49 files changed, 998 insertions, 12 deletions
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 33cd00e..d09991d 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -161,7 +161,7 @@ msgstr "Trajet"
#: templates/chimere/edit.html:100
msgid "Select a route for this new site (have you submit the search?)"
msgstr ""
-"Sélectionnez un trajet pour ce nouvel élément (avez-vous validé vorte "
+"Sélectionnez un trajet pour ce nouvel élément (avez-vous validé votre "
"recherche ?)"
#: templates/chimere/edit.html:107
diff --git a/settings.py b/settings.py
index f636283..b86c620 100644
--- a/settings.py
+++ b/settings.py
@@ -60,11 +60,10 @@ CHIMERE_ALL_DATED_ARE_FRONT = True
# allow feeds
CHIMERE_FEEDS = True
-CHIMERE_ICON_WIDTH = 21
-CHIMERE_ICON_HEIGHT = 25
-CHIMERE_ICON_OFFSET_X = -10
-CHIMERE_ICON_OFFSET_Y = -25
-
+CHIMERE_ICON_WIDTH = 36
+CHIMERE_ICON_HEIGHT = 42
+CHIMERE_ICON_OFFSET_X = -18
+CHIMERE_ICON_OFFSET_Y = -42
# display picture inside the description by default or inside a galery?
CHIMERE_MINIATURE_BY_DEFAULT = False
diff --git a/static/saclay/css/saclay.css b/static/saclay/css/saclay.css
new file mode 100644
index 0000000..c94d90b
--- /dev/null
+++ b/static/saclay/css/saclay.css
@@ -0,0 +1,618 @@
+/* Saclay specific */
+#permalink{
+ display:none;
+}
+
+.welcome-dialog .title{
+ background-image:url(../images/popup/home_title.png) ;
+ background-repeat:no-repeat;
+ background-position: left center;
+ height:85px;
+}
+
+.welcome-dialog.ui-dialog .ui-dialog-titlebar-close{
+ right:25px;
+ width:30px;
+ height:30px;
+ top:35px;
+}
+
+#ul_categories li.main_category > span{
+ color:transparent;
+ font-size:0;
+}
+
+.main_category > span > label{
+ color:transparent;
+ font-size:0;
+}
+
+.main_category.toggle_plus > span#main_category_1 > label,
+.main_category.toggle_minus > span#main_category_1 > label,
+.main_category.toggle_plus > span#main_category_2 > label,
+.main_category.toggle_minus > span#main_category_2 > label,
+.main_category.toggle_plus > span#main_category_3 > label,
+.main_category.toggle_minus > span#main_category_3 > label,
+.main_category.toggle_plus > span#main_category_4 > label,
+.main_category.toggle_minus > span#main_category_4 > label,
+.main_category.toggle_plus > span#main_category_5 > label,
+.main_category.toggle_minus > span#main_category_5 > label,
+.main_category.toggle_plus > span#main_category_6 > label,
+.main_category.toggle_minus > span#main_category_6 > label,
+.main_category.toggle_plus > span#main_category_7 > label,
+.main_category.toggle_minus > span#main_category_7 > label,
+.main_category.toggle_plus > span#main_category_8 > label,
+.main_category.toggle_minus > span#main_category_8 > label,
+.main_category.toggle_plus > span#main_category_9 > label,
+.main_category.toggle_minus > span#main_category_9 > label{
+ background-color:transparent;
+}
+
+#main_category_1{
+ background-image:url('../images/categories/cat_culture.png');
+ background-repeat:no-repeat;
+}
+
+#main_category_1.category-selected{
+ background-image:url('../images/categories/cat_culture_on.png');
+}
+
+#maincategory_1 label{
+ color:#cd5a5a;
+}
+
+#main_category_2{
+ background-image:url('../images/categories/cat_event.png');
+ background-repeat:no-repeat;
+}
+
+#main_category_2.category-selected{
+ background-image:url('../images/categories/cat_event_on.png');
+}
+
+#maincategory_2 label{
+ color:#996998;
+}
+
+#main_category_3{
+ background-image:url('../images/categories/cat_patrimoine.png');
+ background-repeat:no-repeat;
+}
+
+#main_category_3.category-selected{
+ background-image:url('../images/categories/cat_patrimoine_on.png');
+}
+
+#maincategory_3 label{
+ color:#c49c86;
+}
+
+#main_category_4{
+ background-image:url('../images/categories/cat_sport.png');
+ background-repeat:no-repeat;
+}
+
+#main_category_4.category-selected{
+ background-image:url('../images/categories/cat_sport_on.png');
+}
+
+#maincategory_4 label{
+ color:#85ae7a;
+}
+
+#main_category_5{
+ background-image:url('../images/categories/cat_pratique.png');
+ background-repeat:no-repeat;
+}
+
+#main_category_5.category-selected{
+ background-image:url('../images/categories/cat_pratique_on.png');
+}
+
+#maincategory_5 label{
+ color:#a8adad;
+}
+
+#main_category_6{
+ background-image:url('../images/categories/cat_mobilites.png');
+ background-repeat:no-repeat;
+}
+
+#main_category_6.category-selected{
+ background-image:url('../images/categories/cat_mobilites_on.png');
+}
+
+#maincategory_6 label{
+ color:#697c92;
+}
+
+#main_category_7{
+ background-image:url('../images/categories/cat_agri.png');
+ background-repeat:no-repeat;
+}
+
+#main_category_7.category-selected{
+ background-image:url('../images/categories/cat_agri_on.png');
+}
+
+#maincategory_7 label{
+ color:#eba44a;
+}
+
+#main_category_8{
+ background-image:url('../images/categories/cat_balade.png');
+ background-repeat:no-repeat;
+}
+
+#main_category_8.category-selected{
+ background-image:url('../images/categories/cat_balade_on.png');
+}
+
+#maincategory_8 label{
+ color:#d38fac;
+}
+
+/*7 - Cultures - Cinéma*/
+#li_sub_7 label{
+ background-image:url('../images/subcategories/cult_2_off.png');
+}
+
+#li_sub_7 .selected label{
+ background-image:url('../images/subcategories/cult_2_on.png');
+}
+
+/*11 - Agri-cultures - Jardinages citoyens*/
+#li_sub_11 label{
+ background-image:url('../images/subcategories/agri_6_off.png');
+}
+
+#li_sub_11 .selected label{
+ background-image:url('../images/subcategories/agri_6_on.png');
+}
+
+/*13 - Patrimoines - Sites archéologiques*/
+#li_sub_13 label{
+ background-image:url('../images/subcategories/patri_4_off.png');
+}
+
+#li_sub_13 .selected label{
+ background-image:url('../images/subcategories/patri_4_on.png');
+}
+
+/*15 - Balades - Balades à pied*/
+#li_sub_15 label{
+ background-image:url('../images/subcategories/bala_2_off.png');
+}
+
+#li_sub_15 .selected label{
+ 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{
+ background-image:url('../images/subcategories/spor_6_off.png');
+}
+
+#li_sub_18 .selected label{
+ background-image:url('../images/subcategories/spor_6_on.png');
+}
+
+/*19 - Sport et loisirs - Espaces de jeux*/
+#li_sub_19 label{
+ background-image:url('../images/subcategories/spor_5_off.png');
+}
+
+#li_sub_19 .selected label{
+ background-image:url('../images/subcategories/spor_5_on.png');
+}
+
+/*20 - Sport et loisirs - Salles de sport*/
+#li_sub_20 label{
+ background-image:url('../images/subcategories/spor_1_off.png');
+}
+
+#li_sub_20 .selected label{
+ background-image:url('../images/subcategories/spor_1_on.png');
+}
+
+/*22 - Balades - Points étapes*/
+#li_sub_22 label{
+ background-image:url('../images/subcategories/bala_6_off.png');
+}
+
+#li_sub_22 .selected label{
+ background-image:url('../images/subcategories/bala_6_on.png');
+}
+
+/*24 - Cultures - Salles de spectacle*/
+#li_sub_24 label{
+ background-image:url('../images/subcategories/cult_1_off.png');
+}
+
+#li_sub_24 .selected label{
+ background-image:url('../images/subcategories/cult_1_on.png');
+}
+
+/*25 - Patrimoines - Bâtiments remarquables*/
+#li_sub_25 label{
+ background-image:url('../images/subcategories/patri_1_off.png');
+}
+
+#li_sub_25 .selected label{
+ background-image:url('../images/subcategories/patri_1_on.png');
+}
+
+/*27 - Ressources pratiques - Collecte et recyclage des déchets*/
+#li_sub_27 label{
+ background-image:url('../images/subcategories/ress_3_off.png');
+}
+
+#li_sub_27 .selected label{
+ background-image:url('../images/subcategories/ress_3_on.png');
+}
+
+/*30 - Agri-cultures - Ventes en circuits courts*/
+#li_sub_30 label{
+ background-image:url('../images/subcategories/agri_1_off.png');
+}
+
+#li_sub_30 .selected label{
+ background-image:url('../images/subcategories/agri_1_on.png');
+}
+
+/*31 - Agri-cultures - Exploitations agricoles*/
+#li_sub_31 label{
+ background-image:url('../images/subcategories/agri_3_off.png');
+}
+
+#li_sub_31 .selected label{
+ background-image:url('../images/subcategories/agri_3_on.png');
+}
+
+/*32 - Agri-cultures - Pédagogie de l'environnement*/
+#li_sub_32 label{
+ background-image:url('../images/subcategories/agri_5_off.png');
+}
+
+#li_sub_32 .selected label{
+ background-image:url('../images/subcategories/agri_5_on.png');
+}
+
+/*34 - Mobilités - Boutiques et locations de vélo*/
+#li_sub_34 label{
+ background-image:url('../images/subcategories/mob_1_off.png');
+}
+
+#li_sub_34 .selected label{
+ background-image:url('../images/subcategories/mob_1_on.png');
+}
+
+/*35 - Cultures - Bibliothèques et médiathèques*/
+#li_sub_35 label{
+ background-image:url('../images/subcategories/cult_3_off.png');
+}
+
+#li_sub_35 .selected label{
+ background-image:url('../images/subcategories/cult_3_on.png');
+}
+
+
+/*36 - Événements - Spectacles*/
+#li_sub_36 label{
+ background-image:url('../images/subcategories/even_1_off.png');
+}
+
+#li_sub_36 .selected label{
+ background-image:url('../images/subcategories/even_1_on.png');
+}
+
+/*37 - Événements - Randonnées*/
+#li_sub_37 label{
+ background-image:url('../images/subcategories/even_2_off.png');
+}
+
+#li_sub_37 .selected label{
+ background-image:url('../images/subcategories/even_2_on.png');
+}
+
+/*38 - Événements - Manifestations sportives*/
+#li_sub_38 label{
+ background-image:url('../images/subcategories/even_3_off.png');
+}
+
+#li_sub_38 .selected label{
+ background-image:url('../images/subcategories/even_3_on.png');
+}
+
+/*39 - Événements - Conférences et projections*/
+#li_sub_39 label{
+ background-image:url('../images/subcategories/even_4_off.png');
+}
+
+#li_sub_39 .selected label{
+ background-image:url('../images/subcategories/even_4_on.png');
+}
+
+/*40 - Événements - Brocantes*/
+#li_sub_40 label{
+ background-image:url('../images/subcategories/even_5_off.png');
+}
+
+#li_sub_40 .selected label{
+ background-image:url('../images/subcategories/even_5_on.png');
+}
+
+/*41 - Événements - Réunions publiques*/
+#li_sub_41 label{
+ background-image:url('../images/subcategories/even_6_off.png');
+}
+
+#li_sub_41 .selected label{
+ background-image:url('../images/subcategories/even_6_on.png');
+}
+
+/*42 - Événements - Maison de l'environnement mobile*/
+#li_sub_42 label{
+ background-image:url('../images/subcategories/even_7_off.png');
+}
+
+#li_sub_42 .selected label{
+ background-image:url('../images/subcategories/even_7_on.png');
+}
+
+/*43 - Cultures - Apprentissage des arts*/
+#li_sub_43 label{
+ background-image:url('../images/subcategories/cult_4_off.png');
+}
+
+#li_sub_43 .selected label{
+ background-image:url('../images/subcategories/cult_4_on.png');
+}
+
+/*44 - Cultures - Campus ouverts*/
+#li_sub_44 label{
+ background-image:url('../images/subcategories/cult_6_off.png');
+}
+
+#li_sub_44 .selected label{
+ background-image:url('../images/subcategories/cult_6_on.png');
+}
+
+/*45 - Patrimoines - Biodiversité*/
+#li_sub_45 label{
+ background-image:url('../images/subcategories/patri_2_off.png');
+}
+
+#li_sub_45 .selected label{
+ background-image:url('../images/subcategories/patri_2_on.png');
+}
+
+/*46 - Patrimoines - Patrimoine hydraulique*/
+#li_sub_46 label{
+ background-image:url('../images/subcategories/patri_3_off.png');
+}
+
+#li_sub_46 .selected label{
+ background-image:url('../images/subcategories/patri_3_on.png');
+}
+
+/*50 - Sport et loisirs - Associations et clubs de sport*/
+#li_sub_50 label{
+ background-image:url('../images/subcategories/spor_4_off.png');
+}
+
+#li_sub_50 .selected label{
+ background-image:url('../images/subcategories/spor_4_on.png');
+}
+
+/*51 - Sport et loisirs - Associations et clubs de loisirs*/
+#li_sub_51 label{
+ background-image:url('../images/subcategories/spor_7_off.png');
+}
+
+#li_sub_51 .selected label{
+ background-image:url('../images/subcategories/spor_7_on.png');
+}
+
+/*52 - Mobilités - Voitures en partage*/
+#li_sub_52 label{
+ background-image:url('../images/subcategories/mob_2_off.png');
+}
+
+#li_sub_52 .selected label{
+ background-image:url('../images/subcategories/mob_2_on.png');
+}
+
+/*53 - Mobilités - Lignes et stations de bus*/
+#li_sub_53 label{
+ 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');
+ color:#ccc;
+}
+
+/*54 - Mobilités - Lignes et stations de RER*/
+#li_sub_54 label{
+ background-image:url('../images/subcategories/mob_4_off.png');
+}
+
+#li_sub_54 .selected label{
+ background-image:url('../images/subcategories/mob_4_on.png');
+}
+
+/*55 - Mobilités - Chemins piétons et sentiers*/
+#li_sub_55 label{
+ background-image:url('../images/subcategories/mob_5_off.png');
+}
+
+#li_sub_55 .selected label{
+ background-image:url('../images/subcategories/mob_5_on.png');
+}
+
+/*56 - Mobilités - Itinéraires cyclables*/
+#li_sub_56 label{
+ background-image:url('../images/subcategories/mob_6_off.png');
+}
+
+#li_sub_56 .selected label{
+ background-image:url('../images/subcategories/mob_6_on.png');
+}
+
+/*57 - Balades - Sentiers découvertes de Terre et Cité*/
+#li_sub_57 label{
+ background-image:url('../images/subcategories/bala_1_off.png');
+}
+
+#li_sub_57 .selected label{
+ background-image:url('../images/subcategories/bala_1_on.png');
+}
+
+
+/*58 - Balades - Balades à vélo*/
+#li_sub_58 label{
+ background-image:url('../images/subcategories/bala_4_off.png');
+}
+
+#li_sub_58 .selected label{
+ background-image:url('../images/subcategories/bala_4_on.png');
+}
+
+/*59 - Balades - Balades à cheval*/
+#li_sub_59 label{
+ background-image:url('../images/subcategories/bala_5_off.png');
+}
+
+#li_sub_59 .selected label{
+ background-image:url('../images/subcategories/bala_5_on.png');
+}
+
+/*61 - Agri-cultures - Ventes à la ferme*/
+#li_sub_61 label{
+ background-image:url('../images/subcategories/agri_4_off.png');
+}
+
+#li_sub_61 .selected label{
+ background-image:url('../images/subcategories/agri_4_on.png');
+}
+
+/*62 - Événements - Expositions*/
+#li_sub_62 label{
+ background-image:url('../images/subcategories/even_8_off.png');
+}
+
+#li_sub_62 .selected label{
+ background-image:url('../images/subcategories/even_8_on.png');
+}
+
+/*65 - Événements - Festivals */
+#li_sub_65 label{
+ background-image:url('../images/subcategories/even_10_off.png');
+}
+
+#li_sub_65 .selected label{
+ background-image:url('../images/subcategories/even_10_on.png');
+}
+
+/*67 - Ressources pratiques - Économie Sociale et Solidaire */
+#li_sub_67 label{
+ background-image:url('../images/subcategories/ress_6_off.png');
+}
+
+#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');
+}
+
+/*77 - Évènements - Formations et ateliers*/
+#li_sub_77 label{
+ background-image:url('../images/subcategories/even_format_off.png');
+}
+
+#li_sub_77 .selected label{
+ background-image:url('../images/subcategories/even_format_on.png');
+}
+
+/*79 - Mobilités - Chantiers en cours*/
+#li_sub_79 label{
+ background-image:url('../images/subcategories/mob_7_off.png');
+}
+
+#li_sub_79 .selected label{
+ background-image:url('../images/subcategories/mob_7_on.png');
+}
+
+/*80 - Patrimoine - Bois et forêts*/
+#li_sub_80 label{
+ background-image:url('../images/subcategories/patri_forets_off.png');
+}
+
+#li_sub_80 .selected label{
+ background-image:url('../images/subcategories/patri_forets_on.png');
+}
+
+
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index cfbfdf2..291c44d 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -1063,7 +1063,7 @@ div#panel{
bottom:26px;
top:60px;
border-width:0 1px;
- background-image:url('../images/logo.jpg');
+ background-image:url('../images/logo.png');
background-repeat:no-repeat;
background-position:left bottom;
}
@@ -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/logo.png b/static/saclay/images/logo.png
new file mode 100644
index 0000000..a061e8f
--- /dev/null
+++ b/static/saclay/images/logo.png
Binary files differ
diff --git a/static/saclay/images/logos/CapEEDD_Graine_CMJN.jpg b/static/saclay/images/logos/CapEEDD_Graine_CMJN.jpg
new file mode 100644
index 0000000..ae25c99
--- /dev/null
+++ b/static/saclay/images/logos/CapEEDD_Graine_CMJN.jpg
Binary files differ
diff --git a/static/saclay/images/logos/Logo_Conseil_general_de_l'Essonne.svg b/static/saclay/images/logos/Logo_Conseil_general_de_l'Essonne.svg
new file mode 100644
index 0000000..c99e05c
--- /dev/null
+++ b/static/saclay/images/logos/Logo_Conseil_general_de_l'Essonne.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ id="Calque_1"
+ x="0px"
+ y="0px"
+ width="176.285px"
+ height="96.473px"
+ viewBox="0 0 176.285 96.473"
+ enable-background="new 0 0 176.285 96.473"
+ xml:space="preserve"
+ inkscape:version="0.47+devel r9322"
+ sodipodi:docname="Logo Conseil général de l'Essonne.svg"><metadata
+ id="metadata49"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs47" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="880"
+ inkscape:window-height="701"
+ id="namedview45"
+ showgrid="false"
+ inkscape:zoom="2.684689"
+ inkscape:cx="88.142502"
+ inkscape:cy="48.2365"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="Calque_1" />
+<g
+ id="g3">
+ <polyline
+ fill="#0097C0"
+ points="176.285,96.473 0,96.473 0,18.106 176.285,0 176.285,96.473 "
+ id="polyline5" />
+ <path
+ fill="#FFFFFF"
+ d="M162.809,68.266c-0.445-0.247-1.502-0.358-2.912-0.347c-1.873,0-4.383,0.148-7.177,0.148 c-6.447-0.003-14.41-0.788-19.516-6.203c-1.07,0.25-2.133,0.374-3.153,0.374c-3.47,0-6.456-1.435-7.374-4.104 c-0.089-0.195-0.124-0.186-0.287-0.204l-0.371,0.08l-0.148,0.065c-1.153,1.051-2.108,2.062-2.779,2.815 c-0.677,0.754-1.054,1.242-1.054,1.245l-0.096,0.118l-0.148,0.012l-0.359,0.013c-1.236,0-1.879-0.687-1.885-1.313l0.056-0.281 l0.003-0.01l0.006-0.019c1.159-2.182,2.503-4.667,2.708-5.044l0.006-0.059l-0.034-0.108v-0.006l-0.012,0.006l-0.078,0.09 l-0.019,0.037l-0.031,0.034c-5.131,5.202-8.732,6.046-8.793,6.058l-0.037,0.006h-0.04c-0.751,0-1.419-0.377-1.914-0.818 c-0.491-0.461-0.837-0.931-0.862-1.432c0-4.08,0.597-7.544,0.662-7.918l-0.053-0.204l-0.031-0.019 c-0.012,0-0.118,0.019-0.235,0.207l-0.031,0.053l-0.049,0.037c-6.346,5.023-9.918,8.555-11.402,10.348 c-0.498,0.587-0.76,1.017-0.794,1.138l-0.126,0.17c-0.689,0.482-1.171,0.778-1.645,0.801c-0.158,0-0.343-0.053-0.467-0.198 c-0.126-0.148-0.161-0.315-0.161-0.476c0.009-0.411,0.201-0.915,0.578-1.657c2.281-6.277,5.928-11.714,7.687-14.61 c0.587-0.949,0.964-1.672,0.986-1.883l0.003-0.019l0.006-0.027c0.238-0.789,0.365-1.555,0.365-2.278 c-0.009-1.567-0.59-2.89-2.086-3.895c-1.502-1.001-3.978-1.641-7.721-1.641H91.8c-1.085,0.396-1.849,0.562-2.368,0.562 c-0.201,0-0.365-0.021-0.525-0.096c-0.158-0.065-0.325-0.266-0.315-0.479l0.009-0.108l0.003-0.016l0.006-0.012 c0.272-0.955,0.399-1.558,0.572-2.006c0.158-0.455,0.482-0.792,0.939-0.915c0.297-0.093,0.652-0.142,1.156-0.201 c0.43-0.025,0.85-0.041,1.261-0.041c6.457,0,10.459,3.181,11.903,6.441l0.028,0.118c0.049,0.739,0.077,1.366,0.077,1.904 c-0.003,2.164-0.352,2.819-0.503,3.02c-5.184,8.042-6.593,11.26-6.936,12.156c6.883-7.202,11.093-9.749,11.118-9.764l0.046-0.028 l0.056-0.012l0.263-0.031c0.6,0,0.915,0.476,1.036,0.822c0.139,0.358,0.154,0.683,0.154,0.705l0.003,0.049l-0.013,0.053 c-0.674,2.754-1.137,5.137-1.134,6.784c-0.006,0.829,0.118,1.466,0.346,1.849c0.232,0.374,0.501,0.544,1.026,0.557 c0.396,0,0.927-0.13,1.598-0.427c2.912-2.597,5.192-4.574,6.927-5.91c1.758-1.341,2.893-2.064,3.777-2.089 c0.253-0.006,0.513,0.081,0.699,0.26c0.182,0.176,0.281,0.414,0.331,0.68l0.003,0.105c-0.167,1.317-0.776,2.565-1.156,3.239 c0.568,0.037,0.955,0.161,1.264,0.362c0.398,0.284,0.575,0.64,0.856,1.022l0.013,0.013l0.006,0.016 c0.748,1.265,1.351,2.204,2.124,2.81c0.764,0.6,1.723,0.924,3.312,0.928c0.804,0,1.768-0.087,2.937-0.264 c0.538-9.652,6.472-13.977,10.886-13.979c2.263-0.013,4.198,1.184,4.593,3.391c0.074,0.386,0.105,0.77,0.105,1.146 c-0.006,2.634-1.576,4.812-3.536,6.503c-1.966,1.688-4.346,2.918-6.083,3.66c-0.816,0.346-1.465,0.578-1.904,0.705 c1.02,1.903,3.728,3.143,7.295,3.854c3.777,0.764,8.45,0.955,12.895,0.955c2.145,0,4.241-0.043,6.163-0.089l0.124,0.019 c0.612,0.207,0.909,0.732,0.89,1.196c0,0.386-0.142,0.741-0.328,1.014c-0.204,0.266-0.371,0.507-0.761,0.544l0,0L162.809,68.266 M138.78,49.664c-1.539,1.639-2.843,4.315-2.843,8.531v0.321c6.855-2.046,9.884-6.076,9.86-8.568 c-0.025-1.311-0.729-2.201-2.281-2.433l-0.086-0.025c-0.074-0.027-0.223-0.059-0.42-0.059h-0.012 C142.093,47.433,140.301,48.029,138.78,49.664z"
+ id="path7" />
+ <path
+ fill="#FFFFFF"
+ d="M61.088,67.431l-0.037-0.049l-0.015-0.062c-0.05-0.191-0.093-0.463-0.093-0.825 c0.003-1.604,0.819-4.917,5.57-10.642l0.019-0.087c0.034-0.123,0.077-0.353,0.129-0.729c0.108-0.76,0.257-2.136,0.408-4.574 c0.924-8.945,2.408-13.996,4.102-17.068c1.679-3.05,3.613-4.123,5.255-4.998c0.102-0.083,0.337-0.226,0.698-0.226 c0.958,0.031,2.495,0.863,5.106,5.267l0.077,0.124l-0.037,0.143c-0.124,0.438-0.263,0.804-0.427,1.082 c-0.167,0.266-0.365,0.513-0.732,0.532c-0.207,0-0.386-0.111-0.51-0.241c-0.111-0.124-0.204-0.278-0.288-0.467l-0.081-0.077 c-0.096-0.09-0.256-0.238-0.528-0.46c-0.541-0.442-1.512-1.171-3.199-2.315l-0.021-0.013l-0.019-0.019l-0.037-0.006 c-0.121-0.037-0.702,0.309-1.326,1.149c-0.637,0.835-1.388,2.108-2.142,3.836c-1.508,3.453-3.05,8.701-3.876,15.838l0.009,0.034 l0.028,0.056l0.016-0.003c0.695-0.727,2.788-2.674,5.258-4.504c2.513-1.848,5.372-3.585,7.659-3.715 c0.525-0.321,1.109-0.562,1.712-0.569c0.831-0.015,1.623,0.557,1.962,1.756l0.031,0.111l-0.037,0.108l-0.013,0.052l-0.019,0.266 c0,0.544,0.204,1.817,1.682,3.95l0.034,0.052c0.686,1.487,1.014,2.899,1.014,4.204c0.006,4.324-3.712,7.205-9.569,7.415 l-0.102-0.019L78.654,61.7c-1.947-1.218-3.104-2.485-3.101-4.324c0.019-2.297,1.682-5.251,5.144-10.252l0.154-0.204 c-0.408-0.025-1.808,0.649-3.848,2.213c-2.052,1.558-4.825,3.981-8.312,7.425c-0.136,0.884-1.134,6.41-4.448,10.979l-0.207,0.234 c-0.352,0.359-0.875,0.702-1.468,0.718C62.041,68.481,61.58,68.136,61.088,67.431 M64.074,64.427l0.411-0.248l0.016-0.012 c0.964-1.83,1.49-3.172,1.725-4.114c-1.493,2.297-2.191,3.563-2.324,4.016l-0.022,0.093l0.013,0.111l-0.006,0.055L64.074,64.427z M80.422,59.023c1.236,0.013,2.587-1.001,3.601-2.361c1.017-1.354,1.682-3.029,1.672-4.13c0.003-0.256-0.034-0.469-0.096-0.646 c-0.634-1.221-1.168-2.145-1.456-2.618c-3.823,3.629-5.684,5.879-5.647,7.502c0,0.695,0.296,1.338,0.979,2.062 C79.792,58.965,80.104,59.023,80.422,59.023z M76.868,28.928"
+ id="path9" />
+ <polyline
+ fill="#FFFFFF"
+ points="22.187,85.479 25.212,85.479 25.212,87.132 19.995,87.132 19.995,76.639 22.187,76.639 22.187,85.479 "
+ id="polyline11" />
+ <polyline
+ fill="#FFFFFF"
+ points="29.166,80.876 32.161,80.876 32.161,82.533 29.166,82.533 29.166,85.463 32.473,85.463 32.473,87.132 26.916,87.132 26.916,76.639 32.303,76.639 32.303,78.265 29.166,78.265 29.166,80.876 "
+ id="polyline13" />
+ <path
+ fill="#FFFFFF"
+ d="M45.597,83.637c-0.019,1.718-0.176,2.38-0.68,2.865c-0.501,0.507-1.48,0.791-2.661,0.791 c-2.016,0-3.104-0.804-3.292-2.423c-0.062-0.637-0.111-1.753-0.111-2.952c0-3.101,0.191-4.003,0.961-4.658 c0.6-0.507,1.465-0.772,2.534-0.772c1.607,0,2.776,0.631,3.088,1.65c0.096,0.365,0.161,0.788,0.161,1.292c0,0.111,0,0.297,0,0.6 h-2.176c-0.016-0.266-0.016-0.473-0.028-0.615c-0.019-0.899-0.349-1.292-1.073-1.292c-0.742,0-1.106,0.393-1.168,1.308 c-0.046,0.677-0.078,1.465-0.078,2.554c0,1.749,0.078,2.723,0.238,3.137c0.124,0.358,0.473,0.565,0.927,0.565 c0.899,0,1.119-0.377,1.181-2.049H45.597"
+ id="path15" />
+ <path
+ fill="#FFFFFF"
+ d="M53.982,85.036c-0.074,0.458-0.266,0.866-0.535,1.182c-0.593,0.723-1.508,1.069-2.77,1.069 c-1.957,0-3.122-0.785-3.406-2.328c-0.124-0.707-0.17-1.48-0.17-3.075c0-2.473,0.111-3.354,0.535-4.046 c0.55-0.915,1.53-1.356,2.995-1.356c1.904,0,3.085,0.803,3.351,2.269c0.114,0.63,0.161,1.656,0.161,3.134 C54.143,83.367,54.097,84.356,53.982,85.036 M51.905,81.711c0-0.312,0-0.612,0-0.928c0-2.206-0.235-2.714-1.261-2.714 c-0.866,0-1.212,0.396-1.243,1.403c-0.034,0.965-0.046,1.719-0.046,2.949c0,1.465,0.012,1.987,0.093,2.349 c0.126,0.625,0.507,0.946,1.184,0.946c1.039,0,1.258-0.473,1.273-2.788V81.711z"
+ id="path17" />
+ <path
+ fill="#FFFFFF"
+ d="M63.583,87.132h-3.057l-1.657-5.482l-0.216-0.801l-0.238-0.961c-0.111-0.378-0.158-0.662-0.424-2.019 l0.059,1.06l0.096,1.225c0.019,0.253,0.046,0.661,0.077,1.229c0.016,0.408,0.034,0.724,0.034,0.931l0.096,4.818h-1.957V76.639 h2.899l1.23,3.626c0.139,0.473,0.423,1.446,0.677,2.457c0.269,1.057,0.377,1.604,0.646,3.041l-0.046-1.165l-0.065-1.403 l-0.031-0.958l-0.015-0.807l-0.078-4.791h1.969V87.132"
+ id="path19" />
+ <path
+ fill="#FFFFFF"
+ d="M70.086,79.875c-0.015-1.403-0.238-1.817-0.977-1.817c-0.615,0-0.992,0.414-0.992,1.075 c0,0.677,0.427,1.162,1.496,1.731l0.93,0.476c1.416,0.751,1.919,1.509,1.919,2.894c0,0.995-0.296,1.86-0.804,2.318 c-0.535,0.469-1.477,0.741-2.615,0.741c-1.385,0-2.454-0.427-2.896-1.199c-0.3-0.52-0.377-0.927-0.377-2.22h2.235 c0.034,1.447,0.269,1.843,1.134,1.843c0.708,0,1.122-0.439,1.122-1.23c0-0.85-0.269-1.119-1.83-1.919 c-0.754-0.396-1.45-0.838-1.842-1.181c-0.476-0.442-0.727-1.073-0.727-1.861c0-1.926,1.196-3.038,3.264-3.038 c1.208,0,2.154,0.346,2.643,0.945c0.424,0.548,0.535,1.002,0.535,2.108v0.334H70.086"
+ id="path21" />
+ <polyline
+ fill="#FFFFFF"
+ points="76.908,80.876 79.903,80.876 79.903,82.533 76.908,82.533 76.908,85.463 80.215,85.463 80.215,87.132 74.654,87.132 74.654,76.639 80.042,76.639 80.042,78.265 76.908,78.265 76.908,80.876 "
+ id="polyline23" />
+ <rect
+ x="82.342"
+ y="76.639"
+ fill="#FFFFFF"
+ width="2.207"
+ height="10.493"
+ id="rect25" />
+ <polyline
+ fill="#FFFFFF"
+ points="89.194,85.479 92.22,85.479 92.22,87.132 87.009,87.132 87.009,76.639 89.194,76.639 89.194,85.479 "
+ id="polyline27" />
+ <path
+ fill="#FFFFFF"
+ d="M105.029,81.575v5.258c-1.181,0.299-2.222,0.46-3.351,0.46c-1.926,0-3.076-0.711-3.326-2.08 c-0.146-0.661-0.176-1.388-0.176-2.899c0-1.264,0.081-2.711,0.176-3.434c0.158-1.076,0.881-1.938,1.824-2.223 c0.429-0.111,0.93-0.17,1.468-0.17c1.892,0,2.992,0.6,3.243,1.746c0.111,0.485,0.13,0.565,0.142,1.607h-2.17l-0.019-0.535 c0-0.896-0.331-1.279-1.104-1.279c-0.896,0-1.211,0.445-1.258,1.75l-0.034,0.85c-0.015,0.38-0.031,0.804-0.031,1.323 c0,2.08,0.031,2.68,0.176,3.057c0.173,0.491,0.516,0.68,1.243,0.68c0.364,0,0.565-0.019,1.026-0.08v-2.393h-1.137v-1.638H105.029"
+ id="path29" />
+ <path
+ fill="#FFFFFF"
+ d="M109.613,80.876h2.995v1.657h-2.995v2.93h3.31v1.669h-5.561v-10.49h5.388v1.623h-3.137V80.876 M108.731,75.588l0.646-2.38h2.191l-1.373,2.38H108.731z"
+ id="path31" />
+ <path
+ fill="#FFFFFF"
+ d="M122.251,87.132h-3.06l-1.654-5.482l-0.219-0.801l-0.235-0.961c-0.111-0.378-0.161-0.662-0.427-2.019 l0.065,1.06l0.093,1.225c0.016,0.253,0.046,0.661,0.077,1.229c0.016,0.408,0.031,0.724,0.031,0.931l0.096,4.818h-1.954V76.639 h2.899l1.227,3.626c0.145,0.473,0.426,1.446,0.68,2.457c0.269,1.057,0.377,1.604,0.646,3.041l-0.049-1.165l-0.062-1.403 l-0.031-0.958l-0.019-0.807l-0.074-4.791h1.969V87.132"
+ id="path33" />
+ <path
+ fill="#FFFFFF"
+ d="M126.943,80.876h2.99v1.657h-2.99v2.93h3.306v1.669h-5.559v-10.49h5.386v1.623h-3.133V80.876 M126.062,75.588l0.646-2.38h2.187l-1.368,2.38H126.062z"
+ id="path35" />
+ <path
+ fill="#FFFFFF"
+ d="M134.552,87.132H132.4V76.639h3.381c1.737,0,1.892,0.034,2.46,0.522c0.278,0.234,0.5,0.565,0.612,0.931 c0.093,0.343,0.142,0.738,0.142,1.165c0,0.884-0.154,1.526-0.488,1.953c-0.315,0.396-0.63,0.551-1.372,0.708 c0.723,0.108,1.057,0.238,1.341,0.55c0.426,0.474,0.538,0.885,0.569,2.05c0,0.204,0.012,0.473,0.031,0.819 c0.031,1.084,0.049,1.134,0.081,1.338c0.012,0.114,0.062,0.266,0.124,0.457h-2.318c-0.074-0.507-0.093-0.723-0.093-1.057V85.16 c-0.012-2.096-0.173-2.404-1.279-2.404h-1.039V87.132 M135.436,81.191c0.977,0,1.354-0.408,1.354-1.526 c0-1.07-0.346-1.447-1.292-1.447h-0.946v2.974H135.436z"
+ id="path37" />
+ <path
+ fill="#FFFFFF"
+ d="M149.06,87.132h-2.281l-0.587-2.314h-2.912l-0.581,2.314h-1.972l2.807-10.493h2.837L149.06,87.132 M145.283,80.642c-0.037-0.124-0.081-0.328-0.124-0.581c-0.068-0.334-0.118-0.581-0.13-0.742l-0.093-0.6l-0.111-0.627 c-0.173,1.069-0.365,2.03-0.488,2.55l-0.649,2.553h2.126L145.283,80.642z"
+ id="path39" />
+ <polyline
+ fill="#FFFFFF"
+ points="152.918,85.479 155.947,85.479 155.947,87.132 150.729,87.132 150.729,76.639 152.918,76.639 152.918,85.479 "
+ id="polyline41" />
+ <path
+ fill="#FFFFFF"
+ d="M61.796,35.316c-0.17-0.47-0.488-0.875-0.992-0.881c-0.346,0.003-0.652,0.195-0.94,0.491l-0.006,0.013 c-4.93,5.514-5.251,12.802-5.258,14.867c0,0.148,0.003,0.272,0.006,0.361c-12.778,8.664-25.723,15.711-34.77,15.696 c-1.431,0-2.757-0.17-3.972-0.535c-0.633-0.383-0.853-0.812-0.862-1.391c-0.037-1.36,1.601-3.567,3.957-5.746 c2.337-2.191,5.35-4.424,7.999-6.136c6.188-2.732,9.947-4.847,12.178-6.497c2.219-1.65,2.971-2.825,2.986-3.808 c0.003-0.643-0.374-1.103-0.735-1.36c-0.35-0.25-0.674-0.358-0.869-0.398l-0.198-0.065c-2.312-0.63-5.591-0.822-8.386-0.822 c-1.323,0-2.535,0.043-3.48,0.111c-0.862,0.062-1.471,0.129-1.824,0.229c-0.433-0.102-0.723-0.235-0.884-0.362 c-0.17-0.139-0.207-0.231-0.213-0.361c-0.043-0.377,0.683-1.258,1.957-2.121c3.762-2.652,11.897-5.835,14.623-5.814l0.158,0.003 l0.096,0.006l0.087-0.043c0.705-0.389,1.001-0.658,1.035-1.082c-0.028-0.408-0.328-0.516-0.349-0.532l-0.102-0.049l-0.114,0.025 c-7.996,1.7-13.597,4.074-17.244,6.37c-3.647,2.309-5.369,4.466-5.567,5.975l-0.016,0.118l0.065,0.102 c0.547,0.918,1.135,1.178,1.54,1.171l0.291-0.037l13.689,0.136c0.294,0.056,0.569,0.167,0.748,0.309 c0.186,0.148,0.266,0.288,0.269,0.458c0.009,0.245-0.213,0.711-1.014,1.323c-16.228,7.585-20.042,13.205-21.937,15.325l-0.024,0.03 l-0.019,0.034c-1.02,1.83-1.623,3.206-1.629,4.353c-0.016,1.029,0.562,1.842,1.607,2.349c1.042,0.517,2.587,0.764,4.72,1.029 c11.164-0.519,19.726-4.429,25.778-8.222c3.044-1.904,5.453-3.783,7.236-5.174c0.89-0.692,1.629-1.268,2.201-1.663 c0.3-0.21,0.562-0.365,0.76-0.458c-0.482,2.77-0.905,6.127-2.908,8.828c-2.121,2.862-6.024,5.088-13.909,5.094 c-0.834,0-1.706-0.024-2.624-0.077l-0.143,0.664c2.331,0.903,4.711,1.397,7.029,1.397h0.034c7.696,0.006,14.53-5.635,16.23-19.918 c2.88-4.216,3.972-8.673,3.972-11.405C62.059,36.441,61.976,35.799,61.796,35.316 M59.002,44.082 c-0.164-0.244-0.333-1.663,1.162-4.723C60.575,39.606,60.331,41.27,59.002,44.082z"
+ id="path43" />
+</g>
+</svg> \ No newline at end of file
diff --git a/static/saclay/images/logos/region-ile-de-france.svg b/static/saclay/images/logos/region-ile-de-france.svg
new file mode 100644
index 0000000..bf8c2fa
--- /dev/null
+++ b/static/saclay/images/logos/region-ile-de-france.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ width="606.6673"
+ height="97.108879"
+ xml:space="preserve"
+ sodipodi:docname="Région Île-de-France.svg"
+ version="1.0"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+ id="metadata7"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs5"><inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective9" /></defs><sodipodi:namedview
+ inkscape:window-height="726"
+ inkscape:window-width="645"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="0.91687243"
+ inkscape:cx="303.75"
+ inkscape:cy="48.75"
+ inkscape:window-x="369"
+ inkscape:window-y="25"
+ inkscape:current-layer="g11" /><g
+ id="g11"
+ inkscape:groupmode="layer"
+ inkscape:label="IDF_QUADRI"
+ transform="matrix(1.25,0,0,-1.25,-0.6552737,97.3145)"><g
+ id="g13"
+ transform="scale(0.1,0.1)"><path
+ d="M 557.031,565.898 C 554.602,564.961 545.812,562.324 546.523,561.973 C 545.812,562.324 545.242,562.441 545.281,563.066 C 546.25,566.406 530.812,552.051 530.078,557.578 C 529.629,558.516 530.812,557.344 528.633,557.93 C 534.277,557.148 494.102,544.434 494.102,545.137 C 492.18,549.297 492.605,553.418 495.168,557.227 C 498.34,565.195 488.293,576.562 492.078,573.223 C 489.355,575.977 489.355,578.574 491.98,581.348 C 493.711,580.098 492.078,581.738 492.988,585.273 C 494.102,585.977 490.906,590.371 493.809,588.809 C 496.34,589.551 500.496,603.75 497.52,613.887 C 490.906,629.219 493.711,739.902 497.062,735.664 C 498.242,743.32 491.16,748.965 494.551,754.609 C 494.805,760.43 489.258,760.625 490,764.551 C 487.043,776.23 470.598,776.035 472.402,778.516 C 463.711,776.582 431.68,725.039 431.367,723.73 C 433.328,725.625 409.688,690.078 410.156,689.961 C 407.551,690.547 404.609,685.957 404.055,680.625 C 403.816,679.98 390.637,663.711 392.051,666.895 C 387.539,659.316 382.207,652.09 378.047,644.355 C 381.277,646.406 372.219,638.086 373.574,638.359 C 373.77,639.258 363.367,613.32 363.254,615.566 C 364.23,619.062 350.461,602.812 349.016,602.695 C 346.105,590.879 302.363,619.766 301.531,632.988 C 301.648,633.457 300.637,645.234 294.746,646.641 C 297.336,644.355 263.633,675.039 266.184,672.656 C 248.562,696.113 234.695,695.449 208.645,718.242 C 208.816,718.594 202.559,733.066 198.145,738.184 C 188.301,735.781 175,720.488 177.805,716.719 C 173.586,714.941 172.805,720.254 171.152,722.051 C 169.824,716.289 175.469,683.008 175.469,683.008 C 174.844,678.223 177.742,653.516 178.809,657.188 L 180.715,655.039 C 180.715,654.805 177.742,651.348 181.395,648.945 C 185.398,641.895 193.496,636.914 190.613,627.07 C 187.078,625.293 191.047,612.383 190.422,616.582 C 186.438,596.191 234.324,557.852 227.695,530.625 C 224.629,528.184 236.836,513.711 234.324,514.375 C 230.168,509.512 217.805,506.406 209.172,504.102 C 206.641,502.637 204.031,503.945 201.309,504.766 C 198.699,505.273 176.98,514.141 170.879,510.02 C 170.645,509.395 152.871,514.141 152.754,513.359 C 155.945,516.973 132.434,508.379 135.957,516.016 C 137.488,521.953 115.48,509.746 120.918,512.969 C 120.559,512.734 111.316,507.559 111.555,509.082 C 112.285,511.152 103.164,509.316 105.242,508.809 C 103.867,509.199 94.5312,511.875 95.8984,510.957 C 90.7227,514.375 89.6406,509.746 83.5234,512.695 C 83.1523,511.992 76.1992,511.035 74.9102,511.387 C 74.4805,511.504 61.1445,510.918 61.1445,511.309 C 62.1953,511.758 49.4414,507.598 48.5859,510.918 C 49.0547,511.504 38.5156,503.516 35.5586,508.457 C 36.875,512.539 23.6719,505.117 21.5938,504.805 C 19.9805,505.117 13.3125,508.027 14.6094,505.938 C 13.5078,505.352 5.24219,495.234 5.24219,495.234 C 6.79688,494.766 50.5859,461.91 43.7227,467.047 C 43.7227,467.047 48.4453,463.102 59.9414,456.266 C 58.1133,451.363 76.8555,456.031 73.8086,445.406 C 91.2305,455.68 126.934,407.652 139.473,415.27 C 141.062,415.27 146.395,406.871 148.145,407.535 C 145.32,409.977 157.207,403.609 153.477,403.883 C 155.129,401.93 154.52,402.633 160.203,396.754 C 174.473,397.379 180.535,385.602 185.266,381.637 C 200.938,351.461 135.879,322.32 130.273,307.086 C 130.059,306.305 130.059,305.68 129.188,305.914 C 129.922,305.211 120.09,301.637 118.953,296.891 L 109.199,284.215 C 100.527,286.695 78.4961,251.695 69.5703,247.184 L 48.3516,237.379 C 48.3516,237.379 45.3594,234.469 43.3672,231.52 C 41.4258,228.473 38.5156,224.938 36.3789,224.195 C 34.543,223.473 21.3555,210.465 21.3555,210.465 L 18.0977,204.293 L 23.3984,201.949 C 23.3984,201.949 19.9805,197.945 19.4727,196.207 C 18.7383,194.723 16.8477,190.367 20.957,189.43 C 25.2344,188.453 27.6289,188.453 28.6328,186.441 C 29.5508,184.41 46.6211,183.102 47.9961,183.375 C 49.2695,183.824 57.7656,187.574 57.7656,187.574 C 65.9688,190.172 92.8047,189.781 95.8984,187.105 C 95.3516,187.223 134.902,196.832 135.957,200.016 C 137.258,199.82 160.32,208.102 160.32,208.102 C 166.641,211.051 181.062,213.395 185.676,218.648 C 181.277,217.789 204.27,225.719 210.762,222.535 C 212.766,221.441 268.184,232.945 270.09,240.074 C 274.562,239.605 275.066,235.445 275.32,235.211 C 274.031,227.867 275.168,207.516 272.422,203.98 C 272.52,206.891 264.648,198.688 267.324,194.332 C 272.891,192.594 272.617,194.605 276.074,186.441 C 274.465,190.133 276.465,169.996 275.996,162.75 C 276.191,158.863 282.41,146.031 272.129,140.973 C 272.129,140.973 266.316,128.883 266.062,129.078 C 266.824,134.996 266.824,126.051 265.715,127.75 C 270.906,130.211 269.363,114.332 268.184,112.398 C 269.172,114.879 265.48,109.352 265.105,111.227 C 256.73,94.8125 274.348,92.9805 264.18,91.1445 C 268.535,89.8359 270.812,68.0195 270.535,71.1992 C 271.523,63.8555 270.906,56.7695 268.652,49.8125 C 267.188,54.3633 264.719,41.457 265.48,37.9375 C 267.188,29.7344 263.105,14.2695 270.906,10.6914 C 269.719,13.918 276.816,3.17578 276.816,3.17578 C 295.098,-4.5625 299.57,19.3633 307.695,23.1367 C 310.461,23.7227 313.621,34.7578 316.27,33.8945 C 316.523,34.7578 327.512,87.2969 335.969,84.582 C 335.574,84.582 350.105,106.168 353.086,115.387 C 352.969,114.762 346.105,122.926 360.684,129.273 C 367.766,126.891 371.047,145.797 372.859,156.578 C 373.34,162.75 377.695,159.762 378.32,166.324 C 378.203,164.508 390.867,185.699 392.949,194.371 C 395.027,194.254 395.344,203.98 396.797,202.652 C 392.852,206.07 400.234,210.094 399.27,213.082 C 400.625,218.297 400.176,222.965 402.449,222.535 C 404.609,232.711 410.984,228.277 412.41,227.359 C 415.438,225.719 419.609,228.277 420.105,220.738 C 417.18,216.969 429.562,213.395 428.496,211.051 C 428.145,212.848 487.629,142.691 504.055,129.234 C 504.812,128.531 550.879,82.8203 548.879,83.293 C 553.977,80.6523 558.254,71.3945 558.605,72.0625 C 556.68,69.0938 567.395,64.2305 569.277,64.2305 C 576.262,52.0195 576.609,54.5195 580.344,56.6094 C 581.562,51.1641 590.82,53.7773 594.211,52.0195 C 593.176,54.6406 601.492,56.9648 599.688,59.875 C 602.195,58.9961 597.98,69.7578 600.312,68.4844 C 597.336,73.6055 579.895,96.8242 581.105,101.07 C 581.465,102.516 583.594,101.969 584.895,101.695 C 584.656,103.062 582.656,104.488 581.465,105.465 C 584.656,105.543 585.359,107.223 583.594,110.602 C 580.461,108.883 576.16,128.727 578.887,131.52 C 579.988,136.578 564.648,198.688 557.395,204.762 C 557.859,206.93 554.883,220.621 554.309,221.793 C 542.285,229.293 552.227,244.312 543.938,246.949 C 541.992,243.219 533.34,257.379 532.102,269.156 C 528.113,276.48 532.102,294.02 529.375,291.402 C 527.02,294.059 541.855,300.387 545.535,292.301 C 576.848,280.445 636.66,300.113 658.301,283.355 C 663.398,293.004 674.902,285.504 668.738,287.281 C 667.793,286.109 669.836,285.543 671.25,285.152 C 668.367,285.758 692.305,287.281 695.93,285.387 C 686.711,287.633 709.465,286.148 708.562,286.5 C 700.48,288.258 724.727,283.59 750.547,299.605 C 759.824,302.457 758.113,307.281 762.004,316.148 C 760.43,308.59 764.414,323.727 756.57,328.512 C 710.82,339.977 674.426,373.746 628.855,385.68 C 611.199,389.449 582.656,432.691 567.488,429.938 C 595.078,461.441 621.836,492.793 650.281,519.551 C 655.867,524.922 712.898,586.445 712.898,585.703 C 715.02,588.809 718.215,599.043 717.98,594.648 C 718.098,596.113 717.395,598.066 715.859,600.273 C 715.742,599.512 694.426,616.191 688.867,605.801 C 696.379,601.133 673.645,599.512 668.074,598.223 C 666.367,597.168 664.934,597.598 663.645,597.949 C 657.949,599.355 650.496,592.852 646.688,591.992 C 638.352,599.434 617.461,585.625 607.961,582.441 C 608.75,582.852 603.887,581.855 596.504,583.438 C 593.328,578.223 593.43,579.707 594.211,580.176 C 591.445,578.691 589.133,576.328 577.988,572.52 C 579.246,572.051 570.93,568.555 567.742,569.395 C 568.02,567.93 566.492,564.004 561.594,564.961 C 557.898,565.898 558.391,567.305 557.031,565.898"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path15" /><path
+ d="M 972.07,591.719 L 872.355,591.719 L 959.551,707.617 L 1077.87,707.617 L 1165.14,591.719 L 1065.47,591.719 L 1018.76,654.102 L 972.07,591.719 M 952.527,143.785 L 952.527,548.086 L 1084.89,548.086 L 1084.89,143.785 L 952.527,143.785 L 952.527,143.785"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path17" /><path
+ d="M 1149.38,699.961 L 1281.82,699.961 L 1281.82,143.785 L 1149.38,143.785 L 1149.38,699.961"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path19" /><path
+ d="M 1449.21,313.609 C 1451.54,258.316 1483.51,221.715 1539.67,221.715 C 1571.43,221.715 1602.64,236.539 1615.1,266.207 L 1739.03,266.207 C 1714.91,172.672 1628.32,132.184 1537.98,132.184 C 1406.41,132.184 1316.82,211.637 1316.82,347.105 C 1316.82,470.934 1415.74,559.766 1534.9,559.766 C 1679.8,559.766 1752.22,450.66 1746.05,313.609 L 1449.21,313.609 M 1613.56,387.438 C 1611.25,432.887 1579.24,470.191 1534.9,470.191 C 1488.21,470.191 1457.06,436.734 1449.21,387.438 L 1613.56,387.438 L 1613.56,387.438"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path21" /><path
+ d="M 2067.45,143.785 L 2015.23,143.785 L 2015.23,186.715 L 2013.98,186.715 C 1996.85,151.754 1956.22,136.461 1912.7,136.461 C 1815.01,136.461 1766.55,213.863 1766.55,303.453 C 1766.55,393.102 1814.44,468.668 1911.52,468.668 C 1943.98,468.668 1990.65,456.461 2013.98,418.961 L 2015.23,418.961 L 2015.23,582.246 L 2067.45,582.246 L 2067.45,143.785 M 1919.95,182.555 C 1989.99,182.555 2017.02,242.711 2017.02,302.184 C 2017.02,364.957 1988.7,422.555 1917,422.555 C 1845.77,422.555 1821.75,361.832 1821.75,299.762 C 1821.75,240.27 1852.51,182.555 1919.95,182.555 L 1919.95,182.555"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path23" /><path
+ d="M 2387.96,244.508 C 2373.78,174.547 2323.51,136.461 2252.2,136.461 C 2150.91,136.461 2102.96,206.461 2099.93,303.453 C 2099.93,398.707 2162.59,468.668 2249.19,468.668 C 2361.52,468.668 2395.93,363.629 2392.82,286.812 L 2155.2,286.812 C 2153.37,231.48 2184.77,182.555 2254.02,182.555 C 2297,182.555 2327.1,203.512 2336.34,244.508 L 2387.96,244.508 M 2337.51,332.945 C 2335.09,382.73 2297.73,422.555 2246.05,422.555 C 2191.38,422.555 2158.86,381.48 2155.2,332.945 L 2337.51,332.945 L 2337.51,332.945"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path25" /><path
+ d="M 2426.73,699.961 L 2836.3,699.961 L 2836.3,583.906 L 2571.46,583.906 L 2571.46,470.191 L 2800.48,470.191 L 2800.48,358.062 L 2571.46,358.062 L 2571.46,143.785 L 2426.73,143.785 L 2426.73,699.961"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path27" /><path
+ d="M 2862.78,548.086 L 2991.36,548.086 L 2991.36,477.184 L 2992.77,477.184 C 3012.34,528.574 3057.39,555.977 3114.35,555.977 C 3124.44,555.977 3135.3,554.98 3145.5,552.676 L 3145.5,432.027 C 3128.33,436.734 3112.86,439.859 3094.86,439.859 C 3029.44,439.859 2995.05,394.625 2995.05,343.941 L 2995.05,143.785 L 2862.78,143.785 L 2862.78,548.086"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path29" /><path
+ d="M 3145.5,423.512 C 3147.82,476.324 3172.78,510.684 3208.48,531.758 C 3244.35,551.934 3291.02,559.766 3337.1,559.766 C 3432.82,559.766 3525.57,538.711 3525.57,424.215 L 3525.57,247.418 C 3525.57,213.16 3525.57,175.816 3541.2,143.785 L 3407.92,143.785 C 3403.29,156.305 3401.71,168.707 3400.14,181.93 C 3365.89,146.148 3315.28,132.184 3266.9,132.184 C 3189.86,132.184 3129.15,171.031 3129.15,254.469 C 3129.15,386.031 3272.43,375.875 3364.29,394.625 C 3386.93,399.293 3399.36,407.066 3399.36,432.027 C 3399.36,462.34 3362.84,474.039 3335.52,474.039 C 3298.88,474.039 3275.57,457.633 3269.29,423.512 L 3145.5,423.512 M 3316.85,213.941 C 3379.81,213.941 3400.89,249.723 3397.78,333.062 C 3379.15,321.5 3344.86,319.02 3316.02,311.285 C 3286.48,304.391 3261.53,291.871 3261.53,259.859 C 3261.53,227.203 3287.14,213.941 3316.85,213.941 L 3316.85,213.941"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path31" /><path
+ d="M 3573.8,548.086 L 3702.38,548.086 L 3702.38,492.754 L 3703.92,492.754 C 3728.07,534.043 3782.53,559.766 3830.83,559.766 C 3965.61,559.766 3976.52,461.637 3976.52,403.141 L 3976.52,143.785 L 3844.17,143.785 L 3844.17,339.273 C 3844.17,394.625 3850.38,450.66 3777.9,450.66 C 3728.07,450.66 3706.26,408.668 3706.26,364.254 L 3706.26,143.785 L 3573.8,143.785 L 3573.8,548.086"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path33" /><path
+ d="M 4288.88,399.996 C 4288.07,434.254 4257.69,458.453 4224.25,458.453 C 4150.25,458.453 4138.52,395.406 4138.52,339.273 C 4138.52,287.086 4161.12,233.414 4217.22,233.414 C 4263.14,233.414 4286.67,259.859 4292.71,302.613 L 4421.28,302.613 C 4409.6,194.449 4325.52,132.184 4217.98,132.184 C 4096.53,132.184 4006.06,215.523 4006.06,339.273 C 4006.06,467.809 4087.9,559.766 4217.98,559.766 C 4318.48,559.766 4408.06,506.758 4417.45,399.996 L 4288.88,399.996 L 4288.88,399.996"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path35" /><path
+ d="M 4561.52,313.609 C 4563.84,258.316 4595.73,221.715 4651.85,221.715 C 4683.7,221.715 4714.93,236.539 4727.34,266.207 L 4851.24,266.207 C 4827.06,172.672 4740.56,132.184 4650.23,132.184 C 4518.62,132.184 4429.05,211.637 4429.05,347.105 C 4429.05,470.934 4528.02,559.766 4647.04,559.766 C 4792.02,559.766 4864.44,450.66 4858.21,313.609 L 4561.52,313.609 M 4725.83,387.438 C 4723.48,432.887 4691.53,470.191 4647.04,470.191 C 4600.4,470.191 4569.32,436.734 4561.52,387.438 L 4725.83,387.438 L 4725.83,387.438"
+ style="fill:#ee2722;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path37" /></g></g></svg> \ No newline at end of file
diff --git a/static/saclay/images/popup/home_title.png b/static/saclay/images/popup/home_title.png
new file mode 100644
index 0000000..6461732
--- /dev/null
+++ b/static/saclay/images/popup/home_title.png
Binary files differ
diff --git a/static/saclay/images/popup/welcome_logo-chronos.png b/static/saclay/images/popup/welcome_logo-chronos.png
new file mode 100644
index 0000000..fd3d6ca
--- /dev/null
+++ b/static/saclay/images/popup/welcome_logo-chronos.png
Binary files differ
diff --git a/static/saclay/images/popup/welcome_logo-paris-malaquais.png b/static/saclay/images/popup/welcome_logo-paris-malaquais.png
new file mode 100644
index 0000000..3aea586
--- /dev/null
+++ b/static/saclay/images/popup/welcome_logo-paris-malaquais.png
Binary files differ
diff --git a/static/saclay/images/popup/welcome_logo-terre-et-cite.png b/static/saclay/images/popup/welcome_logo-terre-et-cite.png
new file mode 100644
index 0000000..73fa913
--- /dev/null
+++ b/static/saclay/images/popup/welcome_logo-terre-et-cite.png
Binary files differ
diff --git a/static/saclay/images/popup/welcome_logos.png b/static/saclay/images/popup/welcome_logos.png
new file mode 100644
index 0000000..e4ae163
--- /dev/null
+++ b/static/saclay/images/popup/welcome_logos.png
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/static/saclay/images/subcategories/even_10_off.png b/static/saclay/images/subcategories/even_10_off.png
new file mode 100644
index 0000000..b2f453b
--- /dev/null
+++ b/static/saclay/images/subcategories/even_10_off.png
Binary files differ
diff --git a/static/saclay/images/subcategories/even_10_on.png b/static/saclay/images/subcategories/even_10_on.png
new file mode 100644
index 0000000..9b97b38
--- /dev/null
+++ b/static/saclay/images/subcategories/even_10_on.png
Binary files differ
diff --git a/static/saclay/images/subcategories/even_9_off.png b/static/saclay/images/subcategories/even_9_off.png
new file mode 100644
index 0000000..250dfd6
--- /dev/null
+++ b/static/saclay/images/subcategories/even_9_off.png
Binary files differ
diff --git a/static/saclay/images/subcategories/even_9_on.png b/static/saclay/images/subcategories/even_9_on.png
new file mode 100644
index 0000000..31453d8
--- /dev/null
+++ b/static/saclay/images/subcategories/even_9_on.png
Binary files differ
diff --git a/static/saclay/images/subcategories/even_format_off.png b/static/saclay/images/subcategories/even_format_off.png
new file mode 100644
index 0000000..0912f93
--- /dev/null
+++ b/static/saclay/images/subcategories/even_format_off.png
Binary files differ
diff --git a/static/saclay/images/subcategories/even_format_on.png b/static/saclay/images/subcategories/even_format_on.png
new file mode 100644
index 0000000..ce5d9bb
--- /dev/null
+++ b/static/saclay/images/subcategories/even_format_on.png
Binary files differ
diff --git a/static/saclay/images/subcategories/mob_7_off.png b/static/saclay/images/subcategories/mob_7_off.png
new file mode 100644
index 0000000..171205b
--- /dev/null
+++ b/static/saclay/images/subcategories/mob_7_off.png
Binary files differ
diff --git a/static/saclay/images/subcategories/mob_7_on.png b/static/saclay/images/subcategories/mob_7_on.png
new file mode 100644
index 0000000..e3b9b79
--- /dev/null
+++ b/static/saclay/images/subcategories/mob_7_on.png
Binary files differ
diff --git a/static/saclay/images/subcategories/patri_forets_off.png b/static/saclay/images/subcategories/patri_forets_off.png
new file mode 100644
index 0000000..747ecf2
--- /dev/null
+++ b/static/saclay/images/subcategories/patri_forets_off.png
Binary files differ
diff --git a/static/saclay/images/subcategories/patri_forets_on.png b/static/saclay/images/subcategories/patri_forets_on.png
new file mode 100644
index 0000000..28343d3
--- /dev/null
+++ b/static/saclay/images/subcategories/patri_forets_on.png
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/static/saclay/images/subcategories/ress_6_off.png b/static/saclay/images/subcategories/ress_6_off.png
new file mode 100644
index 0000000..5217f9c
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_6_off.png
Binary files differ
diff --git a/static/saclay/images/subcategories/ress_6_on.png b/static/saclay/images/subcategories/ress_6_on.png
new file mode 100644
index 0000000..30b0ded
--- /dev/null
+++ b/static/saclay/images/subcategories/ress_6_on.png
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/static/saclay/images/welcome_logo_chronos.png b/static/saclay/images/welcome_logo_chronos.png
new file mode 100644
index 0000000..f48b9b8
--- /dev/null
+++ b/static/saclay/images/welcome_logo_chronos.png
Binary files differ
diff --git a/static/saclay/images/welcome_logo_malaquais.png b/static/saclay/images/welcome_logo_malaquais.png
new file mode 100644
index 0000000..d621aad
--- /dev/null
+++ b/static/saclay/images/welcome_logo_malaquais.png
Binary files differ
diff --git a/static/saclay/images/welcome_logo_terre_et_cite.png b/static/saclay/images/welcome_logo_terre_et_cite.png
new file mode 100644
index 0000000..4a25472
--- /dev/null
+++ b/static/saclay/images/welcome_logo_terre_et_cite.png
Binary files differ
diff --git a/templates/chimere/base.html b/templates/chimere/base.html
index bab159f..b24f070 100644
--- a/templates/chimere/base.html
+++ b/templates/chimere/base.html
@@ -14,6 +14,22 @@
<script src="{{ STATIC_URL }}saclay/js/mobile.chimere.js" type="text/javascript"></script>{%endif%}
{% if css_area %}
<link rel="stylesheet" href="{{ css_area }}" />{% endif %}
+
+<!-- Piwik -->
+<script type="text/javascript">
+ var _paq = _paq || [];
+ _paq.push(['trackPageView']);
+ _paq.push(['enableLinkTracking']);
+ (function() {
+ var u="https://piwik.proxience.net/";
+ _paq.push(['setTrackerUrl', u+'piwik.php']);
+ _paq.push(['setSiteId', 3]);
+ var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
+ g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+ })();
+</script>
+<noscript><p><img src="https://piwik.proxience.net/piwik.php?idsite=3" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
{% endblock %}
{% block header %}
<noscript>
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 231c143..aa2b51c 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -25,6 +25,17 @@ $(function(){
</div>
<script type="text/javascript">
<!--
+ //LIB iOS
+ var connectWebViewJavascriptBridge = function(callback) {
+ 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();
@@ -43,8 +54,39 @@ $(function(){
$('#action-categories').click(category_panel_open);
- $('#sidebar-handler-hide').click(function(){$('#sidebar').hide();});
- $('#sidebar-handler-show').click(function(){$('#sidebar').show();});
+ $('#sidebar-handler-hide').click(function(){
+ $('#sidebar').hide();
+ // Added for mobile - START //
+ //iOS
+ connectWebViewJavascriptBridge(
+ function(bridge) {
+ if(!bridge){
+ bridge.init(function(message, responseCallback) {
+ if (responseCallback) {
+ responseCallback("Right back atcha");
+ }
+ });
+ }
+ bridge.send('sidebarHide');
+ });
+ });
+ $('#sidebar-handler-show').click(function(){
+ $('#sidebar').show();
+ // Added for mobile - START //
+ //iOS
+ connectWebViewJavascriptBridge(
+ function(bridge) {
+ if(!bridge){
+ bridge.init(function(message, responseCallback) {
+ if (responseCallback) {
+ responseCallback("Right back atcha");
+ }
+ });
+ }
+ bridge.send('sidebarShow');
+ });
+
+ });
{% if single_category %}
$(function() {$('#panel').hide()});{% endif %}
diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html
index ae83180..b811257 100644
--- a/templates/chimere/blocks/welcome.html
+++ b/templates/chimere/blocks/welcome.html
@@ -15,11 +15,44 @@ $(function(){
<div class='title'>
<h2>{{title}}</h2>
</div>
+ {% comment %} <img src='{{STATIC_URL}}saclay/images/popup/welcome_header.png' alt='Welcome header'/> {% endcomment %}
<div id='welcome_message'>
<div id='welcome_content'>
{{welcome_message|safe}}
</div>
+ <div id='logos'>
+ <a href='http://www.paris-malaquais.archi.fr/'><img alt='Paris Malaquais link' src='{{STATIC_URL}}saclay/images/popup/welcome_logo-paris-malaquais.png'/></a><a href='http://www.terreetcite.org/'><img alt='Terre et cité link' src='{{STATIC_URL}}saclay/images/popup/welcome_logo-terre-et-cite.png'/></a><a href='http://www.groupechronos.org/'><img alt='Chronos link' src='{{STATIC_URL}}saclay/images/popup/welcome_logo-chronos.png'/></a>
+ </div>
</div>
+ {% comment %} <div class='welcome-col'>
+ <div class='news'>
+ {% if news_lst %}
+ {% for news in news_lst %}
+ <div class='info'>
+ {% if news.title %}
+ <h4>{{news.title}} &ndash; {{ news.date }}</h4>
+ {{news.short_desc|safe}}
+ {% else %}
+ <h4>{{news.name}} &ndash; {{ news.start_date }}{% if news.end_date %} - {{ news.end_date }}{% endif %}</h4>
+ {% if news.description %}
+ {{news.short_desc|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td th tr"|safe}}...
+ {% endif %}
+ {% endif %}
+ <p class='marker_link'>
+ {% if news.point %}
+ <a href='{% get_tinyfied_url news area_name %}'>{% trans "See it on the map"%}</a> -
+ {% endif %}
+ <a href='#' class='get_more_information'>{% trans "More informations"%}</a>
+ {% if news.url %}
+ - <a href='{{news.url}}'>{% trans "Go to the event website"%}</a>
+ {% endif %}
+ </p>
+ </div>
+ {%endfor%}
+ {% endif %}
+ </div>
+ <div class='footer'><a href='#' class='get_more_information'>{% trans "See all news" %}</a></div>
+ </div>{% endcomment %}
</div>
<script type='text/javascript'>
<!--
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index b511eae..f6560b6 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -14,8 +14,8 @@
{%endif%}
<div>
{% if dated %}
- <p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}}
- {% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span>
+ <p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"l d F Y"}}
+ {% if marker.end_date %} - {{marker.end_date|date:"l d F Y"}}</p>{% endif %}</span>
{% endif %}
{% if marker.description %}
<div id='description_long_{{marker.pk}}' class='description'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</div>
diff --git a/xslt/magny-les-hameaux.xslt b/xslt/magny-les-hameaux.xslt
new file mode 100644
index 0000000..e8a8b75
--- /dev/null
+++ b/xslt/magny-les-hameaux.xslt
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+ <xsl:template match="/">
+ <items>
+ <xsl:for-each select="/nodes/node">
+ <item>
+ <date><xsl:value-of select="date"/></date>
+ <name>Magny-les-Hameaux : <xsl:value-of select="titre"/></name>
+ <category><xsl:value-of select="tiquette"/></category>
+ <link><xsl:value-of select="lien"/></link>
+ <description><xsl:value-of select="corps"/></description>
+ <key>magny-les-hameaux-<xsl:value-of select="titre"/></key>
+ <lat><xsl:value-of select="latitude"/></lat>
+ <lon><xsl:value-of select="longitude"/></lon>
+ </item>
+ </xsl:for-each>
+ </items>
+ </xsl:template>
+</xsl:stylesheet>
+
diff --git a/xslt/villiers-le-bacle-detail.xslt b/xslt/villiers-le-bacle-detail.xslt
new file mode 100644
index 0000000..9dc757d
--- /dev/null
+++ b/xslt/villiers-le-bacle-detail.xslt
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+ <xsl:template match="/">
+ <items>
+ <xsl:for-each select="/html/body/div[@id='container']/table[@id='mainpage']/tr/td[@class='centre']/div">
+ <item>
+ <description>
+ <xsl:copy-of select="div/p[@class='soustitre']"/>
+ <xsl:if test="div[@id='documents_joints']/ul">
+ <xsl:copy-of select="div[@id='documents_joints']/ul"/>
+ </xsl:if>
+ </description>
+ </item>
+ </xsl:for-each>
+ </items>
+ </xsl:template>
+</xsl:stylesheet>
+
diff --git a/xslt/villiers-le-bacle.xslt b/xslt/villiers-le-bacle.xslt
new file mode 100644
index 0000000..1c33955
--- /dev/null
+++ b/xslt/villiers-le-bacle.xslt
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+ <xsl:template match="/">
+ <items>
+ <xsl:for-each select="/html/body/div[@id='agenda']/ul/li">
+ <item>
+ <date><xsl:value-of select="div[@class='ag-date']"/></date>
+ <name>Villiers-le-bâcle : <xsl:value-of select="div[@class='titre']/a"/></name>
+ <link><xsl:value-of select="div[@class='titre']/a/@href"/></link>
+ <key>villiers-le-bacle-<xsl:value-of select="div[@class='titre']/a/@href"/></key>
+ </item>
+ </xsl:for-each>
+ </items>
+ </xsl:template>
+</xsl:stylesheet>
+