# HG changeset patch
# User durandn
# Date 1469609698 -7200
# Node ID c600162cc2cde167dab58f7c5f75ebafe5ca9c1d
# Parent  9675cdd079dfdc91df7910ecdefbb31494d7eb2c
Work on parent lists presentation on revision detail

diff -r 9675cdd079df -r c600162cc2cd src/iconolab/templates/iconolab/detail_revision.html
--- a/src/iconolab/templates/iconolab/detail_revision.html	Tue Jul 26 14:37:43 2016 +0200
+++ b/src/iconolab/templates/iconolab/detail_revision.html	Wed Jul 27 10:54:58 2016 +0200
@@ -27,9 +27,7 @@
                 <br>
                 <a href="{% url 'image_detail' collection_name image_guid %}"><i class="fa fa-picture-o" aria-hidden="true"></i> Revoir l'image </a><br>
                 <a href="{% url 'annotation_detail' collection_name image_guid annotation_guid  %}"><i class="fa fa-reply" aria-hidden="true"></i> Retour sur l'annotation</a><br>
-                {% if revision.parent_revision %}<a href="{% url 'revision_detail' collection_name image_guid annotation_guid revision.parent_revision.revision_guid %}"><i class="fa fa-history" aria-hidden="true"></i> Voir {% if revision.merge_parent_revision %}première {% endif %}révision précédente</a><br>{% endif %}
-                {% if revision.merge_parent_revision %}<a href="{% url 'revision_detail' collection_name image_guid annotation_guid revision.merge_parent_revision.revision_guid %}"><i class="fa fa-history" aria-hidden="true"></i> Voir seconde révision précédente</a><br>{% endif %}
-			</div>
+            </div>
 			<div id="revision-detail" class='col-xs-6' style="">
                 <h4>Annotation révisée par {{ revision.author.username}} </h4>
 				<p> <strong>Title:</strong> {{ revision.title }}</p>
@@ -43,6 +41,23 @@
                     <b>Révision par {{ revision.author }} le {{ revision.created|date:"d/m/Y" }} à {{ revision.created|time:"H:i" }}</b><br>
                     <i class="fa fa-quote-left" aria-hidden="true"></i> {{ revision.creation_comment.first.comment }} <i class="fa fa-quote-right" aria-hidden="true"></i>
                 </div>
+                {% if revision.parent_revision %}
+                  <label>Révision{% if revision.merge_parent_revision %}s{% endif %} source: </label>
+                  <ul class="list-unstyled">
+                    <li style="margin-left: 10px;">
+                      <a href="{% url 'revision_detail' collection_name image_guid annotation_guid revision.parent_revision.revision_guid %}">
+                        <i class="fa fa-history" aria-hidden="true"></i> Révision par <b>{{revision.parent_revision.author}}</b> le {{ revision.parent_revision.created|date:"d/m/Y" }} à {{ revision.parent_revision.created|time:"H:i" }}
+                      </a>
+                    </li>
+                    {% if revision.merge_parent_revision %}
+                      <li style="margin-left: 10px;">
+                        <a href="{% url 'revision_detail' collection_name image_guid annotation_guid revision.merge_parent_revision.revision_guid %}">
+                          <i class="fa fa-history" aria-hidden="true"></i> Révision par <b>{{revision.merge_parent_revision.author}}</b> le {{ revision.merge_parent_revision.created|date:"d/m/Y" }} à {{ revision.merge_parent_revision.created|time:"H:i" }}
+                        </a>
+                      </li>
+                    {% endif %}
+                  </ul>
+                {% endif %}
                   {% if revision.state == 0 and user == annotation.author %}
                   <br>
                   <div class="btn-group" role="group">