Bug 739049 Some bookmark edit panels do not expand correctly r+a=InvisibleSmiley
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Mon, 26 Mar 2012 00:23:14 +0100
changeset 11129 dcc865d68be7c413b8a388c1c9e439b53f6077ca
parent 11128 b93d8d423cc037db75f159f52b1a32777c9cf1f7
child 11130 63eddfec113c2db4f340d68b302ef1ee904ea6c8
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs739049
Bug 739049 Some bookmark edit panels do not expand correctly r+a=InvisibleSmiley
suite/common/bookmarks/bm-props.xul
suite/common/bookmarks/bookmarksManager.xul
suite/common/bookmarks/editBookmarkOverlay.xul
suite/common/bookmarks/placesOverlay.xul
--- a/suite/common/bookmarks/bm-props.xul
+++ b/suite/common/bookmarks/bm-props.xul
@@ -68,11 +68,11 @@
                   src="chrome://communicator/locale/bookmarks/bm-props.properties"/>
   </stringbundleset>
 
   <script type="application/javascript"
           src="chrome://communicator/content/bookmarks/editBookmarkOverlay.js"/>
   <script type="application/javascript"
           src="chrome://communicator/content/bookmarks/bm-props.js"/>
 
-<vbox id="editBookmarkPanelContent"/>
+<vbox id="editBookmarkPanelContent" flex="1"/>
 
 </dialog>
--- a/suite/common/bookmarks/bookmarksManager.xul
+++ b/suite/common/bookmarks/bookmarksManager.xul
@@ -401,17 +401,18 @@
           <label id="itemsCountText"/>
           <spacer flex="1"/>
           <description id="selectItemDescription">
               &detailsPane.selectAnItemText.description;
           </description>
           <spacer flex="3"/>
         </vbox>
         <vbox id="infoBox" minimal="true">
-          <vbox id="editBookmarkPanelContent" flex="1"/>
+          <vbox id="editBookmarkPanelContent"/>
+          <spacer flex="1"/>
           <hbox id="infoBoxExpanderWrapper" align="center">
 
             <button type="image" id="infoBoxExpander"
                     class="expander-down"
                     accesskey="&detailsPane.more.accesskey;"
                     oncommand="PlacesOrganizer.toggleAdditionalInfoFields();"
                     observes="paneElementsBroadcaster"/>
 
--- a/suite/common/bookmarks/editBookmarkOverlay.xul
+++ b/suite/common/bookmarks/editBookmarkOverlay.xul
@@ -43,17 +43,17 @@
 ]>
 
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/editBookmarkOverlay.css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css"?>
 
 <overlay id="editBookmarkOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <vbox id="editBookmarkPanelContent" flex="1">
+  <vbox id="editBookmarkPanelContent">
     <broadcaster id="paneElementsBroadcaster"/>
 
     <hbox id="editBMPanel_selectionCount" hidden="true" pack="center">
       <label id="editBMPanel_itemsCountText"/>
     </hbox>
 
     <grid id="editBookmarkPanelGrid" flex="1">
       <columns id="editBMPanel_columns">
--- a/suite/common/bookmarks/placesOverlay.xul
+++ b/suite/common/bookmarks/placesOverlay.xul
@@ -1,8 +1,10 @@
+<?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/
    -
@@ -121,17 +123,17 @@
          onpopupshown="StarUI.panelShown(event);"
          aria-labelledby="editBookmarkPanelTitle">
     <row id="editBookmarkPanelHeader" align="center" hidden="true">
       <vbox align="center">
         <image id="editBookmarkPanelStarIcon"/>
       </vbox>
       <label id="editBookmarkPanelTitle"/>
     </row>
-    <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
+    <vbox id="editBookmarkPanelContent" hidden="true"/>
     <hbox id="editBookmarkPanelBottomButtons">
       <button id="editBookmarkPanelRemoveButton"
               class="editBookmarkPanelHeaderButton"
               oncommand="StarUI.removeBookmarkButtonCommand();"
               accesskey="&editBookmark.removeBookmark.accessKey;"/>
       <spacer flex="1"/>
       <button id="editBookmarkPanelDeleteButton"
               class="editBookmarkPanelBottomButton"