From 6d3040b6567401dca47d537cf4974723fc29771e Mon Sep 17 00:00:00 2001
From: Alex-D <demodealex@gmail.com>
Date: Tue, 22 Jul 2014 02:43:26 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20incoh=C3=A9rence=20Article/Mes=20a?=
 =?UTF-8?q?rticles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/article/member/edit.html    |  8 ++++++--
 templates/article/member/index.html   |  8 ++++++--
 templates/article/member/new.html     |  8 ++++++--
 templates/article/member/view.html    |  8 ++++++--
 templates/tutorial/base.html          |  2 +-
 templates/tutorial/tutorial/view.html | 23 ++++++++++++++---------
 6 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/templates/article/member/edit.html b/templates/article/member/edit.html
index 38e4f3b977..833f81983a 100644
--- 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
index 4a74317797..b519018da1 100644
--- 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
index 333fdd3533..a38b77cb8e 100644
--- 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
index 2800b78d8b..f2311803a5 100644
--- 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
index 0f54ae7f9a..c3280a5f2e 100644
--- 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
index 32c0d9577d..da3f0be57a 100644
--- 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 %}