--- a/src/iconolab/templates/iconolab/detail_annotation.html Fri Jul 22 16:52:43 2016 +0200
+++ b/src/iconolab/templates/iconolab/detail_annotation.html Fri Jul 22 17:33:48 2016 +0200
@@ -8,8 +8,7 @@
{% load iconolab_tags %}
{% block content %}
- <a href="{% url 'image_detail' collection_name image_guid %}"><i class="fa fa-list"></i> Revoir l'image </a>
- <div id="annotation-wrapper" class="row" style="border: 1px solid gray">
+ <div id="annotation-wrapper" class="row" style="border: 1px solid gray;padding-top: 10px;">
<div id="detail-annotation" class="col-md-12">
<div v-show="!showZoom" class="col-md-6">
@@ -28,14 +27,11 @@
{% endthumbnail %}
</div>
<p @click="toggleZoomView" style="padding-top:2px"><i class="fa fa-search-plus showPointer"></i></p>
-
- <br>
<a class="btn btn-default btn-sm" href="{% url 'item_detail' collection_name image.item.item_guid %}"><i class="fa fa-eye" aria-hidden="true"></i> Revoir l'objet</a>
<a class="btn btn-default btn-sm" href="{% url 'image_detail' collection_name image_guid %}"><i class="fa fa-picture-o" aria-hidden="true"></i> Voir les annotations sur l'image</a>
-
- </div>
-
- <div v-show="!showZoom" id="detail-annotation" class='col-xs-6' style="">
+
+ </div>
+ <div v-show="!showZoom" id="detail-annotation" class='col-md-6' style="">
<h4>Annotation créée par {{ annotation.author.username }}</h4>
<p><strong>Titre:</strong> {{ annotation.current_revision.title }}</p>
<p><strong>Description:</strong> {{ annotation.current_revision.description }}</p>
@@ -51,32 +47,32 @@
{% endif %}
</a>
{% endif %}
+ </div>
+ <!-- zoomView -->
+ <div class="col-md-12 zoom-view" style="display:none" v-show="showZoom">
+
+ <div class="col-md-2">
+ {% thumbnail annotation.image.media "100x100" crop=False as im %}
+ <zoomview ref="zoomview" :zoomtarget="'zoomTarget'" :image-url="'{{ im.url }}'" :width="{{ im.width }}" :height="{{ im.height }}"></zoomview>
+ {% endthumbnail %}
</div>
- <!-- zoomView -->
- <div class="col-md-12 zoom-view" style="display:none" v-show="showZoom">
-
- <div class="col-md-2">
- {% thumbnail annotation.image.media "100x100" crop=False as im %}
- <zoomview ref="zoomview" :zoomtarget="'zoomTarget'" :image-url="'{{ im.url }}'" :width="{{ im.width }}" :height="{{ im.height }}"></zoomview>
- {% endthumbnail %}
-
- <p><i class="fa fa-close">Voir le détail</p>
- </div>
-
- <div class="col-md-8">
- {% thumbnail annotation.image.media "900x900" crop=False as im %}
- <svg id="zoomTarget" ref="zoomTarget" width="{{ im.width }}" height="{{ im.height }}">
- <image class="main-image" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{{ im.url }}" x="0" y="0" width="{{ im.width }}" height="{{ im.height }}"></image>
- <g transform="matrix({% transform_matrix im_width=im.width im_height=im.height max_x=100 max_y=100 %})">
- <path d="{{ annotation.current_revision.fragment|clean_path }}" opacity="0.7" fill="orange"></path>
- </g>
- </svg>
- {% endthumbnail %}
- </div>
- <div class="col-md-2">
- <p class="showPointer" @click="toggleZoomView"><i class="fa fa-close"></i></p>
- </div>
- </div>
+
+ <div class="col-md-8">
+ {% thumbnail annotation.image.media "900x900" crop=False as im %}
+ <svg id="zoomTarget" ref="zoomTarget" width="{{ im.width }}" height="{{ im.height }}">
+ <image class="main-image" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{{ im.url }}" x="0" y="0" width="{{ im.width }}" height="{{ im.height }}"></image>
+ <g transform="matrix({% transform_matrix im_width=im.width im_height=im.height max_x=100 max_y=100 %})">
+ <path d="{{ annotation.current_revision.fragment|clean_path }}" opacity="0.7" fill="orange"></path>
+ </g>
+ </svg>
+ {% endthumbnail %}
+ </div>
+ <div class="col-md-2">
+ <p class="showPointer" @click="toggleZoomView">
+ <i class="fa fa-close"></i>Voir le détail</p>
+
+ </div>
+ </div>
</div>
<div class='col-md-12'>