Bug 957281 - Help button should be positioned at the lower end of the preferences window. r=Mano.
authorstefanh@inbox.com
Mon, 07 Apr 2014 21:16:11 +0200
changeset 177327 6d276863a7e394a62e83a10d1073aef342292022
parent 177326 f1b0d3d13755f04d3f52a6a9244ecc6224907428
child 177328 6b85b16dc2267eb111b349f8c930deb5d5c18cbc
push id26549
push userryanvm@gmail.com
push dateTue, 08 Apr 2014 02:08:55 +0000
treeherdermozilla-central@488caa16c617 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMano
bugs957281
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 957281 - Help button should be positioned at the lower end of the preferences window. r=Mano.
toolkit/content/widgets/preferences.xml
--- a/toolkit/content/widgets/preferences.xml
+++ b/toolkit/content/widgets/preferences.xml
@@ -567,28 +567,26 @@
         <xul:radiogroup anonid="selector" orient="horizontal" class="paneSelector chromeclass-toolbar"
                         role="listbox"/> <!-- Expose to accessibility APIs as a listbox -->
       </xul:windowdragbox>
       <xul:hbox flex="1" class="paneDeckContainer">
         <xul:deck anonid="paneDeck" flex="1">
           <children includes="prefpane"/>
         </xul:deck>
       </xul:hbox>
-      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons"
+      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end">
 #ifdef XP_UNIX
-                >
         <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
         <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
         <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
         <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
         <xul:spacer anonid="spacer" flex="1"/>
         <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
         <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
 #else
-                pack="end">
         <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
         <xul:spacer anonid="spacer" flex="1"/>
         <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
         <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
         <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
         <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
         <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
 #endif
@@ -607,16 +605,18 @@
           if (this.instantApply) {
             var docElt = document.documentElement;
             var acceptButton = docElt.getButton("accept");
             acceptButton.hidden = true;
             var cancelButton  = docElt.getButton("cancel");
 #ifdef XP_MACOSX
             // no buttons on Mac except Help
             cancelButton.hidden = true;
+            // Move Help button to the end
+            document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true;         
             // Also, don't fire onDialogAccept on enter
             acceptButton.disabled = true;
 #else
             // morph the Cancel button into the Close button
             cancelButton.setAttribute ("icon", "close");
             cancelButton.label = docElt.getAttribute("closebuttonlabel");
             cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey");
 #endif