diff --git a/doccano/app/db.sqlite3 b/doccano/app/db.sqlite3 index de8da905..b72fc474 100644 Binary files a/doccano/app/db.sqlite3 and b/doccano/app/db.sqlite3 differ 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 = '

' + msg.text + '

'; + //$('.message .address .name').text(msg.from); + //$('.message .address .email').text(msg.email); + var text = this.items[index].text; + var msg_body = '

' + text + '

'; $('.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 @@
-
+