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.
Change annotation URLs in admin area.
authorAlexandre Segura <mex.zktk@gmail.com>
Fri, 24 Feb 2017 18:04:02 +0100
changeset 393 0aa3af4ab0e6
parent 392 e07a9c8901c2
child 394 776628e44a83
Change annotation URLs in admin area.
src/iconolab/templates/partials/user_pages/annotations_commented_panel.html file | annotate | diff | comparison | revisions
src/iconolab/templates/partials/user_pages/annotations_contributed_panel.html file | annotate | diff | comparison | revisions
src/iconolab/templates/partials/user_pages/annotations_created_panel.html file | annotate | diff | comparison | revisions 
--- a/src/iconolab/templates/partials/user_pages/annotations_commented_panel.html	Fri Feb 24 17:50:56 2017 +0100
+++ b/src/iconolab/templates/partials/user_pages/annotations_commented_panel.html	Fri Feb 24 18:04:02 2017 +0100
@@ -5,16 +5,16 @@
   <div class="panel panel-default annotation-panel">
     <div class="panel-heading">
       {% if annotation.current_revision.title %}
-        {{annotation.current_revision.title}} 
+        {{annotation.current_revision.title}}
       {% else %}
         <i>Annotation sans titre</i>
       {% endif %}
     </div>
-    <div class="panel-content">
+    <div class="panel-body">
       <div style="position:relative" class="{% if large_image %}large-{% endif %}image-detail">
       {% if large_image %}
         {% thumbnail annotation.image.media "400x400" crop=False as im %}
-          <a href="{% url 'annotation_detail' annotation.image.item.collection.name annotation.image.image_guid annotation.annotation_guid %}">
+          <a href="{% url 'image_detail' annotation.image.item.collection.name annotation.image.image_guid %}#{{ annotation.annotation_guid }}">
             <img v-el:small-image src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
             <svg width="{{ im.width }}" height="{{ im.height }}" version="1.1" style="position:absolute; top:0px; left: 0px">
               <g transform="matrix({% transform_matrix im_width=im.width im_height=im.height max_x=100 max_y=100 %})">
@@ -25,7 +25,7 @@
         {% endthumbnail %}
       {% else %}
         {% thumbnail annotation.image.media "150x150" crop=False as im %}
-        <a href="{% url 'annotation_detail' annotation.image.item.collection.name annotation.image.image_guid annotation.annotation_guid %}">
+        <a href="{% url 'image_detail' annotation.image.item.collection.name annotation.image.image_guid %}#{{ annotation.annotation_guid }}">
             <img v-el:small-image src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
             <svg width="{{ im.width }}" height="{{ im.height }}" version="1.1" style="position:absolute; top:0px; left: 0px">
               <g transform="matrix({% transform_matrix im_width=im.width im_height=im.height max_x=100 max_y=100 %})">
@@ -45,7 +45,7 @@
           <dt>A commenté le : </dt>
           <dd>{{annotation_data.latest_comment_date}}</dd>
         </dl>
-        <a class="btn btn-default btn-sm userpage-annotation-btn pull-left" href="{% url 'annotation_detail' annotation.image.item.collection.name annotation.image.image_guid annotation.annotation_guid %}">Voir annotation</a>
+        <a class="btn btn-default btn-sm userpage-annotation-btn pull-left" href="{% url 'image_detail' annotation.image.item.collection.name annotation.image.image_guid %}#{{ annotation.annotation_guid }}">Voir annotation</a>
       </div>
       {% if with_stats %}
       <div class="stats-annotation-userpage">
@@ -55,4 +55,4 @@
     </div>
   </div>
 </li>
-{% endwith %}
\ No newline at end of file
+{% endwith %}
--- a/src/iconolab/templates/partials/user_pages/annotations_contributed_panel.html	Fri Feb 24 17:50:56 2017 +0100
+++ b/src/iconolab/templates/partials/user_pages/annotations_contributed_panel.html	Fri Feb 24 18:04:02 2017 +0100
@@ -5,16 +5,16 @@
   <div class="panel panel-default annotation-panel">
     <div class="panel-heading">
       {% if annotation.current_revision.title %}
-        {{annotation.current_revision.title}} 
+        {{annotation.current_revision.title}}
       {% else %}
         <i>Annotation sans titre</i>
       {% endif %}
     </div>
-    <div class="panel-content">
+    <div class="panel-body">
       <div style="position:relative" class="{% if large_image %}large-{% endif %}image-detail">
         {% if large_image %}
           {% thumbnail annotation.image.media "400x400" crop=False as im %}
-            <a href="{% url 'annotation_detail' annotation.image.item.collection.name annotation.image.image_guid annotation.annotation_guid %}">
+            <a href="{% url 'image_detail' annotation.image.item.collection.name annotation.image.image_guid %}#{{ annotation.annotation_guid }}">
               <img v-el:small-image src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
               <svg width="{{ im.width }}" height="{{ im.height }}" version="1.1" style="position:absolute; top:0px; left: 0px">
                 <g transform="matrix({% transform_matrix im_width=im.width im_height=im.height max_x=100 max_y=100 %})">
@@ -25,7 +25,7 @@
           {% endthumbnail %}
         {% else %}
           {% thumbnail annotation.image.media "150x150" crop=False as im %}
-            <a href="{% url 'annotation_detail' annotation.image.item.collection.name annotation.image.image_guid annotation.annotation_guid %}">
+            <a href="{% url 'image_detail' annotation.image.item.collection.name annotation.image.image_guid %}#{{ annotation.annotation_guid }}">
               <img v-el:small-image src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
               <svg width="{{ im.width }}" height="{{ im.height }}" version="1.1" style="position:absolute; top:0px; left: 0px">
                 <g transform="matrix({% transform_matrix im_width=im.width im_height=im.height max_x=100 max_y=100 %})">
@@ -47,7 +47,7 @@
           <dt>.. Révisions acceptées: </dt>
           <dd><span class="badge {% if annotation_data.accepted_count %}badge-success{% endif %}">{{annotation_data.accepted_count}}</span></dd>
         </dl>
-        <a class="btn btn-default btn-sm userpage-annotation-btn pull-left" href="{% url 'annotation_detail' annotation.image.item.collection.name annotation.image.image_guid annotation.annotation_guid %}">Voir annotation</a>
+        <a class="btn btn-default btn-sm userpage-annotation-btn pull-left" href="{% url 'image_detail' annotation.image.item.collection.name annotation.image.image_guid %}#{{ annotation.annotation_guid }}">Voir annotation</a>
       </div>
       {% if with_stats %}
       <div class="stats-annotation-userpage">
@@ -57,4 +57,4 @@
     </div>
   </div>
 </li>
-{% endwith %}
\ No newline at end of file
+{% endwith %}
--- a/src/iconolab/templates/partials/user_pages/annotations_created_panel.html	Fri Feb 24 17:50:56 2017 +0100
+++ b/src/iconolab/templates/partials/user_pages/annotations_created_panel.html	Fri Feb 24 18:04:02 2017 +0100
@@ -4,16 +4,16 @@
   <div class="panel panel-default annotation-panel">
     <div class="panel-heading">
       {% if annotation.current_revision.title %}
-        {{annotation.current_revision.title}} 
+        {{annotation.current_revision.title}}
       {% else %}
         <i>Annotation sans titre</i>
       {% endif %}
     </div>
-    <div class="panel-content">
+    <div class="panel-body">
       <div style="position:relative" class="{% if large_image %}large-{% endif %}image-detail">
         {% if large_image %}
           {% thumbnail annotation.image.media "400x400" crop=False as im %}
-            <a href="{% url 'annotation_detail' annotation.image.item.collection.name annotation.image.image_guid annotation.annotation_guid %}">
+            <a href="{% url 'image_detail' annotation.image.item.collection.name annotation.image.image_guid %}#{{ annotation.annotation_guid }}">
               <img v-el:small-image src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
               <svg width="{{ im.width }}" height="{{ im.height }}" version="1.1" style="position:absolute; top:0px; left: 0px">
                 <g transform="matrix({% transform_matrix im_width=im.width im_height=im.height max_x=100 max_y=100 %})">
@@ -24,7 +24,7 @@
           {% endthumbnail %}
         {% else %}
           {% thumbnail annotation.image.media "150x150" crop=False as im %}
-          <a href="{% url 'annotation_detail' annotation.image.item.collection.name annotation.image.image_guid annotation.annotation_guid %}">
+          <a href="{% url 'image_detail' annotation.image.item.collection.name annotation.image.image_guid %}#{{ annotation.annotation_guid }}">
               <img v-el:small-image src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
               <svg width="{{ im.width }}" height="{{ im.height }}" version="1.1" style="position:absolute; top:0px; left: 0px">
                 <g transform="matrix({% transform_matrix im_width=im.width im_height=im.height max_x=100 max_y=100 %})">
@@ -46,7 +46,7 @@
           <dd><span class="badge {% if annotation.stats.awaiting_revisions_count > 0 %}badge-warning{% endif %}">{{annotation.stats.awaiting_revisions_count}}</span></dd>
         </dl>
         </dl>
-        <a class="btn btn-default btn-sm userpage-annotation-btn pull-left" href="{% url 'annotation_detail' annotation.image.item.collection.name annotation.image.image_guid annotation.annotation_guid %}">Voir annotation</a>
+        <a class="btn btn-default btn-sm userpage-annotation-btn pull-left" href="{% url 'image_detail' annotation.image.item.collection.name annotation.image.image_guid %}#{{ annotation.annotation_guid }}">Voir annotation</a>
       </div>
       {% if with_stats %}
       <div class="stats-annotation-userpage">
@@ -55,4 +55,4 @@
       {% endif %}
     </div>
   </div>
-</li>
\ No newline at end of file
+</li>
iconolab