diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 95afdf92d3f..38805805bf0 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6968,6 +6968,11 @@ var gIdentityHandler = {
return this._identityPopupMixedContentLearnMore =
document.getElementById("identity-popup-mcb-learn-more");
},
+ get _identityPopupInsecureLoginFormsLearnMore () {
+ delete this._identityPopupInsecureLoginFormsLearnMore;
+ return this._identityPopupInsecureLoginFormsLearnMore =
+ document.getElementById("identity-popup-insecure-login-forms-learn-more");
+ },
get _identityIconLabel () {
delete this._identityIconLabel;
return this._identityIconLabel = document.getElementById("identity-icon-label");
@@ -7289,10 +7294,12 @@ var gIdentityHandler = {
* applicable
*/
refreshIdentityPopup() {
- // Update the "Learn More" hrefs for Mixed Content Blocking.
+ // Update "Learn More" for Mixed Content Blocking and Insecure Login Forms.
let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
- let learnMoreHref = `${baseURL}mixed-content`;
- this._identityPopupMixedContentLearnMore.setAttribute("href", learnMoreHref);
+ this._identityPopupMixedContentLearnMore
+ .setAttribute("href", baseURL + "mixed-content");
+ this._identityPopupInsecureLoginFormsLearnMore
+ .setAttribute("href", baseURL + "insecure-password");
// Determine connection security information.
let connection = "not-secure";
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 97c3dfbf189..8b2ab98e217 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -403,6 +403,7 @@ run-if = e10s
[browser_star_hsts.js]
[browser_subframe_favicons_not_used.js]
[browser_syncui.js]
+skip-if = os == "mac" && debug # Bug 1217332
[browser_tabDrop.js]
skip-if = buildapp == 'mulet' || e10s
[browser_tabReorder.js]
diff --git a/browser/base/content/test/general/browser_insecureLoginForms.js b/browser/base/content/test/general/browser_insecureLoginForms.js
index 053409438fb..bc80c29e54f 100644
--- a/browser/base/content/test/general/browser_insecureLoginForms.js
+++ b/browser/base/content/test/general/browser_insecureLoginForms.js
@@ -55,6 +55,9 @@ add_task(function* test_simple() {
is(securityContentBG,
"url(\"chrome://browser/skin/controlcenter/mcb-disabled.svg\")",
"Using expected icon image in the Control Center subview");
+ is(Array.filter(document.querySelectorAll("[observes=identity-popup-insecure-login-forms-learn-more]"),
+ element => !is_hidden(element)).length, 1,
+ "The 'Learn more' link should be visible once.");
}
// Messages should be visible when the scheme is HTTP, and invisible when
diff --git a/browser/components/controlcenter/content/panel.inc.xul b/browser/components/controlcenter/content/panel.inc.xul
index 205a7df6ca8..e0e094cf4dc 100644
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -12,6 +12,7 @@
+