Merge branch 'master' into saclay

Conflicts:
	chimere/admin.py
	chimere/fixtures/initial_data.json
	chimere/forms.py
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/models.py
	chimere/static/chimere/css/styles.css
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/views.py
	chimere/widgets.py

5 files changed, 14 insertions, 11 deletions

diff --git a/chimere/templates/admin/base_site.html b/chimere/templates/admin/base_site.html
index fa537ef..d0cf4bf 100644
--- a/chimere/templates/admin/base_site.html
+++ b/chimere/templates/admin/base_site.html
@@ -1,10 +1,10 @@
 {% extends "admin/base.html" %}
 {% load i18n %}
 
-{% block title %}{{ title }} | {% trans 'Administration de Chimère' %}{% endblock %}
+{% block title %}{{ title }} | {% trans 'Chimère administration' %}{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">{% trans 'Administration de Chimère' %}</h1>
+<h1 id="site-name">{% trans 'Chimère administration' %}</h1>
 {% endblock %}
 
 {% block nav-global %}{% endblock %}
diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html
index b03dcf2..858a7ae 100644
--- a/chimere/templates/chimere/detail.html
+++ b/chimere/templates/chimere/detail.html
@@ -22,17 +22,18 @@
     {% for property in marker.getProperties %}
     <p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</p>
     {% 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 %}
     <a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
     {% endif %}
     </div>
+    {% if moderator_emails %}
+    <a href="mailto:?from={{moderator_emails}}&subject={% trans "Propose amendment" %}&body={% trans "I would like to propose an amendment for this item:"%} {{share_url}}">
+        {% trans "Propose amendment" %}
+    </a>{%endif%}
     {% share_bar marker.name %}
-    <a href="{{modif_by_email}}">{% trans "Propose a modification" %}</a>
-    {% 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%}'>
-        {% trans "Submit a modification" %}
-    </a>
-    {% endcomment %}
+{% endif %}
 </div>
 {% if marker.multimedia_items %}
 <div id='gallery-{{marker.pk}}' class='gallery'>
diff --git a/chimere/templates/chimere/export_marker.csv b/chimere/templates/chimere/export.csv
index 619b872..619b872 100644
--- a/chimere/templates/chimere/export_marker.csv
+++ b/chimere/templates/chimere/export.csv
diff --git a/chimere/templates/chimere/export.kml b/chimere/templates/chimere/export.kml
index 55d671d..b59bc7c 100644
--- a/chimere/templates/chimere/export.kml
+++ b/chimere/templates/chimere/export.kml
@@ -10,7 +10,8 @@
     {% if location.description %}<description>
 <![CDATA[{{ location.description|safe }}]]>
     </description>{% endif %}
-    {{location.point.kml|safe}}
+    {% if location.point %}{{location.point.kml|safe}}{% endif %}
+    {% if location.route %}{{location.route.kml|safe}}{% endif %}
   </Placemark>
 {% endfor %}
 
diff --git a/chimere/templates/chimere/upload_file.html b/chimere/templates/chimere/upload_file.html
index b0fbafc..91a1444 100644
--- a/chimere/templates/chimere/upload_file.html
+++ b/chimere/templates/chimere/upload_file.html
@@ -22,6 +22,7 @@
 <div class="fieldWrapper">
 {% if gpx_id %}
 <script type="text/javascript"><!--
+jQuery(document).ready(function() {
     jQuery.get("{% url chimere:process_route_file gpx_id %}", function(data) {
             var data = eval(data);
             var main_page = opener.document;
@@ -36,9 +37,9 @@
             opener.focus();
             self.close();
         }).error(function (xhr, ajaxOptions, thrownError){
-                    alert(xhr.status);
-                    alert(thrownError);
+                    alert(xhr.responseText);
                 }    );
+});
 // --></script>
 {% else %}
 <form enctype="multipart/form-data" method='post' action='.'>