Merge pull request #2956 from artragis/zep_12_double_stack

ZEP-12

.gitignore

@@ -6,13 +6,17 @@ base.db
 /static
 /tutoriels-private
 /tutoriels-public
+/contents-private
+/contents-public
 /media
 /articles-data
 
 /tutoriels-private-test
 /tutoriels-public-test
 /media-test
 /articles-data-test
+/contents-private-test
+/contents-public-test
 
 /apache-solr
 

.travis.yml

@@ -10,9 +10,11 @@ env:
   global:
     - secure: "azmDZZQZzf88zpbkYpLpxI66vpEVyv+kniW0QdWAt4qlys8P5OcO3VJBR5YT85vlvnjN9b6raWQAL1ymee0WmVdTmzXed8XjZv7t9QXVw7pfezxMKlEftVp/4Cu4wtvbew0ViZXNWV2hNXHzEqlhgnoIOq94i0UzZ7grMrI0xm0="
   matrix:
-    - TEST_APP="-e back_mysql"
+    - TEST_APP="-e back_mysql -- zds.member zds.mp zds.utils zds.forum zds.gallery zds.pages zds.search zds.featured"
+    - TEST_APP="-e back_mysql -- zds.article zds.tutorial zds.tutorialv2"
     - TEST_APP="-e front"
 
+
 notifications:
   irc:
     channels:

assets/js/accordeon.js

@@ -9,8 +9,10 @@
 
     function accordeon($elem){
         $("h4 + ul, h4 + ol", $elem).each(function(){
-            if($(".current", $(this)).length === 0)
-                $(this).hide();
+            if(!$(this).hasClass("unfolded")){
+                if($(".current", $(this)).length === 0)
+                    $(this).hide();
+            }
         });
 
         $("h4", $elem).click(function(e){

assets/js/compare-commits.js

@@ -0,0 +1,43 @@
+/*
+ * Allow the user to compare two commits
+ */
+
+(function(document, $, undefined){
+    "use strict";
+
+    function toogleRadioInput($radioInput){
+        var $row = $radioInput.parent().parent();
+
+        if($radioInput.attr("name") === "compare-from") {
+            $row.prevAll().find("[name='compare-to']").prop("disabled", false);
+            $row.nextAll().find("[name='compare-to']").prop("disabled", true);
+            $row.find("[name='compare-to']").prop("disabled", true);
+        }
+        else {
+            $row.prevAll().find("[name='compare-from']").prop("disabled", true);
+            $row.nextAll().find("[name='compare-from']").prop("disabled", false);
+            $row.find("[name='compare-from']").prop("disabled", true);
+        }
+    }
+
+    $(".commits-list input[name^='compare']").on("change", function(){
+        toogleRadioInput($(this));
+    });
+
+    $(document).ready(function(){
+        $(".commits-list input[name^='compare']:checked").each(function(){
+            toogleRadioInput($(this));
+        });
+    });
+
+    $(".commits-compare-form").on("submit", function(){
+        var $form = $(this),
+            $fromInput = $form.find("input[name='from']"),
+            $toInput = $form.find("input[name='to']"),
+            compareFrom = $(".commits-list input[name='compare-from']:checked").val(),
+            compareTo = $(".commits-list input[name='compare-to']:checked").val();
+
+        $fromInput.val(compareFrom);
+        $toInput.val(compareTo);
+    });
+})(document, jQuery);

assets/scss/base/_tables.scss

@@ -37,25 +37,49 @@ table {
     &.fullwidth {
         width: 100%;
     }
+}
 
-    &.diff {
-        tbody tr {
-            border-bottom: none;
-            font-family : $font-monospace;
-            background: #FFF;
+/* Specific for diff */
+
+.diff_delta {
+    overflow-x: auto;
+    width: 100%;
+    margin: 15px 0; /* add margin to container */
+
+    table.diff {
+        font-family: $font-monospace;
+        font-size: 0.9em;
+        border: 2px solid gray;
+        margin: 0; /* abort table default margin */
+
+        tr {
             line-height: 1em;
-            .diff_next {
-                display: none;
-            }
-            td.diff_header {
-                padding : 5px;
-            }
+            border-bottom: none;
+        }
+
+        .diff_header {
+            background-color: #e0e0e0;
+            padding: 5px;
+        }
+
+        td.diff_header {
+            text-align: right;
+        }
+
+        .diff_next {
+            display: none;
         }
     }
 }
 
-.diff_delta {
-    overflow: scroll;
-    width: 100%;
-    font-size : 0.9em;
-}
+.diff_add { /* added text */
+    background-color: #aaffaa;
+}
+
+.diff_chg { /* changed text */
+    background-color: #fff8ab;
+}
+
+.diff_sub { /* deleted text */
+    background-color: #ffaaaa;
+}

assets/scss/layout/_main.scss

@@ -118,6 +118,10 @@
     margin-top: 0;
 }
 
+.pagination-bottom-clear{
+    clear: both;
+}
+
 @media only screen and #{$media-mega-wide} {
     .main .content-container {
         .content-wrapper {

assets/scss/main.scss

@@ -80,6 +80,7 @@
 @import "pages/gallery";
 @import "pages/api";
 @import "pages/tutorial-help";
+@import "pages/tutorial-history";
 
 /*-------------------------
 10. High pixel ratio (retina)

assets/scss/pages/_tutorial-history.scss

@@ -0,0 +1,3 @@
+.commits-compare-form button {
+    float: none !important;
+}

assets/tex/template.tex

@@ -152,7 +152,7 @@
 
 \begin{document}
 $if(title)$
-\ULCornerWallPaper{1}{../../assets/tex/coverpage.pdf}
+\ULCornerWallPaper{1}{../../../assets/tex/coverpage.pdf}
 \maketitle
 \ClearWallPaper
 $endif$

doc/source/back-end-code/article.rst

@@ -16,4 +16,4 @@ Vues (``views.py``)
 ===================
 
 .. automodule:: zds.article.views
-    :members:
+    :members:

doc/source/back-end-code/search.rst

@@ -0,0 +1,25 @@
+==========================
+La recherche (``search/``)
+==========================
+
+Module situé dans ``zds/search/``.
+
+.. contents:: Fichiers documentés :
+
+Modèles (``models.py``)
+=======================
+
+.. automodule:: zds.search.models
+    :members:
+
+Vues (``views.py``)
+===================
+
+.. automodule:: zds.search.views
+    :members:
+
+Les utilitaires (``utils.py``)
+==============================
+
+.. automodule:: zds.search.utils
+    :members:

doc/source/back-end-code/tutorialv2.rst

@@ -0,0 +1,64 @@
+==========================================
+Les tutoriels v2 (ZEP12) (``tutorialv2/``)
+==========================================
+
+Module situé dans ``zds/tutorialv2/``.
+
+.. contents:: Fichiers documentés :
+
+Modèles (``models/``)
+=====================
+
+Modèles de la base de donnée (``models_database.py``)
+-----------------------------------------------------
+
+.. automodule:: zds.tutorialv2.models.models_database
+    :members:
+
+
+Modèles "versionnés" (``models_versioned.py``)
+----------------------------------------------
+
+.. automodule:: zds.tutorialv2.models.models_versioned
+    :members:
+
+Vues (``views/``)
+=================
+
+Contenus (``views/views_contents.py``)
+--------------------------------------
+
+.. automodule:: zds.tutorialv2.views.views_contents
+    :members:
+
+
+Validations (``views/views_validations.py``)
+--------------------------------------------
+
+.. automodule:: zds.tutorialv2.views.views_validations
+    :members:
+
+Contenus publiés (``views/views_published.py``)
+-----------------------------------------------
+
+.. automodule:: zds.tutorialv2.views.views_published
+    :members:
+
+Mixins (``mixins.py``)
+======================
+
+.. automodule:: zds.tutorialv2.mixins
+    :members:
+
+Les forumulaires (``forms.py``)
+===============================
+
+.. automodule:: zds.tutorialv2.forms
+    :members:
+
+Les utilitaires (``utils.py``)
+==============================
+
+.. automodule:: zds.tutorialv2.utils
+    :members:
+