Correction incohérence Article/Mes articles

zestedesavoir · Jul 22, 2014 · 6d3040b · 6d3040b
1 parent 88d7f5e
commit 6d3040b
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 18 deletions.
diff --git a/templates/article/member/edit.html b/templates/article/member/edit.html
@@ -5,13 +5,17 @@
 
 
 {% block title_base %}
-    &bull; Mes articles
+    &bull; Articles
 {% endblock %}
 
 
 
 {% block breadcrumb_base %}
-    <li><a href="{% url "zds.member.views.articles" %}">Mes articles</a></li>
+    {% if user in tutorial.authors.all %}
+        <li><a href="{% url "zds.member.views.articles" %}">Mes articles</a></li>
+    {% else %}
+        <li><a href="{% url "zds.article.views.index" %}">Articles</a></li>
+    {% endif %}
 {% endblock %}
 
 

diff --git a/templates/article/member/index.html b/templates/article/member/index.html
@@ -3,13 +3,17 @@
 
 
 {% block title_base %}
-    &bull; Mes articles
+    &bull; Articles
 {% endblock %}
 
 
 
 {% block breadcrumb_base %}
-    <li><a href="{% url "zds.member.views.articles" %}">Mes articles</a></li>
+    {% if user in tutorial.authors.all %}
+        <li><a href="{% url "zds.member.views.articles" %}">Mes articles</a></li>
+    {% else %}
+        <li><a href="{% url "zds.article.views.index" %}">Articles</a></li>
+    {% endif %}
 {% endblock %}
 
 

diff --git a/templates/article/member/new.html b/templates/article/member/new.html
@@ -5,13 +5,17 @@
 
 
 {% block title_base %}
-    &bull; Mes articles
+    &bull; Articles
 {% endblock %}
 
 
 
 {% block breadcrumb_base %}
-    <li><a href="{% url "zds.member.views.articles" %}">Mes articles</a></li>
+    {% if user in tutorial.authors.all %}
+        <li><a href="{% url "zds.member.views.articles" %}">Mes articles</a></li>
+    {% else %}
+        <li><a href="{% url "zds.article.views.index" %}">Articles</a></li>
+    {% endif %}
 {% endblock %}
 
 

diff --git a/templates/article/member/view.html b/templates/article/member/view.html
@@ -7,13 +7,17 @@
 
 
 {% block title_base %}
-    &bull; Mes articles
+    &bull; Articles
 {% endblock %}
 
 
 
 {% block breadcrumb_base %}
-    <li><a href="{% url "zds.member.views.articles" %}">Mes articles</a></li>
+    {% if user in tutorial.authors.all %}
+        <li><a href="{% url "zds.member.views.articles" %}">Mes articles</a></li>
+    {% else %}
+        <li><a href="{% url "zds.article.views.index" %}">Articles</a></li>
+    {% endif %}
 {% endblock %}
 
 

diff --git a/templates/tutorial/base.html b/templates/tutorial/base.html
@@ -4,7 +4,7 @@
 
 
 {% block title_base %}
-    &bull; Mes tutoriels
+    &bull; Tutoriels
 {% endblock %}
 
 

diff --git a/templates/tutorial/tutorial/view.html b/templates/tutorial/tutorial/view.html
@@ -43,16 +43,21 @@ <h2 class="subtitle">
         {% include 'tutorial/includes/tags_authors.part.html' with tutorial=tutorial %}
     {% endif %}
 
-    {% if perms.tutorial.change_tutorial and tutorial.in_validation and validation.comment_authors %}
-        <div class="content-wrapper comment-author">
-            <p>
-                Le message suivant a été laissé à destination des validateurs : 
-            </p>
+    {% if perms.tutorial.change_tutorial and tutorial.sha_validation %}
+        <p class="content-wrapper alert-box info">
+            Ce tutoriel est en attente de validation
+        </p>
+        {% if validation.comment_authors %}
+            <div class="content-wrapper comment-author">
+                <p>
+                    Le message suivant a été laissé à destination des validateurs : 
+                </p>
 
-            <blockquote>
-                {{ validation.comment_authors }}
-            </blockquote>
-        </div>
+                <blockquote>
+                    {{ validation.comment_authors }}
+                </blockquote>
+            </div>
+        {% endif %}
     {% endif %}
 
     {% if tutorial.in_beta and tutorial.sha_beta == version %}