# HG changeset patch
# User Alexandre Segura <mex.zktk@gmail.com>
# Date 1490092560 -3600
# Node ID aff03a86c471ea79ca9404db33f94dd8c488ad58
# Parent  94334e3761ef1882bec19cd245c3efec0cc08e56
Remove inline styles.

diff -r 94334e3761ef -r aff03a86c471 src/iconolab/templates/iconolab/detail_annotation_readonly.html
--- a/src/iconolab/templates/iconolab/detail_annotation_readonly.html	Tue Mar 21 11:29:54 2017 +0100
+++ b/src/iconolab/templates/iconolab/detail_annotation_readonly.html	Tue Mar 21 11:36:00 2017 +0100
@@ -6,8 +6,8 @@
 {% load iconolab_tags %}
 
 {% block content %}
-  <div id="annotation-wrapper" class="row" style="border: 1px solid gray;padding-top: 10px;">
-    
+  <div id="annotation-wrapper" class="row">
+
     <div id="detail-annotation" class="col-md-12">
       <div v-show="!showZoom" class="col-md-6">
         <div class="small-image-wrapper" style="position: relative">
@@ -21,17 +21,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 != "[]" %}
@@ -40,7 +40,7 @@
               <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">
@@ -52,7 +52,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>
@@ -70,13 +70,13 @@
   <script>
     new Vue({
       el: "#detail-annotation",
-      
+
       data: {
         showZoom: false
       },
 
       methods: {
-        
+
         toggleZoomView: function () {
           if (this.showZoom) {
             this.showZoom = false;
@@ -96,4 +96,4 @@
       }
     });
   </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff -r 94334e3761ef -r aff03a86c471 src/iconolab/templates/iconolab/detail_revision.html
--- a/src/iconolab/templates/iconolab/detail_revision.html	Tue Mar 21 11:29:54 2017 +0100
+++ b/src/iconolab/templates/iconolab/detail_revision.html	Tue Mar 21 11:36:00 2017 +0100
@@ -8,7 +8,7 @@
 {% load iconolab_tags %}
 
 {% block content %}
-	<div id="annotation-wrapper" class="row" style="border: 1px solid gray">
+	<div id="annotation-wrapper" class="row">
 		{% if not user.is_authenticated and revision.state != 1 %}
             <p>Connectez vous pour voir cette proposition de révision.</p>
         {% else %}
@@ -67,7 +67,7 @@
                     <button id="merge-revision" type="button" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> Etudier cette révision</button>
                     <button id="reject-revision" type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span> Rejeter cette révision</button>
                   </div><br><br>
-                  
+
                   {% if revision.parent_revision == annotation.current_revision %}
                     <div id="accept-info" class="alert alert-warning alert-merge"> Si vous acceptez cette proposition, elle deviendra automatiquement la version courante de l'annotation.<br><br>
                        <a class="btn btn-default" href="{% url 'annotation_merge' collection_name image_guid annotation_guid revision_guid %}?auto_accept=True"> Valider </a>
@@ -80,7 +80,7 @@
                      <a class="btn btn-default" href="{% url 'annotation_merge' collection_name image_guid annotation_guid revision_guid %}"> Valider </a>
                   </div>
                 {% endif %}
-               
+
           </div>
 		</div>
         {% endif %}
@@ -90,7 +90,7 @@
   <script>
     new Vue({
       el: "#revision-detail",
-      components: {'Typeahead': iconolab.VueComponents.Typeahead }, 
+      components: {'Typeahead': iconolab.VueComponents.Typeahead },
       methods: { yo: function(){alert(1);} }
     });
     $(".alert-merge").hide();
diff -r 94334e3761ef -r aff03a86c471 src/iconolab/templates/iconolab/merge_revision.html
--- a/src/iconolab/templates/iconolab/merge_revision.html	Tue Mar 21 11:29:54 2017 +0100
+++ b/src/iconolab/templates/iconolab/merge_revision.html	Tue Mar 21 11:36:00 2017 +0100
@@ -1,12 +1,12 @@
-{% extends 'iconolab_base.html' %} 
-{% load staticfiles %} 
+{% extends 'iconolab_base.html' %}
+{% load staticfiles %}
 {% load thumbnail %}
-{% load iconolab_tags %} 
+{% load iconolab_tags %}
 {% block content %}
 
 
 
-<div id="merge-tool" class="row" style="border: 2px solid gray">
+<div id="merge-tool" class="row">
   <mergetool inline-template>
     <div class="wrapper">
 
@@ -19,12 +19,12 @@
         </div>
 
         <form class="form">
-          
+
           <fieldset class="form-group">
             <label class="control-label">Titre :</label>
             &nbsp;
             <a @click="showDiffviewer('cur_title_diff','merge-current-revision-title', 'title')" class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
-            <a @click="pickProposition($event, 'merge-current-revision-title', 'title')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>   
+            <a @click="pickProposition($event, 'merge-current-revision-title', 'title')" 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"/>
@@ -38,7 +38,7 @@
             <a  @click="pickProposition($event, 'merge-current-revision-description', 'desc')" 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>
-            <diffviewer ref="cur_desc_diff"></diffviewer>  
+            <diffviewer ref="cur_desc_diff"></diffviewer>
           </fieldset>
 
           <fieldset class="form-group">
@@ -55,11 +55,11 @@
              <a @click="showDiffviewer('cur_frag_diff','merge-current-revision-fragment','frag')" class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
 
             <a @click="pickProposition($event, 'merge-current-revision-fragment', 'frag')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>
-           
+
           <br>
           <fieldset>
             {% thumbnail image.media "100x100" crop=False as im %}
-              <svg width="{{ im.width }}" height="{{ im.height }}"> 
+              <svg width="{{ im.width }}" height="{{ im.height }}">
                 <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 data-path-type="{{ current_revision.fragment|path_type }}" id="merge-current-revision-fragment" d="{{ current_revision.fragment|clean_path }}" opacity="0.7" fill="orange"></path>
@@ -122,12 +122,12 @@
             <label class="control-label" for="id_{{ form.tags.name }}">{{ merge_form.tags.label }}: </label>
             <typeahead ref="proposal-tags" id="proposal-tags" read-only="1" :tags="{{ proposal_tags_data  }}"></typeahead>
           </fieldset>
-          
+
           <label class="control-label" for="id_{{ form.tags.name }}">Image: </label><br>
 
           <div>
             {% thumbnail image.media "100x100" crop=False as im %}
-              <svg width="{{ im.width }}" height="{{ im.height }}"> 
+              <svg width="{{ im.width }}" height="{{ im.height }}">
                 <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 data-path-type="{{ proposal_revision.fragment|path_type }}" ref="proposal-fragment" d="{{ proposal_revision.fragment|clean_path }}" opacity="0.7" fill="orange"></path>
@@ -170,7 +170,7 @@
         </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.
-          
+
           {% if parent_revision.revision_guid == current_revision.revision_guid %}<br><b>Note:  Dans ce cas précis, cette révision est identique à la révision courante. </b>{% endif %}
         </div>
         <form class="form">
@@ -212,7 +212,7 @@
               <a @click="showDiffviewer('parent_frag_diff','merge-parent-revision-fragment','frag')" class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
             <br>
               {% thumbnail image.media "100x100" crop=False as im %}
-                <svg width="{{ im.width }}" height="{{ im.height }}"> 
+                <svg width="{{ im.width }}" height="{{ im.height }}">
                   <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 data-path-type="{{ parent_revision.fragment|path_type }}" id="merge-parent-revision-fragment" d="{{ parent_revision.fragment|clean_path }}" opacity="0.7" fill="orange"></path>
@@ -235,9 +235,9 @@
     </div>
   </mergetool>
 </div>
-{% endblock %} 
+{% endblock %}
 
-{% block footer_js %} 
+{% block footer_js %}
 <script>
   new Vue({