--- a/src/iconolab/templates/iconolab/merge_revision.html	Fri Jul 22 16:52:10 2016 +0200
+++ b/src/iconolab/templates/iconolab/merge_revision.html	Fri Jul 22 16:52:43 2016 +0200
@@ -1,3 +1,105 @@
-{{ current_revision.title }} - {{ current_revision.description }} - {{ current_tags_data }} - {{ current_comment }}<br><br>
-{{ parent_revision.title }} - {{ parent_revision.description }} - {{ parent_tags_data }} - {{ parent_comment }}<br>
-{{ proposal_revision.title }} - {{ proposal_revision.description }} - {{ proposal_tags_data }} - {{ proposal_comment }}<br>
\ No newline at end of file
+{% extends 'iconolab_base.html' %} 
+{% load staticfiles %} 
+{% load thumbnail %} 
+{% block content %}
+<div id="annotation-wrapper" class="row" style="border: 1px solid gray">
+  <div class="col-md-4">
+    <h4>Révision courante
+      <a id="merge-current-revision-info-icon" class="btn btn-default btn-xs btn-revision-info" title="Plus d'info"><i class="fa fa-question-circle-o" aria-hidden="true"></i></a>
+    </h4>
+    <div id="merge-current-revision-alert" class="alert alert-warning revision-info-alert">
+      Cette révision est la révision actuellement publiée pour l'annotation.
+    </div>
+    <form class="form">
+      <fieldset class="form-group">
+        <label class="control-label">Titre:</label>
+        &nbsp;
+        <a class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
+        <a class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>   
+        <input type="text" class="form-control"
+          id="merge-current-revision-title"
+          value="{{current_revision.title}}" readonly="readonly">
+      </fieldset>
+      <fieldset class="form-group">
+        <label class="control-label">Description: </label>
+        &nbsp;
+        <a class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
+        <a class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>
+        <textarea class="form-control"
+          id="merge-current-revision-description" readonly="readonly">{{ current_revision.description}}</textarea>
+      </fieldset>
+      <fieldset class="form-group">
+        <label class="control-label">Tags: </label>
+        &nbsp;
+        <a class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
+        <a class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>
+        <typeahead :tags="{{ current_tags_data  }}"></typeahead>
+      </fieldset>
+      <label>Image: </label><br>
+      <label>Commentaire de création: </label>
+      <div class="alert alert-info" role="alert">
+        <span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
+        <span class="sr-only">Info:</span>
+          <b>Révision par {{ current_revision.author }} <br> le {{ current_revision.created|date:"d/m/Y" }} à {{ current_revision.created|time:"H:i" }}</b><br>
+          <i class="fa fa-quote-left" aria-hidden="true"></i> {{ current_comment.comment }} <i class="fa fa-quote-right" aria-hidden="true"></i>
+      </div>
+    </form>
+  </div>
+  <div class="col-md-4">
+    <h4>Révision parente
+      <a id="merge-parent-revision-info-icon" class="btn btn-default btn-xs btn-revision-info" title="Plus d'info"><i class="fa fa-question-circle-o" aria-hidden="true"></i></a>
+    </h4>
+    <div id="merge-parent-revision-alert" class="alert alert-warning revision-info-alert">
+      Cette révision est la révision à partir de laquelle l'annotation proposée a été créée.
+    </div>
+    <form class="form">
+      <fieldset class="form-group">
+        <label class="control-label">Titre:</label>
+        &nbsp;
+        <a class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
+        <a class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>
+        <input type="text" class="form-control"
+          id="merge-current-revision-title"
+          value="{{parent_revision.title}}" readonly="readonly">
+      </fieldset>
+      <fieldset class="form-group">
+        <label class="control-label">Description: </label>
+        &nbsp;
+        <a class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
+        <a class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>
+        <textarea class="form-control"
+          id="merge-current-revision-description" readonly="readonly">{{ parent_revision.description}}</textarea>
+      </fieldset>
+      <fieldset class="form-group">
+        <label class="control-label">Tags: </label>
+        &nbsp;
+        <a class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
+        <a class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>
+        <typeahead :tags="{{ current_tags_data  }}"></typeahead>
+      </fieldset>
+      <label>Image: </label><br>
+      <label>Commentaire de création: </label>
+      <div class="alert alert-info" role="alert">
+        <span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
+        <span class="sr-only">Info:</span>
+          <b>Révision par {{ parent_revision.author }} <br> le {{ parent_revision.created|date:"d/m/Y" }} à {{ parent_revision.created|time:"H:i" }}</b><br>
+          <i class="fa fa-quote-left" aria-hidden="true"></i> {{ parent_comment.comment }} <i class="fa fa-quote-right" aria-hidden="true"></i>
+      </div>
+    </form>
+  </div>
+  <div class="col-md-4">
+    <h3>Révision proposée</h3>
+    {{ proposal_revision.title }} - {{ proposal_revision.description }} - {{ proposal_tags_data }} - {{ proposal_comment }}<br>
+  </div>
+</div>
+{% endblock %} 
+
+{% block footer_js %} 
+<script>
+	$(".revision-info-alert").hide()
+	$(".btn-revision-info").click(function(event){
+	    relatedAlertID = /([a-zA-Z\-]+)-info-icon/.exec($(this).attr("id"))[1]+"-alert";
+	    $("#"+relatedAlertID).slideToggle()
+	});
+</script>
+{% endblock %}

--- a/src/iconolab/views.py	Fri Jul 22 16:52:10 2016 +0200
+++ b/src/iconolab/views.py	Fri Jul 22 16:52:43 2016 +0200
@@ -423,9 +423,9 @@
         context['parent_tags_data'] = revision.parent_revision.get_tags_json()
         context['parent_comment'] = revision.parent_revision.creation_comment.first()
         # Current data
-        context['current_revision'] = revision
-        context['current_tags_data'] = revision.get_tags_json()
-        context['current_comment'] = revision.creation_comment.first()
+        context['current_revision'] = annotation.current_revision
+        context['current_tags_data'] = annotation.current_revision.get_tags_json()
+        context['current_comment'] = annotation.current_revision.creation_comment.first()
         return render(request, 'iconolab/merge_revision.html', context)
     
     def post(self, request, *args, **kwargs):