From f0b3da295cfdf6f7d1d74c51f955e6f1163d5390 Mon Sep 17 00:00:00 2001 From: Alice Harris Date: Tue, 25 Nov 2014 14:50:01 +1000 Subject: [PATCH] re-enable +1 button, add spaces before delete button, add "quick reply" to Tavern/guilds/party chat --- views/options/social/chat-message.jade | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade index 57b8488a72..27ecf66f70 100644 --- a/views/options/social/chat-message.jade +++ b/views/options/social/chat-message.jade @@ -12,16 +12,19 @@ mixin chatMessages(inbox) markdown(ng-model='::message.text') | - span.muted.time(from-now='::message.timestamp') - unless type='inbox' + unless inbox span a.label.label-default(ng-show='countExists(message.likes)', ng-class='{"label-success":message.likes[user._id]}', ng-click='likeChatMessage(group,message)') +{{countExists(message.likes)}} a.chat-plus-one.muted(ng-show='!countExists(message.likes)', ng-click='likeChatMessage(group, message)') +1 - |   - a(ng-click='#{inbox? "user.ops.deletePM({params:{id:message.$key}})" : "deleteChatMessage(group, message)"}', ng-if='#{inbox ? "true" : ":: user.contributor.admin || message.uuid == user.id"}') - span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) + |     + a(ng-click="quickReply(message.uuid)") + span.glyphicon.glyphicon-envelope(tooltip=env.t('sendPM')) if inbox a(ng-click="quickReply(message.uuid)") span.glyphicon.glyphicon-share-alt(tooltip=env.t('pm-reply')) + |         + a(ng-click='#{inbox? "user.ops.deletePM({params:{id:message.$key}})" : "deleteChatMessage(group, message)"}', ng-if='#{inbox ? "true" : ":: user.contributor.admin || message.uuid == user.id"}') + span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) span.float-label a.label.label-default.chat-message(ng-if=':: message.user', ng-class='::userLevelStyleFromLevel(message.contributor.level, message.backer.npc, style)', ng-click='clickMember(message.uuid, true)') span.glyphicon.glyphicon-arrow-right(ng-if='::message.sent')