From 620fb63a570de023e7c17e04d9f98ba392ec4c66 Mon Sep 17 00:00:00 2001
From: "dtownsend%oxymoronical.com" <dtownsend%oxymoronical.com>
Date: Fri, 18 Jan 2008 10:51:08 +0000
Subject: [PATCH] Bug 408869: Make the extension installation dialog easier to
 understand. r=mano, a=schrep.

---
 .../mozapps/xpinstall/xpinstallConfirm.dtd    |  7 ++--
 .../xpinstall/xpinstallConfirm.properties     |  3 +-
 .../xpinstall/content/xpinstallConfirm.js     |  5 ++-
 .../xpinstall/content/xpinstallConfirm.xul    | 18 ++++----
 .../xpinstall/content/xpinstallItem.xml       |  5 +--
 .../mozapps/xpinstall/xpinstallConfirm.css    | 42 +++++++++++++------
 .../mozapps/xpinstall/xpinstallConfirm.css    | 35 ++++++++++------
 7 files changed, 74 insertions(+), 41 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/mozapps/xpinstall/xpinstallConfirm.dtd b/toolkit/locales/en-US/chrome/mozapps/xpinstall/xpinstallConfirm.dtd
index f9147542b4e..5a1acd7dcba 100644
--- a/toolkit/locales/en-US/chrome/mozapps/xpinstall/xpinstallConfirm.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/xpinstall/xpinstallConfirm.dtd
@@ -1,8 +1,9 @@
 <!-- extracted from institems.xul -->
 
-<!ENTITY dialog.title "Software Installation">
-<!ENTITY warningText2.label "Malicious software can damage your computer or violate your privacy.">
-<!ENTITY warningText3.label "You should only install software from sources that you trust.">
+<!ENTITY dialog.title            "Software Installation">
+<!ENTITY dialog.style            "width: 45em">
+<!ENTITY warningMain.label       "Only install add-ons from authors whom you trust.">
+<!ENTITY warningSecondary.label  "Malicious software can damage your computer or violate your privacy.">
 
 <!ENTITY from.label "from:">
 
diff --git a/toolkit/locales/en-US/chrome/mozapps/xpinstall/xpinstallConfirm.properties b/toolkit/locales/en-US/chrome/mozapps/xpinstall/xpinstallConfirm.properties
index eb7785208fe..fbee4478700 100644
--- a/toolkit/locales/en-US/chrome/mozapps/xpinstall/xpinstallConfirm.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/xpinstall/xpinstallConfirm.properties
@@ -1,4 +1,5 @@
-Unsigned=Unsigned
+unsigned=(Author Unknown)
+signed=(%S)
 
 itemWarnIntroMultiple=You have asked to install the following %S items:
 itemWarnIntroSingle=You have asked to install the following item:
diff --git a/toolkit/mozapps/xpinstall/content/xpinstallConfirm.js b/toolkit/mozapps/xpinstall/content/xpinstallConfirm.js
index a5b2f4cf06f..0b106267fb1 100644
--- a/toolkit/mozapps/xpinstall/content/xpinstallConfirm.js
+++ b/toolkit/mozapps/xpinstall/content/xpinstallConfirm.js
@@ -77,7 +77,10 @@ XPInstallConfirm.init = function ()
     if (icon != "")
       installItem.icon = icon;
     var cert = this._param.GetString(++i);
-    installItem.cert = cert || bundle.getString("Unsigned");
+    if (cert)
+      installItem.cert = bundle.getFormattedString("signed", [cert]);
+    else
+      installItem.cert = bundle.getString("unsigned");
     installItem.signed = cert ? "true" : "false";
   }
   
diff --git a/toolkit/mozapps/xpinstall/content/xpinstallConfirm.xul b/toolkit/mozapps/xpinstall/content/xpinstallConfirm.xul
index 6bc50113f5d..17cd870424c 100644
--- a/toolkit/mozapps/xpinstall/content/xpinstallConfirm.xul
+++ b/toolkit/mozapps/xpinstall/content/xpinstallConfirm.xul
@@ -46,7 +46,7 @@
 <!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/xpinstall/xpinstallConfirm.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="xpinstallConfirm" title="&dialog.title;" style="width: 30em" 
+        id="xpinstallConfirm" title="&dialog.title;" style="&dialog.style;" 
         onload="XPInstallConfirm.init()" 
         ondialogaccept="return XPInstallConfirm.onOK();"
         ondialogcancel="return XPInstallConfirm.onCancel();">
@@ -57,13 +57,15 @@
                 src="chrome://mozapps/locale/xpinstall/xpinstallConfirm.properties"/>
 
   <vbox flex="1" id="dialogContentBox">
-    <description id="itemWarningIntro"/>
-    
-    <vbox id="itemList" class="listbox" flex="1" style="height: 16em; overflow: auto;"/>
-    
-    <description>&warningText2.label;</description> 
-    <description class="warning">&warningText3.label;</description> 
+    <hbox id="xpinstallheader" align="start">
+      <image class="alert-icon"/>
+      <vbox flex="1">
+        <description class="warning">&warningMain.label;</description>
+        <description>&warningSecondary.label;</description>
+      </vbox>
+    </hbox>
+    <label id="itemWarningIntro"/>
+    <vbox id="itemList" class="listbox" flex="1" style="overflow: auto;"/>
   </vbox>
 
 </dialog>
-
diff --git a/toolkit/mozapps/xpinstall/content/xpinstallItem.xml b/toolkit/mozapps/xpinstall/content/xpinstallItem.xml
index d49dec2dc2c..5aff76802d4 100644
--- a/toolkit/mozapps/xpinstall/content/xpinstallItem.xml
+++ b/toolkit/mozapps/xpinstall/content/xpinstallItem.xml
@@ -16,13 +16,12 @@
         <xul:vbox align="center" pack="center">
           <xul:image class="xpinstallItemIcon" xbl:inherits="src=icon"/>
         </xul:vbox>
-        <xul:vbox flex="1">
+        <xul:vbox flex="1" pack="center">
           <xul:hbox class="xpinstallItemNameRow" align="center">
-            <xul:label class="xpinstallItemName" xbl:inherits="value=name" flex="1" crop="right"/>
+            <xul:label class="xpinstallItemName" xbl:inherits="value=name" crop="right"/>
             <xul:label class="xpinstallItemSigned" xbl:inherits="value=cert,signed"/>
           </xul:hbox>
           <xul:hbox class="xpinstallItemDetailsRow" align="center">
-            <xul:label class="xpinstallItemFromLabel">&from.label;</xul:label>
             <xul:textbox class="xpinstallItemURL" xbl:inherits="value=url" flex="1" readonly="true" crop="right"/>
           </xul:hbox>
         </xul:vbox> 
diff --git a/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css b/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css
index a1fbd97d0f5..48545e771d1 100644
--- a/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css
+++ b/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css
@@ -1,6 +1,25 @@
+#xpinstallheader {
+  margin-bottom: 2em;
+}
+
+.alert-icon {
+  width: 48px;
+  height: 48px;
+  list-style-image: url("chrome://global/skin/icons/warning-large.png");
+  margin-top: 0 !important;
+  margin-bottom: 6px !important;
+  -moz-margin-start: 6px !important;
+  -moz-margin-end: 20px !important;
+}
+
 #itemList {
   -moz-appearance: listbox;
-  margin: 10px 4px 10px 4px;
+  margin: 3px 4px 10px 4px;
+  height: 14em;
+}
+
+#itemWarningIntro {
+  -moz-margin-start: 8px;
 }
 
 #dialogContentBox {
@@ -8,13 +27,15 @@
 }
 
 installitem {
-  padding: 5px 0px 5px 5px;
+  padding: 5px 0 5px 5px;
   border-bottom: 1px dotted #C0C0C0;
   margin-bottom: 5px;
 }
 
 .warning {
   font-weight: bold;
+  font-size: 1.25em;
+  margin-bottom: 1em;
 }
 
 .xpinstallItemIcon {
@@ -22,7 +43,7 @@ installitem {
   height: 32px;
   max-width: 32px !important;
   max-height: 32px !important;
-  margin-right: 5px;
+  -moz-margin-end: 5px;
 }
 
 .xpinstallItemName {
@@ -31,22 +52,17 @@ installitem {
 
 .xpinstallItemSigned {
   font-style: italic;
-}
-
-.xpinstallItemSigned[signed=false] {
-  color: #ED1C24;
-  font-style: normal;
-  font-weight: bold;
-}
-
-.xpinstallItemNameRow {
-  padding-bottom: 3px;
+  font-size: 0.9em;
 }
 
 .xpinstallItemURL {
   -moz-appearance: none;
   border: none;
   background-color: Window;
+  margin-top: 2px;
+  margin-bottom: 1px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;
 }
 
 .xpinstallItemIcon {
diff --git a/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css b/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css
index 794d1f5ece3..8a4f7ec809d 100644
--- a/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css
+++ b/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css
@@ -1,6 +1,11 @@
+#xpinstallheader {
+  margin-bottom: 2em;
+}
+
 #itemList {
   -moz-appearance: listbox;
-  margin: 10px 4px 10px 4px;
+  margin: 3px 4px 10px 4px;
+  height: 14em;
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
   -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
@@ -10,6 +15,10 @@
   color: -moz-FieldText;
 }
 
+#itemWarningIntro {
+  -moz-margin-start: 8px;
+}
+
 #dialogContentBox {
   padding: 5px;
 }
@@ -18,13 +27,19 @@ installitem {
   padding-top: 5px;
   padding-bottom: 5px;
   -moz-padding-start: 5px;
-  -moz-padding-end: 0px;
+  -moz-padding-end: 0;
   border-bottom: 1px dotted #C0C0C0;
   margin-bottom: 5px;
 }
 
+.alert-icon {
+  -moz-margin-end: 20px;
+}
+
 .warning {
   font-weight: bold;
+  font-size: 1.25em;
+  margin-bottom: 1em;
 }
 
 .xpinstallItemIcon {
@@ -41,23 +56,19 @@ installitem {
 
 .xpinstallItemSigned {
   font-style: italic;
-}
-
-.xpinstallItemSigned[signed=false] {
-  color: #ED1C24;
-  font-style: normal;
-  font-weight: bold;
-}
-
-.xpinstallItemNameRow {
-  padding-bottom: 3px;
+  font-size: 0.9em;
 }
 
 .xpinstallItemURL {
   -moz-appearance: none;
   border: none;
+  padding: 0;
   background-color: -moz-Field;
   color: -moz-FieldText;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;
 }
 
 .xpinstallItemIcon {