Merge branch 'master-v3.0' into saclay-v3.0

Conflicts:
	static/saclay/js/interface.js

7 files changed, 98 insertions, 23 deletions

diff --git a/local_settings.py.sample b/local_settings.py.sample
index b951b1f..d6a95b9 100644
--- a/local_settings.py.sample
+++ b/local_settings.py.sample
@@ -5,6 +5,7 @@
 
 SECRET_KEY = ""
 ALLOWED_HOSTS = []
+ENABLE_TINYMCE = True
 
 DATABASES = {
     'default': {
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index cacda9c..a46375f 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -91,7 +91,7 @@ body, #content,
 #sidebar,
 .action li.ui-button,
 #detail_content,
-.news,
+.news, #multimedia_form, #submited-window,
 .dialog-content .content{
     background-color:#eee;
 }
@@ -300,7 +300,7 @@ h3.warn{
 }
 
 .no-titlebar-small.ui-dialog .ui-dialog-titlebar{
-    width:340px;
+    width:280px;
 }
 
 .no-titlebar.ui-dialog .ui-dialog-titlebar{
@@ -395,6 +395,10 @@ h3.warn{
     margin-top:22px;
     padding: 0;
 }
+
+#submited-window h2,
+#submited-window h3,
+#multimedia_form h2,
 .no-titlebar .ui-dialog-content.ui-widget-content h2{
     margin:2px 0 12px 0;
     font-weight: bold;
@@ -407,6 +411,23 @@ h3.warn{
     padding: 1em;
 }
 
+#message .content{
+    padding: 0;
+}
+
+a.close, a.close:link{
+    font-size: 1.5em;
+}
+
+#message{
+    position: absolute;
+    z-index: 10000;
+    right: 60px;
+    top: 40px;
+    max-width: 50%;
+    display: none;
+}
+
 .news,
 .dialog-content .content{
     overflow:auto;
@@ -415,10 +436,7 @@ h3.warn{
 }
 
 #multimedia_form{
-    background-image:url(../images/popup/multimedia_title.png) ;
-    background-repeat:no-repeat;
-    background-position: center top;
-    padding-top:45px;
+    padding: 0;
 }
 
 #multimedia_form input[type=text]{
@@ -437,10 +455,17 @@ h3.warn{
 
 
 #submited-window{
-    background-image:url(../images/popup/thanks_title.png) ;
-    background-repeat:no-repeat;
-    background-position: center top;
-    padding-top:45px;
+    padding: 0;
+}
+
+#submited-window h3,
+#submited-window h2{
+    margin: 0;
+}
+
+#submited-window h3{
+    font-size: 1.2em;
+    text-align: center;
 }
 
 /* autocomplete theming */
@@ -1612,18 +1637,21 @@ ul#roadmap_toolbar, ul#roadmap_toolbar ul, ul#roadmap_toolbar li{
 }
 
 #frm-edit-marker textarea,
+#frm-edit-marker input[type=email],
 #frm-edit-marker input[type=text]{
     background-color:#dfe8f3;
     border:none;
 }
 
 #frm-edit-route textarea,
+#frm-edit-route input[type=email],
 #frm-edit-route input[type=text]{
     background-color:#f5e4eb;
     border:none;
 }
 
 #frm-edit-event textarea,
+#frm-edit-event input[type=email],
 #frm-edit-event input[type=text]{
     background-color:#f2e4f5;
     border:none;
@@ -1646,7 +1674,7 @@ input.hasDatepicker{
 
 #add_media,
 #proposition_form_submit{
-    width:100%;
+    width:278px;
     display:block;
     height:25px;
     color:transparent;
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index bed936c..2bd2727 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -1,3 +1,6 @@
+var msg_edit_route = "Cliquez sur la carte pour tracer le trajet. Chaque nouveau clic rajoute un nœud. Double-cliquez pour terminer le trajet.";
+var msg_edit = "Cliquez sur la carte pour placer le lieu.";
+
 var init_default_message_diag = function(){
     $('#default-message').dialog({
           'autoOpen':false,
@@ -11,6 +14,11 @@ var init_default_message_diag = function(){
 
 $(function(){
     init_default_message_diag();
+    $('#message').hide();
+
+    $("[data-hide]").on("click", function(){
+        $("." + $(this).attr("data-hide")).hide();
+    });
     $("#categories").fadeIn();
     $(".buttonset label").click(function(){
         $(".buttonset label").removeAttr("aria-pressed");
@@ -27,6 +35,13 @@ $(function(){
         $('#frm-edit-route').hide();
         $('#frm-edit-event').hide();
         $('#frm-edit-marker').show();
+
+        $('#message').removeClass();
+        $('#message').addClass('alert');
+        $('#message').addClass('alert-info');
+        $('#message .content').html(msg_edit);
+        $('#message').show();
+
         $.ajax({url: edit_url,
                 dataType: "html",
                 success: function (data) {
@@ -52,6 +67,13 @@ $(function(){
         $('#frm-edit-marker').hide();
         $('#frm-edit-route').hide();
         $('#frm-edit-event').show();
+
+        $('#message').removeClass();
+        $('#message').addClass('alert');
+        $('#message').addClass('alert-info');
+        $('#message .content').html(msg_edit);
+        $('#message').show();
+
         $.ajax({url: edit_event_url,
                 dataType: "html",
                 success: function (data) {
@@ -78,6 +100,13 @@ $(function(){
         $('#frm-edit-route').show();
         $('#chimere_itinerary').hide();
         $('#chimere_itinerary_form').show();
+
+        $('#message').removeClass();
+        $('#message').addClass('alert');
+        $('#message').addClass('alert-info');
+        $('#message .content').html(msg_edit_route);
+        $('#message').show();
+
         $.ajax({url: edit_route_url,
                 dataType: "html",
                 success: function (data) {
@@ -97,6 +126,8 @@ $(function(){
         $('#news').dialog('open');
     });
     $("#action-carte").click(function(){
+        $('#main_map').chimere('deactivateEdition');
+        $('#message').hide();
         $('.map_button').hide();
         $("#main-map").chimere('cleanRoute');
         $("#main-map").chimere('cleanMarker');
@@ -117,6 +148,7 @@ $(function(){
 
     $("#action-participate").click(function(){
         $('.map_button').hide();
+        $('#message').hide();
         $('#action-carte').removeClass('state-active');
         $('#action-participate').addClass('state-active');
         $('#map-actions').hide();
diff --git a/templates/chimere/base.html b/templates/chimere/base.html
index 3381cf7..545020d 100644
--- a/templates/chimere/base.html
+++ b/templates/chimere/base.html
@@ -50,6 +50,10 @@
     {% endblock %}
 {% endblock %}
 {% block content %}
+<div id='message' class="alert alert-info">
+   <a href="#" class="close" data-hide='alert' aria-label="close">&times;</a>
+   <div class='content'></div>
+</div>
     {% block top %}{% endblock %}
     {% block message_map %}{% endblock %}
     {% block message_edit %}{% endblock %}
diff --git a/templates/chimere/blocks/alternate_multimedia.html b/templates/chimere/blocks/alternate_multimedia.html
index 61c42c3..b7bf624 100644
--- a/templates/chimere/blocks/alternate_multimedia.html
+++ b/templates/chimere/blocks/alternate_multimedia.html
@@ -34,6 +34,7 @@
     <div id='multimedia_form' title="{% trans "Add multimedia from your computer or a website"%}">
         {%comment%}<div class='notice'>{% trans "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc eu luctus ipsum. Donec vel urna a turpis consectetur consectetur. Vestibulum ut enim vel odio porta vulputate." %}
         </div>{%endcomment%}
+        <h2>Ajouter un média</h2>
         <div class="fieldWrapper">
             <label for="multimedia_name">{% trans "Name" %}</label>
             <input type='text' id='multimedia_name' name='multimedia_name' value=" ">
@@ -61,7 +62,7 @@
                                           modal:true,
                                           resizable:false,
                                           dialogClass:'no-titlebar-small',
-                                          width:300});
+                                          width:280});
             $('#head_multimedia').click(function(){
                 $("#multimedia_form").dialog("open");
                 return false;
diff --git a/templates/chimere/blocks/submited.html b/templates/chimere/blocks/submited.html
index 5e72617..953d1bc 100644
--- a/templates/chimere/blocks/submited.html
+++ b/templates/chimere/blocks/submited.html
@@ -1,6 +1,7 @@
 {% load i18n %}
     <div class='edit' id='submited-window'>
-<p><strong>Merci pour votre contribution au projet !</strong></p>
+<h2>Merci</h2>
+<h3>pour votre contribution au projet !</h3>
 
 <p>En proposant un nouvel élément, vous contribuez à enrichir la carte avec des données libres. Une fois validée, votre contribution sera disponible selon les termes de la licence <a href='https://creativecommons.org/licenses/by-nc/2.0/fr/'>Creative Commons Paternité - Pas d’Utilisation Commerciale 2.0 France</a>. Vous devez être l’auteur des éléments que vous nous faites partager ou  bien vous être assuré de l’accord de leur auteur pour cette mise à disposition. Ceci concerne les textes, photos et tout contenu multimedia.</p>
 {% if contact_email %}<p>N’hésitez pas à nous contacter pour toute question : <a href='mailto:{{contact_email}}'>{{contact_email}}</a>.</p>{% endif%}
@@ -11,7 +12,7 @@
             $("#submited-window").dialog({
                     modal: true,
                     dialogClass:'no-titlebar-small',
-                    width:340,
+                    width:280,
                     resizable:false,
                     beforeClose: function() {
                                     window.location = "{{index_url}}";
diff --git a/templates/chimere/edit.html b/templates/chimere/edit.html
index 5c564c3..ff832e5 100644
--- a/templates/chimere/edit.html
+++ b/templates/chimere/edit.html
@@ -1,4 +1,4 @@
-{% load i18n chimere_tags adminmedia inline_formset%}
+{% load i18n chimere_tags inline_formset%}
     {% if submited %}{% submited %}{% endif %}
     <div class='edit'>
     {% if event %}<h3>{% trans "Add an event" %}</h3>
@@ -136,18 +136,26 @@ Les évènements à caractère politique, confessionnel ainsi que ceux relevant
         $(function(){
             tinyMCE.init({
                 mode : "textareas",
-                theme : "advanced",
+                theme: 'modern',
                 editor_selector : "mceEditor",
                 relative_urls : false,
-                theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,hr,separator,link",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : ""
+                toolbar_items_size: 'small',
+                menubar: '',
+                toolbar1: 'bold italic,underline | bullist,numlist',
+                toolbar2: "",
+                toolbar3: ""
             });
-
-            {% if route and itinerary_form %}
+            {% if route %}
+            var edition_type = 'route';
+            {% if itinerary_form %}
             $("#chimere_itinerary_form").appendTo($("#itinerary_field"));
-            $('#main_map').chimere('updateRoutingInput');
-            {% else %}$('#main_map').chimere('updateMarkerInput');{% endif %}
+            $('#main_map').chimere('updateRoutingInput');{% endif%}
+            {% else %}
+            var edition_type = 'marker';
+            $('#main_map').chimere('updateMarkerInput');
+            {% endif %}
+            $('#main_map').chimere('activateEdition', edition_type);
+            $('#main_map').chimere('activateDraw');
             $('.toggle').click(function(){
                 var div_item = $(this).next();
                 div_item.toggle();