[Pale-Moon] Issue #1717 - Add distinct mixed-mode indicator and logic for display.

application/palemoon/base/content/browser.js

@@ -6832,6 +6832,7 @@ var gIdentityHandler = {
     let punyID = gPrefService.getIntPref("browser.identity.display_punycode", 1);
 
     switch (newMode) {
+      case this.IDENTITY_MODE_MIXED_CONTENT:
       case this.IDENTITY_MODE_DOMAIN_VERIFIED: {
         let iData = this.getIdentityData();
       

application/palemoon/base/content/padlock.css

@@ -20,12 +20,16 @@
   background-color: transparent;
 }
 
-#padlock-ib[padshow="ib-trans-bg"][level="low"],
-#padlock-ib[padshow="ib-trans-bg"][level="mixed"] {
+#padlock-ib[padshow="ib-trans-bg"][level="low"] {
   list-style-image: url("chrome://browser/content/padlock_mod_low.png");
   background-color: transparent;
 }
 
+#padlock-ib[padshow="ib-trans-bg"][level="mixed"] {
+  list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
+  background-color: transparent;
+}
+
 #padlock-ib[padshow="ib-trans-bg"][level="broken"] {
   list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
   background-color: transparent;
@@ -55,13 +59,18 @@
   background-color: transparent;
 }
 
-#padlock-ib-left[padshow="ib-left"][level="low"],
-#padlock-ib-left[padshow="ib-left"][level="mixed"] {
+#padlock-ib-left[padshow="ib-left"][level="low"] {
   list-style-image: url("chrome://browser/content/padlock_mod_low.png");
   padding: 2px;
   background-color: transparent;
 }
 
+#padlock-ib-left[padshow="ib-left"][level="mixed"] {
+  list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
+  padding: 2px;
+  background-color: transparent;
+}
+
 #padlock-ib-left[padshow="ib-left"][level="broken"] {
   list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
   padding: 2px;
@@ -90,12 +99,16 @@
   background-color: transparent;
 }
 
-#padlock-ub-right[padshow="ub-right"][level="low"],
-#padlock-ub-right[padshow="ub-right"][level="mixed"] {
+#padlock-ub-right[padshow="ub-right"][level="low"] {
   list-style-image: url("chrome://browser/content/padlock_mod_low.png");
   background-color: transparent;
 }
 
+#padlock-ub-right[padshow="ub-right"][level="mixed"] {
+  list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
+  background-color: transparent;
+}
+
 #padlock-ub-right[padshow="ub-right"][level="broken"] {
   list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
   background-color: transparent;
@@ -117,12 +130,16 @@
   background-color: transparent;
 }
 
-#padlock-sb[padshow="statbar"][level="low"],
-#padlock-sb[padshow="statbar"][level="mixed"] {
+#padlock-sb[padshow="statbar"][level="low"] {
   list-style-image: url("chrome://browser/content/padlock_mod_low.png");
   background-color: transparent;
 }
 
+#padlock-sb[padshow="statbar"][level="mixed"] {
+  list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
+  background-color: transparent;
+}
+
 #padlock-sb[padshow="statbar"][level="broken"] {
   list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
   background-color: transparent;
@@ -144,12 +161,16 @@
   background-color: transparent;
 }
 
-#padlock-tab[padshow="tabs-bar"][level="low"],
-#padlock-tab[padshow="tabs-bar"][level="mixed"] {
+#padlock-tab[padshow="tabs-bar"][level="low"] {
   list-style-image: url("chrome://browser/content/padlock_mod_low.png");
   background-color: transparent;
 }
 
+#padlock-tab[padshow="tabs-bar"][level="mixed"] {
+  list-style-image: url("chrome://browser/content/padlock_mod_mixed.png");
+  background-color: transparent;
+}
+
 #padlock-tab[padshow="tabs-bar"][level="broken"] {
   list-style-image: url("chrome://browser/content/padlock_mod_broken.png");
   background-color: transparent;
@@ -176,13 +197,16 @@
 #padlock-ib-left[padshow="ib-left"][padstyle="classic"][level="low"],
 #padlock-ub-right[padshow="ub-right"][padstyle="classic"][level="low"],
 #padlock-sb[padshow="statbar"][padstyle="classic"][level="low"],
-#padlock-tab[padshow="tabs-bar"][padstyle="classic"][level="low"],
+#padlock-tab[padshow="tabs-bar"][padstyle="classic"][level="low"] {
+  list-style-image: url("chrome://browser/content/padlock_classic_low.png");
+}
+
 #padlock-ib[padshow="ib-trans-bg"][padstyle="classic"][level="mixed"],
 #padlock-ib-left[padshow="ib-left"][padstyle="classic"][level="mixed"],
 #padlock-ub-right[padshow="ub-right"][padstyle="classic"][level="mixed"],
 #padlock-sb[padshow="statbar"][padstyle="classic"][level="mixed"],
 #padlock-tab[padshow="tabs-bar"][padstyle="classic"][level="mixed"] {
-  list-style-image: url("chrome://browser/content/padlock_classic_low.png");
+  list-style-image: url("chrome://browser/content/padlock_classic_mixed.png");
 }
 
 #padlock-ib[padshow="ib-trans-bg"][padstyle="classic"][level="broken"],

application/palemoon/base/content/padlock.js

@@ -38,10 +38,13 @@ var padlock_PadLock =
           level = "ev";
       } else {
         // Step 1 FALSE: Domain Validation
-        //  Normal               "high"
-        //  Mixed Active Content "low"
+        //  Normal                "high"
+        //  Mixed Passive Content "mixed"
+        //  Mixed Active Content  "broken"
         if (aState & wpl.STATE_LOADED_MIXED_ACTIVE_CONTENT)
-          level = "low";
+          level = "broken";
+        else if (aState & wpl.STATE_LOADED_MIXED_DISPLAY_CONTENT)
+          level = "mixed";
         else
           level = "high";
       }
@@ -125,6 +128,7 @@ var padlock_PadLock =
 
     let s_ev = "Extended Validated";
     let s_hi = "Secure";
+    let s_mx = "Mixed content";
     let s_lo = "Weak security";
     let s_no = "Not secure";
     let gLocale = document.getElementById("bundle_browser");
@@ -135,6 +139,9 @@ var padlock_PadLock =
       let n_hi = gLocale.getString("identity.padlock.high");
       if(n_hi != null)
         s_hi = n_hi;
+      let n_mx = gLocale.getString("identity.padlock.mixed");
+      if(n_mx != null)
+        s_mx = n_mx;
       let n_lo = gLocale.getString("identity.padlock.low");
       if(n_lo != null)
         s_lo = n_lo;
@@ -152,6 +159,9 @@ var padlock_PadLock =
       case "low":
         sectooltip = s_lo;
         break;
+      case "mixed":
+        sectooltip = s_mx;
+        break;
       case "broken":
         sectooltip = s_no;
         break;