Django 1.8 / python 3 migration. Move static to a right path.

292 files changed, 120 insertions, 154 deletions

diff --git a/.gitignore b/.gitignore
index 4ca63a7..86bd6cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,11 +5,4 @@
 *.ignore
 media/*
 local_settings.py
-static/admin/
-static/chimere/
-static/chosen/
-static/icons/
-static/jme/
-static/upload/
-static/prettyPhoto/
 site_static/lib/db.php
diff --git a/forms.py b/forms.py
index 3e42d66..74e8690 100644
--- a/forms.py
+++ b/forms.py
@@ -25,9 +25,10 @@ from django.utils.translation import ugettext as _
 
 from chimere.models import SubCategory
 from chimere.forms import MarkerForm as BaseMarkerForm, \
-                          RouteForm as BaseRouteForm
+    RouteForm as BaseRouteForm
 from chimere.widgets import TextareaWidget
 
+
 class MarkerForm(BaseMarkerForm):
     categories = forms.ChoiceField(choices=[], widget=forms.Select)
     description = forms.CharField(widget=TextareaWidget, required=False)
@@ -35,7 +36,7 @@ class MarkerForm(BaseMarkerForm):
     def __init__(self, *args, **kwargs):
         super(MarkerForm, self).__init__(*args, **kwargs)
         self.fields['categories'].widget.choices = [('', _(u"Select"))] + \
-                           SubCategory.getAvailableTuples(item_types=['M', 'B'])
+            SubCategory.getAvailableTuples(item_types=['M', 'B'])
 
     def clean_categories(self):
         cats = self.cleaned_data.get('categories')
@@ -44,6 +45,7 @@ class MarkerForm(BaseMarkerForm):
                 self.cleaned_data['categories'] = [cats]
         return self.cleaned_data['categories']
 
+
 class RouteForm(BaseRouteForm):
     categories = forms.ChoiceField(choices=[], widget=forms.Select)
     description = forms.CharField(widget=TextareaWidget, required=False)
@@ -51,7 +53,7 @@ class RouteForm(BaseRouteForm):
     def __init__(self, *args, **kwargs):
         super(RouteForm, self).__init__(*args, **kwargs)
         self.fields['categories'].widget.choices = [('', _(u"Select"))] + \
-                           SubCategory.getAvailableTuples(item_types=['R', 'B'])
+            SubCategory.getAvailableTuples(item_types=['R', 'B'])
 
     def clean_categories(self):
         cats = self.cleaned_data.get('categories')
diff --git a/manage.py b/manage.py
index abb366f..504c115 100755
--- a/manage.py
+++ b/manage.py
@@ -1,15 +1,13 @@
-#!/usr/bin/env python
-import os, sys
-from django.core.management import execute_manager
-sys.path.insert(0, '/home/nim/Work/chimere-project/chimere/')
-sys.path.insert(0, os.path.abspath('./..'))
-
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+#!/usr/bin/env python3
+
+import os
+import sys
+
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    sys.path.insert(0, os.path.abspath('./../'))
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/static/jquery-ui/base/images/animated-overlay.gif b/saclay_static/jquery-ui/base/images/animated-overlay.gif
index d441f75..d441f75 100644
--- a/static/jquery-ui/base/images/animated-overlay.gif
+++ b/saclay_static/jquery-ui/base/images/animated-overlay.gif
diff --git a/static/jquery-ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png b/saclay_static/jquery-ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2..5b5dab2 100644
--- a/static/jquery-ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/static/jquery-ui/base/images/ui-bg_flat_75_ffffff_40x100.png b/saclay_static/jquery-ui/base/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229..ac8b229 100644
--- a/static/jquery-ui/base/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png
index ad3d634..ad3d634 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_65_ffffff_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_65_ffffff_1x400.png
index 42ccba2..42ccba2 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_75_dadada_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_75_dadada_1x400.png
index 5a46b47..5a46b47 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_75_dadada_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png
index 86c2baa..86c2baa 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_95_fef1ec_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_95_fef1ec_1x400.png
index 4443fdc..4443fdc 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/saclay_static/jquery-ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7c9fa6c..7c9fa6c 100644
--- a/static/jquery-ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/static/jquery-ui/base/images/ui-icons_222222_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_222222_256x240.png
index ee039dc..ee039dc 100644
--- a/static/jquery-ui/base/images/ui-icons_222222_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_222222_256x240.png
diff --git a/static/jquery-ui/base/images/ui-icons_2e83ff_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_2e83ff_256x240.png
index 45e8928..45e8928 100644
--- a/static/jquery-ui/base/images/ui-icons_2e83ff_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_2e83ff_256x240.png
diff --git a/static/jquery-ui/base/images/ui-icons_454545_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_454545_256x240.png
index 7ec70d1..7ec70d1 100644
--- a/static/jquery-ui/base/images/ui-icons_454545_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_454545_256x240.png
diff --git a/static/jquery-ui/base/images/ui-icons_888888_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_888888_256x240.png
index 5ba708c..5ba708c 100644
--- a/static/jquery-ui/base/images/ui-icons_888888_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_888888_256x240.png
diff --git a/static/jquery-ui/base/images/ui-icons_cd0a0a_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_cd0a0a_256x240.png
index 7930a55..7930a55 100644
--- a/static/jquery-ui/base/images/ui-icons_cd0a0a_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_cd0a0a_256x240.png
diff --git a/static/jquery-ui/base/jquery-ui.css b/saclay_static/jquery-ui/base/jquery-ui.css
index c0afe83..c0afe83 100644
--- a/static/jquery-ui/base/jquery-ui.css
+++ b/saclay_static/jquery-ui/base/jquery-ui.css
diff --git a/static/jquery-ui/base/jquery.ui.accordion.css b/saclay_static/jquery-ui/base/jquery.ui.accordion.css
index 5d79383..5d79383 100644
--- a/static/jquery-ui/base/jquery.ui.accordion.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.accordion.css
diff --git a/static/jquery-ui/base/jquery.ui.all.css b/saclay_static/jquery-ui/base/jquery.ui.all.css
index 351e0d8..351e0d8 100644
--- a/static/jquery-ui/base/jquery.ui.all.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.all.css
diff --git a/static/jquery-ui/base/jquery.ui.autocomplete.css b/saclay_static/jquery-ui/base/jquery.ui.autocomplete.css
index 1c6ab97..1c6ab97 100644
--- a/static/jquery-ui/base/jquery.ui.autocomplete.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.autocomplete.css
diff --git a/static/jquery-ui/base/jquery.ui.base.css b/saclay_static/jquery-ui/base/jquery.ui.base.css
index aefb565..aefb565 100644
--- a/static/jquery-ui/base/jquery.ui.base.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.base.css
diff --git a/static/jquery-ui/base/jquery.ui.button.css b/saclay_static/jquery-ui/base/jquery.ui.button.css
index 1a92496..1a92496 100644
--- a/static/jquery-ui/base/jquery.ui.button.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.button.css
diff --git a/static/jquery-ui/base/jquery.ui.core.css b/saclay_static/jquery-ui/base/jquery.ui.core.css
index 97c9696..97c9696 100644
--- a/static/jquery-ui/base/jquery.ui.core.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.core.css
diff --git a/static/jquery-ui/base/jquery.ui.datepicker.css b/saclay_static/jquery-ui/base/jquery.ui.datepicker.css
index c20aecc..c20aecc 100644
--- a/static/jquery-ui/base/jquery.ui.datepicker.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.datepicker.css
diff --git a/static/jquery-ui/base/jquery.ui.dialog.css b/saclay_static/jquery-ui/base/jquery.ui.dialog.css
index 6ebd1cf..6ebd1cf 100644
--- a/static/jquery-ui/base/jquery.ui.dialog.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.dialog.css
diff --git a/static/jquery-ui/base/jquery.ui.menu.css b/saclay_static/jquery-ui/base/jquery.ui.menu.css
index 0ffa1e0..0ffa1e0 100644
--- a/static/jquery-ui/base/jquery.ui.menu.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.menu.css
diff --git a/static/jquery-ui/base/jquery.ui.progressbar.css b/saclay_static/jquery-ui/base/jquery.ui.progressbar.css
index f8980a5..f8980a5 100644
--- a/static/jquery-ui/base/jquery.ui.progressbar.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.progressbar.css
diff --git a/static/jquery-ui/base/jquery.ui.resizable.css b/saclay_static/jquery-ui/base/jquery.ui.resizable.css
index eeb47a7..eeb47a7 100644
--- a/static/jquery-ui/base/jquery.ui.resizable.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.resizable.css
diff --git a/static/jquery-ui/base/jquery.ui.selectable.css b/saclay_static/jquery-ui/base/jquery.ui.selectable.css
index bb388eb..bb388eb 100644
--- a/static/jquery-ui/base/jquery.ui.selectable.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.selectable.css
diff --git a/static/jquery-ui/base/jquery.ui.slider.css b/saclay_static/jquery-ui/base/jquery.ui.slider.css
index 662912d..662912d 100644
--- a/static/jquery-ui/base/jquery.ui.slider.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.slider.css
diff --git a/static/jquery-ui/base/jquery.ui.spinner.css b/saclay_static/jquery-ui/base/jquery.ui.spinner.css
index 1a298a4..1a298a4 100644
--- a/static/jquery-ui/base/jquery.ui.spinner.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.spinner.css
diff --git a/static/jquery-ui/base/jquery.ui.tabs.css b/saclay_static/jquery-ui/base/jquery.ui.tabs.css
index f3990a4..f3990a4 100644
--- a/static/jquery-ui/base/jquery.ui.tabs.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.tabs.css
diff --git a/static/jquery-ui/base/jquery.ui.theme.css b/saclay_static/jquery-ui/base/jquery.ui.theme.css
index b5ef1ce..b5ef1ce 100644
--- a/static/jquery-ui/base/jquery.ui.theme.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.theme.css
diff --git a/static/jquery-ui/base/jquery.ui.tooltip.css b/saclay_static/jquery-ui/base/jquery.ui.tooltip.css
index bede6fc..bede6fc 100644
--- a/static/jquery-ui/base/jquery.ui.tooltip.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.tooltip.css
diff --git a/static/jquery-ui/copyright b/saclay_static/jquery-ui/copyright
index 25d7a9b..25d7a9b 100644
--- a/static/jquery-ui/copyright
+++ b/saclay_static/jquery-ui/copyright
diff --git a/static/jquery-ui/jquery-ui.min.js b/saclay_static/jquery-ui/jquery-ui.min.js
index 7a1383e..7a1383e 100644
--- a/static/jquery-ui/jquery-ui.min.js
+++ b/saclay_static/jquery-ui/jquery-ui.min.js
diff --git a/static/jquery-ui/smoothness/images/animated-overlay.gif b/saclay_static/jquery-ui/smoothness/images/animated-overlay.gif
index d441f75..d441f75 100644
--- a/static/jquery-ui/smoothness/images/animated-overlay.gif
+++ b/saclay_static/jquery-ui/smoothness/images/animated-overlay.gif
diff --git a/static/jquery-ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
index c06ecaa..c06ecaa 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
index db28c75..db28c75 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
index 137b9d2..137b9d2 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
index 0dc2feb..0dc2feb 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
index c6b94b6..c6b94b6 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
index d99dd51..d99dd51 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
index 8e40834..8e40834 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 4359bc3..4359bc3 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_222222_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_222222_256x240.png
index 43bf16e..43bf16e 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_222222_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_222222_256x240.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_2e83ff_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_2e83ff_256x240.png
index 4af3763..4af3763 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_2e83ff_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_454545_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_454545_256x240.png
index 77628c6..77628c6 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_454545_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_454545_256x240.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_888888_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_888888_256x240.png
index dac466f..dac466f 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_888888_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_888888_256x240.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_cd0a0a_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_cd0a0a_256x240.png
index 61827f0..61827f0 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_cd0a0a_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.css b/saclay_static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.css
index 82c40fc..82c40fc 100644
--- a/static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.css
+++ b/saclay_static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.css
diff --git a/static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.min.css b/saclay_static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.min.css
index 7442c5f..7442c5f 100644
--- a/static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.min.css
+++ b/saclay_static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.min.css
diff --git a/static/jquery-ui/smoothness/jquery-ui.css b/saclay_static/jquery-ui/smoothness/jquery-ui.css
index 8784a02..8784a02 120000
--- a/static/jquery-ui/smoothness/jquery-ui.css
+++ b/saclay_static/jquery-ui/smoothness/jquery-ui.css
diff --git a/static/jquery-ui/smoothness/jquery-ui.min.css b/saclay_static/jquery-ui/smoothness/jquery-ui.min.css
index a57eb75..a57eb75 120000
--- a/static/jquery-ui/smoothness/jquery-ui.min.css
+++ b/saclay_static/jquery-ui/smoothness/jquery-ui.min.css
diff --git a/static/jquery/copyright b/saclay_static/jquery/copyright
index 3d2d52d..3d2d52d 100644
--- a/static/jquery/copyright
+++ b/saclay_static/jquery/copyright
diff --git a/static/jquery/jquery.min.js b/saclay_static/jquery/jquery.min.js
index 4d24ba4..4d24ba4 100644
--- a/static/jquery/jquery.min.js
+++ b/saclay_static/jquery/jquery.min.js
diff --git a/static/saclay/css/mobile.css b/saclay_static/saclay/css/mobile.css
index ee31e25..ee31e25 100644
--- a/static/saclay/css/mobile.css
+++ b/saclay_static/saclay/css/mobile.css
diff --git a/static/saclay/css/print.css b/saclay_static/saclay/css/print.css
index 919fe8d..919fe8d 100644
--- a/static/saclay/css/print.css
+++ b/saclay_static/saclay/css/print.css
diff --git a/static/saclay/css/styles.css b/saclay_static/saclay/css/styles.css
index 2190049..af9c549 100644
--- a/static/saclay/css/styles.css
+++ b/saclay_static/saclay/css/styles.css
@@ -1126,7 +1126,7 @@ div#sidebar{
 
 div#sidebar{
     z-index:7;
-    width:281px;
+    width:295px;
     top:26px;
     position:absolute;
     bottom:0;
@@ -1186,9 +1186,8 @@ ul.share {
     padding:3px;
     bottom:0;
     position:absolute;
-    width:275px;
-    height:22px;
-    border-right:1px solid;
+    width: 281px;
+    height: 26px;
 }
 
 .sidebar-handler{
@@ -1290,10 +1289,9 @@ ul#ul_categories{
 }
 
 #ul_categories .subcategories li label{
-    width:274px;
     display:block;
-    padding:5px 0 0 9px;
-    height:21px;
+    padding:0.5em 1em;
+    margin:0;
     font-weight:bold;
     background-color:#fff;
 }
@@ -2015,6 +2013,22 @@ select#id_categories{
     margin-top:20%;
 }
 
+#categories li{
+    padding: 0;
+}
+
+#categories li.main_category:hover{
+    background-color: transparent;
+}
+
+.subcategory label{
+    border-radius: 0;
+}
+
+.main_category > span > label{
+    width: 100%;
+}
+
 .main_category.toggle_plus > span > label,
 .main_category.toggle_minus > span > label{
     text-transform:uppercase;
diff --git a/static/saclay/images/background-small.png b/saclay_static/saclay/images/background-small.png
index fc904ae..fc904ae 100644
--- a/static/saclay/images/background-small.png
+++ b/saclay_static/saclay/images/background-small.png
diff --git a/static/saclay/images/background-top.png b/saclay_static/saclay/images/background-top.png
index c7fb8e1..c7fb8e1 100644
--- a/static/saclay/images/background-top.png
+++ b/saclay_static/saclay/images/background-top.png
diff --git a/static/saclay/images/background.png b/saclay_static/saclay/images/background.png
index 564dbf4..564dbf4 100644
--- a/static/saclay/images/background.png
+++ b/saclay_static/saclay/images/background.png
diff --git a/static/saclay/images/bottom-arrow.png b/saclay_static/saclay/images/bottom-arrow.png
index 6f98166..6f98166 100644
--- a/static/saclay/images/bottom-arrow.png
+++ b/saclay_static/saclay/images/bottom-arrow.png
diff --git a/static/saclay/images/button-cat-off.png b/saclay_static/saclay/images/button-cat-off.png
index ad9e0e5..ad9e0e5 100644
--- a/static/saclay/images/button-cat-off.png
+++ b/saclay_static/saclay/images/button-cat-off.png
diff --git a/static/saclay/images/button-cat-on.png b/saclay_static/saclay/images/button-cat-on.png
index 3c6c546..3c6c546 100644
--- a/static/saclay/images/button-cat-on.png
+++ b/saclay_static/saclay/images/button-cat-on.png
diff --git a/static/saclay/images/button-cat-three-off.png b/saclay_static/saclay/images/button-cat-three-off.png
index 9d728de..9d728de 100644
--- a/static/saclay/images/button-cat-three-off.png
+++ b/saclay_static/saclay/images/button-cat-three-off.png
diff --git a/static/saclay/images/button-cat-three-on.png b/saclay_static/saclay/images/button-cat-three-on.png
index d9bcc7e..d9bcc7e 100644
--- a/static/saclay/images/button-cat-three-on.png
+++ b/saclay_static/saclay/images/button-cat-three-on.png
diff --git a/static/saclay/images/button-event-off.png b/saclay_static/saclay/images/button-event-off.png
index 34a64a6..34a64a6 100644
--- a/static/saclay/images/button-event-off.png
+++ b/saclay_static/saclay/images/button-event-off.png
diff --git a/static/saclay/images/button-event-on.png b/saclay_static/saclay/images/button-event-on.png
index cdfc2cb..cdfc2cb 100644
--- a/static/saclay/images/button-event-on.png
+++ b/saclay_static/saclay/images/button-event-on.png
diff --git a/static/saclay/images/button-location-off.png b/saclay_static/saclay/images/button-location-off.png
index 4fb3ec3..4fb3ec3 100644
--- a/static/saclay/images/button-location-off.png
+++ b/saclay_static/saclay/images/button-location-off.png
diff --git a/static/saclay/images/button-location-on.png b/saclay_static/saclay/images/button-location-on.png
index 33f60fb..33f60fb 100644
--- a/static/saclay/images/button-location-on.png
+++ b/saclay_static/saclay/images/button-location-on.png
diff --git a/static/saclay/images/button-map-off.png b/saclay_static/saclay/images/button-map-off.png
index d9166a6..d9166a6 100644
--- a/static/saclay/images/button-map-off.png
+++ b/saclay_static/saclay/images/button-map-off.png
diff --git a/static/saclay/images/button-map-on.png b/saclay_static/saclay/images/button-map-on.png
index ff8d122..ff8d122 100644
--- a/static/saclay/images/button-map-on.png
+++ b/saclay_static/saclay/images/button-map-on.png
diff --git a/static/saclay/images/button-news-off.png b/saclay_static/saclay/images/button-news-off.png
index 91d426e..91d426e 100644
--- a/static/saclay/images/button-news-off.png
+++ b/saclay_static/saclay/images/button-news-off.png
diff --git a/static/saclay/images/button-news-on.png b/saclay_static/saclay/images/button-news-on.png
index 377c266..377c266 100644
--- a/static/saclay/images/button-news-on.png
+++ b/saclay_static/saclay/images/button-news-on.png
diff --git a/static/saclay/images/button-participate-off.png b/saclay_static/saclay/images/button-participate-off.png
index 0c5d1cd..0c5d1cd 100644
--- a/static/saclay/images/button-participate-off.png
+++ b/saclay_static/saclay/images/button-participate-off.png
diff --git a/static/saclay/images/button-participate-on.png b/saclay_static/saclay/images/button-participate-on.png
index e8c03b8..e8c03b8 100644
--- a/static/saclay/images/button-participate-on.png
+++ b/saclay_static/saclay/images/button-participate-on.png
diff --git a/static/saclay/images/button-project-off.png b/saclay_static/saclay/images/button-project-off.png
index 35aea1c..35aea1c 100644
--- a/static/saclay/images/button-project-off.png
+++ b/saclay_static/saclay/images/button-project-off.png
diff --git a/static/saclay/images/button-project-on.png b/saclay_static/saclay/images/button-project-on.png
index 6b84d07..6b84d07 100644
--- a/static/saclay/images/button-project-on.png
+++ b/saclay_static/saclay/images/button-project-on.png
diff --git a/static/saclay/images/button-route-off.png b/saclay_static/saclay/images/button-route-off.png
index 91c057c..91c057c 100644
--- a/static/saclay/images/button-route-off.png
+++ b/saclay_static/saclay/images/button-route-off.png
diff --git a/static/saclay/images/button-route-on.png b/saclay_static/saclay/images/button-route-on.png
index c159e34..c159e34 100644
--- a/static/saclay/images/button-route-on.png
+++ b/saclay_static/saclay/images/button-route-on.png
diff --git a/static/saclay/images/button-route-three-off.png b/saclay_static/saclay/images/button-route-three-off.png
index 388fd9d..388fd9d 100644
--- a/static/saclay/images/button-route-three-off.png
+++ b/saclay_static/saclay/images/button-route-three-off.png
diff --git a/static/saclay/images/button-route-three-on.png b/saclay_static/saclay/images/button-route-three-on.png
index 9581525..9581525 100644
--- a/static/saclay/images/button-route-three-on.png
+++ b/saclay_static/saclay/images/button-route-three-on.png
diff --git a/static/saclay/images/button-search-off.png b/saclay_static/saclay/images/button-search-off.png
index 9188039..9188039 100644
--- a/static/saclay/images/button-search-off.png
+++ b/saclay_static/saclay/images/button-search-off.png
diff --git a/static/saclay/images/button-search-on.png b/saclay_static/saclay/images/button-search-on.png
index b7ed487..b7ed487 100644
--- a/static/saclay/images/button-search-on.png
+++ b/saclay_static/saclay/images/button-search-on.png
diff --git a/static/saclay/images/button-wander-off.png b/saclay_static/saclay/images/button-wander-off.png
index 729f825..729f825 100644
--- a/static/saclay/images/button-wander-off.png
+++ b/saclay_static/saclay/images/button-wander-off.png
diff --git a/static/saclay/images/button-wander-on.png b/saclay_static/saclay/images/button-wander-on.png
index 0223f35..0223f35 100644
--- a/static/saclay/images/button-wander-on.png
+++ b/saclay_static/saclay/images/button-wander-on.png
diff --git a/static/saclay/images/buttons/add.png b/saclay_static/saclay/images/buttons/add.png
index 3368a65..3368a65 100644
--- a/static/saclay/images/buttons/add.png
+++ b/saclay_static/saclay/images/buttons/add.png
diff --git a/static/saclay/images/buttons/add_event.png b/saclay_static/saclay/images/buttons/add_event.png
index a5976f9..a5976f9 100644
--- a/static/saclay/images/buttons/add_event.png
+++ b/saclay_static/saclay/images/buttons/add_event.png
diff --git a/static/saclay/images/buttons/add_location.png b/saclay_static/saclay/images/buttons/add_location.png
index d0084d6..d0084d6 100644
--- a/static/saclay/images/buttons/add_location.png
+++ b/saclay_static/saclay/images/buttons/add_location.png
diff --git a/static/saclay/images/buttons/add_wander.png b/saclay_static/saclay/images/buttons/add_wander.png
index fb2d39a..fb2d39a 100644
--- a/static/saclay/images/buttons/add_wander.png
+++ b/saclay_static/saclay/images/buttons/add_wander.png
diff --git a/static/saclay/images/buttons/bicycle.png b/saclay_static/saclay/images/buttons/bicycle.png
index b408275..b408275 100644
--- a/static/saclay/images/buttons/bicycle.png
+++ b/saclay_static/saclay/images/buttons/bicycle.png
diff --git a/static/saclay/images/buttons/bicycle_on.png b/saclay_static/saclay/images/buttons/bicycle_on.png
index 65e5e4c..65e5e4c 100644
--- a/static/saclay/images/buttons/bicycle_on.png
+++ b/saclay_static/saclay/images/buttons/bicycle_on.png
diff --git a/static/saclay/images/buttons/button-help-off.png b/saclay_static/saclay/images/buttons/button-help-off.png
index aa98621..aa98621 100644
--- a/static/saclay/images/buttons/button-help-off.png
+++ b/saclay_static/saclay/images/buttons/button-help-off.png
diff --git a/static/saclay/images/buttons/button-help-on.png b/saclay_static/saclay/images/buttons/button-help-on.png
index aa98621..aa98621 100644
--- a/static/saclay/images/buttons/button-help-on.png
+++ b/saclay_static/saclay/images/buttons/button-help-on.png
diff --git a/static/saclay/images/buttons/button-print-off.png b/saclay_static/saclay/images/buttons/button-print-off.png
index a01b1fc..a01b1fc 100644
--- a/static/saclay/images/buttons/button-print-off.png
+++ b/saclay_static/saclay/images/buttons/button-print-off.png
diff --git a/static/saclay/images/buttons/button-print-on.png b/saclay_static/saclay/images/buttons/button-print-on.png
index a01b1fc..a01b1fc 100644
--- a/static/saclay/images/buttons/button-print-on.png
+++ b/saclay_static/saclay/images/buttons/button-print-on.png
diff --git a/static/saclay/images/buttons/button-send-off.png b/saclay_static/saclay/images/buttons/button-send-off.png
index e8a315c..e8a315c 100644
--- a/static/saclay/images/buttons/button-send-off.png
+++ b/saclay_static/saclay/images/buttons/button-send-off.png
diff --git a/static/saclay/images/buttons/button-send-on.png b/saclay_static/saclay/images/buttons/button-send-on.png
index e8a315c..e8a315c 100644
--- a/static/saclay/images/buttons/button-send-on.png
+++ b/saclay_static/saclay/images/buttons/button-send-on.png
diff --git a/static/saclay/images/buttons/button-share-off.png b/saclay_static/saclay/images/buttons/button-share-off.png
index 232efc3..232efc3 100644
--- a/static/saclay/images/buttons/button-share-off.png
+++ b/saclay_static/saclay/images/buttons/button-share-off.png
diff --git a/static/saclay/images/buttons/button-share-on.png b/saclay_static/saclay/images/buttons/button-share-on.png
index 232efc3..232efc3 100644
--- a/static/saclay/images/buttons/button-share-on.png
+++ b/saclay_static/saclay/images/buttons/button-share-on.png
diff --git a/static/saclay/images/buttons/calendar.png b/saclay_static/saclay/images/buttons/calendar.png
index 8d4bfc8..8d4bfc8 100644
--- a/static/saclay/images/buttons/calendar.png
+++ b/saclay_static/saclay/images/buttons/calendar.png
diff --git a/static/saclay/images/buttons/download.png b/saclay_static/saclay/images/buttons/download.png
index 33c92bc..33c92bc 100644
--- a/static/saclay/images/buttons/download.png
+++ b/saclay_static/saclay/images/buttons/download.png
diff --git a/static/saclay/images/buttons/extra_criteria-open.png b/saclay_static/saclay/images/buttons/extra_criteria-open.png
index 88d7d5e..88d7d5e 100644
--- a/static/saclay/images/buttons/extra_criteria-open.png
+++ b/saclay_static/saclay/images/buttons/extra_criteria-open.png
diff --git a/static/saclay/images/buttons/extra_criteria.png b/saclay_static/saclay/images/buttons/extra_criteria.png
index c4551ab..c4551ab 100644
--- a/static/saclay/images/buttons/extra_criteria.png
+++ b/saclay_static/saclay/images/buttons/extra_criteria.png
diff --git a/static/saclay/images/buttons/finish.png b/saclay_static/saclay/images/buttons/finish.png
index 840bdb4..840bdb4 100644
--- a/static/saclay/images/buttons/finish.png
+++ b/saclay_static/saclay/images/buttons/finish.png
diff --git a/static/saclay/images/buttons/form_finish.png b/saclay_static/saclay/images/buttons/form_finish.png
index 3f36f3b..3f36f3b 100644
--- a/static/saclay/images/buttons/form_finish.png
+++ b/saclay_static/saclay/images/buttons/form_finish.png
diff --git a/static/saclay/images/buttons/form_start.png b/saclay_static/saclay/images/buttons/form_start.png
index 0f81d93..0f81d93 100644
--- a/static/saclay/images/buttons/form_start.png
+++ b/saclay_static/saclay/images/buttons/form_start.png
diff --git a/static/saclay/images/buttons/form_step.png b/saclay_static/saclay/images/buttons/form_step.png
index 61a5d1d..61a5d1d 100644
--- a/static/saclay/images/buttons/form_step.png
+++ b/saclay_static/saclay/images/buttons/form_step.png
diff --git a/static/saclay/images/buttons/modify.png b/saclay_static/saclay/images/buttons/modify.png
index 3a4aebd..3a4aebd 100644
--- a/static/saclay/images/buttons/modify.png
+++ b/saclay_static/saclay/images/buttons/modify.png
diff --git a/static/saclay/images/buttons/new_search.png b/saclay_static/saclay/images/buttons/new_search.png
index 18ea372..18ea372 100644
--- a/static/saclay/images/buttons/new_search.png
+++ b/saclay_static/saclay/images/buttons/new_search.png
diff --git a/static/saclay/images/buttons/search.png b/saclay_static/saclay/images/buttons/search.png
index 3e94445..3e94445 100644
--- a/static/saclay/images/buttons/search.png
+++ b/saclay_static/saclay/images/buttons/search.png
diff --git a/static/saclay/images/buttons/start.png b/saclay_static/saclay/images/buttons/start.png
index 0e211f4..0e211f4 100644
--- a/static/saclay/images/buttons/start.png
+++ b/saclay_static/saclay/images/buttons/start.png
diff --git a/static/saclay/images/buttons/validate.png b/saclay_static/saclay/images/buttons/validate.png
index 8c03952..8c03952 100644
--- a/static/saclay/images/buttons/validate.png
+++ b/saclay_static/saclay/images/buttons/validate.png
diff --git a/static/saclay/images/buttons/walk.png b/saclay_static/saclay/images/buttons/walk.png
index a36b071..a36b071 100644
--- a/static/saclay/images/buttons/walk.png
+++ b/saclay_static/saclay/images/buttons/walk.png
diff --git a/static/saclay/images/buttons/walk_on.png b/saclay_static/saclay/images/buttons/walk_on.png
index 7ae81d8..7ae81d8 100644
--- a/static/saclay/images/buttons/walk_on.png
+++ b/saclay_static/saclay/images/buttons/walk_on.png
diff --git a/static/saclay/images/categories/cat_agri.png b/saclay_static/saclay/images/categories/cat_agri.png
index 4fd1536..4fd1536 100644
--- a/static/saclay/images/categories/cat_agri.png
+++ b/saclay_static/saclay/images/categories/cat_agri.png
diff --git a/static/saclay/images/categories/cat_agri_on.png b/saclay_static/saclay/images/categories/cat_agri_on.png
index a46323f..a46323f 100644
--- a/static/saclay/images/categories/cat_agri_on.png
+++ b/saclay_static/saclay/images/categories/cat_agri_on.png
diff --git a/static/saclay/images/categories/cat_balade.png b/saclay_static/saclay/images/categories/cat_balade.png
index 475be6f..475be6f 100644
--- a/static/saclay/images/categories/cat_balade.png
+++ b/saclay_static/saclay/images/categories/cat_balade.png
diff --git a/static/saclay/images/categories/cat_balade_on.png b/saclay_static/saclay/images/categories/cat_balade_on.png
index 8d1ec8a..8d1ec8a 100644
--- a/static/saclay/images/categories/cat_balade_on.png
+++ b/saclay_static/saclay/images/categories/cat_balade_on.png
diff --git a/static/saclay/images/categories/cat_culture.png b/saclay_static/saclay/images/categories/cat_culture.png
index c77a136..c77a136 100644
--- a/static/saclay/images/categories/cat_culture.png
+++ b/saclay_static/saclay/images/categories/cat_culture.png
diff --git a/static/saclay/images/categories/cat_culture_on.png b/saclay_static/saclay/images/categories/cat_culture_on.png
index 175b0a7..175b0a7 100644
--- a/static/saclay/images/categories/cat_culture_on.png
+++ b/saclay_static/saclay/images/categories/cat_culture_on.png
diff --git a/static/saclay/images/categories/cat_event.png b/saclay_static/saclay/images/categories/cat_event.png
index 5e942d7..5e942d7 100644
--- a/static/saclay/images/categories/cat_event.png
+++ b/saclay_static/saclay/images/categories/cat_event.png
diff --git a/static/saclay/images/categories/cat_event_on.png b/saclay_static/saclay/images/categories/cat_event_on.png
index d51ced1..d51ced1 100644
--- a/static/saclay/images/categories/cat_event_on.png
+++ b/saclay_static/saclay/images/categories/cat_event_on.png
diff --git a/static/saclay/images/categories/cat_mobilites.png b/saclay_static/saclay/images/categories/cat_mobilites.png
index c678b55..c678b55 100644
--- a/static/saclay/images/categories/cat_mobilites.png
+++ b/saclay_static/saclay/images/categories/cat_mobilites.png
diff --git a/static/saclay/images/categories/cat_mobilites_on.png b/saclay_static/saclay/images/categories/cat_mobilites_on.png
index 9bdb1a8..9bdb1a8 100644
--- a/static/saclay/images/categories/cat_mobilites_on.png
+++ b/saclay_static/saclay/images/categories/cat_mobilites_on.png
diff --git a/static/saclay/images/categories/cat_patrimoine.png b/saclay_static/saclay/images/categories/cat_patrimoine.png
index 6cb5d22..6cb5d22 100644
--- a/static/saclay/images/categories/cat_patrimoine.png
+++ b/saclay_static/saclay/images/categories/cat_patrimoine.png
diff --git a/static/saclay/images/categories/cat_patrimoine_on.png b/saclay_static/saclay/images/categories/cat_patrimoine_on.png
index 34592d9..34592d9 100644
--- a/static/saclay/images/categories/cat_patrimoine_on.png
+++ b/saclay_static/saclay/images/categories/cat_patrimoine_on.png
diff --git a/static/saclay/images/categories/cat_pratique.png b/saclay_static/saclay/images/categories/cat_pratique.png
index 17e145b..17e145b 100644
--- a/static/saclay/images/categories/cat_pratique.png
+++ b/saclay_static/saclay/images/categories/cat_pratique.png
diff --git a/static/saclay/images/categories/cat_pratique_on.png b/saclay_static/saclay/images/categories/cat_pratique_on.png
index c2629d8..c2629d8 100644
--- a/static/saclay/images/categories/cat_pratique_on.png
+++ b/saclay_static/saclay/images/categories/cat_pratique_on.png
diff --git a/static/saclay/images/categories/cat_sport.png b/saclay_static/saclay/images/categories/cat_sport.png
index 74c6971..74c6971 100644
--- a/static/saclay/images/categories/cat_sport.png
+++ b/saclay_static/saclay/images/categories/cat_sport.png
diff --git a/static/saclay/images/categories/cat_sport_on.png b/saclay_static/saclay/images/categories/cat_sport_on.png
index a18ebf9..a18ebf9 100644
--- a/static/saclay/images/categories/cat_sport_on.png
+++ b/saclay_static/saclay/images/categories/cat_sport_on.png
diff --git a/static/saclay/images/check-active.png b/saclay_static/saclay/images/check-active.png
index f787c3f..f787c3f 100644
--- a/static/saclay/images/check-active.png
+++ b/saclay_static/saclay/images/check-active.png
diff --git a/static/saclay/images/check-small.png b/saclay_static/saclay/images/check-small.png
index ce5f565..ce5f565 100644
--- a/static/saclay/images/check-small.png
+++ b/saclay_static/saclay/images/check-small.png
diff --git a/static/saclay/images/check.png b/saclay_static/saclay/images/check.png
index 75a1eb0..75a1eb0 100644
--- a/static/saclay/images/check.png
+++ b/saclay_static/saclay/images/check.png
diff --git a/static/saclay/images/close.png b/saclay_static/saclay/images/close.png
index 0b356df..0b356df 100644
--- a/static/saclay/images/close.png
+++ b/saclay_static/saclay/images/close.png
diff --git a/static/saclay/images/cloud-popup-saclay.png b/saclay_static/saclay/images/cloud-popup-saclay.png
index 9e4de73..9e4de73 100755
--- a/static/saclay/images/cloud-popup-saclay.png
+++ b/saclay_static/saclay/images/cloud-popup-saclay.png
diff --git a/static/saclay/images/cloud-popup-saclay.xcf b/saclay_static/saclay/images/cloud-popup-saclay.xcf
index 797be2c..797be2c 100644
--- a/static/saclay/images/cloud-popup-saclay.xcf
+++ b/saclay_static/saclay/images/cloud-popup-saclay.xcf
diff --git a/static/saclay/images/cluster_icon.png b/saclay_static/saclay/images/cluster_icon.png
index d019e11..d019e11 100644
--- a/static/saclay/images/cluster_icon.png
+++ b/saclay_static/saclay/images/cluster_icon.png
diff --git a/static/saclay/images/cluster_icon_hover.png b/saclay_static/saclay/images/cluster_icon_hover.png
index 7901f41..7901f41 100644
--- a/static/saclay/images/cluster_icon_hover.png
+++ b/saclay_static/saclay/images/cluster_icon_hover.png
diff --git a/static/saclay/images/default_icon.png b/saclay_static/saclay/images/default_icon.png
index 7d98be8..7d98be8 100644
--- a/static/saclay/images/default_icon.png
+++ b/saclay_static/saclay/images/default_icon.png
diff --git a/static/saclay/images/display_option.png b/saclay_static/saclay/images/display_option.png
index b5a7550..b5a7550 100644
--- a/static/saclay/images/display_option.png
+++ b/saclay_static/saclay/images/display_option.png
diff --git a/static/saclay/images/display_option_open.png b/saclay_static/saclay/images/display_option_open.png
index 2aa5599..2aa5599 100644
--- a/static/saclay/images/display_option_open.png
+++ b/saclay_static/saclay/images/display_option_open.png
diff --git a/static/saclay/images/email.png b/saclay_static/saclay/images/email.png
index 8eea702..8eea702 100644
--- a/static/saclay/images/email.png
+++ b/saclay_static/saclay/images/email.png
diff --git a/static/saclay/images/favicon.png b/saclay_static/saclay/images/favicon.png
index 6073276..6073276 100644
--- a/static/saclay/images/favicon.png
+++ b/saclay_static/saclay/images/favicon.png
diff --git a/static/saclay/images/handler-hide.png b/saclay_static/saclay/images/handler-hide.png
index 844300a..844300a 100644
--- a/static/saclay/images/handler-hide.png
+++ b/saclay_static/saclay/images/handler-hide.png
diff --git a/static/saclay/images/handler-show.png b/saclay_static/saclay/images/handler-show.png
index f258f87..f258f87 100644
--- a/static/saclay/images/handler-show.png
+++ b/saclay_static/saclay/images/handler-show.png
diff --git a/static/saclay/images/logo.jpg b/saclay_static/saclay/images/logo.jpg
index 070c9c9..070c9c9 100644
--- a/static/saclay/images/logo.jpg
+++ b/saclay_static/saclay/images/logo.jpg
diff --git a/static/saclay/images/map_sprite.png b/saclay_static/saclay/images/map_sprite.png
index 026a334..026a334 100644
--- a/static/saclay/images/map_sprite.png
+++ b/saclay_static/saclay/images/map_sprite.png
diff --git a/static/saclay/images/menu/icon_add.png b/saclay_static/saclay/images/menu/icon_add.png
index 8ad2e8d..8ad2e8d 100644
--- a/static/saclay/images/menu/icon_add.png
+++ b/saclay_static/saclay/images/menu/icon_add.png
diff --git a/static/saclay/images/menu/icon_center.png b/saclay_static/saclay/images/menu/icon_center.png
index 2d3ade4..2d3ade4 100644
--- a/static/saclay/images/menu/icon_center.png
+++ b/saclay_static/saclay/images/menu/icon_center.png
diff --git a/static/saclay/images/menu/icon_from.png b/saclay_static/saclay/images/menu/icon_from.png
index 3623e50..3623e50 100644
--- a/static/saclay/images/menu/icon_from.png
+++ b/saclay_static/saclay/images/menu/icon_from.png
diff --git a/static/saclay/images/menu/icon_minus.png b/saclay_static/saclay/images/menu/icon_minus.png
index 613169a..613169a 100644
--- a/static/saclay/images/menu/icon_minus.png
+++ b/saclay_static/saclay/images/menu/icon_minus.png
diff --git a/static/saclay/images/menu/icon_plus.png b/saclay_static/saclay/images/menu/icon_plus.png
index a02228e..a02228e 100644
--- a/static/saclay/images/menu/icon_plus.png
+++ b/saclay_static/saclay/images/menu/icon_plus.png
diff --git a/static/saclay/images/menu/icon_to.png b/saclay_static/saclay/images/menu/icon_to.png
index 6a2bab2..6a2bab2 100644
--- a/static/saclay/images/menu/icon_to.png
+++ b/saclay_static/saclay/images/menu/icon_to.png
diff --git a/static/saclay/images/minus.png b/saclay_static/saclay/images/minus.png
index 05b4170..05b4170 100644
--- a/static/saclay/images/minus.png
+++ b/saclay_static/saclay/images/minus.png
diff --git a/static/saclay/images/minus_alt.png b/saclay_static/saclay/images/minus_alt.png
index 787b8eb..787b8eb 100644
--- a/static/saclay/images/minus_alt.png
+++ b/saclay_static/saclay/images/minus_alt.png
diff --git a/static/saclay/images/minus_on.png b/saclay_static/saclay/images/minus_on.png
index 6af094b..6af094b 100644
--- a/static/saclay/images/minus_on.png
+++ b/saclay_static/saclay/images/minus_on.png
diff --git a/static/saclay/images/plus.png b/saclay_static/saclay/images/plus.png
index ce14109..ce14109 100644
--- a/static/saclay/images/plus.png
+++ b/saclay_static/saclay/images/plus.png
diff --git a/static/saclay/images/plus_alt.png b/saclay_static/saclay/images/plus_alt.png
index 76ffc81..76ffc81 100644
--- a/static/saclay/images/plus_alt.png
+++ b/saclay_static/saclay/images/plus_alt.png
diff --git a/static/saclay/images/plus_on.png b/saclay_static/saclay/images/plus_on.png
index ac7faa2..ac7faa2 100644
--- a/static/saclay/images/plus_on.png
+++ b/saclay_static/saclay/images/plus_on.png
diff --git a/static/saclay/images/popup/close.png b/saclay_static/saclay/images/popup/close.png
index fb4d7dd..fb4d7dd 100644
--- a/static/saclay/images/popup/close.png
+++ b/saclay_static/saclay/images/popup/close.png
diff --git a/static/saclay/images/popup/multimedia_title.png b/saclay_static/saclay/images/popup/multimedia_title.png
index 68d8f30..68d8f30 100644
--- a/static/saclay/images/popup/multimedia_title.png
+++ b/saclay_static/saclay/images/popup/multimedia_title.png
diff --git a/static/saclay/images/popup/thanks_title.png b/saclay_static/saclay/images/popup/thanks_title.png
index 40bfba5..40bfba5 100644
--- a/static/saclay/images/popup/thanks_title.png
+++ b/saclay_static/saclay/images/popup/thanks_title.png
diff --git a/static/saclay/images/popup/title_frame.png b/saclay_static/saclay/images/popup/title_frame.png
index 9e63a89..9e63a89 100644
--- a/static/saclay/images/popup/title_frame.png
+++ b/saclay_static/saclay/images/popup/title_frame.png
diff --git a/static/saclay/images/popup/welcome_close.png b/saclay_static/saclay/images/popup/welcome_close.png
index 42b335b..42b335b 100644
--- a/static/saclay/images/popup/welcome_close.png
+++ b/saclay_static/saclay/images/popup/welcome_close.png
diff --git a/static/saclay/images/popup/welcome_header.png b/saclay_static/saclay/images/popup/welcome_header.png
index 9b6ca77..9b6ca77 100644
--- a/static/saclay/images/popup/welcome_header.png
+++ b/saclay_static/saclay/images/popup/welcome_header.png
diff --git a/static/saclay/images/printer.png b/saclay_static/saclay/images/printer.png
index 0755b38..0755b38 100644
--- a/static/saclay/images/printer.png
+++ b/saclay_static/saclay/images/printer.png
diff --git a/static/saclay/images/routing_end.png b/saclay_static/saclay/images/routing_end.png
index aab3421..aab3421 100644
--- a/static/saclay/images/routing_end.png
+++ b/saclay_static/saclay/images/routing_end.png
diff --git a/static/saclay/images/routing_start.png b/saclay_static/saclay/images/routing_start.png
index 644e0de..644e0de 100644
--- a/static/saclay/images/routing_start.png
+++ b/saclay_static/saclay/images/routing_start.png
diff --git a/static/saclay/images/routing_step.png b/saclay_static/saclay/images/routing_step.png
index 90589a8..90589a8 100644
--- a/static/saclay/images/routing_step.png
+++ b/saclay_static/saclay/images/routing_step.png
diff --git a/static/saclay/images/routing_warn.png b/saclay_static/saclay/images/routing_warn.png
index 70f4e40..70f4e40 100644
--- a/static/saclay/images/routing_warn.png
+++ b/saclay_static/saclay/images/routing_warn.png
diff --git a/static/saclay/images/search.png b/saclay_static/saclay/images/search.png
index 0eff19b..0eff19b 100644
--- a/static/saclay/images/search.png
+++ b/saclay_static/saclay/images/search.png
diff --git a/static/saclay/images/shadow.png b/saclay_static/saclay/images/shadow.png
index e259c8f..e259c8f 100644
--- a/static/saclay/images/shadow.png
+++ b/saclay_static/saclay/images/shadow.png
diff --git a/static/saclay/images/subcategories/agri_1_off.png b/saclay_static/saclay/images/subcategories/agri_1_off.png
index d831042..d831042 100644
--- a/static/saclay/images/subcategories/agri_1_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_1_off.png
diff --git a/static/saclay/images/subcategories/agri_1_on.png b/saclay_static/saclay/images/subcategories/agri_1_on.png
index 354d96d..354d96d 100644
--- a/static/saclay/images/subcategories/agri_1_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_1_on.png
diff --git a/static/saclay/images/subcategories/agri_2_off.png b/saclay_static/saclay/images/subcategories/agri_2_off.png
index 5296004..5296004 100644
--- a/static/saclay/images/subcategories/agri_2_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_2_off.png
diff --git a/static/saclay/images/subcategories/agri_2_on.png b/saclay_static/saclay/images/subcategories/agri_2_on.png
index ab70e7a..ab70e7a 100644
--- a/static/saclay/images/subcategories/agri_2_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_2_on.png
diff --git a/static/saclay/images/subcategories/agri_3_off.png b/saclay_static/saclay/images/subcategories/agri_3_off.png
index 939c7cb..939c7cb 100644
--- a/static/saclay/images/subcategories/agri_3_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_3_off.png
diff --git a/static/saclay/images/subcategories/agri_3_on.png b/saclay_static/saclay/images/subcategories/agri_3_on.png
index 6ed6434..6ed6434 100644
--- a/static/saclay/images/subcategories/agri_3_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_3_on.png
diff --git a/static/saclay/images/subcategories/agri_4_off.png b/saclay_static/saclay/images/subcategories/agri_4_off.png
index 87858ca..87858ca 100644
--- a/static/saclay/images/subcategories/agri_4_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_4_off.png
diff --git a/static/saclay/images/subcategories/agri_4_on.png b/saclay_static/saclay/images/subcategories/agri_4_on.png
index da2efc6..da2efc6 100644
--- a/static/saclay/images/subcategories/agri_4_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_4_on.png
diff --git a/static/saclay/images/subcategories/agri_5_off.png b/saclay_static/saclay/images/subcategories/agri_5_off.png
index 606276a..606276a 100644
--- a/static/saclay/images/subcategories/agri_5_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_5_off.png
diff --git a/static/saclay/images/subcategories/agri_5_on.png b/saclay_static/saclay/images/subcategories/agri_5_on.png
index a818a29..a818a29 100644
--- a/static/saclay/images/subcategories/agri_5_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_5_on.png
diff --git a/static/saclay/images/subcategories/agri_6_off.png b/saclay_static/saclay/images/subcategories/agri_6_off.png
index bc27c2a..bc27c2a 100644
--- a/static/saclay/images/subcategories/agri_6_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_6_off.png
diff --git a/static/saclay/images/subcategories/agri_6_on.png b/saclay_static/saclay/images/subcategories/agri_6_on.png
index 89bb49e..89bb49e 100644
--- a/static/saclay/images/subcategories/agri_6_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_6_on.png
diff --git a/static/saclay/images/subcategories/bala_1_off.png b/saclay_static/saclay/images/subcategories/bala_1_off.png
index d8cb219..d8cb219 100644
--- a/static/saclay/images/subcategories/bala_1_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_1_off.png
diff --git a/static/saclay/images/subcategories/bala_1_on.png b/saclay_static/saclay/images/subcategories/bala_1_on.png
index 484cccd..484cccd 100644
--- a/static/saclay/images/subcategories/bala_1_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_1_on.png
diff --git a/static/saclay/images/subcategories/bala_2_off.png b/saclay_static/saclay/images/subcategories/bala_2_off.png
index 1b31a7b..1b31a7b 100644
--- a/static/saclay/images/subcategories/bala_2_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_2_off.png
diff --git a/static/saclay/images/subcategories/bala_2_on.png b/saclay_static/saclay/images/subcategories/bala_2_on.png
index e221f33..e221f33 100644
--- a/static/saclay/images/subcategories/bala_2_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_2_on.png
diff --git a/static/saclay/images/subcategories/bala_3_off.png b/saclay_static/saclay/images/subcategories/bala_3_off.png
index 1b9d838..1b9d838 100644
--- a/static/saclay/images/subcategories/bala_3_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_3_off.png
diff --git a/static/saclay/images/subcategories/bala_3_on.png b/saclay_static/saclay/images/subcategories/bala_3_on.png
index 1a74193..1a74193 100644
--- a/static/saclay/images/subcategories/bala_3_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_3_on.png
diff --git a/static/saclay/images/subcategories/bala_4_off.png b/saclay_static/saclay/images/subcategories/bala_4_off.png
index 22f3425..22f3425 100644
--- a/static/saclay/images/subcategories/bala_4_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_4_off.png
diff --git a/static/saclay/images/subcategories/bala_4_on.png b/saclay_static/saclay/images/subcategories/bala_4_on.png
index 25daa63..25daa63 100644
--- a/static/saclay/images/subcategories/bala_4_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_4_on.png
diff --git a/static/saclay/images/subcategories/bala_5_off.png b/saclay_static/saclay/images/subcategories/bala_5_off.png
index 2a79d50..2a79d50 100644
--- a/static/saclay/images/subcategories/bala_5_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_5_off.png
diff --git a/static/saclay/images/subcategories/bala_5_on.png b/saclay_static/saclay/images/subcategories/bala_5_on.png
index f9ce605..f9ce605 100644
--- a/static/saclay/images/subcategories/bala_5_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_5_on.png
diff --git a/static/saclay/images/subcategories/bala_6_off.png b/saclay_static/saclay/images/subcategories/bala_6_off.png
index 494f794..494f794 100644
--- a/static/saclay/images/subcategories/bala_6_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_6_off.png
diff --git a/static/saclay/images/subcategories/bala_6_on.png b/saclay_static/saclay/images/subcategories/bala_6_on.png
index 7221918..7221918 100644
--- a/static/saclay/images/subcategories/bala_6_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_6_on.png
diff --git a/static/saclay/images/subcategories/cult_1_off.png b/saclay_static/saclay/images/subcategories/cult_1_off.png
index 6d902f6..6d902f6 100644
--- a/static/saclay/images/subcategories/cult_1_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_1_off.png
diff --git a/static/saclay/images/subcategories/cult_1_on.png b/saclay_static/saclay/images/subcategories/cult_1_on.png
index 48a2029..48a2029 100644
--- a/static/saclay/images/subcategories/cult_1_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_1_on.png
diff --git a/static/saclay/images/subcategories/cult_2_off.png b/saclay_static/saclay/images/subcategories/cult_2_off.png
index 581f6ae..581f6ae 100644
--- a/static/saclay/images/subcategories/cult_2_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_2_off.png
diff --git a/static/saclay/images/subcategories/cult_2_on.png b/saclay_static/saclay/images/subcategories/cult_2_on.png
index b74f7fb..b74f7fb 100644
--- a/static/saclay/images/subcategories/cult_2_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_2_on.png
diff --git a/static/saclay/images/subcategories/cult_3_off.png b/saclay_static/saclay/images/subcategories/cult_3_off.png
index 22dfe34..22dfe34 100644
--- a/static/saclay/images/subcategories/cult_3_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_3_off.png
diff --git a/static/saclay/images/subcategories/cult_3_on.png b/saclay_static/saclay/images/subcategories/cult_3_on.png
index 9c27ddc..9c27ddc 100644
--- a/static/saclay/images/subcategories/cult_3_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_3_on.png
diff --git a/static/saclay/images/subcategories/cult_4_off.png b/saclay_static/saclay/images/subcategories/cult_4_off.png
index 3487ee8..3487ee8 100644
--- a/static/saclay/images/subcategories/cult_4_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_4_off.png
diff --git a/static/saclay/images/subcategories/cult_4_on.png b/saclay_static/saclay/images/subcategories/cult_4_on.png
index 6c79154..6c79154 100644
--- a/static/saclay/images/subcategories/cult_4_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_4_on.png
diff --git a/static/saclay/images/subcategories/cult_5_off.png b/saclay_static/saclay/images/subcategories/cult_5_off.png
index a07a5d3..a07a5d3 100644
--- a/static/saclay/images/subcategories/cult_5_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_5_off.png
diff --git a/static/saclay/images/subcategories/cult_5_on.png b/saclay_static/saclay/images/subcategories/cult_5_on.png
index 47d9840..47d9840 100644
--- a/static/saclay/images/subcategories/cult_5_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_5_on.png
diff --git a/static/saclay/images/subcategories/cult_6_off.png b/saclay_static/saclay/images/subcategories/cult_6_off.png
index 3087db5..3087db5 100644
--- a/static/saclay/images/subcategories/cult_6_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_6_off.png
diff --git a/static/saclay/images/subcategories/cult_6_on.png b/saclay_static/saclay/images/subcategories/cult_6_on.png
index f211914..f211914 100644
--- a/static/saclay/images/subcategories/cult_6_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_6_on.png
diff --git a/static/saclay/images/subcategories/even_1_off.png b/saclay_static/saclay/images/subcategories/even_1_off.png
index 477d534..477d534 100644
--- a/static/saclay/images/subcategories/even_1_off.png
+++ b/saclay_static/saclay/images/subcategories/even_1_off.png
diff --git a/static/saclay/images/subcategories/even_1_on.png b/saclay_static/saclay/images/subcategories/even_1_on.png
index 3fff957..3fff957 100644
--- a/static/saclay/images/subcategories/even_1_on.png
+++ b/saclay_static/saclay/images/subcategories/even_1_on.png
diff --git a/static/saclay/images/subcategories/even_2_off.png b/saclay_static/saclay/images/subcategories/even_2_off.png
index ec7af5d..ec7af5d 100644
--- a/static/saclay/images/subcategories/even_2_off.png
+++ b/saclay_static/saclay/images/subcategories/even_2_off.png
diff --git a/static/saclay/images/subcategories/even_2_on.png b/saclay_static/saclay/images/subcategories/even_2_on.png
index a8ba473..a8ba473 100644
--- a/static/saclay/images/subcategories/even_2_on.png
+++ b/saclay_static/saclay/images/subcategories/even_2_on.png
diff --git a/static/saclay/images/subcategories/even_3_off.png b/saclay_static/saclay/images/subcategories/even_3_off.png
index 2682910..2682910 100644
--- a/static/saclay/images/subcategories/even_3_off.png
+++ b/saclay_static/saclay/images/subcategories/even_3_off.png
diff --git a/static/saclay/images/subcategories/even_3_on.png b/saclay_static/saclay/images/subcategories/even_3_on.png
index 4a628d6..4a628d6 100644
--- a/static/saclay/images/subcategories/even_3_on.png
+++ b/saclay_static/saclay/images/subcategories/even_3_on.png
diff --git a/static/saclay/images/subcategories/even_4_off.png b/saclay_static/saclay/images/subcategories/even_4_off.png
index bd26719..bd26719 100644
--- a/static/saclay/images/subcategories/even_4_off.png
+++ b/saclay_static/saclay/images/subcategories/even_4_off.png
diff --git a/static/saclay/images/subcategories/even_4_on.png b/saclay_static/saclay/images/subcategories/even_4_on.png
index a426170..a426170 100644
--- a/static/saclay/images/subcategories/even_4_on.png
+++ b/saclay_static/saclay/images/subcategories/even_4_on.png
diff --git a/static/saclay/images/subcategories/even_5_off.png b/saclay_static/saclay/images/subcategories/even_5_off.png
index 3120d1e..3120d1e 100644
--- a/static/saclay/images/subcategories/even_5_off.png
+++ b/saclay_static/saclay/images/subcategories/even_5_off.png
diff --git a/static/saclay/images/subcategories/even_5_on.png b/saclay_static/saclay/images/subcategories/even_5_on.png
index 8f204dc..8f204dc 100644
--- a/static/saclay/images/subcategories/even_5_on.png
+++ b/saclay_static/saclay/images/subcategories/even_5_on.png
diff --git a/static/saclay/images/subcategories/even_6_off.png b/saclay_static/saclay/images/subcategories/even_6_off.png
index 990aecb..990aecb 100644
--- a/static/saclay/images/subcategories/even_6_off.png
+++ b/saclay_static/saclay/images/subcategories/even_6_off.png
diff --git a/static/saclay/images/subcategories/even_6_on.png b/saclay_static/saclay/images/subcategories/even_6_on.png
index f6bb3c7..f6bb3c7 100644
--- a/static/saclay/images/subcategories/even_6_on.png
+++ b/saclay_static/saclay/images/subcategories/even_6_on.png
diff --git a/static/saclay/images/subcategories/even_7_off.png b/saclay_static/saclay/images/subcategories/even_7_off.png
index 4418f82..4418f82 100644
--- a/static/saclay/images/subcategories/even_7_off.png
+++ b/saclay_static/saclay/images/subcategories/even_7_off.png
diff --git a/static/saclay/images/subcategories/even_7_on.png b/saclay_static/saclay/images/subcategories/even_7_on.png
index 043f158..043f158 100644
--- a/static/saclay/images/subcategories/even_7_on.png
+++ b/saclay_static/saclay/images/subcategories/even_7_on.png
diff --git a/static/saclay/images/subcategories/even_8_off.png b/saclay_static/saclay/images/subcategories/even_8_off.png
index 04ecc81..04ecc81 100644
--- a/static/saclay/images/subcategories/even_8_off.png
+++ b/saclay_static/saclay/images/subcategories/even_8_off.png
diff --git a/static/saclay/images/subcategories/even_8_on.png b/saclay_static/saclay/images/subcategories/even_8_on.png
index bd76803..bd76803 100644
--- a/static/saclay/images/subcategories/even_8_on.png
+++ b/saclay_static/saclay/images/subcategories/even_8_on.png
diff --git a/static/saclay/images/subcategories/mob_1_off.png b/saclay_static/saclay/images/subcategories/mob_1_off.png
index 90115a9..90115a9 100644
--- a/static/saclay/images/subcategories/mob_1_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_1_off.png
diff --git a/static/saclay/images/subcategories/mob_1_on.png b/saclay_static/saclay/images/subcategories/mob_1_on.png
index 4beb571..4beb571 100644
--- a/static/saclay/images/subcategories/mob_1_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_1_on.png
diff --git a/static/saclay/images/subcategories/mob_2_off.png b/saclay_static/saclay/images/subcategories/mob_2_off.png
index 1dfa8b8..1dfa8b8 100644
--- a/static/saclay/images/subcategories/mob_2_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_2_off.png
diff --git a/static/saclay/images/subcategories/mob_2_on.png b/saclay_static/saclay/images/subcategories/mob_2_on.png
index 54aa2fc..54aa2fc 100644
--- a/static/saclay/images/subcategories/mob_2_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_2_on.png
diff --git a/static/saclay/images/subcategories/mob_3_disabled.png b/saclay_static/saclay/images/subcategories/mob_3_disabled.png
index b2ec02c..b2ec02c 100644
--- a/static/saclay/images/subcategories/mob_3_disabled.png
+++ b/saclay_static/saclay/images/subcategories/mob_3_disabled.png
diff --git a/static/saclay/images/subcategories/mob_3_off.png b/saclay_static/saclay/images/subcategories/mob_3_off.png
index 3d4db66..3d4db66 100644
--- a/static/saclay/images/subcategories/mob_3_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_3_off.png
diff --git a/static/saclay/images/subcategories/mob_3_on.png b/saclay_static/saclay/images/subcategories/mob_3_on.png
index 2db8bca..2db8bca 100644
--- a/static/saclay/images/subcategories/mob_3_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_3_on.png
diff --git a/static/saclay/images/subcategories/mob_4_off.png b/saclay_static/saclay/images/subcategories/mob_4_off.png
index f7e6402..f7e6402 100644
--- a/static/saclay/images/subcategories/mob_4_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_4_off.png
diff --git a/static/saclay/images/subcategories/mob_4_on.png b/saclay_static/saclay/images/subcategories/mob_4_on.png
index b67a35f..b67a35f 100644
--- a/static/saclay/images/subcategories/mob_4_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_4_on.png
diff --git a/static/saclay/images/subcategories/mob_5_off.png b/saclay_static/saclay/images/subcategories/mob_5_off.png
index cbe1074..cbe1074 100644
--- a/static/saclay/images/subcategories/mob_5_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_5_off.png
diff --git a/static/saclay/images/subcategories/mob_5_on.png b/saclay_static/saclay/images/subcategories/mob_5_on.png
index 46d815b..46d815b 100644
--- a/static/saclay/images/subcategories/mob_5_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_5_on.png
diff --git a/static/saclay/images/subcategories/mob_6_off.png b/saclay_static/saclay/images/subcategories/mob_6_off.png
index c23a438..c23a438 100644
--- a/static/saclay/images/subcategories/mob_6_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_6_off.png
diff --git a/static/saclay/images/subcategories/mob_6_on.png b/saclay_static/saclay/images/subcategories/mob_6_on.png
index 5b6832f..5b6832f 100644
--- a/static/saclay/images/subcategories/mob_6_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_6_on.png
diff --git a/static/saclay/images/subcategories/patri_1_off.png b/saclay_static/saclay/images/subcategories/patri_1_off.png
index dfc23e4..dfc23e4 100644
--- a/static/saclay/images/subcategories/patri_1_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_1_off.png
diff --git a/static/saclay/images/subcategories/patri_1_on.png b/saclay_static/saclay/images/subcategories/patri_1_on.png
index 6f98059..6f98059 100644
--- a/static/saclay/images/subcategories/patri_1_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_1_on.png
diff --git a/static/saclay/images/subcategories/patri_2_off.png b/saclay_static/saclay/images/subcategories/patri_2_off.png
index c4f5716..c4f5716 100644
--- a/static/saclay/images/subcategories/patri_2_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_2_off.png
diff --git a/static/saclay/images/subcategories/patri_2_on.png b/saclay_static/saclay/images/subcategories/patri_2_on.png
index a07ba54..a07ba54 100644
--- a/static/saclay/images/subcategories/patri_2_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_2_on.png
diff --git a/static/saclay/images/subcategories/patri_3_off.png b/saclay_static/saclay/images/subcategories/patri_3_off.png
index f65f6d7..f65f6d7 100644
--- a/static/saclay/images/subcategories/patri_3_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_3_off.png
diff --git a/static/saclay/images/subcategories/patri_3_on.png b/saclay_static/saclay/images/subcategories/patri_3_on.png
index effcc16..effcc16 100644
--- a/static/saclay/images/subcategories/patri_3_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_3_on.png
diff --git a/static/saclay/images/subcategories/patri_4_off.png b/saclay_static/saclay/images/subcategories/patri_4_off.png
index 7630f15..7630f15 100644
--- a/static/saclay/images/subcategories/patri_4_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_4_off.png
diff --git a/static/saclay/images/subcategories/patri_4_on.png b/saclay_static/saclay/images/subcategories/patri_4_on.png
index feb1fc5..feb1fc5 100644
--- a/static/saclay/images/subcategories/patri_4_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_4_on.png
diff --git a/static/saclay/images/subcategories/patri_5_off.png b/saclay_static/saclay/images/subcategories/patri_5_off.png
index 3243f70..3243f70 100644
--- a/static/saclay/images/subcategories/patri_5_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_5_off.png
diff --git a/static/saclay/images/subcategories/patri_5_on.png b/saclay_static/saclay/images/subcategories/patri_5_on.png
index 01b5342..01b5342 100644
--- a/static/saclay/images/subcategories/patri_5_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_5_on.png
diff --git a/static/saclay/images/subcategories/patri_6_off.png b/saclay_static/saclay/images/subcategories/patri_6_off.png
index 8dda7ab..8dda7ab 100644
--- a/static/saclay/images/subcategories/patri_6_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_6_off.png
diff --git a/static/saclay/images/subcategories/patri_6_on.png b/saclay_static/saclay/images/subcategories/patri_6_on.png
index 6d5b8ad..6d5b8ad 100644
--- a/static/saclay/images/subcategories/patri_6_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_6_on.png
diff --git a/static/saclay/images/subcategories/ress_1_off.png b/saclay_static/saclay/images/subcategories/ress_1_off.png
index 5af2567..5af2567 100644
--- a/static/saclay/images/subcategories/ress_1_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_1_off.png
diff --git a/static/saclay/images/subcategories/ress_1_on.png b/saclay_static/saclay/images/subcategories/ress_1_on.png
index d4cad53..d4cad53 100644
--- a/static/saclay/images/subcategories/ress_1_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_1_on.png
diff --git a/static/saclay/images/subcategories/ress_2_off.png b/saclay_static/saclay/images/subcategories/ress_2_off.png
index 27410d7..27410d7 100644
--- a/static/saclay/images/subcategories/ress_2_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_2_off.png
diff --git a/static/saclay/images/subcategories/ress_2_on.png b/saclay_static/saclay/images/subcategories/ress_2_on.png
index 6ba1068..6ba1068 100644
--- a/static/saclay/images/subcategories/ress_2_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_2_on.png
diff --git a/static/saclay/images/subcategories/ress_3_off.png b/saclay_static/saclay/images/subcategories/ress_3_off.png
index 7e17b76..7e17b76 100644
--- a/static/saclay/images/subcategories/ress_3_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_3_off.png
diff --git a/static/saclay/images/subcategories/ress_3_on.png b/saclay_static/saclay/images/subcategories/ress_3_on.png
index f56cc0f..f56cc0f 100644
--- a/static/saclay/images/subcategories/ress_3_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_3_on.png
diff --git a/static/saclay/images/subcategories/ress_4_off.png b/saclay_static/saclay/images/subcategories/ress_4_off.png
index 0cdc84c..0cdc84c 100644
--- a/static/saclay/images/subcategories/ress_4_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_4_off.png
diff --git a/static/saclay/images/subcategories/ress_4_on.png b/saclay_static/saclay/images/subcategories/ress_4_on.png
index 83f3145..83f3145 100644
--- a/static/saclay/images/subcategories/ress_4_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_4_on.png
diff --git a/static/saclay/images/subcategories/ress_5_off.png b/saclay_static/saclay/images/subcategories/ress_5_off.png
index 3ecd3b5..3ecd3b5 100644
--- a/static/saclay/images/subcategories/ress_5_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_5_off.png
diff --git a/static/saclay/images/subcategories/ress_5_on.png b/saclay_static/saclay/images/subcategories/ress_5_on.png
index a5735e7..a5735e7 100644
--- a/static/saclay/images/subcategories/ress_5_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_5_on.png
diff --git a/static/saclay/images/subcategories/spor_1_off.png b/saclay_static/saclay/images/subcategories/spor_1_off.png
index 2340224..2340224 100644
--- a/static/saclay/images/subcategories/spor_1_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_1_off.png
diff --git a/static/saclay/images/subcategories/spor_1_on.png b/saclay_static/saclay/images/subcategories/spor_1_on.png
index 4bcd447..4bcd447 100644
--- a/static/saclay/images/subcategories/spor_1_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_1_on.png
diff --git a/static/saclay/images/subcategories/spor_2_off.png b/saclay_static/saclay/images/subcategories/spor_2_off.png
index a5c3ef7..a5c3ef7 100644
--- a/static/saclay/images/subcategories/spor_2_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_2_off.png
diff --git a/static/saclay/images/subcategories/spor_2_on.png b/saclay_static/saclay/images/subcategories/spor_2_on.png
index c124233..c124233 100644
--- a/static/saclay/images/subcategories/spor_2_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_2_on.png
diff --git a/static/saclay/images/subcategories/spor_3_off.png b/saclay_static/saclay/images/subcategories/spor_3_off.png
index 2c09500..2c09500 100644
--- a/static/saclay/images/subcategories/spor_3_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_3_off.png
diff --git a/static/saclay/images/subcategories/spor_3_on.png b/saclay_static/saclay/images/subcategories/spor_3_on.png
index 855333f..855333f 100644
--- a/static/saclay/images/subcategories/spor_3_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_3_on.png
diff --git a/static/saclay/images/subcategories/spor_4_off.png b/saclay_static/saclay/images/subcategories/spor_4_off.png
index ef00d57..ef00d57 100644
--- a/static/saclay/images/subcategories/spor_4_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_4_off.png
diff --git a/static/saclay/images/subcategories/spor_4_on.png b/saclay_static/saclay/images/subcategories/spor_4_on.png
index 1054558..1054558 100644
--- a/static/saclay/images/subcategories/spor_4_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_4_on.png
diff --git a/static/saclay/images/subcategories/spor_5_off.png b/saclay_static/saclay/images/subcategories/spor_5_off.png
index e99b52f..e99b52f 100644
--- a/static/saclay/images/subcategories/spor_5_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_5_off.png
diff --git a/static/saclay/images/subcategories/spor_5_on.png b/saclay_static/saclay/images/subcategories/spor_5_on.png
index db3937a..db3937a 100644
--- a/static/saclay/images/subcategories/spor_5_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_5_on.png
diff --git a/static/saclay/images/subcategories/spor_6_off.png b/saclay_static/saclay/images/subcategories/spor_6_off.png
index 6471dda..6471dda 100644
--- a/static/saclay/images/subcategories/spor_6_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_6_off.png
diff --git a/static/saclay/images/subcategories/spor_6_on.png b/saclay_static/saclay/images/subcategories/spor_6_on.png
index 57e2348..57e2348 100644
--- a/static/saclay/images/subcategories/spor_6_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_6_on.png
diff --git a/static/saclay/images/subcategories/spor_7_off.png b/saclay_static/saclay/images/subcategories/spor_7_off.png
index a5fe1d2..a5fe1d2 100644
--- a/static/saclay/images/subcategories/spor_7_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_7_off.png
diff --git a/static/saclay/images/subcategories/spor_7_on.png b/saclay_static/saclay/images/subcategories/spor_7_on.png
index 793f328..793f328 100644
--- a/static/saclay/images/subcategories/spor_7_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_7_on.png
diff --git a/static/saclay/js/SaclayPanZoom.js b/saclay_static/saclay/js/SaclayPanZoom.js
index 40bfc87..40bfc87 100644
--- a/static/saclay/js/SaclayPanZoom.js
+++ b/saclay_static/saclay/js/SaclayPanZoom.js
diff --git a/static/saclay/js/interface.js b/saclay_static/saclay/js/interface.js
index 238c586..64cadca 100644
--- a/static/saclay/js/interface.js
+++ b/saclay_static/saclay/js/interface.js
@@ -2,7 +2,8 @@ $(function(){
     $('#default-message').dialog({'autoOpen':false,
                                   'resizable':false,
                                   width:630,
-                                  'dialogClass':'no-titlebar'});
+                                   'dialogClass':'no-titlebar'});
+    $("#categories").fadeIn();
 
     var update_editmarker = function(){
         $("#main-map").chimere('cleanRoute');
diff --git a/static/saclay/js/jquery.form.js b/saclay_static/saclay/js/jquery.form.js
index 13e9a55..13e9a55 100644
--- a/static/saclay/js/jquery.form.js
+++ b/saclay_static/saclay/js/jquery.form.js
diff --git a/static/saclay/js/mobile.chimere.js b/saclay_static/saclay/js/mobile.chimere.js
index e05cd22..e05cd22 100644
--- a/static/saclay/js/mobile.chimere.js
+++ b/saclay_static/saclay/js/mobile.chimere.js
diff --git a/settings.py b/settings.py
index ddd06fc..8806929 100644
--- a/settings.py
+++ b/settings.py
@@ -25,7 +25,7 @@ STATIC_URL = '/static/'
 STATIC_ROOT = ROOT_PATH + 'static/'
 
 STATICFILES_DIRS = (
-    os.path.join(ROOT_PATH, "chimere_example_static"),
+    os.path.join(ROOT_PATH, "saclay_static"),
 )
 
 TINYMCE_URL = ''
@@ -161,9 +161,9 @@ CHIMERE_MODIF_EMAIL = _(u"Hello, I would like to propose you a modification "
                         u"about this item: ")
 
 CHIMERE_ROUTING_WARN_MESSAGE = "<h3 class='warn'>Attention</h3>"\
-    "<p>Cet itineraire comporte des passages dangereux, nous vous conseillons"\
+    "<p>Cet itinéraire comporte des passages dangereux, nous vous conseillons"\
     " de modifier votre recherche, en ajoutant par exemple un ou des points "\
-    "d'etape à votre parcours pour eviter les zones de danger.</p>"
+    "d'étape à votre parcours pour éviter les zones de danger.</p>"
 
 CHIMERE_CSV_ENCODING = 'ISO-8859-1'
 
@@ -228,7 +228,7 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware'
 ]
 
@@ -270,7 +270,6 @@ except ImportError:
     pass
 
 INSTALLED_APPS += [
-    'south',
     'chimere',
 ]
 
@@ -280,11 +279,11 @@ MOBILE_DOMAINS = []  # if you have specific domains for mobile access
 
 try:
     from local_settings import *
-except ImportError, e:
-    print 'Unable to load local_settings.py:', e
+except ImportError as e:
+    print('Unable to load local_settings.py:', e)
 
 if CHIMERE_SEARCH_ENGINE:
-    INSTALLED_APPS.insert(INSTALLED_APPS.index('south'), 'haystack')
+    INSTALLED_APPS.append('haystack')
 
 if 'LOGGING' not in globals():
     global LOGGING
@@ -368,17 +367,20 @@ if DEBUG_TOOLBAR:
     global DEBUG_TOOLBAR_CONFIG
     MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware']
     INSTALLED_APPS += ['debug_toolbar']
-    DEBUG_TOOLBAR_PANELS = (
-        'debug_toolbar.panels.version.VersionDebugPanel',
-        'debug_toolbar.panels.timer.TimerDebugPanel',
-        'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
-        'debug_toolbar.panels.headers.HeaderDebugPanel',
-        'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-        'debug_toolbar.panels.template.TemplateDebugPanel',
-        'debug_toolbar.panels.sql.SQLDebugPanel',
-        'debug_toolbar.panels.signals.SignalDebugPanel',
-        'debug_toolbar.panels.logger.LoggingPanel',
-    )
+    DEBUG_TOOLBAR_PANELS = [
+        'debug_toolbar.panels.versions.VersionsPanel',
+        'debug_toolbar.panels.timer.TimerPanel',
+        'debug_toolbar.panels.settings.SettingsPanel',
+        'debug_toolbar.panels.headers.HeadersPanel',
+        'debug_toolbar.panels.request.RequestPanel',
+        'debug_toolbar.panels.sql.SQLPanel',
+        'debug_toolbar.panels.staticfiles.StaticFilesPanel',
+        'debug_toolbar.panels.templates.TemplatesPanel',
+        'debug_toolbar.panels.cache.CachePanel',
+        'debug_toolbar.panels.signals.SignalsPanel',
+        'debug_toolbar.panels.logging.LoggingPanel',
+        'debug_toolbar.panels.redirects.RedirectsPanel',
+    ]
     DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS': False}
 
 
diff --git a/static/saclay/js/SaclayCloud.js b/static/saclay/js/SaclayCloud.js
deleted file mode 100644
index a3f48f4..0000000
--- a/static/saclay/js/SaclayCloud.js
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/* set this empty if you put cloud-popup-saclay.png inside your default
- * OpenLayers dir */
-var SACLAY_IMAGE_PATH = '../../saclay/images/'
-
-OpenLayers.Popup.SaclayCloud =
-  OpenLayers.Class(OpenLayers.Popup.FramedCloud, {
-
-    initialize:function(id, lonlat, contentSize, contentHTML, anchor, closeBox,
-                        closeBoxCallback) {
-        this.positionBlocks.tc = {
-            'offset': new OpenLayers.Pixel(-217, 28),
-            'padding': new OpenLayers.Bounds(8, 30, 8, 9),
-            'blocks': [
-                { // top-left
-                    size: new OpenLayers.Size('auto', 'auto'),
-                    anchor: new OpenLayers.Bounds(0, 51, 22, 0),
-                    position: new OpenLayers.Pixel(0, 0)
-                },
-                { //top-right
-                    size: new OpenLayers.Size(22, 'auto'),
-                    anchor: new OpenLayers.Bounds(null, 50, 0, 0),
-                    position: new OpenLayers.Pixel(-1238, 0)
-                },
-                { //bottom-left
-                    size: new OpenLayers.Size('auto', 19),
-                    anchor: new OpenLayers.Bounds(0, 32, 22, null),
-                    position: new OpenLayers.Pixel(0, -631)
-                },
-                { //bottom-right
-                    size: new OpenLayers.Size(22, 18),
-                    anchor: new OpenLayers.Bounds(null, 32, 0, null),
-                    position: new OpenLayers.Pixel(-1238, -631)
-                    /*anchor: new OpenLayers.Bounds(null, 32, 10, null),
-                    position: new OpenLayers.Pixel(-1228, -632)*/
-                },
-                { // stem
-                    size: new OpenLayers.Size(54, 35),
-                    anchor: new OpenLayers.Bounds(null, 0, 168, null),
-                    position: new OpenLayers.Pixel(0, -688)
-                }
-            ]
-        };
-
-        this.calculateRelativePosition = function () {return 'tc';};
-        this.autoSize = true;
-        this.imageSrc = (OpenLayers.Util.getImageLocation(SACLAY_IMAGE_PATH + 'cloud-popup-saclay.png'));
-        OpenLayers.Popup.Framed.prototype.initialize.apply(this, arguments);
-        this.contentDiv.className = this.contentDisplayClass;
-    },
-
-    CLASS_NAME: "OpenLayers.Popup.SaclayCloud"
-});
-
diff --git a/static/static_files_collected_here b/static/static_files_collected_here
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/static/static_files_collected_here
diff --git a/templates/chimere/base.html b/templates/chimere/base.html
index bab159f..5154210 100644
--- a/templates/chimere/base.html
+++ b/templates/chimere/base.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% load chimere_tags i18n %}
 {% block extra_head %}
+<link rel="stylesheet" href="{{ STATIC_URL }}font-awesome/css/font-awesome.min.css" />
+<link rel="stylesheet" href="{{ STATIC_URL }}bootstrap/bootstrap.min.css" />
 <link rel="shortcut icon" href="{{ STATIC_URL }}saclay/images/favicon.png"/>
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/styles.css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/print.css" media='print'/>
diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html
index dca7fc7..b98ba89 100644
--- a/templates/chimere/blocks/actions.html
+++ b/templates/chimere/blocks/actions.html
@@ -13,7 +13,7 @@
                 {% trans "News" %}
             </li>
             <li id='action-project' class='dyn-page'>
-                <a href='{% url chimere:extra_page "" "project"%}'>{% trans "The project" %}</a>
+                <a href='{% url 'chimere:extra_page' "" "project"%}'>{% trans "The project" %}</a>
             </li>
         </ul>
         <ul id='action-3' class='action'>
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 1dce75f..947a35c 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -128,7 +128,6 @@ $("#{{map_id}}").show();
         "icon_offset": new OpenLayers.Pixel({{icon_offset_x}},
                                                                    {{icon_offset_y}}),
         'marker_hover_offset': new OpenLayers.Pixel(7, 20),
-        "popupClass": OpenLayers.Popup.SaclayCloud,
         "popupClass"].imageSrc = "{{STATIC_URL}}/saclay/js/cloud-popup-saclay.png",
         "cluster_icon": new OpenLayers.Icon(
                         STATIC_URL + "saclay/images/cluster_icon.png",
diff --git a/templates/chimere/blocks/share_bar.html b/templates/chimere/blocks/share_bar.html
index aaa9fc4..b5a24e8 100644
--- a/templates/chimere/blocks/share_bar.html
+++ b/templates/chimere/blocks/share_bar.html
@@ -8,7 +8,7 @@
         {% if not email_only %}<li class='share-icon'><a href="#">{% trans "Share" %}</a></li>{% for share_network in share_networks %}
         <li class='shared'><a class='share_link share_id_{{share_network.0}}' href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li>
     {% endfor %}
-        <li class='shared'><a href='{% url chimere:feeds-global %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{%endif%}
+        <li class='shared'><a href='{% url 'chimere:feeds-global' %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{%endif%}
     </ul>{% endif %}
     <script type='text/javascript'>
         <!--
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index 4397f5f..8f5df7a 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -41,7 +41,7 @@
     </ul>
     {% share_bar marker.name %}
     {% comment %}
-    <a href='{% if marker.route %}{% url chimere:editroute-item area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url chimere:edit-item area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'>
+    <a href='{% if marker.route %}{% url 'chimere:editroute-item' area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url 'chimere:edit-item' area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'>
         {% trans "Submit a modification" %}
     </a>
     {% endcomment %}
diff --git a/templates/chimere/edit.html b/templates/chimere/edit.html
index de60dc5..5c564c3 100644
--- a/templates/chimere/edit.html
+++ b/templates/chimere/edit.html
@@ -18,7 +18,7 @@ Les évènements à caractère politique, confessionnel ainsi que ceux relevant
     {% endif%}{% endif%}
     </div>
     <p class='notice'>* {% trans "indicates a mandatory field" %}</p>
-    <form enctype="multipart/form-data" method='post' action='{% if route%}{% url edit-route%}{%else%}{% url edit %}{% endif %}' id='proposition_form'>
+    <form enctype="multipart/form-data" method='post' action='{% if route%}{% url 'edit-route' %}{%else%}{% url 'edit' %}{% endif %}' id='proposition_form'>
     {% csrf_token %}
     {% if not route %}
     <div class="fieldWrapper point_label">
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 2acbba5..ee0f4ad 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -6,7 +6,6 @@
 {% head_jme %}
 {% head_form %}
 <script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}saclay/js/SaclayCloud.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}saclay/js/jquery.form.js" type="text/javascript"></script>
 {% if has_search %}
 <script src="{{ STATIC_URL }}chimere/js/search.js" type="text/javascript"></script>
@@ -15,9 +14,9 @@
 <script type='text/javascript' language='javascript'>
     <!--
     var default_error_message = "{% trans "Error while loading the page... Refresh the page. If the problem persist contact the webmaster." %}";
-    var edit_url = "{% url edit %}";
-    var edit_event_url = "{% url edit-event %}";
-    var edit_route_url = "{% url edit-route %}";
+    var edit_url = "{% url 'edit' %}";
+    var edit_event_url = "{% url 'edit-event' %}";
+    var edit_route_url = "{% url 'edit-route' %}";
     // -->
 </script>
 <script src="{{ STATIC_URL }}saclay/js/interface.js" type="text/javascript"></script>
@@ -70,7 +69,7 @@
     </div>
     <div class='footer' id='footer-panel'>
         {% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact us" %}</a> | {% endif %}
-        <a href='{% url chimere:extra_page '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service, credits" %}</a>
+        <a href='{% url 'chimere:extra_page' '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service, credits" %}</a>
     </div>
 {% endblock %}
 {% block content %}
diff --git a/urls.py b/urls.py
index 11b54f6..fe91a99 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2012-2016 Etienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as
@@ -18,7 +18,8 @@
 # See the file COPYING for details.
 
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
+from django.conf.urls.static import static
 
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -29,6 +30,12 @@ urlpatterns = patterns(
     (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve',
      {'document_root': settings.MEDIA_ROOT}),
 )
+
+if "tinymce" in settings.INSTALLED_APPS:
+    urlpatterns += patterns(
+        'django.views.static',
+        (r'^tinymce/', include('tinymce.urls')),)
+
 urlpatterns += staticfiles_urlpatterns()
 
 urlpatterns += patterns(
@@ -54,4 +61,4 @@ urlpatterns += patterns(
     url(r'^(saclay/)?$', 'chimere_saclay.views.index_saclay',
         name="index-saclay"),
     url(r'^', include('chimere.urls', namespace="chimere")),
-)
+) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/views.py b/views.py
index 86729bb..8e2c6a4 100644
--- a/views.py
+++ b/views.py
@@ -27,6 +27,7 @@ from chimere.actions import actions
 from chimere.models import Marker, Route, PropertyModel
 from chimere.views import get_edit_page, index
 
+
 def index_saclay(request, area_name=None, default_area=None, simple=False):
     tpl, response_dct = index(request, area_name, default_area, simple,
                               get_response=True)
@@ -37,6 +38,7 @@ def index_saclay(request, area_name=None, default_area=None, simple=False):
 
 get_edit_marker = get_edit_page('edit', Marker, MarkerForm)
 
+
 def edit(request, area_name="", item_id=None, submited=False, event=False):
     """
     Edition page
@@ -46,28 +48,28 @@ def edit(request, area_name="", item_id=None, submited=False, event=False):
     if response:
         return response
     item_id, init_item, response_dct, form, formset_multi, formset_picture = \
-                                                                        values
+        values
     # get the "manualy" declared_fields. Ie: properties
     declared_fields = form.declared_fields.keys()
     declared_fields = PropertyModel.objects.filter(available=True).all()
-    filtered_properties = PropertyModel.objects.filter(available=True,
-                                subcategories__id__isnull=False).all()
+    filtered_properties = PropertyModel.objects.filter(
+        available=True, subcategories__id__isnull=False).all()
     response_dct.update({
-        'actions':actions,
-        'action_selected':('contribute', 'edit'),
-        'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER,
-        'form':form,
-        'formset_multi':formset_multi,
-        'formset_picture':formset_picture,
-        'dated':settings.CHIMERE_DAYS_BEFORE_EVENT,
-        'extra_head':form.media,
-        'marker_id':item_id,
-        'sub_categories':sub_categories,
-        'point_widget':'',
-        'properties':declared_fields,
-        'filtered_properties':filtered_properties,
-        'submited':submited,
-        'event':event,
+        'actions': actions,
+        'action_selected': ('contribute', 'edit'),
+        'map_layer': settings.CHIMERE_DEFAULT_MAP_LAYER,
+        'form': form,
+        'formset_multi': formset_multi,
+        'formset_picture': formset_picture,
+        'dated': settings.CHIMERE_DAYS_BEFORE_EVENT,
+        'extra_head': form.media,
+        'marker_id': item_id,
+        'sub_categories': sub_categories,
+        'point_widget': '',
+        'properties': declared_fields,
+        'filtered_properties': filtered_properties,
+        'submited': submited,
+        'event': event,
     })
     # manualy populate the custom widget
     if 'subcategory' in form.data and form.data['subcategory']:
@@ -77,37 +79,38 @@ def edit(request, area_name="", item_id=None, submited=False, event=False):
 
 get_edit_route = get_edit_page('edit-route', Route, RouteForm)
 
+
 def edit_route(request, area_name="", item_id=None, submited=False):
     """
     Edition page
     """
     response, values, sub_categories = get_edit_route(request, area_name,
-                                                       item_id, ['R', 'B'])
+                                                      item_id, ['R', 'B'])
     if response:
         return response
     item_id, init_item, response_dct, form, formset_multi, formset_picture = \
-                                                                        values
+        values
     # get the "manualy" declared_fields. Ie: properties
     declared_fields = form.declared_fields.keys()
     declared_fields = PropertyModel.objects.filter(available=True).all()
-    filtered_properties = PropertyModel.objects.filter(available=True,
-                                subcategories__id__isnull=False).all()
+    filtered_properties = PropertyModel.objects.filter(
+        available=True, subcategories__id__isnull=False).all()
     response_dct.update({
-        'actions':actions,
-        'action_selected':('contribute', 'edit'),
-        'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER,
-        'form':form,
-        'formset_multi':formset_multi,
-        'formset_picture':formset_picture,
-        'dated':settings.CHIMERE_DAYS_BEFORE_EVENT,
-        'extra_head':form.media,
-        'marker_id':item_id,
-        'sub_categories':sub_categories,
-        'point_widget':'',
-        'properties':declared_fields,
-        'filtered_properties':filtered_properties,
-        'submited':submited,
-        'route':True
+        'actions': actions,
+        'action_selected': ('contribute', 'edit'),
+        'map_layer': settings.CHIMERE_DEFAULT_MAP_LAYER,
+        'form': form,
+        'formset_multi': formset_multi,
+        'formset_picture': formset_picture,
+        'dated': settings.CHIMERE_DAYS_BEFORE_EVENT,
+        'extra_head': form.media,
+        'marker_id': item_id,
+        'sub_categories': sub_categories,
+        'point_widget': '',
+        'properties': declared_fields,
+        'filtered_properties': filtered_properties,
+        'submited': submited,
+        'route': True
     })
     # manualy populate the custom widget
     if 'subcategory' in form.data and form.data['subcategory']: