From d87fb78b3adad9d076e3abcba08e6f870f2e8961 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Mon, 21 May 2018 10:45:06 +0900
Subject: [PATCH] Update template

show shortcut key
---
 doccano/app/db.sqlite3                       | Bin 163840 -> 163840 bytes
 doccano/app/server/models.py                 |   4 +-
 doccano/app/server/templates/annotation.html |  47 +++++++++++--------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/doccano/app/db.sqlite3 b/doccano/app/db.sqlite3
index 0070c20c8b539a0bd0280091d97c0c7bc884a1c0..551b54951ea40b8a3da3668e4a445855785b9a90 100644
GIT binary patch
delta 1280
zcma)+PiWg#9LM#u<j9VRe>SXhT05K5#E$<o@_UkONjY>0Ep*VdDgDC^LnMl$&Mr<2
ziq^5Qu4!Q8xDAJCx0S8*&`a9|YBmamKrds5_RyxMk{k-Vr1a3sV62nm%_QvL3Eqbv
zPx^kJ-k0BdD=YmgEB#+5<F^=w$+_cQcYr(2eRD*DTX*MfARCWtw)og^AhNkZW8Xz4
z)Oe6NC`~P!)@9Qogh;auW8Q4cF4vltUH#Y=3022Qd0eDvLMJ3;f=B`-GF6q0Ka&ZL
z*YFIk<NC%hVKH@RfYsnYlr2HW?;o$(W@91L(n`l6-uj}HaQSVi4#ib+kH8`FHh;D6
zW#2o2&A^xNl35F`al5R;IxQOepuIK+uLB%+l1VvNt1y_mMyL2hCIhP(+n8^ddso?8
zk2;ezxODDF`tZNoIGnz0Sk;<g<tWLgPtTlBpT00XoevE%KO{;exVHEozgh3E_nP_>
z&U-aT2K}-{LS^Tx8l>903s7V^H|JJ6RfFFZwitcm@YjK09!GEp6Bx$`2BUA<mFw_x
zlmuCTP|;_>XWnPd=a|o|&y3Ger*s>huth95{2e$E!&CS^9>b%kp^POgYz(J=i{>~s
z3`GwG4|xy%+?ZEoJ!CwLw$DC*pJHs09dY<au3PYaQ0M;QzUL;{9d?x+aogfyAgLF_
z435Kx5S~(}y@p6P=P#L6JDpP<x&^6Y-C*@ASM<>SE|H~)vM5v(jf$dP=o%^ejTGNV
z>tQ6Tf+i6~l=XbqsNx$ri%%ijQ!WdVB9|3W&voVHj{H|wPI{~^X+lNTD3$cFj@)_m
z9Nu!oElBoCKoSKii)BLfY<Fd8e*)6~N<dTv_Y5kkqG!5BVrL6GTfGwyWq~Rptq^^*
zE2ka#(Pxm&^+<p!LPb=GDz%eO;YFBtyWD%){5JeCGdSRuAzWv07q{^-KEz+}HvZ^d
z2l2Vju`v+hm?509?D|EcYTNxh$0YDnbIJVF3iol$0X%NlrWp=;<@x%e`AI+LeKBL#
xOzYx+d!mMLx>+^sdUI(Z65yDFc*eArn@h`a;Ft`~SRWZn_0RnG#?8sV<lkaaMvVXf

delta 440
zcmX|7J4gdT5WTtIY9#KaNhFDykD#J(7cKNEQwTv2jA`slPP1SjBoKq8Mp4olPTcm2
zVC(0=vlHwU3$?ZpL`W(dA)w1a9C*x|Vcsxr8Vz5g;X924Y(WsFI3_rNBiovt2m89v
z#u6FoS%}1)c<g1!=|w^^I>QFe;;a+bB^(X=B?ES8ZI9OSW~EZCoApw)lFwJmMcFd6
zWgynR7J^~xTq{BHNWaw~tOo~1(1F@j$HWKm1iC^~Y04d;X{E@9+bqDhDDyLF>|h&4
z*eZn}8>bLZyroR1urlh=L~JTiHn(UwUn(Z1x#BmpZouIZYf)HKy%Ee(6k_a)!esPc
zQ#9*lU$Pl83^-nAtpWu7-bCMv+bP0~Bp;GF<VJVkb3saCjUgL!H)F%yu$3lhrd`4-
z@8=l0f((C%jNRNl+z=_LMi_eLy%c#=+{hbz3?e^&>;P`N=pBC62rv4P<ODl`!V^v)
aS>Z-NQjp{kQB*}v20>QA%i={^O#cCuoN+h+

diff --git a/doccano/app/server/models.py b/doccano/app/server/models.py
index 0a7600ac..3ba9899d 100644
--- a/doccano/app/server/models.py
+++ b/doccano/app/server/models.py
@@ -3,10 +3,12 @@ from django.db import models
 
 class Label(models.Model):
     text = models.CharField(max_length=100)
+    shortcut = models.CharField(max_length=10)
 
     def as_dict(self):
         return {'id': self.id,
-                'text': self.text}
+                'text': self.text,
+                'shortcut': self.shortcut}
 
 
 class RawData(models.Model):
diff --git a/doccano/app/server/templates/annotation.html b/doccano/app/server/templates/annotation.html
index a9748f2f..a60e18ac 100644
--- a/doccano/app/server/templates/annotation.html
+++ b/doccano/app/server/templates/annotation.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Forum - Free Bulma template</title>
+    <title>doccano - Document Annotation Tool</title>
 
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp"
         crossorigin="anonymous">
@@ -91,23 +91,23 @@
                             </article>
                         </div>
                         <div class="is-clearfix	">
-                                <div class="buttons has-addons is-left is-pulled-left">
-                                    <a class="button is-small" v-on:click="prevPage">
-                                        <span class="icon">
-                                            <i class="fas fa-chevron-circle-left"></i>
-                                        </span>
-                                        <span>Prev</span>
-                                    </a>
-                                </div>
-                                <div class="buttons has-addons is-right">
-                                    <a class="button is-small" v-on:click="nextPage">
-                                        <span>Next</span>
-                                        <span class="icon">
-                                            <i class="fas fa-chevron-circle-right"></i>
-                                        </span>
-                                    </a>
-                                </div>
+                            <div class="buttons has-addons is-left is-pulled-left">
+                                <a class="button is-small" v-on:click="prevPage">
+                                    <span class="icon">
+                                        <i class="fas fa-chevron-circle-left"></i>
+                                    </span>
+                                    <span>Prev</span>
+                                </a>
                             </div>
+                            <div class="buttons has-addons is-right">
+                                <a class="button is-small" v-on:click="nextPage">
+                                    <span>Next</span>
+                                    <span class="icon">
+                                        <i class="fas fa-chevron-circle-right"></i>
+                                    </span>
+                                </a>
+                            </div>
+                        </div>
                     </tab>
 
                     <tab name="Guideline">
@@ -143,7 +143,9 @@
                                     Active Learning
                                 </p>
                                 <p>
-                                    <a class="button is-primary is-small" v-on:click="activeLearn"><b>Do It!</b></a>
+                                    <a class="button is-primary is-small" v-on:click="activeLearn">
+                                        <b>Do It!</b>
+                                    </a>
                                 </p>
                             </aside>
 
@@ -162,8 +164,13 @@
                                 <p class="menu-label" style="padding-left:0;">
                                     Tags
                                 </p>
-                                <div class="tags">
-                                    <a class="tag is-grey" v-for="label in labels" v-on:click="addLabel(label.text)">[[label.text]]</a>
+                                <div class="field is-grouped is-grouped-multiline">
+                                    <div class="control" v-for="label in labels">
+                                        <div class="tags has-addons">
+                                            <a class="tag is-grey" v-on:click="addLabel(label.text)">[[label.text]]</a>
+                                            <span class="tag is-primary">[[label.shortcut]]</span>
+                                        </div>
+                                    </div>
                                 </div>
                             </aside>
                         </div>