www

commit b52cfae2252835bfcf0fe692b5628001f848ecb6
parent f2bef5998cb0feaebddaad3a384f488f4227fb92
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue,  3 Nov 2015 17:07:20 -0500

Show "Delete Permanently..." button in right-hand pane in trash

Diffstat:
M
chrome/content/zotero/zoteroPane.js
 | 
6
+++---
M
chrome/locale/en-US/zotero/zotero.dtd
 | 
1
+
M
chrome/skin/default/zotero/itemPane.css
 | 
11
++++++++---

3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
@@ -1271,14 +1271,14 @@ var ZoteroPane = new function()
 				return false;
 			}
 			
-			// Display restore button if items selected in Trash
+			// Display restore/delete buttons if items selected in Trash
 			if (this.itemsView.selection.count) {
-				document.getElementById('zotero-item-restore-button').hidden
+				document.getElementById('zotero-item-top-buttons-holder').hidden
 					= !this.getCollectionTreeRow().isTrash()
 						|| _nonDeletedItemsSelected(this.itemsView);
 			}
 			else {
-				document.getElementById('zotero-item-restore-button').hidden = true;
+				document.getElementById('zotero-item-top-buttons-holder').hidden = true;
 			}
 			
 			var tabs = document.getElementById('zotero-view-tabbox');
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
@@ -130,6 +130,7 @@
 <!ENTITY zotero.item.creatorTransform.nameSwap      	"Swap First/Last Names">
 <!ENTITY zotero.item.viewOnline							"View Online">
 <!ENTITY zotero.item.copyAsURL							"Copy as URL">
+<!ENTITY zotero.item.deletePermanently                 "Delete Permanently…">
 
 <!ENTITY zotero.toolbar.newNote				"New Note">
 <!ENTITY zotero.toolbar.note.standalone				"New Standalone Note">
diff --git a/chrome/skin/default/zotero/itemPane.css b/chrome/skin/default/zotero/itemPane.css
@@ -36,10 +36,15 @@
 	margin-left: 5px;
 }
 
-/* Restore button in trash view */
-#zotero-item-restore-button-holder
-{
+/* Restore/Delete buttons in trash view */
+#zotero-item-top-buttons-holder {
 	-moz-appearance: toolbar;
+	-moz-box-pack: center;
+	min-height: 3em;
+}
+
+#zotero-item-top-buttons-holder > button {
+	-moz-box-flex: 1
 }
 
 /* Merge pane in duplicates view */