Bug 1193849 - Show "Learn more" link in security subview when mixed content blocking is disabled. f=tanvi r=paolo, a=sylvestre
authorTim Taubert <ttaubert@mozilla.com>
Wed, 23 Sep 2015 14:18:46 +0200
changeset 289405 f84537028ef21f86447619a9e2aaf56a7d44af7c
parent 289404 b0a5e4576b03c7fb70d30504d71929ccfaa41022
child 289406 ab5858bf34c1999af454c33c4f2ac0749458b3d7
push id5109
push usercbook@mozilla.com
push dateTue, 29 Sep 2015 10:00:36 +0000
treeherdermozilla-beta@f84537028ef2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspaolo, sylvestre
bugs1193849
milestone42.0
Bug 1193849 - Show "Learn more" link in security subview when mixed content blocking is disabled. f=tanvi r=paolo, a=sylvestre
browser/components/controlcenter/content/panel.inc.xul
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -133,17 +133,17 @@
 
         <!-- Passive Mixed Content Loaded, Active Mixed Content Blocked -->
         <description when-mixedcontent="passive-loaded active-blocked">&identity.description.passiveLoaded;</description>
         <description when-mixedcontent="passive-loaded active-blocked"
                      class="identity-popup-warning-yellow">&identity.description.passiveLoaded3; <label observes="identity-popup-mcb-learn-more"/></description>
 
         <!-- Active Mixed Content Blocking Disabled -->
         <description when-mixedcontent="active-loaded">&identity.description.activeLoaded;</description>
-        <description when-mixedcontent="active-loaded">&identity.description.activeLoaded2;</description>
+        <description when-mixedcontent="active-loaded">&identity.description.activeLoaded2; <label observes="identity-popup-mcb-learn-more"/></description>
 
         <!-- Buttons to enable/disable mixed content blocking. -->
         <button when-mixedcontent="active-blocked"
                 label="&identity.disableMixedContentBlocking.label;"
                 accesskey="&identity.disableMixedContentBlocking.accesskey;"
                 oncommand="gIdentityHandler.disableMixedContentProtection()"/>
         <button when-mixedcontent="active-loaded"
                 label="&identity.enableMixedContentBlocking.label;"