Mercurial Mercurial > iconolab / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use full image instead of thumbnail when zooming
authordurandn
Wed, 27 Jul 2016 10:55:21 +0200
changeset 82 128512e8acbb
parent 81 c600162cc2cd
child 84 9f55f0bcb29a
use full image instead of thumbnail when zooming
src/iconolab/templates/iconolab/change_annotation.html file | annotate | diff | comparison | revisions
src/iconolab/templates/iconolab/detail_annotation.html file | annotate | diff | comparison | revisions 
--- a/src/iconolab/templates/iconolab/change_annotation.html	Wed Jul 27 10:54:58 2016 +0200
+++ b/src/iconolab/templates/iconolab/change_annotation.html	Wed Jul 27 10:55:21 2016 +0200
@@ -29,18 +29,18 @@
 					
 					<li @click="clear" class='pull-md-right drawingModeBtn'><i class='fa fa-trash'></i> Effacer</li>
 
-					<li @click="showForm" class='pull-md-right drawingModeBtn infos info'><i class='fa fa-plus'></i> Valider</li>
+					<li id="confirm-fragment-button" @click="showForm" class='pull-md-right drawingModeBtn infos info'><i class='fa fa-plus'></i> Valider</li>
 				</ul>
 			</div>
 			
 			<div class="col-md-10">
 				<div ref="image" id="iconolab-image-wrapper">
-					{% thumbnail image.media "835x835" crop=False as im %}
+					{% with image.media as im %}
 						<svg class="cut-canvas" width="850" height="850">
 							<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>
 	    					<path class="image-path" d="{% if annotation %}{{ annotation.current_revision.fragment }}{% endif %}"></path>
 	    				</svg>
-					{% endthumbnail %}
+                    {% endwith %}
 				</div>
 			</div>
 		</div>
@@ -81,10 +81,10 @@
 				</div>
 				<ul class="inline">
 					<li @click="showEditor" class="showPointer"> <i class='fa fa-edit'></i> Editer le fragment</li>
-					<li v-show="!displayMask" @click="highLightZone" class="showPointer"> <i class='fa fa-eye-slash'></i> Afficher la zone</li>
-					<li v-show="displayMask" @click="highLightZone" class="showPointer"> <i class='fa fa-eye-slash'></i> Masquer la zone</li>
-					<li v-if="canZoom" @click="zoom('in')"><i class="fa fa-zoom-in"></i>Zoomer</li>
-					<li v-if="!canZoom" @click="zoom('out')"><i class="fa fa-zoom-out"></i>Dezoomer</li>
+					<li v-show="!displayMask" @click="highLightZone" class="showPointer show-zone"> <i class='fa fa-eye-slash'></i> Afficher la zone</li>
+					<li v-show="displayMask" @click="highLightZone" class="showPointer hide-zone"> <i class='fa fa-eye-slash'></i> Masquer la zone</li>
+					<li class="zoom-link" v-if="canZoom" @click="zoom('in')"><i class="fa fa-zoom-in"></i>Zoomer</li>
+					<li class="zoom-link" v-if="!canZoom" @click="zoom('out')"><i class="fa fa-zoom-out"></i>Dezoomer</li>
 				</ul>
 			</div>
 
@@ -144,7 +144,7 @@
                         name="{{ form.comment.name }}"
                         id="id_{{ form.comment.name }}" ></textarea>
                     </fieldset>
-        			<input v-model="normalizePath" type="hidden" name="fragment"></input>
+        			<input id="fragment-hidden-field" v-model="normalizePath" type="hidden" name="fragment"></input>
         			<button type="submit" class="save btn btn-default btn-sm">Enregister</button>
                     <a class="btn btn-default btn-sm" href="{% if annotation %}{% url 'annotation_detail' collection_name image_guid annotation_guid %}{% else %}{% url 'item_detail' collection_name image.item.item_guid %}{% endif %}" role="button">Retour</a>
     			    <br><br>
@@ -159,5 +159,19 @@
 {% block footer_js %}
 	<script>
 		iconolab.Cutout.init();
+		if(($("#fragment-hidden-field").val()==";FREE")||!$("#fragment-hidden-field").val()){
+	        $(".zoom-link, .show-zone, .hide-zone").hide()
+		}
+		$("#confirm-fragment-button").on("click", function(){
+		    $("#fragment-hidden-field").trigger("change");
+		});
+		$("#fragment-hidden-field").on("change", function(){
+		    if($(this).val()==";FREE"){
+		        $(".zoom-link, .show-zone, .hide-zone").hide()
+		    }
+		    else {
+		        $(".zoom-link, .show-zone").show() 
+		    }
+		});
 	</script>
 {% endblock %}
\ No newline at end of file
--- a/src/iconolab/templates/iconolab/detail_annotation.html	Wed Jul 27 10:54:58 2016 +0200
+++ b/src/iconolab/templates/iconolab/detail_annotation.html	Wed Jul 27 10:55:21 2016 +0200
@@ -57,14 +57,14 @@
             {% endthumbnail %}
           </div>
           <div class="col-md-10 zoomTarget-wrapper">
-            {% thumbnail annotation.image.media "835x835" crop=False as im %}
+            {% with image.media as im %}
               <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>
                 </g>
               </svg>
-            {% endthumbnail %}
+            {% endwith %}
             </div>
           </div>
iconolab