From 896e5ff7e4dfa3b78d6217e2a3dffccaaa9d499e Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Wed, 6 Aug 2003 09:14:03 +0000
Subject: [PATCH] Fixing some description-related issues.

---
 .../bookmarks/content/bookmarksProperties.js  | 25 ++++++-------------
 .../bookmarks/content/bookmarksProperties.xul |  9 +++++++
 .../bookmarks/locale/bookmarks.properties     |  6 -----
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/browser/components/bookmarks/content/bookmarksProperties.js b/browser/components/bookmarks/content/bookmarksProperties.js
index 69b5cb0e0b7..29b9b353a1c 100644
--- a/browser/components/bookmarks/content/bookmarksProperties.js
+++ b/browser/components/bookmarks/content/bookmarksProperties.js
@@ -56,23 +56,14 @@ function showDescription()
 
   gBookmarkID = window.arguments[0];
   var resource = RDF.GetResource(gBookmarkID);
-
-  // Check the description
-  var primaryType = BookmarksUtils.resolveType(resource);
-  var description = BookmarksUtils.getLocaleString("description_"+primaryType);
-  
-  var newBookmarkFolder = BookmarksUtils.getNewBookmarkFolder();
-  var newSearchFolder   = BookmarksUtils.getNewSearchFolder();
-
-  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);
+ 
+  if (BookmarksUtils.isPersonalToolbarFolder(resource)) {
+    var description = BookmarksUtils.getLocaleString("description_PersonalToolbarFolder");
+    var box = document.getElementById("description-box");
+    box.hidden = false;
+    var textNode = document.createTextNode(description);
+    document.getElementById("bookmarkDescription").appendChild(textNode);
+  }
 }
 
 function Init()
diff --git a/browser/components/bookmarks/content/bookmarksProperties.xul b/browser/components/bookmarks/content/bookmarksProperties.xul
index 1f68ebd9bca..f5a6545e46c 100644
--- a/browser/components/bookmarks/content/bookmarksProperties.xul
+++ b/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>
diff --git a/browser/components/bookmarks/locale/bookmarks.properties b/browser/components/bookmarks/locale/bookmarks.properties
index b6f7d2e6189..a426a84a850 100644
--- a/browser/components/bookmarks/locale/bookmarks.properties
+++ b/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