From 80c14ba2f19df70af8ee4f46d8fdb7f48b39a427 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Wed, 13 Jun 2018 11:16:39 +0900
Subject: [PATCH] Update annotation_template

---
 doccano/app/db.sqlite3                        | Bin 208896 -> 208896 bytes
 doccano/app/server/static/annotation.1.js     |  13 +++++++++----
 doccano/app/server/static/inbox.css           |   2 +-
 .../app/server/templates/annotation.1.html    |   2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/doccano/app/db.sqlite3 b/doccano/app/db.sqlite3
index de8da9057a3a2de94e406a349bda04206af744de..b72fc474145f90a2431b70d407763005befde633 100644
GIT binary patch
delta 835
zcmah{T}u>E7(O2}yEC=xyOQ8e#kxX?5xdUJ&Q80E=GKL+AOzw<cWb($ZtRB%nh=>R
zL^pjPG#6bI5p)ssH5Y?I2>Ap0xQR$gj4qNOZ#D#rI&;hlT8MXecsS>M-gD-8&g`mh
zcGY)nAFf{Ce_X7h$oGlI!;4X@%r~{gamF5Kn=aMsVO4L}lI?LLY9@6xX4>y=wRAUN
z*g~)cRaT$iHLsU;eRct?jiW?7+$&OyX&NEqqbC@8Xb)fMcadZ`9}uXFyLQ<)`=jYj
zDZsubB_VK6=*HPP1@Z_Mz=kO(L*DV-#;0KZ<a?pctGHTkkYl5D{vp0Z6{uL=M>yhv
zD{vVq>>9lQ?r_D0pbL%8{1Pq)s3Nym-WRM@zANYC7F!E^mVBLxjOvrvkL8qMU0lHp
z7mWBJ>eW>(5mC*E#x2m*c1?@MjATNMbq4<k%v7OJoE)4SD;C1V)8o0J$#AP-){?7<
zsG;gfJ>J>)TW)GK<Yq{#sb>ioM^r8De0YPKZ|p?y6*gd<h2YjJ_V0__sACe3KyV}2
z%_9(dMAtNdM?f>KE87Y9Sqp|u1e@>$KEhjg%FAZ6ZbDk>^&lj(FeNGdiwR7yhp$n_
zWX5E++rP6bWwsfi-T}^J>gn<z=i5~x1tj9Hpt@)NirpNZ_P5S;5V5Z!rp^>gGvi}J
ziR9pDe&$@EJTV%}O%+GZ8s?ZeJv>ry)*lcNE9T#ik(n8r>%d%ZtuB$U+q4%;1RMk_
u;IRAOhl2-bAO7ETVy!HZRwi6Vum;Oa=s;75rtr=a(EmA@IBU;IDEkvZh{&-3

delta 319
zcmZp8z|-)6XM!~2%!xA2tTP$(Bu;Eh*`>!QHd$WZlu>hYsD4F(prL|+k(Hr|m8p@Q
znWcfHh0*4F^VJ-<7z7v?_<!?%<o~!?FyR?LFTVx@0|S>jkYLs1+RT{nUw%=601#~|
zU=di(;=q`|A;w?Jz`v7!^LC*HjFJ2k7f4JFxX&`ZaXn)*vl##6>FgUAb%933^KYNL
zpRrJYS&Z}XboL8CF++j%oZBDYWK^66v-Caxd!WiE{4#<pAX~YaA=dH&*<fe=;D5&d
z45;EZzpxYoCnqBdP+SniU<NWcw*Tp8;t*hC<U7Q`cWASs!VW%;CTm7k-xgNK=@0fZ
tDQthWj!BA<jgkKj1OFYMDVO-C-`UTk0Tg(|!2bv+aD#vQqw`F12>=#BTSNc=

diff --git a/doccano/app/server/static/annotation.1.js b/doccano/app/server/static/annotation.1.js
index f7c22efc..e28a1934 100644
--- a/doccano/app/server/static/annotation.1.js
+++ b/doccano/app/server/static/annotation.1.js
@@ -73,10 +73,13 @@ var vm = new Vue({
         nextPage: function () {
             this.cur = Math.min(this.cur + 1, this.items.length - 1);
             this.remaining -= 1;
+            console.log('nextPage');
+            this.showMessage(this.cur);
         },
         prevPage: function () {
             this.cur = Math.max(this.cur - 1, 0);
             this.remaining += 1;
+            this.showMessage(this.cur);
         },
         activeLearn: function () {
             alert('Active Learning!');
@@ -93,15 +96,17 @@ var vm = new Vue({
                     console.log('ERROR!! happend by Backend.')
                 });
         },
-        showMessage: function (msg, index) {
+        showMessage: function (index) {
             this.cur = index;
             console.log(this.cur);
+            console.log(this.items[index]);
             $('#message-pane').removeClass('is-hidden');
             $('.card').removeClass('active');
             $('#msg-card-' + index).addClass('active');
-            $('.message .address .name').text(msg.from);
-            $('.message .address .email').text(msg.email);
-            var msg_body = '<p>' + msg.text + '</p>';
+            //$('.message .address .name').text(msg.from);
+            //$('.message .address .email').text(msg.email);
+            var text = this.items[index].text;
+            var msg_body = '<p>' + text + '</p>';
             $('.message .content').html(msg_body);
         }
     },
diff --git a/doccano/app/server/static/inbox.css b/doccano/app/server/static/inbox.css
index 76523607..4b00a2df 100644
--- a/doccano/app/server/static/inbox.css
+++ b/doccano/app/server/static/inbox.css
@@ -176,7 +176,7 @@ html,body {
     float:right;
   }
   .inbox-messages .msg-snippet {
-    padding: 5px 20px 0px 5px;
+    padding: 5px 20px 0px 0px;
   }
   .inbox-messages .msg-subject .fa {
     font-size: 14px;
diff --git a/doccano/app/server/templates/annotation.1.html b/doccano/app/server/templates/annotation.1.html
index 445d7b9e..07da2775 100644
--- a/doccano/app/server/templates/annotation.1.html
+++ b/doccano/app/server/templates/annotation.1.html
@@ -59,7 +59,7 @@
         </div>
 
         <div class="inbox-messages" id="inbox-messages">
-            <div v-for="(msg, index) in items" class="card" v-bind:id="'msg-card-'+index" v-on:click="showMessage(msg,index)" v-bind:data-preview-id="index">
+            <div v-for="(msg, index) in items" class="card" v-bind:id="'msg-card-'+index" v-on:click="showMessage(index)" v-bind:data-preview-id="index">
                 <div class="card-content">
                     <div class="msg-header">
                         <span class="msg-from">