Skip to content

Commit 3ecf643

Browse files
committed
Bug 1814266 - Use moz-support-link for the "identify-popup-custom-root-learn-more" label. r=tgiles,flod
Differential Revision: https://phabricator.services.mozilla.com/D173701
1 parent eb2de1e commit 3ecf643

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

browser/base/content/browser-siteIdentity.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -927,14 +927,6 @@ var gIdentityHandler = {
927927
});
928928
}
929929

930-
// Update "Learn More" for Mixed Content Blocking and Insecure Login Forms.
931-
let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
932-
933-
this._identityPopupCustomRootLearnMore.setAttribute(
934-
"href",
935-
baseURL + "enterprise-roots"
936-
);
937-
938930
let customRoot = false;
939931

940932
// Determine connection security information.

browser/components/controlcenter/content/identityPanel.inc.xhtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@
125125
when-connection="secure secure-ev secure-cert-user-overridden"/>
126126
<description id="identity-popup-content-verifier-unknown"
127127
class="identity-popup-warning-box identity-popup-warning-gray"
128-
when-customroot="true"
129-
data-l10n-id="identity-description-custom-root">
130-
<label data-l10n-name="link" id="identity-popup-custom-root-learn-more" is="text-link"/>
128+
when-customroot="true">
129+
<label data-l10n-id="identity-description-custom-root2"/>
130+
<html:a is="moz-support-link" id="identity-popup-custom-root-learn-more" support-page="enterprise-roots"/>
131131
</description>
132132

133133
<!-- Remove Certificate Exception -->

browser/locales/en-US/browser/browser.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ identity-clear-site-data =
400400
identity-connection-not-secure-security-view = You are not securely connected to this site.
401401
identity-connection-verified = You are securely connected to this site.
402402
identity-ev-owner-label = Certificate issued to:
403-
identity-description-custom-root = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator. <label data-l10n-name="link">Learn More</label>
403+
identity-description-custom-root2 = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator.
404404
identity-remove-cert-exception =
405405
.label = Remove Exception
406406
.accesskey = R

browser/themes/shared/controlcenter/panel.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@
286286
}
287287
}
288288

289+
#identity-popup-content-verifier-unknown > label {
290+
display: inline;
291+
}
292+
289293
/* CONTENT BLOCKING / TRACKING PROTECTION */
290294

291295
#protections-popup-sendReportView-heading,

tools/lint/fluent-lint/exclusions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ CO01:
147147
- extension-firefox-alpenglow-name
148148
# browser/locales/en-US/browser/browser.ftl
149149
- identity-custom-root
150-
- identity-description-custom-root
150+
- identity-description-custom-root2
151151
# browser/locales/en-US/browser/migration.ftl
152152
- import-from-firefox
153153
# browser/locales/en-US/browser/migrationWizard.ftl

0 commit comments

Comments
 (0)