Add link to connect when user is not authenticated.
authorAlexandre Segura <mex.zktk@gmail.com>
Fri, 17 Mar 2017 14:01:36 +0100
changeset 444 d57f95ee9115
parent 443 fb9bf3f479f1
child 445 2bed73d26854
Add link to connect when user is not authenticated.
src/iconolab/templates/iconolab/detail_image.html
src_js/iconolab-bundle/src/components/editor/Canvas.vue
--- a/src/iconolab/templates/iconolab/detail_image.html	Fri Mar 17 12:37:01 2017 +0100
+++ b/src/iconolab/templates/iconolab/detail_image.html	Fri Mar 17 14:01:36 2017 +0100
@@ -27,6 +27,7 @@
       ref="annotator"
       image="{% with image.media as img %}{{ img.url }}{% endwith %}"
       thumbnail="{% thumbnail image.media '100x100' crop=False as thumb %}{{ thumb.url }}{% endthumbnail %}"
+      login-url="{% url 'account:login' %}?next={{ request.path | urlencode }}"
       v-bind:is-authenticated="isAuthenticated"
       v-bind:annotations="annotations"
       v-on:click:annotation="onAnnotationClick($event)"
--- a/src_js/iconolab-bundle/src/components/editor/Canvas.vue	Fri Mar 17 12:37:01 2017 +0100
+++ b/src_js/iconolab-bundle/src/components/editor/Canvas.vue	Fri Mar 17 14:01:36 2017 +0100
@@ -60,22 +60,28 @@
         <div class="controls" v-show="loaded">
             <div class="controls-left">
                 <button @click="toggleReadonly" type="button" class="btn"
-                    v-bind:class="{ 'active': readonly, 'disabled': !isAuthenticated }">
+                    v-bind:class="{ 'active': readonly }"
+                    v-show="isAuthenticated">
                     <i class="fa fa-eye"></i>
                 </button>
                 <button @click="toggleReadonly" type="button" class="btn"
-                    v-bind:class="{ 'disabled': !isAuthenticated }">
+                    v-show="isAuthenticated">
                     <i v-show="readonly" class="fa fa-toggle-on" style="transform: rotate(180deg)"></i>
                     <i v-show="!readonly" class="fa fa-toggle-on"></i>
                 </button>
                 <button @click="setMode('rect')" type="button" class="btn"
-                    v-bind:class="{ 'active': !readonly &amp;&amp; mode === 'rect', 'disabled': readonly }">
+                    v-bind:class="{ 'active': !readonly &amp;&amp; mode === 'rect', 'disabled': readonly }"
+                    v-show="isAuthenticated">
                     <svg width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve"><g><rect x="352" y="432" width="64" height="48"/><polygon points="416,352 416,96 176,96 176,160 352,160 352,352 160,352 160,32 96,32 96,96 32,96 32,160 96,160 96,416 480,416 480,352"/></g><text x="0" y="527" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">Created by Bluetip Design</text><text x="0" y="532" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">from the Noun Project</text></svg>
                 </button>
                 <button @click="setMode('free')" type="button" class="btn"
-                    v-bind:class="{ 'active': !readonly &amp;&amp; mode === 'free', 'disabled': readonly }">
+                    v-bind:class="{ 'active': !readonly &amp;&amp; mode === 'free', 'disabled': readonly }"
+                    v-show="isAuthenticated">
                     <svg width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 30 30" xml:space="preserve"><g transform="translate(-450 -380)"><g xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M453,395c0,2.209,1.79,4,4,4c1.307,0,2.455-0.635,3.186-1.604l7.121,4.069C467.11,401.938,467,402.456,467,403    c0,2.209,1.79,4,4,4c2.209,0,4-1.791,4-4s-1.791-4-4-4c-1.307,0-2.455,0.635-3.186,1.604l-7.121-4.069    c0.196-0.473,0.307-0.99,0.307-1.534s-0.11-1.062-0.307-1.534l7.121-4.069c0.73,0.969,1.879,1.604,3.186,1.604    c2.209,0,4-1.791,4-4s-1.791-4-4-4c-2.21,0-4,1.791-4,4c0,0.544,0.11,1.062,0.307,1.534l-7.121,4.069    c-0.73-0.969-1.879-1.604-3.186-1.604C454.79,391,453,392.791,453,395z M471,400c1.654,0,3,1.346,3,3s-1.346,3-3,3s-3-1.346-3-3    S469.346,400,471,400z M471,384c1.654,0,3,1.346,3,3s-1.346,3-3,3s-3-1.346-3-3S469.346,384,471,384z M460,395    c0,1.654-1.346,3-3,3s-3-1.346-3-3s1.346-3,3-3S460,393.346,460,395z"/></g></g><text x="0" y="45" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">Created by Hea Poh Lin</text><text x="0" y="50" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">from the Noun Project</text></svg>
                 </button>
+                <a class="btn" v-bind:href="loginUrl" v-show="!isAuthenticated">
+                    <i class="fa fa-sign-in"></i> <small>Connexion</small>
+                </a>
             </div>
             <zoom-thumbnail
                 class="controls-center"
@@ -130,7 +136,8 @@
             annotations: {
                 type: Array,
                 default: []
-            }
+            },
+            loginUrl: String
         },
         components: {
             shapeRect: ShapeRect,