Ajout filtres mes articles/mes tutoriels

zestedesavoir · Jul 27, 2014 · 603c761 · 603c761
1 parent 91562ca
commit 603c761
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 11 deletions.
diff --git a/templates/article/member/index.html b/templates/article/member/index.html
@@ -17,6 +17,8 @@
 {% block breadcrumb %}
     {% if request.GET.type == "public" %}
         <li>Publiés</li>
+    {% elif request.GET.type == "validate" %}
+        <li>En validation</li>
     {% elif request.GET.type == "draft" %}
         <li>Brouillons</li>
     {% else %}
@@ -30,6 +32,8 @@
     Mes Articles
     {% if request.GET.type == "public" %}
         / Publiés
+    {% elif request.GET.type == "validate" %}
+        / En validation
     {% elif request.GET.type == "draft" %}
         / Brouillons
     {% endif %}
@@ -41,6 +45,8 @@
     Mes Articles
     {% if request.GET.type == "public" %}
         / Publiés
+    {% elif request.GET.type == "validate" %}
+        / En validation
     {% elif request.GET.type == "draft" %}
         / Brouillons
     {% endif %}
@@ -63,7 +69,12 @@ <h3>Filtres</h3>
                     </a>
                 </li>
                 <li>
-                    <a href="{% url "zds.member.views.articles" %}?type=draft" class="ico-after tick {% if request.GET.type == "draft" %}unread{% endif %}">
+                    <a href="{% url "zds.member.views.articles" %}?type=validate" class="ico-after tick {% if request.GET.type == "validate" %}unread{% endif %}">
+                        En validation
+                    </a>
+                </li>
+                <li>
+                    <a href="{% url "zds.member.views.articles" %}?type=draft" class="ico-after edit {% if request.GET.type == "draft" %}unread{% endif %}">
                         Brouillons
                     </a>
                 </li>

diff --git a/templates/tutorial/member/index.html b/templates/tutorial/member/index.html
@@ -5,12 +5,37 @@
 
 {% block title %}
     Mes tutoriels
+    {% if request.GET.type == "public" %}
+        / Publiés
+    {% elif request.GET.type == "validate" %}
+        / En validation
+    {% elif request.GET.type == "beta" %}
+        / En bêta
+    {% elif request.GET.type == "draft" %}
+        / Brouillons
+    {% endif %}
+{% endblock %}
+
+
+
+{% block breadcrumb_base %}
+    <li><a href="{% url "zds.member.views.tutorials" %}">Mes tutoriels</a></li>
 {% endblock %}
 
 
 
 {% block breadcrumb %}
-    <li>Mes tutoriels</li>
+    {% if request.GET.type == "public" %}
+        <li>Publiés</li>
+    {% elif request.GET.type == "validate" %}
+        <li>En validation</li>
+    {% elif request.GET.type == "beta" %}
+        <li>En bêta</li>
+    {% elif request.GET.type == "draft" %}
+        <li>Brouillons</li>
+    {% else %}
+        <li>Tous mes tutoriels</li>
+    {% endif %}
 {% endblock %}
 
 
@@ -20,6 +45,15 @@
         <h2 class="ico-after ico-tutorials">
             {% block headline %}
                 Mes tutoriels
+                {% if request.GET.type == "public" %}
+                    / Publiés
+                {% elif request.GET.type == "validate" %}
+                    / En validation
+                {% elif request.GET.type == "beta" %}
+                    / En bêta
+                {% elif request.GET.type == "draft" %}
+                    / Brouillons
+                {% endif %}
             {% endblock %}
         </h2>
 
@@ -67,12 +101,9 @@ <h3>{{ tutorial.title }}</h3>
     <a href="{% url "zds.tutorial.views.add_tutorial" %}" class="new-btn ico-after more blue">
         Nouveau tutoriel
     </a>
-{% endblock %}
-
-
-
-{% block sidebar_actions %}
-    <li><a href="{% url "zds.tutorial.views.import_tuto" %}" class="ico-after import blue">Importer</a></li>
+    <a href="{% url "zds.tutorial.views.import_tuto" %}" class="new-btn ico-after import blue">
+        Importer
+    </a>
 {% endblock %}
 
 
@@ -81,9 +112,34 @@ <h3>{{ tutorial.title }}</h3>
     <div class="mobile-menu-bloc mobile-all-links mobile-show-ico" data-title="Actions">
         <h3>Filtres</h3>
         <ul>
-            <li><a href="{% url "zds.member.views.tutorials" %}">Tous</a></li>
-            <li><a href="{% url "zds.member.views.tutorials" %}?type=public">Publics</a></li>
-            <li><a href="{% url "zds.member.views.tutorials" %}?type=draft">Brouillons</a><li>
+            <li>
+                <a href="{% url "zds.member.views.tutorials" %}?type=public" class="ico-after tick green {% if request.GET.type == "public" %}unread{% endif %}">
+                    Publiés
+                </a>
+            </li>
+            <li>
+                <a href="{% url "zds.member.views.tutorials" %}?type=validate" class="ico-after tick {% if request.GET.type == "validate" %}unread{% endif %}">
+                    En validation
+                </a>
+            </li>
+            <li>
+                <a href="{% url "zds.member.views.tutorials" %}?type=beta" class="ico-after beta {% if request.GET.type == "beta" %}unread{% endif %}">
+                    En bêta
+                </a>
+            </li>
+            <li>
+                <a href="{% url "zds.member.views.tutorials" %}?type=draft" class="ico-after edit {% if request.GET.type == "draft" %}unread{% endif %}">
+                    Brouillons
+                </a>
+            </li>
+
+            {% if request.GET.type %}
+                <li>
+                    <a href="{% url "zds.member.views.tutorials" %}" class="ico-after cross">
+                        Annuler le filtre
+                    </a>
+                </li>
+            {% endif %}
         </ul>
     </div>
 {% endblock %}
diff --git a/zds/member/views.py b/zds/member/views.py
@@ -286,6 +286,10 @@ def tutorials(request):
     profile = request.user.profile
     if type == "draft":
         user_tutorials = profile.get_draft_tutos()
+    elif type == "beta":
+        user_tutorials = profile.get_beta_tutos()
+    elif type == "validate":
+        user_tutorials = profile.get_validate_tutos()
     elif type == "public":
         user_tutorials = profile.get_public_tutos()
     else:
@@ -313,6 +317,8 @@ def articles(request):
     profile = request.user.profile
     if type == "draft":
         user_articles = profile.get_draft_articles()
+    if type == "validate":
+        user_articles = profile.get_validate_articles()
     elif type == "public":
         user_articles = profile.get_public_articles()
     else: