Bug 490106 - Tooltips for autoconfig server security quality don't wrap, r=philringnalda
authorBlake Winton <bwinton@latte.ca>
Thu, 02 Jul 2009 20:53:08 -0700
changeset 3002 f53696dd29ae221676d7433e4b1a15fefa6927fa
parent 3001 3491ba183bb002e15a4e331d3bb72521c91d320e
child 3003 27b3a0d2aa23b3f5684315b8d21f775322762410
push idunknown
push userunknown
push dateunknown
reviewersphilringnalda
bugs490106
Bug 490106 - Tooltips for autoconfig server security quality don't wrap, r=philringnalda
mail/base/content/accountCreation.dtd
mail/themes/gnomestripe/mail/accountCreation.css
mail/themes/pinstripe/mail/accountCreation.css
mail/themes/qute/mail/accountCreation.css
mailnews/base/prefs/resources/content/accountcreation/emailWizard.js
mailnews/base/prefs/resources/content/accountcreation/emailWizard.xul
--- a/mail/base/content/accountCreation.dtd
+++ b/mail/base/content/accountCreation.dtd
@@ -33,17 +33,20 @@
 <!ENTITY outgoing_settings.label         "Outgoing settings:">
 <!ENTITY incoming_is_checked.label       "I've double-checked the incoming settings.">
 <!ENTITY outgoing_is_checked.label       "I've double-checked the outgoing settings.">
 <!ENTITY understood.label                "I know what I'm doing.">
 <!ENTITY getmeout.label                  "This is scary, let me out.">
 
 <!ENTITY lectureYourProvider.description "&brandShortName; will let you get to your mail, but you should really get your email provider to configure the server with a secure connection.">
 
-<!ENTITY insecureCleartext.description   "Warning! This is an insecure server. Email is sent in clear-text, so your email could be read by attackers, etc. &brandShortName; will let you get to your mail, but you should really get your email provider to configure the server with a secure connection.">
-<!ENTITY insecureSelfsigned.description  "Warning! This is an insecure server. The server uses a certificate that we can't trust, so we can't be sure that someone isn't intercepting the traffic between &brandShortName; and your server. &brandShortName; will let you get to your mail, but you should really get your email provider to configure the server with a trusted certificate.">
+<!ENTITY insecureServer.tooltip.title    "Warning! This is an insecure server.">
+<!ENTITY insecureServer.tooltip.details  "Click circle for more details.">
+
+<!ENTITY insecureCleartext.description   "Email is sent in clear-text, so your email could be read by attackers, etc. &brandShortName; will let you get to your mail, but you should really get your email provider to configure the server with a secure connection.">
+<!ENTITY insecureSelfsigned.description  "The server uses a certificate that we can't trust, so we can't be sure that someone isn't intercepting the traffic between &brandShortName; and your server. &brandShortName; will let you get to your mail, but you should really get your email provider to configure the server with a trusted certificate.">
 <!ENTITY secureServer.description        "Congratulations! This is a secure server.">
 
 <!ENTITY customfields-header.label     "Additional information">
 <!ENTITY customfields-intro1.descr     "For your mail provider, there is additional information needed to configure your account.">
 <!ENTITY customfields-intro2.descr     "Please look up the information in the paper or email with your account details that the provider sent you, usually when you signed up there, and enter it below.">
 <!ENTITY customfields-cancel.label     "Back">
 <!ENTITY customfields-ok.label         "OK">
--- a/mail/themes/gnomestripe/mail/accountCreation.css
+++ b/mail/themes/gnomestripe/mail/accountCreation.css
@@ -277,8 +277,24 @@ label.linklabel:hover {
 
 checkbox.acknowledge_checkbox {
   padding-top: .5em;
 }
 
 vbox.settings {
   padding: 1em;
 }
+
+.title {
+  font-weight: bold;
+  padding: 0px 3px;
+}
+
+.details {
+  font-style: italic;
+  padding: 3px;
+}
+
+.popup-panel {
+  padding: 2px 3px;
+  background-color: #ffffc7;
+  max-width: 320px;
+}
--- a/mail/themes/pinstripe/mail/accountCreation.css
+++ b/mail/themes/pinstripe/mail/accountCreation.css
@@ -302,8 +302,24 @@ label.linklabel:hover {
 
 checkbox.acknowledge_checkbox {
   padding-top: .5em;
 }
 
 vbox.settings {
   padding: 1em;
 }
+
+.title {
+  font-weight: bold;
+  padding: 0px 3px;
+}
+
+.details {
+  font-style: italic;
+  padding: 3px;
+}
+
+.popup-panel {
+  padding: 2px 3px;
+  background-color: #ffffc7;
+  max-width: 320px;
+}
--- a/mail/themes/qute/mail/accountCreation.css
+++ b/mail/themes/qute/mail/accountCreation.css
@@ -196,8 +196,24 @@ vbox.icon[state='probing'] {
 
 vbox.icon[state='weak'] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
 vbox.settings {
   padding: 1em;
 }
+
+.title {
+  font-weight: bold;
+  padding: 0px 3px;
+}
+
+.details {
+  font-style: italic;
+  padding: 3px;
+}
+
+.popup-panel {
+  padding: 2px 3px;
+  background-color: #ffffc7;
+  max-width: 320px;
+}
--- a/mailnews/base/prefs/resources/content/accountcreation/emailWizard.js
+++ b/mailnews/base/prefs/resources/content/accountcreation/emailWizard.js
@@ -845,27 +845,30 @@ EmailConfigWizard.prototype =
       this._outgoingState = 'done';
 
     this._setIconAndTooltip('outgoing_status', state, details);
   },
 
   _setIconAndTooltip : function(id, state, details)
   {
     let icon = getElementById(id);
-    icon.setAttribute('state', state);
+    icon.setAttribute("state", state);
     switch (state)
     {
-      case 'weak':
-        icon.setAttribute('tooltip', 'insecureserver-'+details);
+      case "weak":
+        icon.setAttribute("tooltip", "insecureserver-" + details);
+        icon.setAttribute("popup", "insecureserver-" + details + "-panel");
         break;
-      case 'hidden':
-        icon.removeAttribute('tooltip');
+      case "hidden":
+        icon.removeAttribute("tooltip");
+        icon.removeAttribute("popup");
         break;
-      case 'strong':
-        icon.setAttribute('tooltip', 'secureservertooltip');
+      case "strong":
+        icon.setAttribute("tooltip", "secureservertooltip");
+        icon.setAttribute("popup", "secureserver-panel");
         break;
     }
   },
 
   showConfigDetails : function()
   {
     // show the config details area
     _show("settingsbox");
--- a/mailnews/base/prefs/resources/content/accountcreation/emailWizard.xul
+++ b/mailnews/base/prefs/resources/content/accountcreation/emailWizard.xul
@@ -82,32 +82,63 @@
           src="chrome://messenger/content/accountcreation/createInBackend.js"/>
   <script type="application/javascript"
           src="chrome://messenger/content/accountcreation/MyBadCertHandler.js"/>
 
   <keyset id="mailKeys">
     <key keycode="VK_ESCAPE" oncommand="window.close();"/>
   </keyset>
 
+  <panel id="insecureserver-cleartext-panel" class="popup-panel">
+    <hbox>
+      <image class="insecureLarry"/>
+      <vbox flex="1">
+        <description class="title">&insecureServer.tooltip.title;</description>
+        <description class="details">&insecureCleartext.description;</description>
+      </vbox>
+    </hbox>
+  </panel>
+  <panel id="insecureserver-selfsigned-panel" class="popup-panel">
+    <hbox>
+      <image class="insecureLarry"/>
+      <vbox flex="1">
+        <description class="title">&insecureServer.tooltip.title;</description>
+        <description class="details">&insecureSelfsigned.description;</description>
+      </vbox>
+    </hbox>
+  </panel>
+  <panel id="secureserver-panel" class="popup-panel">
+    <hbox>
+      <image class="secureLarry"/>
+      <description class="title">&secureServer.description;</description>
+    </hbox>
+  </panel>
+
   <tooltip id="insecureserver-cleartext">
-    <hbox align="bottom">
+    <hbox>
       <image class="insecureLarry"/>
-      <description>&insecureCleartext.description;</description>
+      <vbox>
+        <description class="title">&insecureServer.tooltip.title;</description>
+        <description class="details">&insecureServer.tooltip.details;</description>
+      </vbox>
     </hbox>
   </tooltip>
   <tooltip id="insecureserver-selfsigned">
-    <hbox align="bottom">
+    <hbox>
       <image class="insecureLarry"/>
-      <description>&insecureSelfsigned.description;</description>
+      <vbox>
+        <description class="title">&insecureServer.tooltip.title;</description>
+        <description class="details">&insecureServer.tooltip.details;</description>
+      </vbox>
     </hbox>
   </tooltip>
   <tooltip id="secureservertooltip">
-    <hbox align="bottom">
+    <hbox>
       <image class="secureLarry"/>
-      <description>&secureServer.description;</description>
+      <description class="title">&secureServer.description;</description>
     </hbox>
   </tooltip>
 
 
   <vbox class="mastervbox"
         id="mastervbox"
         flex="1">
     <grid>