--- a/src/iconolab/templates/iconolab/detail_annotation.html Tue Jan 17 11:59:07 2017 +0100
+++ b/src/iconolab/templates/iconolab/detail_annotation.html Tue Jan 17 12:07:31 2017 +0100
@@ -9,7 +9,7 @@
{% block content %}
<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">
<div class="small-image-wrapper" style="position: relative">
@@ -23,17 +23,17 @@
</g>
</svg>
-
+
{% endthumbnail %}
</div>
<br>
<p class="btn btn-default btn-sm" @click="toggleZoomView" style="padding-top:2px"><i class="fa fa-search-plus showPointer"></i></p>
<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> Voir l'objet de cette annotation</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-md-6' style="">
- <h4>Annotation créée par <a href="{% url 'user_home' annotation.author.id %}">{{ annotation.author.username }}</a></h4>
+ <h4>Annotation créée par <a href="{% url 'user_home' annotation.author.id %}">{{ annotation.author.username }}</a></h4>
<p><strong>Titre :</strong> {{ annotation.current_revision.title }}</p>
<p><strong>Description :</strong> {{ annotation.current_revision.description }}</p>
{% if tags_data != "[]" %}
@@ -44,15 +44,15 @@
{% if user.is_authenticated %}
<a href="{% url 'annotation_edit' collection_name image_guid annotation_guid %}" class="btn btn-default btn-sm">
{% if user == annotation.author %}
- <span class="glyphicon glyphicon-edit"></span> Editer l'annotation
+ <span class="glyphicon glyphicon-edit"></span> Modifier l'annotation
{% else %}
<span class="glyphicon glyphicon-share"></span> Proposer une révision
{% endif %}
- </a>
+ </a>
<br>
{% endif %}
<br>
- {% include "partials/annotation_stats_panel.html" with annotation=annotation label="Statistiques sur cette annotation:" %}
+ {% include "partials/annotation_stats_panel.html" with annotation=annotation label="Statistiques sur cette annotation:" %}
</div>
<!-- zoomView -->
<div class="col-md-12 zoom-view" style="display:none" v-show="showZoom">
@@ -64,7 +64,7 @@
</div>
<div class="col-md-10 zoomTarget-wrapper">
{% with image.media as im %}
- <svg id="zoomTarget" ref="zoomTarget" width="920" height="920">
+ <svg id="zoomTarget" ref="zoomTarget" width="920" height="920">
<image id="main-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>
@@ -87,8 +87,8 @@
<div id="c{{comment.id}}-label-list" class="comment-metacategories">
{% if comment.revision or comment.metacategories.count > 0 %} - {% endif %}
{% if comment.revision %}
- <a href="{% url 'revision_detail' collection_name image_guid annotation_guid comment.revision.revision_guid %}">
- <span class="label
+ <a href="{% url 'revision_detail' collection_name image_guid annotation_guid comment.revision.revision_guid %}">
+ <span class="label
{% if comment.revision.author == annotation.author %}
label-success
{% else %}
@@ -101,11 +101,11 @@
{% elif comment.revision.state == 3 %}
label-primary
{% endif %}
- {% endif %} revision-link">
+ {% endif %} revision-link">
{% if comment.revision.author == annotation.author %}
Voir révision {% if comment.revision.merge_parent_revision %}(fusion){% endif %}
{% else %}
- Voir proposition
+ Voir proposition
{% if comment.revision.state == 0 %}
(en attente)
{% elif comment.revision.state == 1 %}
@@ -115,7 +115,7 @@
{% elif comment.revision.state == 3 %}
(étudiée)
{% endif %}
- {% endif %}</span>
+ {% endif %}</span>
</a>
{% endif %}
{% for metacategory in comment.metacategories.all %}
@@ -150,14 +150,14 @@
</a>
</li>
{% endif %}
-
+
{% for page in comments.paginator.page_range %}
<li id="page-link-{{page}}" class="pagination-link {% if page == comments.number %}active{% endif %}">
<a {% if page != comments.number %}href="{% url 'annotation_detail' collection_name image_guid annotation_guid %}?page={{page}}&perpage={{comments.paginator.per_page}}"{% endif %}>{{page}}</a>
</li>
-
+
{% endfor %}
-
+
{% if comments.has_next %}
<li>
<a href="{% url 'annotation_detail' collection_name image_guid annotation_guid %}?page={{comments.next_page_number}}&perpage={{comments.paginator.per_page}}" aria-label="Suivant">
@@ -168,8 +168,8 @@
</ul>
{% endif %}
</div>
-
-
+
+
<div class='col-md-12'>
{% if user.is_authenticated %}
{% if not comment_form %}
@@ -220,7 +220,7 @@
</p>
</form>
{% endif %}
-
+
</div>
{% endblock %}
@@ -228,13 +228,13 @@
<script>
new Vue({
el: "#detail-annotation",
-
+
data: {
showZoom: false
},
methods: {
-
+
toggleZoomView: function () {
if (this.showZoom) {
this.showZoom = false;
@@ -253,7 +253,7 @@
'Zoomview': iconolab.VueComponents.Zoomview
}
});
-
+
$(".reply-to-container").hide()
$(".reply-to-btn").click(function(event){
$(".reply-to-container").hide()
@@ -277,4 +277,4 @@
$("#reply-to-field").val("0");
})
</script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}