diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 75b61889..f18a2a15 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -1012,9 +1012,11 @@ MESSAGES_BOX: 'Messages Box', MESSAGES_SEND: 'Send Messages', ADMIN_MESSAGES_SEND: 'Send System Messages', + ADMIN_MESSAGES_ALREADY_SEND: 'Sended System Messages', MESSAGES_SEND_BUTTON: 'Send', MESSAGES_IS_LOADING: 'Loading messages, please wait ...', MESSAGES_IS_EMPTY: 'Messages Box is empty!', + OFFICIAL_MESSAGES_TOOLTIP: '

Tip:

In order to maintain a clean list of official messages, please delete messages that have expired over time as they cannot be unilaterally cleared in the users message center.', MESSAGES_FIELD: { TO: 'Send to:', TYPE: 'Message type:', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index d5c7a9d2..88303d1b 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -1012,9 +1012,11 @@ MESSAGES_BOX: '站内消息', MESSAGES_SEND: '发送消息', ADMIN_MESSAGES_SEND: '发送系统消息', + ADMIN_MESSAGES_ALREADY_SEND: '已经发送的系统消息', MESSAGES_SEND_BUTTON: '发送', MESSAGES_IS_LOADING: '正在装载, 请稍候 ...', MESSAGES_IS_EMPTY: '消息列表为空!', + OFFICIAL_MESSAGES_TOOLTIP: '

提示:

为了维护一个干净的官方消息列表,请及时将长时间过期的消息删除,因为这些消息在用户的消息中心里不能被单方面清理。', MESSAGES_FIELD: { TO: '发送至:', TYPE: '消息类型:', diff --git a/modules/messages/client/less/message.less b/modules/messages/client/less/message.less index e1df27e8..99c44604 100644 --- a/modules/messages/client/less/message.less +++ b/modules/messages/client/less/message.less @@ -85,7 +85,6 @@ font-size: 18px; margin: 5px 0; width: max-content; - border-bottom: double #aaa; } .message-info { font-size: 12px; @@ -117,6 +116,10 @@ .message-content { word-break: normal; } + .message-content-admin { + color: #6A6A6A; + word-break: normal; + } } .popup-side-overlay { diff --git a/modules/messages/client/views/admin-send.client.view.html b/modules/messages/client/views/admin-send.client.view.html index 82c5487a..f05222b9 100644 --- a/modules/messages/client/views/admin-send.client.view.html +++ b/modules/messages/client/views/admin-send.client.view.html @@ -1,13 +1,14 @@
-
- +
-

{{'ADMIN_MESSAGES_SEND' | translate}}

+

{{'ADMIN_MESSAGES_SEND' | translate}}

  • +
    -
    +
    +
    @@ -24,7 +25,8 @@
    {{ 'MESSAGES_FIELD.TITLE' | translate}}
    -
    @@ -36,8 +38,10 @@
    {{ 'MESSAGES_FIELD.CONTENT' | translate}}
    - +

    {{ 'MESSAGES_FIELD.CT_REQUIRED' | translate}}

    @@ -70,40 +74,51 @@
    -
    +
    +
    +

    {{'ADMIN_MESSAGES_ALREADY_SEND' | translate}}

    +
  • +
    +
    +
    + +
    +
    - +
    - + - - - - -
    {{ 'MESSAGES_FIELD.LIST_TITLE_CONTENT' | translate}} {{ 'MESSAGES_FIELD.LIST_READERS' | translate}} {{ 'MESSAGES_FIELD.LIST_TYPE' | translate}}{{ 'MESSAGES_FIELD.LIST_SENDAT' | translate}} {{ 'MESSAGES_FIELD.LIST_SELECT' | translate}}
    -
    +
    +

    -

    +

    {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{m.createdat | date: 'yyyy-MM-dd HH:mm:ss' }}

    + {{m._readers.length}} + {{'MESSAGE_TYPE_' + m.type.toUpperCase() | translate}} - {{m.createdat | life}} - + + + +