Remaniement de la page de validation des tutoriels

zestedesavoir · Jul 27, 2014 · ce103c8 · ce103c8
1 parent eaf3648
commit ce103c8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 24 deletions.
diff --git a/assets/scss/_all-supports.scss b/assets/scss/_all-supports.scss
@@ -1048,19 +1048,24 @@
     }
 
     .member-item {
-        margin-right: 7px;
-
         .avatar {
             margin-top: -2px;
             height: 20px;
             width: 20px;
             border: 1px solid #CCC;
         }
 
+        .avatar + span {
+            padding-left: 3px;
+        }
+
         &:hover .avatar {
             border-color: #999;
         }
     }
+    .member-item + .member-item {
+        margin-left: 7px;
+    }
     .authors .member-item {
         margin-right: 0;
         margin-left: 7px;
@@ -2370,10 +2375,6 @@ table {
                 text-indent: 20px;
             }
 
-            .member-item {
-                margin: 0;
-            }
-
             textarea {
                 margin: 10px 0 10px -1px;
                 background-color: transparent;

diff --git a/templates/misc/member_item.part.html b/templates/misc/member_item.part.html
@@ -12,13 +12,11 @@
             itemprop="author"
         {% endif %}
     >{% spaceless %}
-    	{% if avatar %}
-        	<img src="{{ profile.get_avatar_url }}" alt="" class="avatar" itemprop="image">
-    	{% endif %}
-
-        <span itemprop="name">
-        	{{ member.username }}
-        </span>
+        {% if avatar %}
+            <img src="{{ profile.get_avatar_url }}" alt="" class="avatar" itemprop="image">
+        {% endif %}
+
+        <span itemprop="name">{{ member.username }}</span>
 
         {% if info %}
             <span class="info">({{ info }})</span>

diff --git a/templates/tutorial/validation/index.html b/templates/tutorial/validation/index.html
@@ -47,9 +47,8 @@ <h2 class="subtitle">{{ headlinesub|safe }}</h2>
                     <thead>
                         <tr>
                             <th>Titre</th>
-                            <th width="8%">Catégorie(s)</th>
-                            <th width="8%">Auteur(s)</th>
-                            <th width="8%">Proposé</th>
+                            <th width="15%">Auteur(s)</th>
+                            <th width="10%">Proposé</th>
                             <th width="24%">Statut</th>
                         </tr>
                     </thead>
@@ -60,21 +59,27 @@ <h2 class="subtitle">{{ headlinesub|safe }}</h2>
                                     <a href="{% url "zds.tutorial.views.view_tutorial" validation.tutorial.pk validation.tutorial.slug %}?version={{ validation.version }}">
                                         {{ validation.tutorial.title }}
                                     </a>
-                                </td>
-                                <td>
-                                    {% for subcategory in validation.tutorial.subcategory.all %}
-                                        <a href="{% url "zds.tutorial.views.list_validation" %}?subcategory={{subcategory.pk}}">
-                                            {{ subcategory.title }}
-                                        </a>
-                                    {% endfor %}
+                                    <br>
+                                    {% if validation.tutorial.subcategory.all %}
+                                        Catégories : 
+                                        {% for subcategory in validation.tutorial.subcategory.all %}
+                                            {% if not forloop.first %}
+                                                -
+                                            {% endif %}
+                                            <a href="{% url "zds.tutorial.views.list_validation" %}?subcategory={{ subcategory.pk }}">
+                                                {{ subcategory.title }}</a>
+                                        {% endfor %}
+                                    {% else %}
+                                        <em>Aucune catégorie</em>
+                                    {% endif %}
                                 </td>
                                 <td>
                                     {% for author in validation.tutorial.authors.all %}
                                         {% include 'misc/member_item.part.html' with member=author avatar=True %}
                                     {% endfor %}
                                 </td>
                                 <td>
-                                    <span>{{ validation.date_proposition|format_date|capfirst }}</span>
+                                    <span>{{ validation.date_proposition|format_date:True|capfirst }}</span>
                                 </td>
                                 <td>
                                     {% captureas reservation_url %}