Bug 555452 Mail List Dialog header sections should use <hbox align=end> instead of spacers to align the labels r=Mnyromyr sr=Neil; a=Standard8 for checkin to CLOSED TREE
authorPhilip Chee <philip.chee@gmail.com>
Tue, 25 May 2010 20:23:07 +0800
changeset 5732 23337051ed93c8d987ea4d4c6d1b830e31c85a3a
parent 5731 17e1829c4c41a3b55554dd40b0e8af99706eb41a
child 5733 eb6e07797656a8965dde6e6384e43b9765905c7e
push idunknown
push userunknown
push dateunknown
reviewersMnyromyr, Neil, Standard8
bugs555452
Bug 555452 Mail List Dialog header sections should use <hbox align=end> instead of spacers to align the labels r=Mnyromyr sr=Neil; a=Standard8 for checkin to CLOSED TREE
mailnews/addrbook/content/abListOverlay.xul
mailnews/jar.mn
suite/mailnews/addrbook/abListOverlay.xul
suite/mailnews/jar.mn
suite/themes/classic/messenger/addressbook/cardDialog.css
suite/themes/modern/messenger/addressbook/cardDialog.css
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -12,17 +12,16 @@ messenger.jar:
     content/messenger/addressbook/abNewCardDialog.xul                          (addrbook/content/abNewCardDialog.xul)
     content/messenger/addressbook/abResultsPaneOverlay.xul                     (addrbook/content/abResultsPaneOverlay.xul)
     content/messenger/addressbook/abResultsPane.js                             (addrbook/content/abResultsPane.js)
     content/messenger/addressbook/abSelectAddressesDialog.js                   (addrbook/content/abSelectAddressesDialog.js)
     content/messenger/addressbook/abSelectAddressesDialog.xul                  (addrbook/content/abSelectAddressesDialog.xul)
     content/messenger/addressbook/addrbookWidgets.xml                          (addrbook/content/addrbookWidgets.xml)
     content/messenger/addressbook/abDragDrop.js                                (addrbook/content/abDragDrop.js)
     content/messenger/addressbook/abMailListDialog.js                          (addrbook/content/abMailListDialog.js)
-    content/messenger/addressbook/abListOverlay.xul                            (addrbook/content/abListOverlay.xul)
     content/messenger/addressbook/addressbook-panel.xul                        (addrbook/content/addressbook-panel.xul)
     content/messenger/addressbook/addressbook-panel.js                         (addrbook/content/addressbook-panel.js)
     content/messagebody/addressbook/print.css                                  (addrbook/content/print.css)
 *   content/messenger/AccountManager.xul                                       (base/prefs/content/AccountManager.xul)
     content/messenger/AccountManager.js                                        (base/prefs/content/AccountManager.js)
     content/messenger/am-main.xul                                              (base/prefs/content/am-main.xul)
     content/messenger/am-main.js                                               (base/prefs/content/am-main.js)
     content/messenger/am-help.js                                               (base/prefs/content/am-help.js)
rename from mailnews/addrbook/content/abListOverlay.xul
rename to suite/mailnews/addrbook/abListOverlay.xul
--- a/mailnews/addrbook/content/abListOverlay.xul
+++ b/suite/mailnews/addrbook/abListOverlay.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <!-- ***** BEGIN LICENSE BLOCK *****
  Version: MPL 1.1/GPL 2.0/LGPL 2.1
 
  The contents of this file are subject to the Mozilla Public License Version
  1.1 (the "License"); you may not use this file except in compliance with
  the License. You may obtain a copy of the License at
  http://www.mozilla.org/MPL/
 
@@ -30,17 +30,17 @@
  under the terms of either the GPL or the LGPL, and not to allow others to
  use your version of this file under the terms of the MPL, indicate your
  decision by deleting the provisions above and replace them with the notice
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
- 
+
 <?xml-stylesheet href="chrome://messenger/skin/addressingWidget.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/cardDialog.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
 
 <overlay id="editListOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
@@ -48,63 +48,69 @@
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
   <script type="application/javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
   <script type="application/javascript" src="chrome://global/content/dialogOverlay.js"/>
 
 <vbox id="editlist">
-  <vbox>
-    <hbox>
-      <spacer flex="1"/>
-      <label control="ListName" value="&ListName.label;"
-             accesskey="&ListName.accesskey;" class="CardEditLabel"/>
-      <hbox class="CardEditWidth">
-        <textbox id="ListName" flex="1"/>
-      </hbox>
-    </hbox>
-    <hbox>
-      <spacer flex="1"/>
-      <label control="ListNickName" value="&ListNickName.label;"
-             accesskey="&ListNickName.accesskey;" class="CardEditLabel"/>
-      <hbox class="CardEditWidth">
-        <textbox id="ListNickName" flex="1"/>
-      </hbox>
-    </hbox>
-    <hbox>
-      <spacer flex="1"/>
-      <label control="ListDescription" value="&ListDescription.label;"
-             accesskey="&ListDescription.accesskey;" class="CardEditLabel"/>
-      <hbox class="CardEditWidth">
-        <textbox id="ListDescription" flex="1"/>
-      </hbox>
-    </hbox>
-  </vbox>
+  <grid>
+    <columns>
+      <column/>
+      <column class="CardEditWidth" flex="1"/>
+    </columns>
+
+    <rows>
+      <row align="center">
+        <label control="ListName"
+               class="CardEditLabel"
+               value="&ListName.label;"
+               accesskey="&ListName.accesskey;"/>
+        <textbox id="ListName"/>
+      </row>
+
+      <row align="center">
+        <label control="ListNickName"
+               class="CardEditLabel"
+               value="&ListNickName.label;"
+               accesskey="&ListNickName.accesskey;"/>
+        <textbox id="ListNickName"/>
+      </row>
+
+      <row align="center">
+        <label control="ListDescription"
+               class="CardEditLabel"
+               value="&ListDescription.label;"
+               accesskey="&ListDescription.accesskey;"/>
+        <textbox id="ListDescription"/>
+      </row>
+    </rows>
+  </grid>
 
   <spacer style="height:1em"/>
   <label control="addressingWidget" value="&AddressTitle.label;"/>
   <spacer style="height:0.1em"/>
 
   <listbox id="addressingWidget" style="height: 15em;"
            onclick="awClickEmptySpace(event.target, true)">
     <listitem class="addressingWidgetItem" allowevents="true">
       <listcell class="addressingWidgetCell">
         <textbox id="addressCol1#1"
                  class="plain textbox-addressingWidget uri-element"
                  type="autocomplete"
                  flex="1"
-                 autocompletesearch="addrbook" timeout="300" maxrows="4" 
+                 autocompletesearch="addrbook" timeout="300" maxrows="4"
                  completedefaultindex="true" forcecomplete="true"
                  minresultsforpopup="3"
                  ontextentered="awRecipientTextCommand(eventParam, this)"
                  onkeypress="handleKeyPress(this, event);"
                  onkeydown="awRecipientKeyDown(event, this);"
                  onclick="awNotAnEmptyArea(event);">
           <image onclick="awNotAnEmptyArea(event)" class="person-icon"/>
         </textbox>
-      </listcell>            
+      </listcell>
     </listitem>
   </listbox>
 </vbox>
 
 </overlay>
 
--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -97,16 +97,17 @@ messenger.jar:
     content/messenger/messengercompose/mailComposeExtrasOverlay.xul            (compose/mailComposeExtrasOverlay.xul)
     content/messenger/addressbook/addressbook.js                               (addrbook/addressbook.js)
     content/messenger/addressbook/addressbook.xul                              (addrbook/addressbook.xul)
     content/messenger/addressbook/abCommon.js                                  (addrbook/abCommon.js)
     content/messenger/addressbook/abCardOverlay.js                             (addrbook/abCardOverlay.js)
     content/messenger/addressbook/abCardViewOverlay.js                         (addrbook/abCardViewOverlay.js)
     content/messenger/addressbook/abMailListDialog.xul                         (addrbook/abMailListDialog.xul)
     content/messenger/addressbook/abEditListDialog.xul                         (addrbook/abEditListDialog.xul)
+    content/messenger/addressbook/abListOverlay.xul                            (addrbook/abListOverlay.xul)
     content/messenger/addressbook/pref-addressing.js                           (addrbook/prefs/pref-addressing.js)
     content/messenger/addressbook/pref-addressing.xul                          (addrbook/prefs/pref-addressing.xul)
 #ifdef XP_MACOSX
     content/messenger/platformMailnewsOverlay.xul                              (mac/platformMailnewsOverlay.xul)
 #else
 #ifdef XP_WIN32
     content/messenger/platformMailnewsOverlay.xul                              (win/platformMailnewsOverlay.xul)
 #else
--- a/suite/themes/classic/messenger/addressbook/cardDialog.css
+++ b/suite/themes/classic/messenger/addressbook/cardDialog.css
@@ -45,16 +45,20 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Card Edit dialog ::::: */
 
 .CardEditWidth {
   width: 42ch;
 }
 
+.CardEditLabel {
+  text-align: end;
+}
+
 .PhoneEditWidth {
   width: 24ch;
 }
 
 .AddressCardEditWidth {
   width: 72ch;
 }
 
--- a/suite/themes/modern/messenger/addressbook/cardDialog.css
+++ b/suite/themes/modern/messenger/addressbook/cardDialog.css
@@ -45,16 +45,20 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Card Edit dialog ::::: */
 
 .CardEditWidth {
   width: 42ch;
 }
 
+.CardEditLabel {
+  text-align: end;
+}
+
 .PhoneEditWidth {
   width: 24ch;
 }
 
 .AddressCardEditWidth {
   width: 72ch;
 }