Bug 492271 - "All Add-ons have been disabled in safe mode" is misleading in safe mode. r=dtownsend, a=blocking-final
authorBlair McBride <bmcbride@mozilla.com>
Tue, 07 Dec 2010 13:31:32 +1300
changeset 58731 50b3455b84ba8fa817734516a1cb3922693d41e1
parent 58730 ee65aa15982e1af2b6a48fcf93ecf5c2e111e5e7
child 58732 88fee6b520bbeafc581aa8547fb4f1b131df4a9c
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersdtownsend, blocking-final
bugs492271
milestone2.0b8pre
Bug 492271 - "All Add-ons have been disabled in safe mode" is misleading in safe mode. r=dtownsend, a=blocking-final
toolkit/mozapps/extensions/content/extensions.css
toolkit/mozapps/extensions/content/extensions.js
toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
toolkit/themes/pinstripe/mozapps/extensions/extensions.css
toolkit/themes/winstripe/mozapps/extensions/extensions.css
--- a/toolkit/mozapps/extensions/content/extensions.css
+++ b/toolkit/mozapps/extensions/content/extensions.css
@@ -140,11 +140,18 @@ xhtml|link {
 
 #addons-page:not([warning]) .global-warning,
 #addons-page:not([warning="safemode"]) .global-warning-safemode,
 #addons-page:not([warning="checkcompatibility"]) .global-warning-checkcompatibility,
 #addons-page:not([warning="updatesecurity"]) .global-warning-updatesecurity {
   display: none;
 }
 
+/* Plugins aren't yet disabled by safemode (bug 342333),
+   so don't show that warning when viewing plugins. */
+#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning,
+#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning {
+  display: none;
+}
+
 .addon .relnotes {
   -moz-user-select: text;
 }
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -1909,16 +1909,17 @@ var gListView = {
         var item = self._listBox.selectedItem;
         if (item)
           item.showInDetailView();
       }
     }, false);
   },
 
   show: function(aType, aRequest) {
+    this.node.setAttribute("type", aType);
     this.showEmptyNotice(false);
 
     while (this._listBox.itemCount > 0)
       this._listBox.removeItemAt(0);
 
     var self = this;
     var types = getAddonsAndInstalls(aType, function(aAddonsList, aInstallsList) {
       if (gViewController && aRequest != gViewController.currentViewRequest)
--- a/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
@@ -82,16 +82,25 @@
 }
 
 @media all and (max-width: 600px) {
   .global-warning-text {
     display: none;
   }
 }
 
+/* Plugins aren't yet disabled by safemode (bug 342333),
+   so don't show that warning when viewing plugins. */
+#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
+#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
+  background-color: inherit;
+  background-image: none;
+}
+
+
 /*** notification icons ***/
 
 .warning-icon {
   list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=menu");
   width: 16px;
   height: 16px;
   margin: 3px 0;
 }
--- a/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
@@ -91,16 +91,25 @@
 
   .global-warning .warning-icon {
     background-color: rgba(255, 255, 255, 0.7);
     box-shadow: 0px 0px 2px 4px rgba(255, 255, 255, 0.7);
     border-radius: 10px;
   }
 }
 
+/* Plugins aren't yet disabled by safemode (bug 342333),
+   so don't show that warning when viewing plugins. */
+#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
+#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
+  background-color: inherit;
+  background-image: none;
+}
+
+
 /*** notification icons ***/
 
 .warning-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
   width: 16px;
   height: 15px;
   margin: 3px 0;
 }
--- a/toolkit/themes/winstripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/winstripe/mozapps/extensions/extensions.css
@@ -160,16 +160,25 @@
 
   .global-warning .warning-icon {
     background-color: #FFF;
     box-shadow: 0px 0px 2px 5px #FFF;
     border-radius: 10px;
   }
 }
 
+/* Plugins aren't yet disabled by safemode (bug 342333),
+   so don't show that warning when viewing plugins. */
+#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
+#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
+  background-color: inherit;
+  background-image: none;
+}
+
+
 /*** notification icons ***/
 
 .warning-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
   width: 16px;
   height: 15px;
   margin: 3px 0;
 }