OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

update message context texts and icons 

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
pull/21833/head
Michael Weimann 2021-06-22 20:11:12 +02:00
parent 9a1be63baa
commit 086042f078
No known key found for this signature in database
GPG Key ID: 34F0524D4DA694A1
4 changed files with 60 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/css/views/context_menus/_MessageContextMenu.scss
View File

@ -1,4 +1,5 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2021 Michael Weimann <mail@michael-weimann.eu> Copyright 2021 Michael Weimann <mail@michael-weimann.eu>
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
@ -42,7 +43,7 @@ limitations under the License.
} }
.mx_MessageContextMenu_iconLink::before { .mx_MessageContextMenu_iconLink::before {
mask-image: url('$(res)/img/element-icons/message/link.svg'); mask-image: url('$(res)/img/element-icons/link.svg');
} }
.mx_MessageContextMenu_iconPermalink::before { .mx_MessageContextMenu_iconPermalink::before {
@ -50,7 +51,7 @@ limitations under the License.
} }
.mx_MessageContextMenu_iconUnhidePreview::before { .mx_MessageContextMenu_iconUnhidePreview::before {
mask-image: url('$(res)/img/feather-customised/eye.svg'); mask-image: url('$(res)/img/element-icons/settings/appearance.svg');
} }
.mx_MessageContextMenu_iconForward::before { .mx_MessageContextMenu_iconForward::before {
@ -62,7 +63,7 @@ limitations under the License.
} }
.mx_MessageContextMenu_iconResend::before { .mx_MessageContextMenu_iconResend::before {
mask-image: url('$(res)/img/element-icons/message/repeat.svg'); mask-image: url('$(res)/img/element-icons/retry.svg');
} }
.mx_MessageContextMenu_iconSource::before { .mx_MessageContextMenu_iconSource::before {

34
res/img/element-icons/warning-badge.svg
View File

@ -1,4 +1,32 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<path style="fill:#ff4b55" <svg
d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 3c.554 0 1 .446 1 1v4c0 .554-.446 1-1 1s-1-.446-1-1V4c0-.554.446-1 1-1zm0 8c.554 0 1 .446 1 1s-.446 1-1 1-1-.446-1-1 .446-1 1-1z"/> xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg8"
version="1.1"
fill="none"
viewBox="0 0 24 24"
height="24"
width="24">
<metadata
id="metadata14">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs12" />
<path
id="path2"
d="M 12 2 C 6.47715 2 2 6.47715 2 12 C 2 17.5228 6.47715 22 12 22 C 17.5228 22 22 17.5228 22 12 C 22 6.47715 17.5228 2 12 2 z M 11.880859 5.5039062 C 12.720859 5.4439063 13.470547 6.0746875 13.560547 6.9296875 L 13.560547 7.1699219 L 13.080078 13.169922 C 13.035078 13.724922 12.570625 14.144531 12.015625 14.144531 L 11.925781 14.144531 C 11.400781 14.099531 10.996172 13.694922 10.951172 13.169922 L 10.470703 7.1699219 C 10.395703 6.3149219 11.025859 5.5639064 11.880859 5.5039062 z M 12 15.763672 C 12.729 15.763672 13.320312 16.354884 13.320312 17.083984 C 13.320313 17.812984 12.729 18.404297 12 18.404297 C 11.271 18.404297 10.679688 17.812984 10.679688 17.083984 C 10.679688 16.354884 11.271 15.763672 12 15.763672 z "
style="fill:#ff4b55;fill-opacity:1" />
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 1.5 KiB

39
src/components/views/context_menus/MessageContextMenu.js
View File

@ -22,13 +22,13 @@ import { EventStatus } from 'matrix-js-sdk/src/models/event';
import { MatrixClientPeg } from '../../../MatrixClientPeg'; import { MatrixClientPeg } from '../../../MatrixClientPeg';
import dis from '../../../dispatcher/dispatcher'; import dis from '../../../dispatcher/dispatcher';
import * as sdk from '../../../index'; import * as sdk from '../../../index';
import {_t} from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import Modal from '../../../Modal'; import Modal from '../../../Modal';
import Resend from '../../../Resend'; import Resend from '../../../Resend';
import SettingsStore from '../../../settings/SettingsStore'; import SettingsStore from '../../../settings/SettingsStore';
import { isUrlPermitted } from '../../../HtmlUtils'; import { isUrlPermitted } from '../../../HtmlUtils';
import { isContentActionable } from '../../../utils/EventUtils'; import { isContentActionable } from '../../../utils/EventUtils';
import IconizedContextMenu, {IconizedContextMenuOption, IconizedContextMenuOptionList} from "./IconizedContextMenu"; import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from './IconizedContextMenu';
import { EventType } from "matrix-js-sdk/src/@types/event"; import { EventType } from "matrix-js-sdk/src/@types/event";
import { replaceableComponent } from "../../../utils/replaceableComponent"; import { replaceableComponent } from "../../../utils/replaceableComponent";
import { ReadPinsEventId } from "../right_panel/PinnedMessagesCard"; import { ReadPinsEventId } from "../right_panel/PinnedMessagesCard";
@ -306,7 +306,7 @@ export default class MessageContextMenu extends React.Component {
const viewSourceButton = ( const viewSourceButton = (
<IconizedContextMenuOption <IconizedContextMenuOption
iconClassName="mx_MessageContextMenu_iconSource" iconClassName="mx_MessageContextMenu_iconSource"
label={_t("View Source")} label={_t("View source")}
onClick={this.onViewSourceClick} onClick={this.onViewSourceClick}
/> />
); );
@ -316,7 +316,7 @@ export default class MessageContextMenu extends React.Component {
unhidePreviewButton = ( unhidePreviewButton = (
<IconizedContextMenuOption <IconizedContextMenuOption
iconClassName="mx_MessageContextMenu_iconUnhidePreview" iconClassName="mx_MessageContextMenu_iconUnhidePreview"
label={_t("Unhide Preview")} label={_t("Show preview")}
onClick={this.onUnhidePreviewClick} onClick={this.onUnhidePreviewClick}
/> />
); );
@ -351,8 +351,7 @@ export default class MessageContextMenu extends React.Component {
} }
// Bridges can provide a 'external_url' to link back to the source. // Bridges can provide a 'external_url' to link back to the source.
if (true || if (typeof (mxEvent.event.content.external_url) === "string" &&
typeof (mxEvent.event.content.external_url) === "string" &&
isUrlPermitted(mxEvent.event.content.external_url) isUrlPermitted(mxEvent.event.content.external_url)
) { ) {
externalURLButton = ( externalURLButton = (
@ -372,7 +371,7 @@ export default class MessageContextMenu extends React.Component {
collapseReplyThread = ( collapseReplyThread = (
<IconizedContextMenuOption <IconizedContextMenuOption
iconClassName="mx_MessageContextMenu_iconCollapse" iconClassName="mx_MessageContextMenu_iconCollapse"
label={_t("Collapse Reply Thread")} label={_t("Collapse reply thread")}
onClick={this.onCollapseReplyThreadClick} onClick={this.onCollapseReplyThreadClick}
/> />
); );
@ -383,7 +382,7 @@ export default class MessageContextMenu extends React.Component {
reportEventButton = ( reportEventButton = (
<IconizedContextMenuOption <IconizedContextMenuOption
iconClassName="mx_MessageContextMenu_iconReport" iconClassName="mx_MessageContextMenu_iconReport"
label={_t("Report Content")} label={_t("Report")}
onClick={this.onReportEventClick} onClick={this.onReportEventClick}
/> />
); );
@ -391,23 +390,23 @@ export default class MessageContextMenu extends React.Component {
optionLists.push(( optionLists.push((
<IconizedContextMenuOptionList key={'group1'}> <IconizedContextMenuOptionList key={'group1'}>
{quoteButton} { quoteButton }
{forwardButton} { forwardButton }
{pinButton} { pinButton }
{permalinkButton} { permalinkButton }
{reportEventButton} { reportEventButton }
{externalURLButton} { externalURLButton }
{viewSourceButton} { unhidePreviewButton }
{unhidePreviewButton} { viewSourceButton }
{resendReactionsButton} { resendReactionsButton }
{collapseReplyThread} { collapseReplyThread }
</IconizedContextMenuOptionList> </IconizedContextMenuOptionList>
)); ));
if (redactButton) { if (redactButton) {
optionLists.push(( optionLists.push((
<IconizedContextMenuOptionList key={'group2'} red> <IconizedContextMenuOptionList key={'group2'} red>
{redactButton} { redactButton }
</IconizedContextMenuOptionList> </IconizedContextMenuOptionList>
)); ));
} }
@ -418,7 +417,7 @@ export default class MessageContextMenu extends React.Component {
className="mx_MessageContextMenu" className="mx_MessageContextMenu"
compact={true} compact={true}
> >
{optionLists} { optionLists }
</IconizedContextMenu> </IconizedContextMenu>
); );
} }

12
src/i18n/strings/en_EN.json
View File

@ -2252,7 +2252,7 @@
"Sending": "Sending", "Sending": "Sending",
"Sent": "Sent", "Sent": "Sent",
"Open link": "Open link", "Open link": "Open link",
"Forward": "Forward", "Forward message": "Forward message",
"Message preview": "Message preview", "Message preview": "Message preview",
"Search for rooms or people": "Search for rooms or people", "Search for rooms or people": "Search for rooms or people",
"Confirm abort of host creation": "Confirm abort of host creation", "Confirm abort of host creation": "Confirm abort of host creation",
@ -2525,12 +2525,12 @@
"Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?", "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
"Unable to reject invite": "Unable to reject invite", "Unable to reject invite": "Unable to reject invite",
"Resend %(unsentCount)s reaction(s)": "Resend %(unsentCount)s reaction(s)", "Resend %(unsentCount)s reaction(s)": "Resend %(unsentCount)s reaction(s)",
"Forward Message": "Forward", "Forward": "Forward",
"Unpin Message": "Unpin Message", "View source": "View source",
"Pin Message": "Pin Message", "Show preview": "Show preview",
"Unhide Preview": "Unhide Preview",
"Source URL": "Source URL", "Source URL": "Source URL",
"Collapse Reply Thread": "Collapse Reply Thread", "Collapse reply thread": "Collapse reply thread",
"Report": "Report",
"Clear status": "Clear status", "Clear status": "Clear status",
"Update status": "Update status", "Update status": "Update status",
"Set status": "Set status", "Set status": "Set status",