Bug 1177437 - [Control Center] Show security subview with a warning for unsecure connections r=MattN
authorTim Taubert <ttaubert@mozilla.com>
Mon, 29 Jun 2015 07:00:38 +0200
changeset 250663 3727797fe3fcff0747ee2ef942c5c2f095f63a18
parent 250602 e6c3f42f0534adda8d8c9eca99db6e1b43641e2a
child 250664 87f6240419e4e022e02dc77a7d36a7b9ac24e891
push idunknown
push userunknown
push dateunknown
reviewersMattN
bugs1177437
milestone42.0a1
Bug 1177437 - [Control Center] Show security subview with a warning for unsecure connections r=MattN
browser/base/content/browser.js
browser/locales/en-US/chrome/browser/browser.properties
browser/themes/shared/controlcenter/panel.inc.css
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6988,16 +6988,19 @@ var gIdentityHandler = {
         supplemental += gNavigatorBundle.getFormattedString("identity.identified.state_and_country",
                                                             [iData.state, iData.country]);
       else if (iData.state) // State only
         supplemental += iData.state;
       else if (iData.country) // Country only
         supplemental += iData.country;
       break;
     }
+    case this.IDENTITY_MODE_UNKNOWN:
+      supplemental = gNavigatorBundle.getString("identity.not_secure");
+      break;
     case this.IDENTITY_MODE_MIXED_DISPLAY_LOADED:
     case this.IDENTITY_MODE_MIXED_DISPLAY_LOADED_ACTIVE_BLOCKED:
       supplemental = gNavigatorBundle.getString("identity.broken_loaded");
       break;
     case this.IDENTITY_MODE_MIXED_ACTIVE_LOADED:
       supplemental = gNavigatorBundle.getString("identity.mixed_active_loaded2");
       break;
     }
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -324,16 +324,17 @@ offlineApps.notNowAccessKey=N
 offlineApps.usage=This website (%S) is now storing more than %SMB of data on your computer for offline use.
 offlineApps.manageUsage=Show settings
 offlineApps.manageUsageAccessKey=S
 
 identity.identified.verifier=Verified by: %S
 identity.identified.verified_by_you=You have added a security exception for this site.
 identity.identified.state_and_country=%S, %S
 
+identity.not_secure=Your connection to this site is not private. Information you submit could be viewable to others (for example passwords, messages, credit cards, etc.).
 identity.broken_loaded=The connection to this website is not fully secure because it contains unencrypted elements (such as images) or the encryption is not strong enough.
 identity.mixed_active_loaded2=This website contains interactive content that isn't encrypted (such as scripts). Other people can view your information or modify the website's behavior.
 
 identity.unknown.tooltip=This website does not supply identity information.
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle=Page Bookmarked
 editBookmarkPanel.pageBookmarkedDescription=%S will always remember this page for you.
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -1,18 +1,17 @@
 #identity-popup-securityView:not(.verifiedIdentity) > #identity-popup-content-owner,
 #identity-popup-securityView:not(.verifiedIdentity):not(.verifiedDomain) > #identity-popup-content-verifier,
-#identity-popup-securityView:not(.verifiedIdentity):not(.mixedContent) > #identity-popup-content-supplemental,
+#identity-popup-securityView:not(.unknownIdentity):not(.verifiedIdentity):not(.mixedContent) > #identity-popup-content-supplemental,
 #identity-popup-security-content:not(.verifiedIdentity):not(.verifiedDomain) > .identity-popup-connection-secure,
 #identity-popup-securityView:not(.verifiedIdentity):not(.verifiedDomain) > #identity-popup-securityView-header > .identity-popup-connection-secure,
 #identity-popup-securityView:not(.unknownIdentity) > #identity-popup-securityView-header > .identity-popup-connection-not-secure,
 #identity-popup-securityView:not(.chromeUI) > #identity-popup-securityView-header > .identity-popup-connection-internal,
 #identity-popup-security-content:not(.unknownIdentity) > .identity-popup-connection-not-secure,
 #identity-popup-securityView:not(.verifiedIdentity) > #identity-popup-securityView-connection,
-#identity-popup-security-content.unknownIdentity:not(.mixedContent) + .identity-popup-expander,
 #identity-popup-security-content:not(.chromeUI) > .identity-popup-connection-internal,
 #identity-popup-security-content.chromeUI + .identity-popup-expander {
   display: none;
 }
 
 /* PANEL */
 
 #identity-popup,