Bug 1561390 - fixed unaligned elements in the account manager. r=aceman a=jorgk BETA_68_CONTINUATION
authorKhushil Mistry <khushil324@gmail.com>
Sat, 13 Jul 2019 14:50:00 +0200
branchBETA_68_CONTINUATION
changeset 36083 bbc19c7449026616efc289158a968da7b3e7b390
parent 36082 09320da375a6a3e5156f1071d978a86d211cab5b
child 36084 1cae59747a9a62a7bb9609cea72357b06057e821
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersaceman, jorgk
bugs1561390
Bug 1561390 - fixed unaligned elements in the account manager. r=aceman a=jorgk
mailnews/base/prefs/content/am-identity-edit.xul
mailnews/base/prefs/content/am-main.xul
mailnews/base/prefs/content/am-server.xul
--- a/mailnews/base/prefs/content/am-identity-edit.xul
+++ b/mailnews/base/prefs/content/am-identity-edit.xul
@@ -56,48 +56,65 @@
       <tab label="&securityTab.label;"/>
     </tabs>
 
     <tabpanels id="identityTabsPanels" flex="1">
       <!-- Identity Settings Tab -->
       <vbox flex="1" name="settings">
         <groupbox>
           <label class="header">&publicData.label;</label>
-          <hbox>
-            <vbox>
-              <hbox flex="1" align="center">
+          <html:table>
+            <html:tr>
+              <html:td>
                 <label value="&name.label;" control="identity.fullName"
                        accesskey="&name.accesskey;"/>
-              </hbox>
-              <hbox flex="1" align="center">
+              </html:td>
+              <html:td style="width:100%;">
+                <textbox id="identity.fullName" size="30" style="width:100%;"/>
+              </html:td>
+            </html:tr>
+            <html:tr>
+              <html:td>
                 <label value="&email.label;" control="identity.email"
                        accesskey="&email.accesskey;"/>
-              </hbox>
-              <hbox flex="1" align="center">
+              </html:td>
+              <html:td style="width:100%;">
+                <textbox id="identity.email" class="uri-element" style="width:100%;"/>
+              </html:td>
+            </html:tr>
+            <html:tr>
+              <html:td>
                 <label value="&replyTo.label;" control="identity.replyTo"
                        accesskey="&replyTo.accesskey;"/>
-              </hbox>
-              <hbox flex="1" align="center">
+              </html:td>
+              <html:td style="width:100%;">
+                <textbox id="identity.replyTo" class="uri-element" placeholder="&replyTo.placeholder;"
+                         style="width:100%;"/>
+              </html:td>
+            </html:tr>
+            <html:tr>
+              <html:td>
                 <label value="&organization.label;" control="identity.organization"
                        accesskey="&organization.accesskey;"/>
-              </hbox>
-              <hbox flex="1" align="center">
+              </html:td>
+              <html:td style="width:100%;">
+                <textbox id="identity.organization" style="width:100%;"/>
+              </html:td>
+            </html:tr>
+            <html:tr>
+              <html:td>
                 <label value="&signatureText.label;" control="identity.htmlSigText"
                        accesskey="&signatureText.accesskey;"/>
-              </hbox>
-            </vbox>
-            <vbox flex="1">
-              <textbox id="identity.fullName" size="30"/>
-              <textbox id="identity.email" class="uri-element"/>
-              <textbox id="identity.replyTo" class="uri-element" placeholder="&replyTo.placeholder;"/>
-              <textbox id="identity.organization"/>
-              <checkbox id="identity.htmlSigFormat" label="&signatureHtml.label;"
-                          accesskey="&signatureHtml.accesskey;"/>
-            </vbox>
-          </hbox>
+              </html:td>
+              <html:td style="width:100%;">
+                <checkbox id="identity.htmlSigFormat" label="&signatureHtml.label;"
+                          accesskey="&signatureHtml.accesskey;" style="width:100%;"/>
+              </html:td>
+            </html:tr>
+          </html:table>
 
           <separator class="thin"/>
 
           <hbox class="indent" flex="1" style="display: flex;align-items: stretch;">
             <html:textarea id="identity.htmlSigText" style="flex-grow: 1;" rows="4" class="signatureBox"/>
           </hbox>
 
           <hbox align="center">
--- a/mailnews/base/prefs/content/am-main.xul
+++ b/mailnews/base/prefs/content/am-main.xul
@@ -36,56 +36,72 @@
     </hbox>
 
     <separator class="thin"/>
 
     <groupbox style="width: 20em !important;" flex="1">
       <label class="header">&identityTitle.label;</label>
       <description>&identityDesc.label;</description>
       <separator class="thin"/>
-      <hbox>
-        <vbox>
-          <hbox flex="1" align="center">
+      <html:table>
+        <html:tr>
+          <html:td>
             <label value="&name.label;" control="identity.fullName"
                    accesskey="&name.accesskey;"/>
-          </hbox>
-          <hbox flex="1" align="center">
+          </html:td>
+          <html:td style="width:100%;">
+            <textbox id="identity.fullName" wsm_persist="true" size="30" style="width:100%;"
+                     prefstring="mail.identity.%identitykey%.fullName"/>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:td>
             <label value="&email.label;" control="identity.email"
                    accesskey="&email.accesskey;"/>
-          </hbox>
-          <hbox flex="1" align="center">
+          </html:td>
+          <html:td style="width:100%;">
+            <textbox id="identity.email" wsm_persist="true" style="width:100%;"
+                     prefstring="mail.identity.%identitykey%.useremail" class="uri-element"/>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:td>
             <label value="&replyTo.label;" control="identity.replyTo"
                    accesskey="&replyTo.accesskey;"/>
-          </hbox>
-          <hbox flex="1" align="center">
+          </html:td>
+          <html:td style="width:100%;">
+            <textbox id="identity.replyTo" wsm_persist="true" style="width:100%;"
+                     prefstring="mail.identity.%identitykey%.reply_to" class="uri-element"
+                     placeholder="&replyTo.placeholder;"/>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:td>
             <label value="&organization.label;" control="identity.organization"
                    accesskey="&organization.accesskey;"/>
-          </hbox>
-          <hbox flex="1" align="center">
+          </html:td>
+          <html:td style="width:100%;">
+            <textbox id="identity.organization" wsm_persist="true" style="width:100%;"
+                     prefstring="mail.identity.%identitykey%.organization"/>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:td>
             <label value="&signatureText.label;" control="identity.htmlSigText"
                    accesskey="&signatureText.accesskey;"/>
-          </hbox>
-        </vbox>
-        <vbox flex="1">
-          <textbox id="identity.fullName" wsm_persist="true" size="30"
-                   prefstring="mail.identity.%identitykey%.fullName"/>
-          <textbox id="identity.email" wsm_persist="true"
-                   prefstring="mail.identity.%identitykey%.useremail" class="uri-element"/>
-          <textbox id="identity.replyTo" wsm_persist="true"
-                   prefstring="mail.identity.%identitykey%.reply_to" class="uri-element"
-                   placeholder="&replyTo.placeholder;"/>
-          <textbox id="identity.organization" wsm_persist="true"
-                   prefstring="mail.identity.%identitykey%.organization"/>
-          <hbox align="center">
-            <checkbox id="identity.htmlSigFormat" wsm_persist="true" label="&signatureHtml.label;"
-                      prefattribute="value" accesskey="&signatureHtml.accesskey;"
-                      prefstring="mail.identity.%identitykey%.htmlSigFormat"/>
-          </hbox>
-        </vbox>
-      </hbox>
+          </html:td>
+          <html:td style="width:100%;">
+            <hbox align="center">
+              <checkbox id="identity.htmlSigFormat" wsm_persist="true" label="&signatureHtml.label;"
+                        prefattribute="value" accesskey="&signatureHtml.accesskey;" style="width:100%;"
+                        prefstring="mail.identity.%identitykey%.htmlSigFormat"/>
+            </hbox>
+          </html:td>
+        </html:tr>
+      </html:table>
 
       <hbox class="indent" flex="1" style="min-height: 50px;display: flex;align-items: stretch;">
         <html:textarea id="identity.htmlSigText" wsm_persist="true" rows="4" style="flex-grow: 1;"
                        prefstring="mail.identity.%identitykey%.htmlSigText" class="signatureBox"/>
       </hbox>
 
       <hbox align="center">
         <checkbox wsm_persist="true" id="identity.attachSignature" label="&signatureFile.label;" flex="1"
--- a/mailnews/base/prefs/content/am-server.xul
+++ b/mailnews/base/prefs/content/am-server.xul
@@ -89,64 +89,68 @@
       </div>
       <div/>
     </div>
 
     <separator class="thin"/>
 
     <groupbox hidefor="movemail">
       <label class="header">&securitySettings.label;</label>
-
-      <hbox flex="1">
-        <vbox>
-          <hbox flex="1" align="center">
+      <html:table>
+        <html:tr>
+          <html:td>
             <label value="&connectionSecurity.label;"
                    accesskey="&connectionSecurity.accesskey;"
                    control="server.socketType"/>
-          </hbox>
-          <hbox flex="1" align="center">
+          </html:td>
+          <html:td style="width:100%;">
+            <menulist wsm_persist="true" id="server.socketType"
+                      oncommand="secureSelect();" style="width:100%;">
+              <menupopup id="server.socketTypePopup">
+                <menuitem value="0" label="&connectionSecurityType-0.label;"/>
+                <menuitem id="connectionSecurityType-1"
+                          value="1" label="&connectionSecurityType-1.label;"
+                          disabled="true"/>
+                <menuitem value="2" label="&connectionSecurityType-2.label;"
+                          hidefor="nntp"/>
+                <menuitem value="3" label="&connectionSecurityType-3.label;"/>
+              </menupopup>
+            </menulist>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:td>
             <label value="&authMethod.label;"
                    accesskey="&authMethod.accesskey;"
                    control="server.authMethod"
                    hidefor="nntp,movemail"/>
-          </hbox>
-        </vbox>
-        <vbox>
-          <menulist wsm_persist="true" id="server.socketType"
-                      oncommand="secureSelect();">
-            <menupopup id="server.socketTypePopup">
-              <menuitem value="0" label="&connectionSecurityType-0.label;"/>
-              <menuitem id="connectionSecurityType-1"
-                          value="1" label="&connectionSecurityType-1.label;"
-                          disabled="true"/>
-              <menuitem value="2" label="&connectionSecurityType-2.label;"
-                          hidefor="nntp"/>
-              <menuitem value="3" label="&connectionSecurityType-3.label;"/>
-            </menupopup>
-          </menulist>
-          <menulist id="server.authMethod"
-                    wsm_persist="true"
-                    preftype="int"
-                    prefstring="mail.server.%serverkey%.authMethod"
-                    hidefor="nntp,movemail">
-            <menupopup id="server.authMethodPopup">
-              <menuitem id="authMethod-no" value="1"/>
-              <menuitem id="authMethod-old" value="2"/>
-              <menuitem id="authMethod-password-cleartext" value="3"/>
-              <menuitem id="authMethod-password-encrypted" value="4"/>
-              <menuitem id="authMethod-kerberos" value="5"/>
-              <menuitem id="authMethod-ntlm" value="6"/>
-              <menuitem id="authMethod-external" value="7"/>
-              <menuitem id="authMethod-oauth2" value="10"/>
-              <menuitem id="authMethod-anysecure" value="8"/>
-              <menuitem id="authMethod-any" value="9"/>
-            </menupopup>
-          </menulist>
-        </vbox>
-      </hbox>
+          </html:td>
+          <html:td style="width:100%;">
+            <menulist id="server.authMethod"
+                      wsm_persist="true"
+                      preftype="int"
+                      prefstring="mail.server.%serverkey%.authMethod"
+                      hidefor="nntp,movemail"
+                      style="width:100%;">
+              <menupopup id="server.authMethodPopup">
+                <menuitem id="authMethod-no" value="1"/>
+                <menuitem id="authMethod-old" value="2"/>
+                <menuitem id="authMethod-password-cleartext" value="3"/>
+                <menuitem id="authMethod-password-encrypted" value="4"/>
+                <menuitem id="authMethod-kerberos" value="5"/>
+                <menuitem id="authMethod-ntlm" value="6"/>
+                <menuitem id="authMethod-external" value="7"/>
+                <menuitem id="authMethod-oauth2" value="10"/>
+                <menuitem id="authMethod-anysecure" value="8"/>
+                <menuitem id="authMethod-any" value="9"/>
+              </menupopup>
+            </menulist>
+          </html:td>
+        </html:tr>
+      </html:table>
     </groupbox>
 
     <groupbox>
       <label class="header">&serverSettings.label;</label>
       <vbox align="start">
       <checkbox wsm_persist="true"
                 id="server.loginAtStartUp"
                 label="&loginAtStartup.label;"