From 2f506ce0e07610fd09d04cdfc7b4066b4587ccb1 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 5 Dec 2014 07:43:20 -0600 Subject: [PATCH] Give flag text danger class and already reported message if already reproted --- public/css/index.styl | 3 +++ views/options/social/chat-message.jade | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/css/index.styl b/public/css/index.styl index 07e2829d0b..381ab03082 100644 --- a/public/css/index.styl +++ b/public/css/index.styl @@ -135,6 +135,9 @@ a a span.glyphicon color: #333 // Takes base color from bootstrap + &.text-danger + color: #a94442 // Allows glyphicon to use text-danger class + a.label color: #fff diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade index 07de522d21..19938dcbe1 100644 --- a/views/options/social/chat-message.jade +++ b/views/options/social/chat-message.jade @@ -26,7 +26,7 @@ mixin chatMessages(inbox) 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="flagChatMessage(message)", ng-if='#{inbox ? "true" : ":: message.uuid != user.id && message.uuid != \'system\'"}') - span.glyphicon.glyphicon-flag(tooltip=env.t('abuseFlag')) + span.glyphicon.glyphicon-flag(tooltip="{{message.flags[user._id] ? env.t('abuseAlreadyReported') : env.t('abuseFlag')}}" ng-class='message.flags[user._id] ? "text-danger" : ""') 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')