Bug 508705: simplify bookmarks hierarchy [r=mark.finkle]

mobile/chrome/content/bindings.xml

@@ -825,7 +825,7 @@
               parents.insertBefore(parent, parents.firstChild);
 
               // XXX Fix me - use <handler>?
-              parent.addEventListener("click", function(e) { self.openFolder(e.target.itemId); }, false);
+              parent.addEventListener("click", function(e) { self.openFolder(e.target.previousSibling.itemId); }, false);
 
               folderId = PlacesUtils.bookmarks.getFolderIdForItem(folderId);
             } while (folderId != PlacesUtils.bookmarks.placesRoot)

mobile/themes/hildon/browser.css

@@ -450,12 +450,20 @@ toolbarbutton.page-button {
 
 .place-list-parents {
   background-color: rgb(207,207,207);
-  padding: 0.5mm;
+}
+
+.place-list-parents placelabel {
+  visibility: collapse;
+}
+
+.place-list-parents placelabel:last-child:not(:only-child) {
+  visibility: visible;
 }
 
 .place-list-children {
   -moz-appearance: none;
   border: none !important;
+  margin: 0.5mm;
   padding: 0;
 }
 
@@ -502,6 +510,7 @@ placeitem[selected] .bookmark-item-image {
 
 placelabel.bookmark-folder {
   border-bottom: 0.1mm solid rgb(255,255,255);
+  background: url(chrome://browser/skin/images/arrowup-16.png) no-repeat 98% 50%;
 }
 
 /* folders have a fixed image */
@@ -509,6 +518,10 @@ placeitem[type=folder] .bookmark-item-image {
   list-style-image: url("chrome://browser/skin/images/folder-30.png");
 }
 
+placeitem[type="folder"] {
+  background: url(chrome://browser/skin/images/arrowright-16.png) no-repeat 98% 50%;
+}
+
 /* hide the unuseful fields for folder */
 placeitem[type=folder] .bookmark-item-uri,
 placeitem[type=folder] .bookmark-item-tags {
@@ -524,6 +537,10 @@ placelist[ui="manage"] .bookmark-folder-new {
   visibility: visible;
 }
 
+placelist[ui="manage"] placeitem[type="folder"] {
+  background-image: none;
+}
+
 placeitem[ui="manage"] .bookmark-close-button,
 placeitem[ui="manage"] .bookmark-folder-button,
 placeitem[ui="manage"] .bookmark-item-image {

mobile/themes/hildon/jar.mn

@@ -14,6 +14,7 @@ chrome.jar:
   browser.css                          (browser.css)
   notification.css                     (notification.css)
   images/arrowright-16.png             (images/arrowright-16.png)
+  images/arrowup-16.png                (images/arrowup-16.png)
   images/ratings-18.png                (images/ratings-18.png)
   images/favicon-default-30.png        (images/favicon-default-30.png)
   images/starred-64.png                (images/starred-64.png)

mobile/themes/wince/browser.css

@@ -237,12 +237,20 @@ toolbarbutton.page-button {
 
 .place-list-parents {
   background-color: rgb(207,207,207);
-  padding: 0.25mm;
+}
+
+.place-list-parents placelabel {
+  visibility: collapse;
+}
+
+.place-list-parents placelabel:last-child:not(:only-child) {
+  visibility: visible;
 }
 
 .place-list-children {
   -moz-appearance: none;
   border: none !important;
+  margin: 0.25mm;
   padding: 0;
 }
 
@@ -289,6 +297,11 @@ placeitem[selected] .bookmark-item-image {
 
 placelabel.bookmark-folder {
   border-bottom: 0.05mm solid rgb(255,255,255);
+  background: url(chrome://browser/skin/images/arrowup-16.png) no-repeat 98% 50%;
+}
+
+placeitem[type="folder"] {
+  background: url(chrome://browser/skin/images/arrowright-16.png) no-repeat 98% 50%;
 }
 
 /* hide the unuseful fields for folder */
@@ -306,6 +319,10 @@ placelist[ui="manage"] .bookmark-folder-new {
   visibility: visible;
 }
 
+placelist[ui="manage"] placeitem[type="folder"] {
+  background-image: none;
+}
+
 placeitem[ui="manage"] .bookmark-close-button,
 placeitem[ui="manage"] .bookmark-folder-button,
 placeitem[ui="manage"] .bookmark-item-image {

mobile/themes/wince/jar.mn

@@ -16,6 +16,7 @@ chrome.jar:
   browser-low.css                      (browser-low.css)
   notification.css                     (notification.css)
   images/arrowright-16.png             (images/arrowright-16.png)
+  images/arrowup-16.png                (images/arrowup-16.png)
   images/ratings-18.png                (images/ratings-18.png)
 
   images/favicon-default-30.png        (images/favicon-default-30.png)