From da6cc5c2e94b4af0b478ab85214378e5dd584d2e Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 3 Sep 2020 15:20:46 +0100 Subject: [PATCH] Tweak Security settings section headers This brings us slightly closer to the version Design is working from in terms of section naming. Prep for https://github.com/vector-im/element-web/issues/13895 --- res/css/views/settings/tabs/_SettingsTab.scss | 3 ++- .../views/settings/E2eAdvancedPanel.js | 2 +- .../tabs/user/SecurityUserSettingsTab.js | 26 ++++++++++++------- src/i18n/strings/en_EN.json | 15 ++++++----- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss index e3a61e6825..5f00ed86f7 100644 --- a/res/css/views/settings/tabs/_SettingsTab.scss +++ b/res/css/views/settings/tabs/_SettingsTab.scss @@ -1,5 +1,5 @@ /* -Copyright 2019 New Vector Ltd +Copyright 2019, 2020 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ limitations under the License. font-size: $font-20px; font-weight: 600; color: $primary-fg-color; + margin-bottom: 10px; } .mx_SettingsTab_heading:nth-child(n + 2) { diff --git a/src/components/views/settings/E2eAdvancedPanel.js b/src/components/views/settings/E2eAdvancedPanel.js index 2ba6190a9b..0650630901 100644 --- a/src/components/views/settings/E2eAdvancedPanel.js +++ b/src/components/views/settings/E2eAdvancedPanel.js @@ -25,7 +25,7 @@ const SETTING_MANUALLY_VERIFY_ALL_SESSIONS = "e2ee.manuallyVerifyAllSessions"; const E2eAdvancedPanel = props => { const SettingsFlag = sdk.getComponent('views.elements.SettingsFlag'); return
- {_t("Advanced")} + {_t("Encryption")} {warning} -
{_t("Security & Privacy")}
+
{_t("Where you’re logged in")}
- {_t("Where you’re logged in")} {_t( "Manage the names of and sign out of your sessions below or " + @@ -351,11 +350,15 @@ export default class SecurityUserSettingsTab extends React.Component {
- {keyBackup} - {eventIndex} - {crossSigning} - {this._renderCurrentDeviceInfo()} -
+
{_t("Encryption")}
+
+ {keyBackup} + {eventIndex} + {crossSigning} + {this._renderCurrentDeviceInfo()} +
+
{_t("Privacy")}
+
{_t("Analytics")}
{_t( @@ -372,9 +375,12 @@ export default class SecurityUserSettingsTab extends React.Component {
- {this._renderIgnoredUsers()} - {this._renderManageInvites()} - +
{_t("Advanced")}
+
+ {this._renderIgnoredUsers()} + {this._renderManageInvites()} + +
); } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index bc0845386d..95b6c23a77 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -62,11 +62,6 @@ "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", "The server does not support the room version specified.": "The server does not support the room version specified.", "Failure to create room": "Failure to create room", - "Cancel entering passphrase?": "Cancel entering passphrase?", - "Are you sure you want to cancel entering passphrase?": "Are you sure you want to cancel entering passphrase?", - "Go Back": "Go Back", - "Cancel": "Cancel", - "Setting up keys": "Setting up keys", "Sun": "Sun", "Mon": "Mon", "Tue": "Tue", @@ -142,6 +137,11 @@ "Missing room_id in request": "Missing room_id in request", "Room %(roomId)s not visible": "Room %(roomId)s not visible", "Missing user_id in request": "Missing user_id in request", + "Cancel entering passphrase?": "Cancel entering passphrase?", + "Are you sure you want to cancel entering passphrase?": "Are you sure you want to cancel entering passphrase?", + "Go Back": "Go Back", + "Cancel": "Cancel", + "Setting up keys": "Setting up keys", "Messages": "Messages", "Actions": "Actions", "Advanced": "Advanced", @@ -684,6 +684,7 @@ "Public Name": "Public Name", "Last seen": "Last seen", "Failed to set display name": "Failed to set display name", + "Encryption": "Encryption", "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.", "Securely cache encrypted messages locally for them to appear in search results, using ": "Securely cache encrypted messages locally for them to appear in search results, using ", " to store messages from ": " to store messages from ", @@ -907,10 +908,10 @@ "Message search": "Message search", "Cross-signing": "Cross-signing", "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.", - "Security & Privacy": "Security & Privacy", "Where you’re logged in": "Where you’re logged in", "Manage the names of and sign out of your sessions below or verify them in your User Profile.": "Manage the names of and sign out of your sessions below or verify them in your User Profile.", "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with", + "Privacy": "Privacy", "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s collects anonymous analytics to allow us to improve the application.", "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.", "Learn more about how we use analytics.": "Learn more about how we use analytics.", @@ -993,7 +994,7 @@ "Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)", "Members only (since they were invited)": "Members only (since they were invited)", "Members only (since they joined)": "Members only (since they joined)", - "Encryption": "Encryption", + "Security & Privacy": "Security & Privacy", "Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.", "Encrypted": "Encrypted", "Who can access this room?": "Who can access this room?",