Bug 618268 Remove unused element and move Remove button to share space with the other buttons r=IanN
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Thu, 16 Dec 2010 23:33:30 +0000
changeset 6850 c671983f52d8ec575445dd629d4b37564ea2a567
parent 6849 afdde738a6687999aad4db6bbae3ce528c76fb4c
child 6851 85faf50deb16ec623f6f97ce3bfb31d700d59fb2
push idunknown
push userunknown
push dateunknown
reviewersIanN
bugs618268
Bug 618268 Remove unused element and move Remove button to share space with the other buttons r=IanN
suite/common/bookmarks/browser-places.js
suite/common/bookmarks/placesOverlay.xul
suite/themes/classic/mac/navigator/navigator.css
suite/themes/classic/navigator/navigator.css
suite/themes/modern/navigator/navigator.css
--- a/suite/common/bookmarks/browser-places.js
+++ b/suite/common/bookmarks/browser-places.js
@@ -199,35 +199,30 @@ var StarUI = {
     // if we are batching, i.e. the bookmark has been added now,
     // then show Page Bookmarked, else if the bookmark did already exist,
     // we are about editing it, then use Edit This Bookmark.
     this._element("editBookmarkPanelTitle").value =
       this._batching ?
         gNavigatorBundle.getString("editBookmarkPanel.pageBookmarkedTitle") :
         gNavigatorBundle.getString("editBookmarkPanel.editBookmarkTitle");
 
-    // No description; show the Done, Cancel;
-    this._element("editBookmarkPanelDescription").textContent = "";
     this._element("editBookmarkPanelBottomButtons").hidden = false;
     this._element("editBookmarkPanelContent").hidden = false;
 
     // The remove button is shown only if we're not already batching, i.e.
     // if the cancel button/ESC does not remove the bookmark.
     this._element("editBookmarkPanelRemoveButton").hidden = this._batching;
 
     // The label of the remove button differs if the URI is bookmarked
     // multiple times.
     var bookmarks = PlacesUtils.getBookmarksForURI(gBrowser.currentURI);
     var forms = gNavigatorBundle.getString("editBookmark.removeBookmarks.label");
     var label = PluralForm.get(bookmarks.length, forms).replace("#1", bookmarks.length);
     this._element("editBookmarkPanelRemoveButton").label = label;
 
-    // unset the unstarred state, if set
-    this._element("editBookmarkPanelStarIcon").removeAttribute("unstarred");
-
     this._itemId = aItemId !== undefined ? aItemId : this._itemId;
     this.beginBatch();
 
     // Consume dismiss clicks, see bug 400924
     this.panel.popupBoxObject
         .setConsumeRollupEvent(Components.interfaces.nsIPopupBoxObject.ROLLUP_CONSUME);
     this.panel.openPopup(aAnchorElement, aPosition);
 
--- a/suite/common/bookmarks/placesOverlay.xul
+++ b/suite/common/bookmarks/placesOverlay.xul
@@ -121,29 +121,25 @@
          ignorekeys="true"
          hidden="true"
          onpopupshown="StarUI.panelShown(event);"
          aria-labelledby="editBookmarkPanelTitle">
     <row id="editBookmarkPanelHeader" align="center" hidden="true">
       <vbox align="center">
         <image id="editBookmarkPanelStarIcon"/>
       </vbox>
-      <vbox>
-        <label id="editBookmarkPanelTitle"/>
-        <description id="editBookmarkPanelDescription"/>
-        <hbox>
-          <button id="editBookmarkPanelRemoveButton"
-                  class="editBookmarkPanelHeaderButton"
-                  oncommand="StarUI.removeBookmarkButtonCommand();"
-                  accesskey="&editBookmark.removeBookmark.accessKey;"/>
-        </hbox>
-      </vbox>
+      <label id="editBookmarkPanelTitle"/>
     </row>
     <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
-    <hbox id="editBookmarkPanelBottomButtons" pack="end">
+    <hbox id="editBookmarkPanelBottomButtons">
+      <button id="editBookmarkPanelRemoveButton"
+              class="editBookmarkPanelHeaderButton"
+              oncommand="StarUI.removeBookmarkButtonCommand();"
+              accesskey="&editBookmark.removeBookmark.accessKey;"/>
+      <spacer flex="1"/>
       <button id="editBookmarkPanelDeleteButton"
               class="editBookmarkPanelBottomButton"
               label="&editBookmark.cancel.label;"
               oncommand="StarUI.cancelButtonOnCommand();"/>
       <button id="editBookmarkPanelDoneButton"
               class="editBookmarkPanelBottomButton"
               label="&editBookmark.done.label;"
               default="true"
--- a/suite/themes/classic/mac/navigator/navigator.css
+++ b/suite/themes/classic/mac/navigator/navigator.css
@@ -603,16 +603,21 @@ toolbar[mode="text"] toolbarbutton.chevr
 #star-button[starred="true"]:hover {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #star-button[starred="true"]:hover:active {
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
+#editBookmarkPanelStarIcon {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
 /* ::::: feeds ::::: */
 
 #feedsMenu {
   list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png") !important;
 }
 
 #feedsButton {
   list-style-image: url("chrome://navigator/skin/btn1/feeds.png");
--- a/suite/themes/classic/navigator/navigator.css
+++ b/suite/themes/classic/navigator/navigator.css
@@ -647,16 +647,21 @@ toolbar[mode="text"] toolbarbutton.chevr
 #star-button[starred="true"]:hover {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #star-button[starred="true"]:hover:active {
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
+#editBookmarkPanelStarIcon {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
 /* ::::: feeds ::::: */
 
 #feedsMenu {
   list-style-image: url("chrome://navigator/skin/btn1/feeds.png") !important;
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 #feedsMenu[_moz-menuactive="true"] {
--- a/suite/themes/modern/navigator/navigator.css
+++ b/suite/themes/modern/navigator/navigator.css
@@ -811,16 +811,21 @@ toolbar[mode="text"] toolbarbutton.chevr
 #star-button[starred="true"]:hover {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #star-button[starred="true"]:hover:active {
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
+#editBookmarkPanelStarIcon {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
 /* ::::: feeds ::::: */
 
 #feedsMenu {
   list-style-image: url("chrome://navigator/skin/btn1/feeds.png") !important;
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 #feedsMenu[_moz-menuactive="true"] {