diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 36fb873b..ae3b3772 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -468,6 +468,7 @@ //user message box MESSAGES_BOX: 'Messages Box', + MESSAGES_IS_EMPTY: 'Messages Box is empty!', //chat view CHAT_USERS_LIST: 'Users List', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index ce469610..8ea04390 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -468,6 +468,7 @@ //user message box MESSAGES_BOX: '站内消息', + MESSAGES_IS_EMPTY: '消息盒子为空!', //chat view CHAT_USERS_LIST: '用户列表', diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index b24f88b8..8865ec84 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -46,8 +46,6 @@ * getInvitationsCount */ vm.getInvitationsCount = function () { - console.log(Authentication.user); - if (Authentication.user) { InvitationsService.countInvitations({}, function (res) { if (res.countMyInvitations > 0) { diff --git a/modules/messages/client/less/message.less b/modules/messages/client/less/message.less index 97c8da04..38a5d70a 100644 --- a/modules/messages/client/less/message.less +++ b/modules/messages/client/less/message.less @@ -1,2 +1,10 @@ @import (reference) "../../../core/client/less/mt-var.less"; +.messages-list { + .pagination-div-bottom { + border-top: 2px solid lighten(@gray-base, 85%) + } + .pagination-div-top { + border-bottom: 2px solid lighten(@gray-base, 85%) + } +} \ No newline at end of file diff --git a/modules/messages/client/views/box.client.view.html b/modules/messages/client/views/box.client.view.html index a49f934b..4af6c618 100644 --- a/modules/messages/client/views/box.client.view.html +++ b/modules/messages/client/views/box.client.view.html @@ -1,8 +1,61 @@
-
-
-