diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml index b37ec3d0c..c853f6ec1 100644 --- a/chrome/content/zotero/bindings/tagselector.xml +++ b/chrome/content/zotero/bindings/tagselector.xml @@ -151,6 +151,7 @@ } Zotero.debug('Refreshing tags selector'); + var empty = true; var tagsToggleBox = this.id('tags-toggle'); if (fetch || this._dirty) { @@ -201,6 +202,7 @@ //Zotero.debug(2); labels[i].setAttribute('inScope', true); labels[i].setAttribute('hidden', false); + empty = false; } else { //Zotero.debug(3); @@ -220,8 +222,38 @@ } labels[i].setAttribute('hidden', false); + empty = false; } } + + this.updateNumSelected(); + this.id('tags-toggle').setAttribute('collapsed', empty); + this.id('no-tags-box').setAttribute('collapsed', !empty); + ]]> + + + + + + + @@ -252,6 +284,7 @@ + + @@ -462,29 +498,56 @@ - - - - - - - + + + + + + + + + + + + - - + + + + + --> + + + + + + + + + + + + + + + + + + + diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd index 51b95fda8..cebb996e4 100644 --- a/chrome/locale/en-US/zotero/zotero.dtd +++ b/chrome/locale/en-US/zotero/zotero.dtd @@ -55,11 +55,12 @@ + - - - - + + + + diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index aa93f772e..05cea5c63 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -21,6 +21,9 @@ pane.tagSelector.rename.title = Please enter a new name for this tag. pane.tagSelector.rename.message = The tag will be changed in all associated items. pane.tagSelector.delete.title = Are you sure you want to delete this tag? pane.tagSelector.delete.message = The tag will be removed from all items. +pane.tagSelector.numSelected.none = 0 tags selected +pane.tagSelector.numSelected.singular = %S tag selected +pane.tagSelector.numSelected.plural = %S tags selected pane.items.delete = Are you sure you want to delete the selected item? pane.items.delete.multiple = Are you sure you want to delete the selected items? diff --git a/chrome/skin/default/zotero/bindings/tagselector.css b/chrome/skin/default/zotero/bindings/tagselector.css index 84161b612..023dc1f7f 100644 --- a/chrome/skin/default/zotero/bindings/tagselector.css +++ b/chrome/skin/default/zotero/bindings/tagselector.css @@ -1,9 +1,3 @@ -/* Don't focus filter textbox if pane isn't open */ -zoterotagselector[collapsed=true] tags-search -{ - -moz-user-focus: ignore; -} - groupbox { overflow: auto; @@ -21,20 +15,20 @@ checkbox margin: .75em 0 .4em; } -label +#tags-toggle label { margin-right: .2em; padding: .15em .25em; -moz-user-focus: ignore; } -label[selected="true"] +#tags-toggle label[selected="true"] { background: #a9c6f0 !important; } /* Visible out-of-scope tags should be grey */ -label[inScope="false"] +#tags-toggle label[inScope="false"] { color: #666 !important; } @@ -46,15 +40,15 @@ label.zotero-clicky[inScope="false"]:active background: inherit !important; } -label[draggedOver="true"] +#tags-toggle label[draggedOver="true"] { color: white !important; background: #666; } -hbox +groupbox > hbox { - -moz-box-align: baseline; + -moz-box-align: center; -moz-box-pack: center; } @@ -66,6 +60,12 @@ hbox list-style-image: url('chrome://zotero/skin/search-cancel.png'); } +groupbox > hbox > hbox +{ + -moz-box-flex: 1; + -moz-box-align: center; +} + /* Bottom buttons */ toolbarbutton.zotero-clicky {