krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

some ui fixes / requested changes

Browse Source
This commit is contained in:
negue
2018-11-20 17:20:58 +01:00
parent 3203bffeaa
commit 52a7112591
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/client/components/chat/chatCard.vue
View File

@@ -1,8 +1,8 @@
<template lang="pug"> <template lang="pug">
div div
.mentioned-icon(v-if='isUserMentioned') .mentioned-icon(v-if='isUserMentioned')
.message-hidden(v-if='msg.flagCount === 1 && user.contributor.admin') Message flagged once, not hidden .message-hidden(v-if='!inbox && msg.flagCount === 1 && user.contributor.admin') Message flagged once, not hidden
.message-hidden(v-if='msg.flagCount > 1 && user.contributor.admin') Message hidden .message-hidden(v-if='!inbox && msg.flagCount > 1 && user.contributor.admin') Message hidden
.card-body .card-body
h3.leader( h3.leader(
:class='userLevelStyle(msg)', :class='userLevelStyle(msg)',
@@ -17,11 +17,10 @@ div
span.mr-1(v-if="msg.username") • span.mr-1(v-if="msg.username") •
span(v-b-tooltip="", :title="msg.timestamp | date") {{ msg.timestamp | timeAgo }} span(v-b-tooltip="", :title="msg.timestamp | date") {{ msg.timestamp | timeAgo }}
.text(v-html='atHighlight(parseMarkdown(msg.text))') .text(v-html='atHighlight(parseMarkdown(msg.text))')
hr .reported(v-if="isMessageReported && inbox")
.reported(v-if="isMessageReported")
span(v-once) {{ $t('reportedMessage')}} span(v-once) {{ $t('reportedMessage')}}
br br
span(v-if="inbox") {{ $t('canDeleteNow') }} span(v-once) {{ $t('canDeleteNow') }}
hr hr
.d-flex(v-if='msg.id') .d-flex(v-if='msg.id')
.action.d-flex.align-items-center(v-if='!inbox', @click='copyAsTodo(msg)') .action.d-flex.align-items-center(v-if='!inbox', @click='copyAsTodo(msg)')
@@ -30,7 +29,6 @@ div
.action.d-flex.align-items-center(v-if='(inbox || (user.flags.communityGuidelinesAccepted && msg.uuid !== "system")) && !isMessageReported', @click='report(msg)') .action.d-flex.align-items-center(v-if='(inbox || (user.flags.communityGuidelinesAccepted && msg.uuid !== "system")) && !isMessageReported', @click='report(msg)')
.svg-icon(v-html="icons.report", v-once) .svg-icon(v-html="icons.report", v-once)
div(v-once) {{$t('report')}} div(v-once) {{$t('report')}}
// @TODO make flagging/reporting work in the inbox. NOTE: it must work even if the communityGuidelines are not accepted and it MUST work for messages that you have SENT as well as received. -- Alys
.action.d-flex.align-items-center(v-if='msg.uuid === user._id || inbox || user.contributor.admin', @click='remove()') .action.d-flex.align-items-center(v-if='msg.uuid === user._id || inbox || user.contributor.admin', @click='remove()')
.svg-icon(v-html="icons.delete", v-once) .svg-icon(v-html="icons.delete", v-once)
div(v-once) {{$t('delete')}} div(v-once) {{$t('delete')}}

1
website/common/locales/en/groups.json
View File

@@ -156,7 +156,6 @@
"cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.", "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.",
"badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.",
"report": "Report", "report": "Report",
"canDeleteNow": "You can now delete the message if you wish.",
"abuseFlag": "Report violation of Community Guidelines", "abuseFlag": "Report violation of Community Guidelines",
"abuseFlagModalHeading": "Report a Violation", "abuseFlagModalHeading": "Report a Violation",
"abuseFlagModalBody": "Are you sure you want to report this post? You should <strong>only</strong> report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction.", "abuseFlagModalBody": "Are you sure you want to report this post? You should <strong>only</strong> report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction.",

3
website/common/locales/en/messages.json
View File

@@ -72,5 +72,6 @@
"messageDeletedUser": "Sorry, this user has deleted their account.", "messageDeletedUser": "Sorry, this user has deleted their account.",
"messageMissingDisplayName": "Missing display name.", "messageMissingDisplayName": "Missing display name.",
"reportedMessage": "You have reported this message to moderators." "reportedMessage": "You have reported this message to moderators.",
"canDeleteNow": "You can now delete the message if you wish."
} }

2
website/server/controllers/api-v4/members.js
View File

@@ -5,7 +5,7 @@ let api = {};
/** /**
* @api {post} /api/v4/members/flag-private-message/:messageId Flag a private message * @api {post} /api/v4/members/flag-private-message/:messageId Flag a private message
* @apiDescription An email is sent to the moderators about every flagged message. * @apiDescription An email and slack message are sent to the moderators about every flagged message.
* @apiName FlagPrivateMessage * @apiName FlagPrivateMessage
* @apiGroup Member * @apiGroup Member
* *