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

Iterate the Modal Widget Dialog paddings and phishing warning 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-10-20 15:05:22 +01:00
parent 16362440b3
commit b6fd2a0691
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
res/css/views/dialogs/_ModalWidgetDialog.scss
View File

@ -15,7 +15,19 @@ limitations under the License.
*/ */
.mx_ModalWidgetDialog { .mx_ModalWidgetDialog {
.mx_ModalWidgetDialog_warning {
margin-bottom: 24px;
> img {
vertical-align: middle;
margin-right: 8px;
}
}
.mx_ModalWidgetDialog_buttons { .mx_ModalWidgetDialog_buttons {
float: right;
margin-top: 24px;
.mx_AccessibleButton + .mx_AccessibleButton { .mx_AccessibleButton + .mx_AccessibleButton {
margin-left: 8px; margin-left: 8px;
} }
@ -24,5 +36,7 @@ limitations under the License.
iframe { iframe {
width: 100%; width: 100%;
height: 450px; height: 450px;
border: 0;
border-radius: 8px;
} }
} }

5
res/img/element-icons/warning-badge.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="8" cy="8" r="8" fill="#737D8C" style="mix-blend-mode:multiply"/>
<rect x="7" y="3" width="2" height="6" rx="1" fill="white"/>
<rect x="7" y="11" width="2" height="2" rx="1" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 303 B

19
src/components/views/dialogs/ModalWidgetDialog.tsx
View File

@ -87,7 +87,7 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
public render() { public render() {
// TODO: Don't violate every single security principle // TODO: Don't violate every single security principle
// TODO copied from SGWidget // TODO: DRY - copied from SGWidget
const templated = this.widget.getCompleteUrl({ const templated = this.widget.getCompleteUrl({
currentRoomId: RoomViewStore.getRoomId(), currentRoomId: RoomViewStore.getRoomId(),
currentUserId: MatrixClientPeg.get().getUserId(), currentUserId: MatrixClientPeg.get().getUserId(),
@ -140,15 +140,26 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
contentId="mx_Dialog_content" contentId="mx_Dialog_content"
onFinished={this.props.onFinished} onFinished={this.props.onFinished}
> >
<div className="mx_ModalWidgetDialog_warning">
<img
src={require("../../../../res/img/element-icons/warning-badge.svg")}
height="16"
width="16"
alt=""
/>
{_t("Data on this screen is shared with %(widgetDomain)s", {
widgetDomain: parsed.hostname,
})}
</div>
<div> <div>
<iframe <iframe
ref={this.appFrame} ref={this.appFrame}
// sandbox="allow-forms allow-scripts" TODO sandbox="allow-forms allow-scripts"
src={widgetUrl.toString()} src={widgetUrl}
onLoad={this.onLoad} onLoad={this.onLoad}
/> />
</div> </div>
<div className="mx_ModalWidgetDialog_buttons" style={{float: "right"}}> <div className="mx_ModalWidgetDialog_buttons">
{ buttons } { buttons }
</div> </div>
</BaseDialog>; </BaseDialog>;

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

@ -1769,6 +1769,7 @@
"Your homeserver doesn't seem to support this feature.": "Your homeserver doesn't seem to support this feature.", "Your homeserver doesn't seem to support this feature.": "Your homeserver doesn't seem to support this feature.",
"Message edits": "Message edits", "Message edits": "Message edits",
"Modal Widget": "Modal Widget", "Modal Widget": "Modal Widget",
"Data on this screen is shared with %(widgetDomain)s": "Data on this screen is shared with %(widgetDomain)s",
"Your account is not secure": "Your account is not secure", "Your account is not secure": "Your account is not secure",
"Your password": "Your password", "Your password": "Your password",
"This session, or the other session": "This session, or the other session", "This session, or the other session": "This session, or the other session",