From e381b552d08e210e6b518320f75da185ced65597 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Sun, 13 Feb 2011 06:16:06 +0000 Subject: [PATCH] Modifications to notes and attachments box appearances: - attachment notes box is now located at bottom, with linked items options above it - notes no longer display the parent item title. I think this is a waste of space, but if someone wants it back, I can do that - notes editor spans entire pane - notes editor does not have gray borders on left or right - metadata display in notes and attachments boxes is consistent with metadata display in item pane --- .../zotero-platform/mac/attachmentbox.css | 5 -- .../zotero-platform/mac/noteeditor.css | 5 -- .../content/zotero-platform/mac/overlay.css | 7 +-- .../content/zotero/bindings/attachmentbox.xml | 12 ++-- chrome/content/zotero/bindings/noteeditor.xml | 13 ++++- chrome/content/zotero/tinymce/note.html | 7 +++ chrome/content/zotero/tinymce/noteview.html | 5 ++ .../default/zotero/bindings/attachmentbox.css | 55 +++++++++++++------ .../default/zotero/bindings/noteeditor.css | 42 ++++++++++---- chrome/skin/default/zotero/overlay.css | 5 +- 10 files changed, 103 insertions(+), 53 deletions(-) diff --git a/chrome/content/zotero-platform/mac/attachmentbox.css b/chrome/content/zotero-platform/mac/attachmentbox.css index 6206fe8397..2bd0977f95 100644 --- a/chrome/content/zotero-platform/mac/attachmentbox.css +++ b/chrome/content/zotero-platform/mac/attachmentbox.css @@ -1,9 +1,4 @@ row > label:first-child { color: #7f7f7f; -} - -*[zoteroFontSize=small] #attachment-box -{ - font-size: 10px; } \ No newline at end of file diff --git a/chrome/content/zotero-platform/mac/noteeditor.css b/chrome/content/zotero-platform/mac/noteeditor.css index 9c23d1e91b..2bd0977f95 100644 --- a/chrome/content/zotero-platform/mac/noteeditor.css +++ b/chrome/content/zotero-platform/mac/noteeditor.css @@ -1,9 +1,4 @@ row > label:first-child { color: #7f7f7f; -} - -*[zoteroFontSize=small] #note-editor -{ - font-size: 10px; } \ No newline at end of file diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css index d798ad26d2..0599dd20e5 100644 --- a/chrome/content/zotero-platform/mac/overlay.css +++ b/chrome/content/zotero-platform/mac/overlay.css @@ -96,7 +96,6 @@ #zotero-view-tabbox { background-color: #fff; padding: 0; - margin: 0; } #zotero-item-pane-content .groupbox-body { @@ -108,13 +107,9 @@ color: #7f7f7f; } -#zotero-view-tabbox > tabpanels { - margin: 0; - padding: 0; -} - #zotero-view-tabbox > tabpanels { margin: 12px 0 0 0; + padding: 0; -moz-appearance: none; } diff --git a/chrome/content/zotero/bindings/attachmentbox.xml b/chrome/content/zotero/bindings/attachmentbox.xml index 2f250e8a91..ae01fca88a 100644 --- a/chrome/content/zotero/bindings/attachmentbox.xml +++ b/chrome/content/zotero/bindings/attachmentbox.xml @@ -210,7 +210,7 @@ // Access date if (this.displayAccessed) { - this._id("accessed-label").value = Zotero.getString('itemFields.accessDate')+": "; + this._id("accessed-label").value = Zotero.getString('itemFields.accessDate')+":"; this._id("accessed").value = Zotero.Date.sqlToDate( this.item.getField('accessDate'), true ).toLocaleString(); @@ -234,7 +234,7 @@ if (fileName) { // TODO: localize - this._id("fileName-label").value = "Filename: "; + this._id("fileName-label").value = "Filename:"; this._id("fileName").value = fileName; fileNameRow.hidden = false; } @@ -252,7 +252,7 @@ var pages = pages ? pages.total : null; if (pages) { // TODO: localize colon - this._id("pages-label").value = Zotero.getString('itemFields.pages') + ': '; + this._id("pages-label").value = Zotero.getString('itemFields.pages') + ':'; this._id("pages").value = pages; pagesRow.hidden = false; } @@ -265,7 +265,7 @@ } if (this.displayDateModified) { - this._id("dateModified-label").value = Zotero.getString('itemFields.dateModified')+': '; + this._id("dateModified-label").value = Zotero.getString('itemFields.dateModified')+':'; var mtime = this.item.attachmentModificationTime; if (mtime) { this._id("dateModified").value = new Date(mtime).toLocaleString(); @@ -296,6 +296,8 @@ var noteEditor = this._id('note-editor'); if (this.displayNote) { if (this.displayNoteIfEmpty || this.item.getNote() != '') { + Zotero.debug("setting links on top"); + noteEditor.linksOnTop = true; noteEditor.hidden = false; // Don't make note editable (at least for now) @@ -470,7 +472,7 @@ str = 'general.yes'; break; } - this._id("index-status-label").value = Zotero.getString('fulltext.indexState.indexed') + ': '; + this._id("index-status-label").value = Zotero.getString('fulltext.indexState.indexed') + ':'; indexStatus.value = Zotero.getString(str); // Reindex button tooltip (string stored in zotero.properties) diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml index 57368c7938..647b534bd0 100644 --- a/chrome/content/zotero/bindings/noteeditor.xml +++ b/chrome/content/zotero/bindings/noteeditor.xml @@ -134,6 +134,17 @@ + + + + + + @@ -368,7 +379,7 @@ - +