Fixing bugs 122932 and 113488. Fixing the serevr page in mailnews accountwizard to avoid vertical scroll bars in classic skin and also to remove group boxes on that page. r=ssu, sr=blake, a=asa

mailnews/base/prefs/resources/content/AccountWizard.xul

@@ -116,39 +116,41 @@ Rights Reserved.
               onpageshow="return serverPageInit();"
               onpageadvanced="return serverPageValidate();">
     <vbox flex="1">
-      <groupbox orient="vertical">
-        <caption label="&incomingServerTitle.label;"/>
+        <vbox id="serverTypeBox">
         <description>&incomingServerTypeDesc.label;</description>
-        <separator class="thin"/>
-        <hbox align="center">
-          <!-- The initial value for the servertype radiogroup is set in onInit() -->
-          <radiogroup id="servertype" wsm_persist="true" orient="horizontal">
-              <radio group="servertype" value="pop3" id="pop3" label="&popType.label;" wsm_persist="true" oncommand="setServerType();"/>
-              <radio group="servertype" value="imap" id="imap" label="&imapType.label;" wsm_persist="true" oncommand="setServerType();"/>
-          </radiogroup>
-        </hbox>
-        <separator class="thin"/>
-        <description>&incomingServerNameDesc.label;</description>
-        <separator class="thin"/>
-        <hbox align="center">
-          <label class="label" style="width: 8em;" value="&incomingServerLabel.label;" for="incomingServer"/>
-          <textbox wsm_persist="true" id="incomingServer" flex="1"/>
-        </hbox>
-      </groupbox>
+          <separator class="thin"/>
+          <hbox align="center" class="serverDataBox">
+            <!-- The initial value for the servertype radiogroup is set in onInit() -->
+            <radiogroup id="servertype" wsm_persist="true" orient="horizontal">
+                <radio group="servertype" value="pop3" id="pop3" label="&popType.label;" wsm_persist="true" oncommand="setServerType();"/>
+                <radio group="servertype" value="imap" id="imap" label="&imapType.label;" wsm_persist="true" oncommand="setServerType();"/>
+            </radiogroup>
+          </hbox>
+        </vbox>
 
-      <groupbox orient="vertical" id="noSmtp">
-        <caption label="&smtpServerTitle.label;"/>
-        <description>&smtpServerDesc.label;</description>
-        <separator class="thin"/>
-        <hbox align="center">
-          <label class="label" value="&smtpServerLabel.label;" for="smtphostname" style="width: 8em;"/>
-          <textbox id="smtphostname" wsm_persist="true" flex="1"/>
-        </hbox>
-      </groupbox>
+        <separator/>
 
-      <groupbox id="haveSmtp" orient="vertical">
-        <description id="smtpStaticText" style="width: 200px;">&haveSmtp1.label;</description>
-      </groupbox>
+        <vbox id="incomingServerbox">
+          <description>&incomingServerNameDesc.label;</description>
+          <hbox align="center" class="serverDataBox">
+            <label class="label, serverLabel" value="&incomingServerLabel.label;" for="incomingServer"/>
+            <textbox wsm_persist="true" id="incomingServer" flex="1"/>
+          </hbox>
+        </vbox>
+
+        <separator/>
+
+        <vbox id="noSmtp">
+          <description>&smtpServerDesc.label;</description>
+          <hbox align="center" class="serverDataBox">
+            <label class="label, serverLabel" value="&smtpServerLabel.label;" for="smtphostname"/>
+            <textbox id="smtphostname" wsm_persist="true" flex="1"/>
+          </hbox>
+        </vbox>
+
+        <vbox id="haveSmtp">
+          <description id="smtpStaticText" style="width: 200px;">&haveSmtp1.label;</description>
+        </vbox>
     </vbox>
   </wizardpage>
 
@@ -177,7 +179,7 @@ Rights Reserved.
       <description>&newsServerNameDesc.label;</description>
       <separator class="thin"/>
       <hbox align="center">
-        <label control="hostname" value="&incomingServerLabel.label;" style="width: 8em;"/>
+        <label control="hostname" value="&newsServerLabel.label;" style="width: 8em;"/>
         <textbox id="newsServer" wsm_persist="true" flex="1"/>
       </hbox>
     </vbox>

mailnews/base/prefs/resources/locale/en-US/AccountWizard.dtd

@@ -37,14 +37,15 @@
 <!ENTITY incomingServerTypeLabel.label "Server Type:">
 <!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
 <!ENTITY incomingServerNameDesc.label "Enter the name of your incoming server (for example, &quot;mail.example.net&quot;).">
-<!ENTITY incomingServerLabel.label "Server Name:">
+<!ENTITY incomingServerLabel.label "Incoming Server:">
 <!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
 <!ENTITY newsServerNameDesc.label "Enter the name of your news server (NNTP) (for example, &quot;news.example.net&quot;).">
 <!-- LOCALIZATION NOTE (smtpServerTitle.label) : Do not translate "SMTP" in below line -->
 <!ENTITY smtpServerTitle.label "Outgoing Server (SMTP)">
 <!-- LOCALIZATION NOTE (smtpServerDesc.label) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
 <!ENTITY smtpServerDesc.label "Enter the name of your outgoing server (SMTP) (for example, &quot;smtp.example.net&quot;).">
-<!ENTITY smtpServerLabel.label "Server Name:">
+<!ENTITY smtpServerLabel.label "Outgoing Server:">
+<!ENTITY newsServerLabel.label "Newsgroup Server:">
 <!-- LOCALIZATION NOTE (imapType.label) : Do not translate "IMAP" in below line -->
 <!ENTITY imapType.label "IMAP">
 <!-- LOCALIZATION NOTE (popType.label) : Do not translate "POP" in below line -->
@@ -57,7 +58,7 @@
 	  inserting text after the "&quot;" entity in currentSmtpAfter.label, if required grammatically
 -->
 <!-- LOCALIZATION NOTE (haveSmtp1.label) : Do not translate "SMTP" in below line -->
-<!ENTITY haveSmtp1.label "'@server_name@' is set as your outgoing server (SMTP). You need only one outgoing server, even for multiple accounts. Normally you choose the outgoing server for your most active mail account. To specify additional outgoing servers, choose Mail &amp; Newsgroups Account Settings from the Edit menu.">
+<!ENTITY haveSmtp1.label "Your existing outgoing server (SMTP), &quot;@server_name@&quot;, will be used. You can modify outgoing server settings by choosing Mail &amp; Newsgroups Account Settings from the Edit menu.">
 
 <!-- Entities for Login page -->