Merge pull request #38 from davidbgk/37-better-discussions-threads

Improve discussions' threads rendering, fixes #37
opendatateam · Jun 1, 2015 · 61d8d92 · 61d8d92
2 parents 39e86b6 + b0f475d
commit 61d8d92
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/udata/templates/dataset/discussion-item.html b/udata/templates/dataset/discussion-item.html
@@ -1,29 +1,29 @@
 <div class="list-group-item" id="discussion-{{ loop_index }}" data-discussion-id="{{ discussion.id }}">
     <div class="format-label pull-left">
-        <span>
-            <a href="#discussion-{{ loop_index }}">{{ loop_index }}</a>
-        </span>
+        {{ discussion.user|avatar(52) }}
     </div>
+    <span class="list-group-item-link">
+        <a href="#discussion-{{ loop_index }}"><span class="glyphicon glyphicon-link"></span></a>
+    </span>
     <h4 class="list-group-item-heading ellipsis open-discussion-thread">
         <span itemprop="name">{{ discussion.title }}</span>
     </h4>
     <p class="list-group-item-text ellipsis open-discussion-thread list-group-message-number-{{ discussion.id }}">
         {{ _('Discussion started on') }} {{ discussion.created|dateformat }} {{ _('with') }}
         {% trans nb=discussion.discussion|length %}{{nb}} message{% pluralize %}{{nb}} messages{% endtrans %}
     </p>
-    {{ discussion.user|avatar(52, 'resource-owner') }}
 </div>
 {% for message in discussion.discussion %}
     <div class="list-group-item list-group-indent list-group-thread-{{ discussion.id }} hidden animated" id="discussion-{{ loop_index }}-{{ loop.index }}">
         <div class="format-label pull-left">
-            <span>
-                <a href="#discussion-{{ loop_index }}-{{ loop.index }}">{{ loop_index }}.{{ loop.index }}</a>
-            </span>
+            {{ message.posted_by|avatar(52) }}
         </div>
+        <span class="list-group-item-link">
+            <a href="#discussion-{{ loop_index }}-{{ loop.index }}"><span class="glyphicon glyphicon-link"></span></a>
+        </span>
         <p class="list-group-item-heading">
             {{ message.content }}
         </p>
-        {{ message.posted_by|avatar(52, 'resource-owner') }}
     </div>
 {% endfor %}
 <a class="list-group-item add new-comment list-group-indent list-group-thread-{{ discussion.id }} hidden animated"
@@ -38,10 +38,11 @@ <h4 class="list-group-item-heading">
     data-discussion-id="{{ discussion.id }}"
     id="discussion-{{ loop_index }}-{{ discussion.discussion|length + 1 }}">
     <div class="format-label pull-left">
-        <span>
-            <a href="#discussion-{{ loop_index }}-{{ discussion.discussion|length + 1 }}">{{ loop_index }}.{{ discussion.discussion|length + 1 }}</a>
-        </span>
+        {{ current_user|avatar(52) }}
     </div>
+    <span class="list-group-item-link">
+        <a href="#discussion-{{ loop_index }}-{{ discussion.discussion|length + 1 }}"><span class="glyphicon glyphicon-link"></span></a>
+    </span>
     <h4 class="list-group-item-heading">
         {{ _('Commenting on this thread') }}
     </h4>
@@ -56,5 +57,4 @@ <h4 class="list-group-item-heading">
         </div>
         <input type="submit" value="{{ _('Submit your comment') }}" class="btn btn-primary btn-block pull-right submit-new-comment" />
     </form>
-    {{ current_user|avatar(52, 'resource-owner') }}
 </div>