Fixing some description-related issues.

browser/components/bookmarks/content/bookmarksProperties.js

@@ -56,23 +56,14 @@ function showDescription()
 
   gBookmarkID = window.arguments[0];
   var resource = RDF.GetResource(gBookmarkID);
-
+ 
-  // Check the description
+  if (BookmarksUtils.isPersonalToolbarFolder(resource)) {
-  var primaryType = BookmarksUtils.resolveType(resource);
+    var description = BookmarksUtils.getLocaleString("description_PersonalToolbarFolder");
-  var description = BookmarksUtils.getLocaleString("description_"+primaryType);
+    var box = document.getElementById("description-box");
-  
+    box.hidden = false;
-  var newBookmarkFolder = BookmarksUtils.getNewBookmarkFolder();
+    var textNode = document.createTextNode(description);
-  var newSearchFolder   = BookmarksUtils.getNewSearchFolder();
+    document.getElementById("bookmarkDescription").appendChild(textNode);
-
+  }
-  if (resource == newBookmarkFolder && resource == newSearchFolder)
-    description = description+" "+BookmarksUtils.getLocaleString("description_NewBookmarkAndSearchFolder")
-  else if (resource == newBookmarkFolder )
-    description = description+" "+BookmarksUtils.getLocaleString("description_NewBookmarkFolder")
-  else if (resource == newSearchFolder)
-    description = description+" "+BookmarksUtils.getLocaleString("description_NewSearchFolder");
-
-  var textNode = document.createTextNode(description);
-  document.getElementById("bookmarkDescription").appendChild(textNode);
 }
 
 function Init()

browser/components/bookmarks/content/bookmarksProperties.xul

@@ -45,6 +45,15 @@
     </tabs>
     <tabpanels>
       <vbox>
+        <vbox id="description-box" hidden="true">
+          <separator class="thin"/>                                               
+          <hbox align="start">                                                    
+            <image class="message-icon"/>                                         
+            <separator class="thin" orient="vertical"/>                           
+            <description id="bookmarkDescription" flex="1"/> 
+          </hbox>                                                                 
+          <separator class="thin"/>
+        </vbox>
         <vbox class="box-padded">    
           <grid>
             <columns>

browser/components/bookmarks/locale/bookmarks.properties

@@ -18,13 +18,7 @@
 # Contributor(s): 
 #
 
-description_Bookmark = %brandShortName% can remember web page locations for you. Type the page name and location in the fields below, then click OK. Select the page from the Bookmarks menu or your Bookmarks Sidebar tab to visit the page.
-description_Folder = %brandShortName% can organize your bookmarks into specific folders. Type the folder name and an optional comment below, then click OK.
 description_PersonalToolbarFolder = Folders and bookmarks in this folder appear on the Bookmarks Toolbar.
-description_BookmarkSeparator = %brandShortName% can organize your bookmarks by putting separators between them. Type an optional separator name below, then click OK.
-description_NewBookmarkFolder = Newly created bookmarks will be stored here by default.
-description_NewSearchFolder = Search results will be stored here by default.
-description_NewBookmarkAndSearchFolder = Newly created bookmarks and search results will be stored here by default.
 
 cmd_bm_open = Open
 cmd_bm_expandfolder = Expand