Merge branch 'master' into saclay

Conflicts:
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/static/chimere/css/styles.css
	chimere/static/chimere/js/jquery.chimere.js
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/utils.py
	chimere/views.py
	example_project/settings.py

6 files changed, 12 insertions, 8 deletions

diff --git a/chimere/templates/admin/chimere/marker/change_form.html b/chimere/templates/admin/chimere/marker/change_form.html
index 64c48f9..3b3d238 100644
--- a/chimere/templates/admin/chimere/marker/change_form.html
+++ b/chimere/templates/admin/chimere/marker/change_form.html
@@ -1,7 +1,7 @@
 {% extends "admin/change_form.html" %}
 {% load i18n %}
 {% block field_sets %}
-{% if original.ref_item and original.ref_item != orginal %}
+{% if original.has_modified %}
 <p class='errornote'>
 {% url admin:admin-modification object_id as rapprochement_form %}
 {% blocktrans %}
diff --git a/chimere/templates/chimere/blocks/areas.html b/chimere/templates/chimere/blocks/areas.html
index 8c4b981..a1ebe76 100644
--- a/chimere/templates/chimere/blocks/areas.html
+++ b/chimere/templates/chimere/blocks/areas.html
@@ -3,6 +3,7 @@
     <div id='areas-div'>
         <label for='areas-select'>{% trans "Areas:" %}</label>
         <select id='areas-select'>
+            {% if not has_default_area %}<option value=''>--</option>{% endif %}
         {% for area in areas %}
             <option value='{{area.urn}}'{% if area_name and area.urn == area_name %} selected='selected'{% endif %}{% if not area_name and area.default %} selected='selected'{% endif %}>{{area.name}}</option>
         {% endfor %}
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index 6304e13..4affb19 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -43,8 +43,9 @@
     chimere_init_options["checked_categories"] = [{% for cc in checked_categories %}{% if forloop.counter0 > 0 %}, {% endif %}{{cc}}{% endfor %}];
     {% if area_id %}chimere_init_options['area_id'] = "{{area_id}}";{% endif %}
     {% if p_current_feature %}
-    chimere_init_options["display_feature"] = {{ p_current_feature }};
-    {% endif %}
+    chimere_init_options["display_feature"] = {{ p_current_feature }};{% endif %}
+    {% if p_current_route %}
+    chimere_init_options["display_route"] = {{ p_current_route }};{% endif %}
     {% if restricted_extent %}{{ restricted_extent }}
     chimere_init_options["restricted_extent"] = bounds;
     {% endif %}
diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html
index 134c03e..4b5c168 100644
--- a/chimere/templates/chimere/detail.html
+++ b/chimere/templates/chimere/detail.html
@@ -24,11 +24,11 @@
     {% endfor %}
     {% if marker.origin %}<p class='detail_source'><strong>{% trans "Source:" %}</strong> <span>{{marker.origin}}</span></p>{% endif %}
     {% if marker.license %}<p class='detail_license'><strong>{% trans "License:" %}</strong> <span>{{marker.license}}</span></p>{% endif %}
-    {% if marker.multimedia_items %}
+    {% if marker.multimedia_items %}<p class='detail_multimedia'>
     <a href='#' class='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
-    {% endif %}
+    </p>{% endif %}
     </div>
-    <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%}'>
+    <p class='detail_amendment'><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 an amendment" %}
     </a>
     {% if moderator_emails %}
diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html
index 9732005..f9706d3 100644
--- a/chimere/templates/chimere/edit.html
+++ b/chimere/templates/chimere/edit.html
@@ -20,8 +20,9 @@
         <legend>{% trans "Error" %}</legend>
         <p>{{ error_message }}</p>
     {% endif %}</fieldset>
+    {% if is_modification and is_superuser %}<div class='warning'><p>{% trans "You are logged as an administrator. Your modifications will be taking into account immediately." %}</p></div>{% endif %}
     <fieldset class='edit'>
-    <legend>{% trans "Add/modify a point of interest" %}</legend>
+    <legend>{% if is_modification %}{% trans "Modify a point of interest" %}{% else %}{% trans "Add a point of interest" %}{% endif %}</legend>
     <form enctype="multipart/form-data" method='post' action='.'>
     {% csrf_token %}
     <div class='rightWrapper'>
diff --git a/chimere/templates/chimere/edit_route.html b/chimere/templates/chimere/edit_route.html
index 0221949..10f4d5e 100644
--- a/chimere/templates/chimere/edit_route.html
+++ b/chimere/templates/chimere/edit_route.html
@@ -17,8 +17,9 @@
     {{ block.super }}
     {% if submited %}{% submited %}{% endif %}
     {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+    {% if is_modification and is_superuser %}<div class='warning'><p>{% trans "You are logged as an administrator. Your modifications will be taking into account immediately." %}</p></div>{% endif %}
     <fieldset class='edit'>
-    <legend>{% trans "Add/modify a route" %}</legend>
+    <legend>{% if is_modification %}{% trans "Modify a route" %}{% else %}{% trans "Add a route" %}{% endif %}</legend>
     <form enctype="multipart/form-data" method='post' action='.'>
     {% csrf_token %}
     <div class='rightWrapper'>