Bug 506290 - "[autoconfig] Layout changes to quick account setup" - improve the warning dialog. [r=philringnalda sr=bienvenu ui-r=clarkbw]
authorBlake Winton <bwinton@latte.ca>
Mon, 31 Aug 2009 10:08:34 +0100
changeset 3455 0eb7935fcb9bab1edec17619e0b8eba88289c8cd
parent 3454 072d7b84a131419c26feee6d68f81aa21d7cd676
child 3456 7baea2266f3e99f8c681de75f4ebc7f52a1a63cd
push idunknown
push userunknown
push dateunknown
reviewersphilringnalda, bienvenu, clarkbw
bugs506290
Bug 506290 - "[autoconfig] Layout changes to quick account setup" - improve the warning dialog. [r=philringnalda sr=bienvenu ui-r=clarkbw]
mail/locales/en-US/chrome/messenger/accountCreation.dtd
mail/locales/en-US/chrome/messenger/accountCreation.properties
mail/themes/gnomestripe/jar.mn
mail/themes/gnomestripe/mail/accountCreation.css
mail/themes/gnomestripe/mail/section_collapsed.png
mail/themes/gnomestripe/mail/section_expanded.png
mail/themes/pinstripe/jar.mn
mail/themes/pinstripe/mail/accountCreation.css
mail/themes/pinstripe/mail/section_collapsed.png
mail/themes/pinstripe/mail/section_expanded.png
mail/themes/qute/jar.mn
mail/themes/qute/mail/accountCreation.css
mail/themes/qute/mail/section_collapsed.png
mail/themes/qute/mail/section_expanded.png
mailnews/base/prefs/content/accountcreation/emailWizard.js
mailnews/base/prefs/content/accountcreation/emailWizard.xul
--- a/mail/locales/en-US/chrome/messenger/accountCreation.dtd
+++ b/mail/locales/en-US/chrome/messenger/accountCreation.dtd
@@ -37,16 +37,17 @@
 <!ENTITY edit.accesskey                  "E">
 
 <!ENTITY rememberPassword.label          "Remember password">
 <!ENTITY rememberPassword.accesskey      "m">
 
 <!ENTITY warning.label                   "Warning!">
 <!ENTITY incomingSettings.label          "Incoming settings:">
 <!ENTITY outgoingSettings.label          "Outgoing settings:">
+<!ENTITY technicaldetails.label          "Technical Details">
 <!-- LOCALIZATION NOTE (confirmWarning.label): If there is a security
      warning on the outgoing server, then the user will need to check a
      checkbox beside this text before continuing. -->
 <!ENTITY confirmWarning.label            "I understand the risks.">
 <!ENTITY confirmWarning.accesskey        "u">
 <!-- LOCALIZATION NOTE (createAccount.label): If there is a security warning
      on the incoming or outgoing servers, then the page that pops up will
      have this text in a button to continue by creating the account. -->
--- a/mail/locales/en-US/chrome/messenger/accountCreation.properties
+++ b/mail/locales/en-US/chrome/messenger/accountCreation.properties
@@ -1,15 +1,13 @@
 # accountCreation.properties
 
-# LOCALIZATION NOTE: %1$S will be the name of the app (i.e. ThunderBird), %2$S will be the hostname of the server the user was trying to connect to.
-incoming_cleartext_warning=You've setup %1$S to connect to the incoming mail server %2$S, which is an insecure server.
-incoming_selfsigned_warning=You've setup %1$S to connect securely to the incoming mail server %2$S, but we can't confirm that your connection is secure.
-outgoing_cleartext_warning=You've setup %1$S to connect to the outgoing mail server %2$S, which is an insecure server.
-outgoing_selfsigned_warning=You've setup %1$S to connect securely to the outgoing mail server %2$S, but we can't confirm that your connection is secure.
+# LOCALIZATION NOTE: %1$S will be the hostname of the server the user was trying to connect to.
+cleartext_warning=%1$S does not use encryption.
+selfsigned_warning=%1$S does not use a trusted certificate.
 selfsigned_details=Normally, a secure mail server will present a trusted certificate to prove that it is really the server it claims to be. The connection to the mail server will be encrypted but cannot be validated as being the correct server.
 cleartext_details=Insecure mail servers do not use encrypted connections to protect your passwords and private information. By connecting to this server you could expose your password and private information.
 
 # LOCALIZATION NOTE(default_server_tag): Used to indicate the default smtp server in the server dropdown list.
 default_server_tag= (default)
 
 # config titles
 searching_for_configs=Searching…
--- a/mail/themes/gnomestripe/jar.mn
+++ b/mail/themes/gnomestripe/jar.mn
@@ -1,16 +1,18 @@
 classic.jar:
   skin/classic/communicator/smileys.css                       (mail/smileys.css)
 % skin messenger classic/1.0 %skin/classic/messenger/
   skin/classic/messenger/primaryToolbar.css                   (mail/primaryToolbar.css)
   skin/classic/messenger/accountCentral.css                   (mail/accountCentral.css)
-  skin/classic/messenger/accountCreation.css                     (mail/accountCreation.css)
+  skin/classic/messenger/accountCreation.css                  (mail/accountCreation.css)
   skin/classic/messenger/accountManage.css                    (mail/accountManage.css)
   skin/classic/messenger/accountWizard.css                    (mail/accountWizard.css)
+  skin/classic/messenger/section_collapsed.png                (mail/section_collapsed.png)
+  skin/classic/messenger/section_expanded.png                 (mail/section_expanded.png)
   skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
   skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
   skin/classic/messenger/messageQuotes.css                    (mail/messageQuotes.css)
   skin/classic/messenger/messenger.css                        (mail/messenger.css)
   skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
   skin/classic/messenger/tagColors.css                        (mail/tagColors.css)
   skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
   skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
--- a/mail/themes/gnomestripe/mail/accountCreation.css
+++ b/mail/themes/gnomestripe/mail/accountCreation.css
@@ -219,25 +219,32 @@ vbox.icon[state='weak'] {
   border: 1px solid threedshadow;
 }
 
 .warning_text {
   color: white;
   font-size: 120%;
 }
 
+.warning_text > vbox {
+  padding-top: 5px;
+}
+
 .warning-heading {
-  border-bottom:1px solid threedlightshadow;
-  font-size:160%;
-  margin:0 0 0.6em;
+  border-bottom: 1px solid threedlightshadow;
+  font-size: 160%;
+  margin: 0px;
+  padding: 2px 2px 1px;
 }
 
 .warning_settings {
   color: yellow;
   font-weight: bold;
+  margin: 0px;
+  margin-right: 2px;
 }
 
 .larrybox {
   -moz-padding-end: 2em;
 }
 
 label.linklabel {
   color: yellow;
@@ -332,8 +339,19 @@ row.heading {
  * menulist.clickable:hover
  * menulist.clickable > .menulist-label-box
  * menulist.clickable > .menulist-label-box:hover
  * menulist[editable="true"].clickable
  * menulist[editable="true"].clickable > .menulist-editable-box
  * menulist[editable="true"].clickable > .menulist-editable-box > .menulist-editable-input
  * menulist[editable="true"].clickable > .menulist-dropmarker
  */
+
+.technical_details {
+  cursor: pointer;
+  margin: 0px;
+  padding-left: 20px;
+  background: url("chrome://messenger/skin/section_collapsed.png") left 0 no-repeat;
+}
+
+.technical_details[expanded] {
+  background-image: url("chrome://messenger/skin/section_expanded.png");
+}
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..774e0fe1c67f9229c5d1ddf9bb741c05e849f23c
GIT binary patch
literal 908
zc$@)@19SX|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006&X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlTT>Va1_VCZIM-!Qt%JxDF>MfRbpG%E`x6U<J#34+K#Fx+azr|
z+cYL=)!{)wym%7)a~OgL6)U3P!3ho=p1cUkK#T0)S&xHVWW@K&kF*F5FTRlcKKbUo
z_xt_c%MS>AuNp?n51_5vX7S{VaOUheVQhe%@FR!=2v=pxn3kkGxol&bU*Kb(){e1U
zk8dyCe7D}u-8%p5#@)5Zt8IcjIb_m=fG<MA-UjCc;~M8O<4d+-laIz&)~X8eRpN+Q
zE+&be5{DX`-!QIm{=m2=H(2a|Sk#rK4)}w_lZtA|#0g?evE()}%k!h%?oj@~9pWRh
zVNz^hh4>Jw3yow;KY>#RDQA47#a;priom{$Bkk}Mz4w8Y>mzMr;MU5wKWNosQ8%4$
z*D|o<p5ts(fU%>%)>p^*wd^=sPiXFM!0M*lHG8fvP3rpy{Og_XnP&$+(;mp&9{rtp
zU0g2_=wAcM2_R16i&bF!KCtI4AdyD8KNj<DUPCYorPBF)G%ik5GSVzH<-c0H)ump!
z7N+NJy;e9)BlQ5EtX?VYalM(zdaP7aa~>~h$%4mqGedpiu?y9l<gu#HmpnG?nW2wr
zrHA^WR;C{DShHK4_xM6*Zs@P5so{F`R)L)xcb!c;TlN?!q>-m9ia10}pn?n}%z_HX
z|3C6X_&M-!{6wx;djIG(6aFw;z3lci*)gt|&4y+R({%dOh>+Fg;}Ib$ij(*aV&<+&
z9Cuc%00009a7bBm000XU000XU0RWnu7ytkO@<~KNR5%f1U>F6A=t1!Ouwgj^BLkNN
z2U91b$=Pq{^5}dfbOE-%Z##gds=WO1_twj!Mlt{Y|HrTdSr3Nfy92WSK??pcurT~#
z=062i%*d24VRP;TvPKvirvWep{}|bU2Jt*)U|>AR%EFc@Y;p1vOb$e2cmY`wtl<Ao
z2DU$Mr5XPHj{5cc*9r`IbOCfe$OXSxM1fYZE@NY5i$IrWK^K7WL1FNZRfOT+zu%y6
z0EWSNtYLs*z<*#I{$rPB`1|+!Q$~ir72-DMmohRkf&&(2I5Lf4z%ORu3WmQwfa!o4
inhr3+8Cm~uU;_Y9&PP|_Arhbf0000<MNUMnLSTX=^RcY}
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..38bf1e5adafa1f3b0e345e61008a03dee328c9b6
GIT binary patch
literal 879
zc$@)m1CacQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006&X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlTT>Va1_VCZIM-!Qt%JxDF>MfRbpG%E`x6U<J#34+K#Fx+azr|
z+cYL=)!{)wym%7)a~OgL6)U3P!3ho=p1cUkK#T0)S&xHVWW@K&kF*F5FTRlcKKbUo
z_xt_c%MS>AuNp?n51_5vX7S{VaOUheVQhe%@FR!=2v=pxn3kkGxol&bU*Kb(){e1U
zk8dyCe7D}u-8%p5#@)5Zt8IcjIb_m=fG<MA-UjCc;~M8O<4d+-laIz&)~X8eRpN+Q
zE+&be5{DX`-!QIm{=m2=H(2a|Sk#rK4)}w_lZtA|#0g?evE()}%k!h%?oj@~9pWRh
zVNz^hh4>Jw3yow;KY>#RDQA47#a;priom{$Bkk}Mz4w8Y>mzMr;MU5wKWNosQ8%4$
z*D|o<p5ts(fU%>%)>p^*wd^=sPiXFM!0M*lHG8fvP3rpy{Og_XnP&$+(;mp&9{rtp
zU0g2_=wAcM2_R16i&bF!KCtI4AdyD8KNj<DUPCYorPBF)G%ik5GSVzH<-c0H)ump!
z7N+NJy;e9)BlQ5EtX?VYalM(zdaP7aa~>~h$%4mqGedpiu?y9l<gu#HmpnG?nW2wr
zrHA^WR;C{DShHK4_xM6*Zs@P5so{F`R)L)xcb!c;TlN?!q>-m9ia10}pn?n}%z_HX
z|3C6X_&M-!{6wx;djIG(6aFw;z3lci*)gt|&4y+R({%dOh>+Fg;}Ib$ij(*aV&<+&
z9Cuc%00009a7bBm000XU000XU0RWnu7ytkO)k#D_R5%gskUa{*KoEszHh&VtAQ6dp
z3c*Sg&tqk2j$jUA?jbf3h@K)?*(&5`<4!`ty2%l;&CGk>+gA+0@K8O$>$W<X#rup<
zsz^8pspk5N-7{z)YnFB**xXvSQeHCM4Mm47dz}Jr#Db#uCLDA*2emHu#AVPaz;*mV
zWIi`$at?CMiO44|gH8d#`6j+_o<$t3D%(u*<<GSD79gUy7dz(Kq{`>oI3Zp6N<(h}
zWxVa<4p4?EbA-Zct(D(G{$EPrhHf6x45p@-3L2zzfgd*fHn=7kac%$r002ovPDHLk
FV1kR{qm%#u
--- a/mail/themes/pinstripe/jar.mn
+++ b/mail/themes/pinstripe/jar.mn
@@ -3,16 +3,18 @@ classic.jar:
   skin/classic/messenger/multimessageview.css                    (mail/multimessageview.css)
   skin/classic/messenger/dialogs.css                             (mail/dialogs.css)
   skin/classic/messenger/messenger.css                           (mail/messenger.css)
   skin/classic/messenger/primaryToolbar.css                      (mail/primaryToolbar.css)
   skin/classic/messenger/accountCentral.css                      (mail/accountCentral.css)
   skin/classic/messenger/accountCreation.css                     (mail/accountCreation.css)
   skin/classic/messenger/accountManage.css                       (mail/accountManage.css)
   skin/classic/messenger/accountWizard.css                       (mail/accountWizard.css)
+  skin/classic/messenger/section_collapsed.png                   (mail/section_collapsed.png)
+  skin/classic/messenger/section_expanded.png                    (mail/section_expanded.png)
   skin/classic/messenger/messageHeader.css                       (mail/messageHeader.css)
   skin/classic/messenger/messageWindow.css                       (mail/messageWindow.css)
   skin/classic/messenger/messageBody.css                         (mail/messageBody.css)
   skin/classic/messenger/msgSelectOffline.css                    (mail/msgSelectOffline.css)
   skin/classic/messenger/mailWindow1.css                         (mail/mailWindow1.css)
   skin/classic/messenger/searchBox.css                           (mail/searchBox.css)
   skin/classic/messenger/tagColors.css                           (mail/tagColors.css)
   skin/classic/messenger/junkMail.css                            (mail/junkMail.css)
--- a/mail/themes/pinstripe/mail/accountCreation.css
+++ b/mail/themes/pinstripe/mail/accountCreation.css
@@ -199,25 +199,32 @@ vbox.icon[state='weak'] {
   border: 1px solid threedshadow;
 }
 
 .warning_text {
   color: white;
   font-size: 120%;
 }
 
+.warning_text > vbox {
+  padding-top: 5px;
+}
+
 .warning-heading {
-  border-bottom:1px solid threedlightshadow;
-  font-size:160%;
-  margin:0 0 0.6em;
+  border-bottom: 1px solid threedlightshadow;
+  font-size: 160%;
+  margin: 0px;
+  padding: 2px 2px 1px;
 }
 
 .warning_settings {
   color: yellow;
   font-weight: bold;
+  margin: 0px;
+  margin-right: 2px;
 }
 
 .larrybox {
   -moz-padding-end: 2em;
 }
 
 label.linklabel {
   color: yellow;
@@ -353,8 +360,18 @@ menulist[editable="true"].clickable > .m
   border-width: 3px;
 }
 
 menulist[editable="true"].clickable > .menulist-dropmarker{
   -moz-appearance: menulist-button;
   display: inline;
 }
 
+.technical_details {
+  cursor: pointer;
+  margin: 0px;
+  padding-left: 20px;
+  background: url("chrome://messenger/skin/section_collapsed.png") left 0 no-repeat;
+}
+
+.technical_details[expanded] {
+  background-image: url("chrome://messenger/skin/section_expanded.png");
+}
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..774e0fe1c67f9229c5d1ddf9bb741c05e849f23c
GIT binary patch
literal 908
zc$@)@19SX|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006&X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlTT>Va1_VCZIM-!Qt%JxDF>MfRbpG%E`x6U<J#34+K#Fx+azr|
z+cYL=)!{)wym%7)a~OgL6)U3P!3ho=p1cUkK#T0)S&xHVWW@K&kF*F5FTRlcKKbUo
z_xt_c%MS>AuNp?n51_5vX7S{VaOUheVQhe%@FR!=2v=pxn3kkGxol&bU*Kb(){e1U
zk8dyCe7D}u-8%p5#@)5Zt8IcjIb_m=fG<MA-UjCc;~M8O<4d+-laIz&)~X8eRpN+Q
zE+&be5{DX`-!QIm{=m2=H(2a|Sk#rK4)}w_lZtA|#0g?evE()}%k!h%?oj@~9pWRh
zVNz^hh4>Jw3yow;KY>#RDQA47#a;priom{$Bkk}Mz4w8Y>mzMr;MU5wKWNosQ8%4$
z*D|o<p5ts(fU%>%)>p^*wd^=sPiXFM!0M*lHG8fvP3rpy{Og_XnP&$+(;mp&9{rtp
zU0g2_=wAcM2_R16i&bF!KCtI4AdyD8KNj<DUPCYorPBF)G%ik5GSVzH<-c0H)ump!
z7N+NJy;e9)BlQ5EtX?VYalM(zdaP7aa~>~h$%4mqGedpiu?y9l<gu#HmpnG?nW2wr
zrHA^WR;C{DShHK4_xM6*Zs@P5so{F`R)L)xcb!c;TlN?!q>-m9ia10}pn?n}%z_HX
z|3C6X_&M-!{6wx;djIG(6aFw;z3lci*)gt|&4y+R({%dOh>+Fg;}Ib$ij(*aV&<+&
z9Cuc%00009a7bBm000XU000XU0RWnu7ytkO@<~KNR5%f1U>F6A=t1!Ouwgj^BLkNN
z2U91b$=Pq{^5}dfbOE-%Z##gds=WO1_twj!Mlt{Y|HrTdSr3Nfy92WSK??pcurT~#
z=062i%*d24VRP;TvPKvirvWep{}|bU2Jt*)U|>AR%EFc@Y;p1vOb$e2cmY`wtl<Ao
z2DU$Mr5XPHj{5cc*9r`IbOCfe$OXSxM1fYZE@NY5i$IrWK^K7WL1FNZRfOT+zu%y6
z0EWSNtYLs*z<*#I{$rPB`1|+!Q$~ir72-DMmohRkf&&(2I5Lf4z%ORu3WmQwfa!o4
inhr3+8Cm~uU;_Y9&PP|_Arhbf0000<MNUMnLSTX=^RcY}
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..38bf1e5adafa1f3b0e345e61008a03dee328c9b6
GIT binary patch
literal 879
zc$@)m1CacQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006&X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlTT>Va1_VCZIM-!Qt%JxDF>MfRbpG%E`x6U<J#34+K#Fx+azr|
z+cYL=)!{)wym%7)a~OgL6)U3P!3ho=p1cUkK#T0)S&xHVWW@K&kF*F5FTRlcKKbUo
z_xt_c%MS>AuNp?n51_5vX7S{VaOUheVQhe%@FR!=2v=pxn3kkGxol&bU*Kb(){e1U
zk8dyCe7D}u-8%p5#@)5Zt8IcjIb_m=fG<MA-UjCc;~M8O<4d+-laIz&)~X8eRpN+Q
zE+&be5{DX`-!QIm{=m2=H(2a|Sk#rK4)}w_lZtA|#0g?evE()}%k!h%?oj@~9pWRh
zVNz^hh4>Jw3yow;KY>#RDQA47#a;priom{$Bkk}Mz4w8Y>mzMr;MU5wKWNosQ8%4$
z*D|o<p5ts(fU%>%)>p^*wd^=sPiXFM!0M*lHG8fvP3rpy{Og_XnP&$+(;mp&9{rtp
zU0g2_=wAcM2_R16i&bF!KCtI4AdyD8KNj<DUPCYorPBF)G%ik5GSVzH<-c0H)ump!
z7N+NJy;e9)BlQ5EtX?VYalM(zdaP7aa~>~h$%4mqGedpiu?y9l<gu#HmpnG?nW2wr
zrHA^WR;C{DShHK4_xM6*Zs@P5so{F`R)L)xcb!c;TlN?!q>-m9ia10}pn?n}%z_HX
z|3C6X_&M-!{6wx;djIG(6aFw;z3lci*)gt|&4y+R({%dOh>+Fg;}Ib$ij(*aV&<+&
z9Cuc%00009a7bBm000XU000XU0RWnu7ytkO)k#D_R5%gskUa{*KoEszHh&VtAQ6dp
z3c*Sg&tqk2j$jUA?jbf3h@K)?*(&5`<4!`ty2%l;&CGk>+gA+0@K8O$>$W<X#rup<
zsz^8pspk5N-7{z)YnFB**xXvSQeHCM4Mm47dz}Jr#Db#uCLDA*2emHu#AVPaz;*mV
zWIi`$at?CMiO44|gH8d#`6j+_o<$t3D%(u*<<GSD79gUy7dz(Kq{`>oI3Zp6N<(h}
zWxVa<4p4?EbA-Zct(D(G{$EPrhHf6x45p@-3L2zzfgd*fHn=7kac%$r002ovPDHLk
FV1kR{qm%#u
--- a/mail/themes/qute/jar.mn
+++ b/mail/themes/qute/jar.mn
@@ -30,16 +30,18 @@ classic.jar:
 % skin messenger classic/1.0 %skin/classic/messenger/ os!=WINNT
 # NOTE: If you add a new file here, you'll need to add it to the aero
 # section at the bottom of this file, too.
   skin/classic/messenger/primaryToolbar.css                   (mail/primaryToolbar.css)
   skin/classic/messenger/accountCentral.css                   (mail/accountCentral.css)
   skin/classic/messenger/accountCreation.css                  (mail/accountCreation.css)
   skin/classic/messenger/accountManage.css                    (mail/accountManage.css)
   skin/classic/messenger/accountWizard.css                    (mail/accountWizard.css)
+  skin/classic/messenger/section_collapsed.png                (mail/section_collapsed.png)
+  skin/classic/messenger/section_expanded.png                 (mail/section_expanded.png)
   skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
   skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
   skin/classic/messenger/messageQuotes.css                    (mail/messageQuotes.css)
   skin/classic/messenger/messenger.css                        (mail/messenger.css)
   skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
   skin/classic/messenger/tagColors.css                        (mail/tagColors.css)
   skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
   skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
--- a/mail/themes/qute/mail/accountCreation.css
+++ b/mail/themes/qute/mail/accountCreation.css
@@ -220,25 +220,32 @@ vbox.icon[state='weak'] {
   border: 1px solid threedshadow;
 }
 
 .warning_text {
   color: white;
   font-size: 120%;
 }
 
+.warning_text > vbox {
+  padding-top: 5px;
+}
+
 .warning-heading {
-  border-bottom:1px solid threedlightshadow;
-  font-size:160%;
-  margin:0 0 0.6em;
+  border-bottom: 1px solid threedlightshadow;
+  font-size: 160%;
+  margin: 0px;
+  padding: 2px 2px 1px;
 }
 
 .warning_settings {
   color: yellow;
   font-weight: bold;
+  margin: 0px;
+  margin-right: 2px;
 }
 
 .larrybox {
   -moz-padding-end: 2em;
 }
 
 label.linklabel {
   color: yellow;
@@ -298,8 +305,19 @@ vbox.settings {
  * menulist.clickable:hover
  * menulist.clickable > .menulist-label-box
  * menulist.clickable > .menulist-label-box:hover
  * menulist[editable="true"].clickable
  * menulist[editable="true"].clickable > .menulist-editable-box
  * menulist[editable="true"].clickable > .menulist-editable-box > .menulist-editable-input
  * menulist[editable="true"].clickable > .menulist-dropmarker
  */
+
+.technical_details {
+  cursor: pointer;
+  margin: 0px;
+  padding-left: 20px;
+  background: url("chrome://messenger/skin/section_collapsed.png") left 0 no-repeat;
+}
+
+.technical_details[expanded] {
+  background-image: url("chrome://messenger/skin/section_expanded.png");
+}
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..774e0fe1c67f9229c5d1ddf9bb741c05e849f23c
GIT binary patch
literal 908
zc$@)@19SX|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006&X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlTT>Va1_VCZIM-!Qt%JxDF>MfRbpG%E`x6U<J#34+K#Fx+azr|
z+cYL=)!{)wym%7)a~OgL6)U3P!3ho=p1cUkK#T0)S&xHVWW@K&kF*F5FTRlcKKbUo
z_xt_c%MS>AuNp?n51_5vX7S{VaOUheVQhe%@FR!=2v=pxn3kkGxol&bU*Kb(){e1U
zk8dyCe7D}u-8%p5#@)5Zt8IcjIb_m=fG<MA-UjCc;~M8O<4d+-laIz&)~X8eRpN+Q
zE+&be5{DX`-!QIm{=m2=H(2a|Sk#rK4)}w_lZtA|#0g?evE()}%k!h%?oj@~9pWRh
zVNz^hh4>Jw3yow;KY>#RDQA47#a;priom{$Bkk}Mz4w8Y>mzMr;MU5wKWNosQ8%4$
z*D|o<p5ts(fU%>%)>p^*wd^=sPiXFM!0M*lHG8fvP3rpy{Og_XnP&$+(;mp&9{rtp
zU0g2_=wAcM2_R16i&bF!KCtI4AdyD8KNj<DUPCYorPBF)G%ik5GSVzH<-c0H)ump!
z7N+NJy;e9)BlQ5EtX?VYalM(zdaP7aa~>~h$%4mqGedpiu?y9l<gu#HmpnG?nW2wr
zrHA^WR;C{DShHK4_xM6*Zs@P5so{F`R)L)xcb!c;TlN?!q>-m9ia10}pn?n}%z_HX
z|3C6X_&M-!{6wx;djIG(6aFw;z3lci*)gt|&4y+R({%dOh>+Fg;}Ib$ij(*aV&<+&
z9Cuc%00009a7bBm000XU000XU0RWnu7ytkO@<~KNR5%f1U>F6A=t1!Ouwgj^BLkNN
z2U91b$=Pq{^5}dfbOE-%Z##gds=WO1_twj!Mlt{Y|HrTdSr3Nfy92WSK??pcurT~#
z=062i%*d24VRP;TvPKvirvWep{}|bU2Jt*)U|>AR%EFc@Y;p1vOb$e2cmY`wtl<Ao
z2DU$Mr5XPHj{5cc*9r`IbOCfe$OXSxM1fYZE@NY5i$IrWK^K7WL1FNZRfOT+zu%y6
z0EWSNtYLs*z<*#I{$rPB`1|+!Q$~ir72-DMmohRkf&&(2I5Lf4z%ORu3WmQwfa!o4
inhr3+8Cm~uU;_Y9&PP|_Arhbf0000<MNUMnLSTX=^RcY}
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..38bf1e5adafa1f3b0e345e61008a03dee328c9b6
GIT binary patch
literal 879
zc$@)m1CacQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006&X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlTT>Va1_VCZIM-!Qt%JxDF>MfRbpG%E`x6U<J#34+K#Fx+azr|
z+cYL=)!{)wym%7)a~OgL6)U3P!3ho=p1cUkK#T0)S&xHVWW@K&kF*F5FTRlcKKbUo
z_xt_c%MS>AuNp?n51_5vX7S{VaOUheVQhe%@FR!=2v=pxn3kkGxol&bU*Kb(){e1U
zk8dyCe7D}u-8%p5#@)5Zt8IcjIb_m=fG<MA-UjCc;~M8O<4d+-laIz&)~X8eRpN+Q
zE+&be5{DX`-!QIm{=m2=H(2a|Sk#rK4)}w_lZtA|#0g?evE()}%k!h%?oj@~9pWRh
zVNz^hh4>Jw3yow;KY>#RDQA47#a;priom{$Bkk}Mz4w8Y>mzMr;MU5wKWNosQ8%4$
z*D|o<p5ts(fU%>%)>p^*wd^=sPiXFM!0M*lHG8fvP3rpy{Og_XnP&$+(;mp&9{rtp
zU0g2_=wAcM2_R16i&bF!KCtI4AdyD8KNj<DUPCYorPBF)G%ik5GSVzH<-c0H)ump!
z7N+NJy;e9)BlQ5EtX?VYalM(zdaP7aa~>~h$%4mqGedpiu?y9l<gu#HmpnG?nW2wr
zrHA^WR;C{DShHK4_xM6*Zs@P5so{F`R)L)xcb!c;TlN?!q>-m9ia10}pn?n}%z_HX
z|3C6X_&M-!{6wx;djIG(6aFw;z3lci*)gt|&4y+R({%dOh>+Fg;}Ib$ij(*aV&<+&
z9Cuc%00009a7bBm000XU000XU0RWnu7ytkO)k#D_R5%gskUa{*KoEszHh&VtAQ6dp
z3c*Sg&tqk2j$jUA?jbf3h@K)?*(&5`<4!`ty2%l;&CGk>+gA+0@K8O$>$W<X#rup<
zsz^8pspk5N-7{z)YnFB**xXvSQeHCM4Mm47dz}Jr#Db#uCLDA*2emHu#AVPaz;*mV
zWIi`$at?CMiO44|gH8d#`6j+_o<$t3D%(u*<<GSD79gUy7dz(Kq{`>oI3Zp6N<(h}
zWxVa<4p4?EbA-Zct(D(G{$EPrhHf6x45p@-3L2zzfgd*fHn=7kac%$r002ovPDHLk
FV1kR{qm%#u
--- a/mailnews/base/prefs/content/accountcreation/emailWizard.js
+++ b/mailnews/base/prefs/content/accountcreation/emailWizard.js
@@ -587,16 +587,30 @@ EmailConfigWizard.prototype =
                                         incoming.hostname,
                                         sanitize.enum(incoming.type,
                                                       ["pop3", "imap", "nntp"]),
                                         incoming.port) == null;
     }
     return isNew;
   },
 
+  toggleDetails : function (id)
+  {
+    let tech = document.getElementById(id+"_technical");
+    let details = document.getElementById(id+"_details");
+    if (details.getAttribute("collapsed")) {
+      tech.setAttribute("expanded", true);
+      details.removeAttribute("collapsed");
+    }
+    else {
+      details.setAttribute("collapsed", true);
+      tech.removeAttribute("expanded");
+    }
+  },
+
   toggleAcknowledgeWarning : function()
   {
     this._warningAcknowledged =
       getElementById('acknowledge_warning').checked;
     this.checkEnableIKnow();
   },
 
   checkEnableIKnow: function()
@@ -627,50 +641,50 @@ EmailConfigWizard.prototype =
         let outgoing_details;
         let incoming = this._currentConfigFilledIn.incoming;
         let outgoing = this._currentConfigFilledIn.outgoing;
         var brandShortName = gBrandBundle.getString("brandShortName");
         switch (this._incomingWarning)
         {
           case 'cleartext':
             incomingwarningstring = gStringsBundle.getFormattedString(
-              "incoming_cleartext_warning", [brandShortName, incoming.hostname]);
+              "cleartext_warning", [incoming.hostname]);
             incoming_details = gStringsBundle.getString("cleartext_details");
             setText('warning_incoming', incomingwarningstring);
             setText('incoming_details', incoming_details);
             _show('incoming_box');
             _show('acknowledge_warning');
             break;
           case 'selfsigned':
             incomingwarningstring = gStringsBundle.getFormattedString(
-              "incoming_selfsigned_warning", [brandShortName, incoming.hostname]);
+              "selfsigned_warning", [incoming.hostname]);
             incoming_details = gStringsBundle.getString("selfsigned_details");
             setText('warning_incoming', incomingwarningstring);
             setText('incoming_details', incoming_details);
             _show('incoming_box');
             _show('acknowledge_warning');
             break;
           case '':
             _hide('incoming_box');
             _hide('acknowledge_warning');
         }
         switch (this._outgoingWarning)
         {
           case 'cleartext':
             outgoingwarningstring = gStringsBundle.getFormattedString(
-              "outgoing_cleartext_warning", [brandShortName, outgoing.hostname]);
+              "cleartext_warning", [outgoing.hostname]);
             outgoing_details = gStringsBundle.getString("cleartext_details");
             setText('warning_outgoing', outgoingwarningstring);
             setText('outgoing_details', outgoing_details);
             _show('outgoing_box');
             _show('acknowledge_warning');
             break;
           case 'selfsigned':
             outgoingwarningstring = gStringsBundle.getFormattedString(
-              "outgoing_selfsigned_warning", [brandShortName, outgoing.hostname]);
+              "selfsigned_warning", [outgoing.hostname]);
             outgoing_details = gStringsBundle.getString("selfsigned_details");
             setText('warning_outgoing', outgoingwarningstring);
             setText('outgoing_details', outgoing_details);
             _show('outgoing_box');
             _show('acknowledge_warning');
             break;
           case '':
             _hide('outgoing_box');
--- a/mailnews/base/prefs/content/accountcreation/emailWizard.xul
+++ b/mailnews/base/prefs/content/accountcreation/emailWizard.xul
@@ -384,38 +384,46 @@
   </vbox>
 
 
   <vbox id="warningbox" class="warningbox" hidden="true" flex="1">
     <hbox class="warning" flex="1">
       <vbox class="larrybox">
         <image id="insecure_larry" class="insecureLarry"/>
       </vbox>
-      <vbox flex="1">
-        <vbox class="warning_text" flex="1">
-          <label class="warning-heading">&warning.label;</label>
-          <description id="warning_description"/>
-          <vbox id="incoming_box" flex="1">
-            <label class="warning_settings" value="&incomingSettings.label;"/>
-            <description id="warning_incoming"/>
-            <description id="incoming_details"/>
-          </vbox>
-          <vbox id="outgoing_box" flex="1">
-            <label class="warning_settings" value="&outgoingSettings.label;"/>
-            <description id="warning_outgoing"/>
-            <description id="outgoing_details"/>
-          </vbox>
-          <description id="findoutmore">&contactYourProvider.description;</description>
-          <checkbox id="acknowledge_warning"
-                    class="acknowledge_checkbox"
-                    label="&confirmWarning.label;"
-                    accesskey="&confirmWarning.accesskey;"
-                    oncommand="gEmailConfigWizard.toggleAcknowledgeWarning()"/>
-        </vbox>
-        <spacer flex="1"/>
+      <vbox flex="1" class="warning_text">
+         <label class="warning-heading">&warning.label;</label>
+         <vbox id="incoming_box">
+           <hbox>
+             <label class="warning_settings" value="&incomingSettings.label;"/>
+             <description id="warning_incoming"/>
+           </hbox>
+           <label id="incoming_technical" value="&technicaldetails.label;"
+                  class="technical_details"
+                  onclick="gEmailConfigWizard.toggleDetails('incoming');"/>
+           <description id="incoming_details" collapsed="true"/>
+         </vbox>
+         <vbox id="outgoing_box">
+           <hbox>
+             <label class="warning_settings" value="&outgoingSettings.label;"/>
+             <description id="warning_outgoing"/>
+           </hbox>
+           <label id="outgoing_technical" value="&technicaldetails.label;"
+                  class="technical_details"
+                  onclick="gEmailConfigWizard.toggleDetails('outgoing');"/>
+           <description id="outgoing_details" collapsed="true"/>
+         </vbox>
+         <spacer flex="10"/>
+         <description id="findoutmore">&contactYourProvider.description;</description>
+         <checkbox id="acknowledge_warning"
+                   class="acknowledge_checkbox"
+                   label="&confirmWarning.label;"
+                   accesskey="&confirmWarning.accesskey;"
+                  oncommand="gEmailConfigWizard.toggleAcknowledgeWarning()"/>
+        <spacer flex="100"/>
         <hbox>
           <button id="getmeoutofhere" label="&changeSettings.label;"
                   accesskey="&changeSettings.accesskey;"
                   oncommand="gEmailConfigWizard.getMeOutOfHere()"/>
           <spacer flex="1"/>
           <button id="iknow" label="&createAccount.label;" disabled="true"
                   accesskey="&createAccount.accesskey;"
                   oncommand="gEmailConfigWizard.validateAndFinish()"/>