Nettoyage et style, diverses améliorations visuelles

assets/js/auto-merge.js

@@ -1,79 +1,66 @@
-
-
-$(document).ready(function () {
-    console.log('oooooo');
-
-	$('.compare-introduction').mergely({
-		width: 'auto',
-		height: 400,
-		sidebar: false,
-		cmsettings: { readOnly: false, lineNumbers: true },
-		lhs: function(setValue) {
-			setValue($("#your_introduction").html());
-		},
-		rhs: function(setValue) {
-			setValue($("#id_introduction").text());
-		}
-	});
+(function($, undefined) {
+    "use strict";
 
-	$('.compare-conclusion').mergely({
-		width: 'auto',
-		height: 400,
-		sidebar: false,
-		cmsettings: { readOnly: false, lineNumbers: true },
-		lhs: function(setValue) {
-			setValue($("#your_conclusion").html());
-		},
-		rhs: function(setValue) {
-			setValue($("#id_conclusion").text());
+	$(document).ready(function () {
+
+		/**
+		 * Sets up the merge interface (using mergely). 
+		 */
+		function mergelySetUp(div, left, right)
+		{
+			div.mergely({
+				width: "auto",
+				height: 400,
+				sidebar: false,
+				cmsettings: { readOnly: false, lineNumbers: true, lineWrapping: true },
+				lhs: function(setValue) {
+					setValue(left.html());
+				},
+				rhs: function(setValue) {
+					setValue(right.text());
+				}
+			});
 		}
-	});
-
-	// TODO a voir comment on peut factoriser ce code.
-
-	$("#compare-editor-lhs").append('Votre Version');
-	$("#compare-editor-rhs").append('La version courante');
-
-
-
-	/**
-     * Merge introduction
-     */
-    $(".merge-btn").on("click", function(e){
-    	console.log('click');
-    	e.stopPropagation();
-        e.preventDefault();
-        // var $form = $(this).parents("form:first");
-        var button = $(this);
-
-        console.log(button);
-
-        var classList = button.attr('class').split(/\s+/);
-        console.log(classList);
-		for (var i = 0; i < classList.length; i++) {
-		    if (classList[i].indexOf('need-to-merge-') >= 0) {
 
-		    	// Cut the string to get the ending part
-		    	console.log(classList[i])
-		    	var substring = classList[i].substring(14)
-
-		    	// TODO : problème des retours à la ligne qui s'en vont (ou normal car markdown ?) ?
-		        $intro = $("#id_" + substring);
-		        $to_merge = $(".compare-" + substring).mergely('get','rhs');
-		        $intro.val($to_merge);
-
-		        console.log($intro.val());
-		        // TODO : un bon petit alert des familles
-                 var msg = '<div class="alert-box alert"> \
-                                <span>Le merge a bien été effectué</span> \
-                                <a href="#close-alert-box" class="close-alert-box ico-after cross white">{% trans "Masquer l\'alerte" %}</a> \
-                            </div>';
-
-                 $(".compare-" + substring).append(msg)
-
-		        alert('Contenu bien mergé');
-		    }
-		}
-    });
+		mergelySetUp($(".compare-introduction"),$("#your_introduction"),$("#id_introduction"));
+		mergelySetUp($(".compare-conclusion"),$("#your_conclusion"),$("#id_conclusion"));
+
+		$("#compare-editor-lhs").append("Votre Version");
+		$("#compare-editor-rhs").append("La version courante");
+
+
+		/**
+	     * Merge content
+	     */
+	    $(".merge-btn").on("click", function(e){
+
+	    	e.stopPropagation();
+	        e.preventDefault();
+
+	        var button = $(this);
+	        var classList = button.attr("class").split(/\s+/);
+
+			for (var i = 0; i < classList.length; i++) {
+			    if (classList[i].indexOf("need-to-merge-") >= 0) {
+
+			    	// Cut the string to get the ending part
+			    	var substring = classList[i].substring(14);
+
+			        var $intro = $("#id_" + substring);
+			        var $toMerge = $(".compare-" + substring).mergely("get","rhs");
+			        $intro.val($toMerge);
+
 
-});
+					// Display confirmation message
+	                var msg = "<div class='alert-box success'>" + 
+	                                "<span>Le merge a bien été effectué</span>" + 
+	                                "<a href='#close-alert-box' class='close-alert-box ico-after cross white'>Masquer l'alerte</a>" +
+	                           "</div>";
+
+	                 button.before(msg);
+			    }
+			}
+	    });
+
+	});
+})(jQuery);

zds/settings.py

@@ -31,7 +31,6 @@
     },
 }
 
-ALLOWED_HOSTS = ['zds-anto59290.c9users.io']
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.

zds/tutorialv2/forms.py

@@ -237,27 +237,25 @@ def __init__(self, *args, **kwargs):
 
         if kwargs.get('data') is not None:
             old_intro = kwargs.get('data').get('introduction')
-            # TODO retirer le br et passer en style
+
             self.helper.layout.append(Layout(Field('introduction', css_class='hidden')))
             self.helper.layout.append(Layout(HTML('<div id="your_introduction" class="hidden" >'+old_intro+'</div>')))
-            self.helper.layout.append(Layout(HTML('<br><br><div id="compare" class="compare-introduction"></div><br><br>')))
+            self.helper.layout.append(Layout(HTML('<div id="compare" class="compare-introduction"></div>')))
 
             self.helper.layout.append(Layout(
                 ButtonHolder(StrictButton(_(u'Merger'), type='merge', name='merge', css_class='btn btn-submit merge-btn need-to-merge-introduction'))))
-
         else :
             self.helper.layout.append(Layout(Field('introduction', css_class='md-editor')))
 
         if kwargs.get('data') is not None:
             old_conclusion = kwargs.get('data').get('conclusion')
-            # TODO retirer le br et passer en style
+
             self.helper.layout.append(Layout(Field('conclusion', css_class='hidden')))
             self.helper.layout.append(Layout(HTML('<div id="your_conclusion" class="hidden" >'+old_conclusion+'</div>')))
-            self.helper.layout.append(Layout(HTML('<br><br><div id="compare" class="compare-conclusion"></div><br><br>')))
+            self.helper.layout.append(Layout(HTML('<div id="compare" class="compare-conclusion"></div>')))
 
             self.helper.layout.append(Layout(
                 ButtonHolder(StrictButton(_(u'Merger'), type='merge', name='merge', css_class='btn btn-submit merge-btn need-to-merge-conclusion'))))
-
         else :
             self.helper.layout.append(Layout(Field('conclusion', css_class='md-editor')))