diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/overlay.js index a2806062b3..9f507645de 100644 --- a/chrome/chromeFiles/content/scholar/overlay.js +++ b/chrome/chromeFiles/content/scholar/overlay.js @@ -107,13 +107,13 @@ var ScholarPane = new function() itemsView = new Scholar.ItemTreeView(collection); document.getElementById('items-tree').view = itemsView; - document.getElementById('tb-rename').disabled = collection.isLibrary(); + document.getElementById('tb-collection-rename').disabled = collection.isLibrary(); itemsView.selection.clearSelection(); } else { document.getElementById('items-tree').view = itemsView = null; - document.getElementById('tb-rename').disabled = true; + document.getElementById('tb-collection-rename').disabled = true; } } diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul index 15b976e960..d6dfe01457 100644 --- a/chrome/chromeFiles/content/scholar/overlay.xul +++ b/chrome/chromeFiles/content/scholar/overlay.xul @@ -43,8 +43,8 @@ - - + + - + diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css index 777dd06a72..1703ad8a1d 100644 --- a/chrome/chromeFiles/skin/default/scholar/overlay.css +++ b/chrome/chromeFiles/skin/default/scholar/overlay.css @@ -26,6 +26,26 @@ tree #items-tree } +#tb-collection-add +{ + list-style-image: url('chrome://scholar/skin/toolbar-collection-add.png'); +} + +#tb-collection-rename +{ + list-style-image: url('chrome://scholar/skin/toolbar-collection-edit.png'); +} + +#tb-collection-rename[disabled="true"] +{ + list-style-image: url('chrome://scholar/skin/toolbar-collection-edit-gray.png'); +} + +#tb-add +{ + list-style-image: url('chrome://scholar/skin/toolbar-item-add.png'); +} + #scholar-pane toolbar { border-bottom: none; diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-collection-add.png b/chrome/chromeFiles/skin/default/scholar/toolbar-collection-add.png new file mode 100644 index 0000000000..529fe8fe04 Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/toolbar-collection-add.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit-gray.png b/chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit-gray.png new file mode 100644 index 0000000000..7bea75c07d Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit-gray.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit.png b/chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit.png new file mode 100644 index 0000000000..ad669cc781 Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-item-add.png b/chrome/chromeFiles/skin/default/scholar/toolbar-item-add.png new file mode 100644 index 0000000000..6332fefea4 Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/toolbar-item-add.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-book.png b/chrome/chromeFiles/skin/default/scholar/treeitem-book.png index 90f3f49584..b0f4dd7928 100644 Binary files a/chrome/chromeFiles/skin/default/scholar/treeitem-book.png and b/chrome/chromeFiles/skin/default/scholar/treeitem-book.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-journalArticle.png b/chrome/chromeFiles/skin/default/scholar/treeitem-journalArticle.png index 9c3f25a218..813f712f72 100644 Binary files a/chrome/chromeFiles/skin/default/scholar/treeitem-journalArticle.png and b/chrome/chromeFiles/skin/default/scholar/treeitem-journalArticle.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/treesource-collection.png b/chrome/chromeFiles/skin/default/scholar/treesource-collection.png index c6613f54cd..784e8fa482 100644 Binary files a/chrome/chromeFiles/skin/default/scholar/treesource-collection.png and b/chrome/chromeFiles/skin/default/scholar/treesource-collection.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/treesource-library.png b/chrome/chromeFiles/skin/default/scholar/treesource-library.png index 6b70306639..8443c23eb9 100644 Binary files a/chrome/chromeFiles/skin/default/scholar/treesource-library.png and b/chrome/chromeFiles/skin/default/scholar/treesource-library.png differ