From fd43043337a5d73ad4f1b067910c0f07290025e2 Mon Sep 17 00:00:00 2001 From: Csoregi Natalia Date: Thu, 6 Apr 2023 18:40:06 +0300 Subject: [PATCH] Backed out 2 changesets (bug 1814261) as per request. CLOSED TREE Backed out changeset 8640c4a18d9e (bug 1814261) Backed out changeset c00c8fc88dbd (bug 1814261) --- browser/base/content/browser-siteIdentity.js | 4 +- .../content/identityPanel.inc.xhtml | 22 ++++----- browser/locales/en-US/browser/browser.ftl | 8 +-- browser/themes/shared/controlcenter/panel.css | 4 -- ...ug_1814261_mixed_content_identity_panel.py | 49 ------------------- .../moz-support-link/moz-support-link.mjs | 2 +- 6 files changed, 20 insertions(+), 69 deletions(-) delete mode 100644 python/l10n/fluent_migrations/bug_1814261_mixed_content_identity_panel.py diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js index e71311ce33f2..868e066c0190 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js @@ -166,7 +166,6 @@ var gIdentityHandler = { _popupInitialized: false, _initializePopup() { - window.ensureCustomElements("moz-support-link"); if (!this._popupInitialized) { let wrapper = document.getElementById("template-identity-popup"); wrapper.replaceWith(wrapper.content); @@ -929,6 +928,9 @@ var gIdentityHandler = { // Update "Learn More" for Mixed Content Blocking and Insecure Login Forms. let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL"); + this._identityPopupMixedContentLearnMore.forEach(e => + e.setAttribute("href", baseURL + "mixed-content") + ); this._identityPopupCustomRootLearnMore.setAttribute( "href", diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml index 00ddc77e619b..3a8e689e579c 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml @@ -147,25 +147,25 @@ - - - @@ -174,8 +174,8 @@ - + diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl index 7a92656e3afb..710e52485579 100644 --- a/browser/locales/en-US/browser/browser.ftl +++ b/browser/locales/en-US/browser/browser.ftl @@ -408,12 +408,14 @@ identity-description-insecure = Your connection to this site is not private. Inf identity-description-insecure-login-forms = The login information you enter on this page is not secure and could be compromised. identity-description-weak-cipher-intro = Your connection to this website uses weak encryption and is not private. identity-description-weak-cipher-risk = Other people can view your information or modify the website’s behavior. -identity-description-active-blocked2 = { -brand-short-name } has blocked parts of this page that are not secure. +identity-description-active-blocked = { -brand-short-name } has blocked parts of this page that are not secure. identity-description-passive-loaded = Your connection is not private and information you share with the site could be viewed by others. -identity-description-passive-loaded-insecure2 = This website contains content that is not secure (such as images). -identity-description-passive-loaded-mixed2 = Although { -brand-short-name } has blocked some content, there is still content on the page that is not secure (such as images). +identity-description-passive-loaded-insecure = This website contains content that is not secure (such as images). +identity-description-passive-loaded-mixed = Although { -brand-short-name } has blocked some content, there is still content on the page that is not secure (such as images). identity-description-active-loaded = This website contains content that is not secure (such as scripts) and your connection to it is not private. identity-description-active-loaded-insecure = Information you share with this site could be viewed by others (like passwords, messages, credit cards, etc.). +identity-learn-more = + .value = Learn More identity-disable-mixed-content-blocking = .label = Disable protection for now .accesskey = D diff --git a/browser/themes/shared/controlcenter/panel.css b/browser/themes/shared/controlcenter/panel.css index fc2362674237..8392040e3c4d 100644 --- a/browser/themes/shared/controlcenter/panel.css +++ b/browser/themes/shared/controlcenter/panel.css @@ -268,10 +268,6 @@ font-weight: 600; } -#identity-popup-securityView-extended-info > .identity-popup-warning-box > label { - display: inline-block; -} - #identity-popup-securityView-extended-info > button { margin-inline: 0; } diff --git a/python/l10n/fluent_migrations/bug_1814261_mixed_content_identity_panel.py b/python/l10n/fluent_migrations/bug_1814261_mixed_content_identity_panel.py deleted file mode 100644 index a135870df8cd..000000000000 --- a/python/l10n/fluent_migrations/bug_1814261_mixed_content_identity_panel.py +++ /dev/null @@ -1,49 +0,0 @@ -# Any copyright is dedicated to the Public Domain. -# http://creativecommons.org/publicdomain/zero/1.0/ - -import fluent.syntax.ast as FTL - -from fluent.migrate.transforms import TransformPattern - - -class STRIP_LEARNMORE(TransformPattern): - # Used to remove `SOME TEXT` from a string - def visit_TextElement(self, node): - link_start = node.value.find('