commit e381b552d08e210e6b518320f75da185ced65597
parent 39cd0264cd2307b2b14fc12111b52ddc25dda8c2
Author: Simon Kornblith <simon@simonster.com>
Date: Sun, 13 Feb 2011 06:16:06 +0000
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
Diffstat:
10 files changed, 91 insertions(+), 41 deletions(-)
diff --git 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
@@ -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
@@ -96,7 +96,6 @@
#zotero-view-tabbox {
background-color: #fff;
padding: 0;
- margin: 0;
}
#zotero-item-pane-content .groupbox-body {
@@ -109,12 +108,8 @@
}
#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
@@ -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
@@ -134,6 +134,17 @@
</setter>
</property>
+ <property name="linksOnTop">
+ <setter>
+ <![CDATA[
+ var links = this._id('linksbox');
+ var parent = links.parentNode;
+ parent.removeChild(links);
+ parent.insertBefore(links, this._id(val ? 'citeLabel' : 'goButton'));
+ ]]>
+ </setter>
+ </property>
+
<property name="note"
onget="Zotero.debug('Getting note with .note deprecated -- use .item in zoteronoteeditor'); return this._item"
onset="Zotero.debug('Setting note with .note deprecated -- use .item in zoteronoteeditor'); this.item = val"/>
@@ -368,7 +379,7 @@
<content>
<xul:vbox xbl:inherits="flex">
- <xul:label id="citeLabel"/>
+ <xul:label id="citeLabel" hidden="true"/>
<xul:textbox id="noteField" type="styled" mode="note"
timeout="1000" flex="1" hidden="true"/>
<xul:textbox id="noteFieldReadOnly" type="styled" mode="note"
diff --git a/chrome/content/zotero/tinymce/note.html b/chrome/content/zotero/tinymce/note.html
@@ -68,6 +68,13 @@
});
tinyMCE.execCommand("mceAddControl", true, "tinymce");
</script>
+<style>
+table.mceLayout {
+ border-left: 0 !important;
+ border-right: 0 !important;
+ border-top: 0 !important;
+}
+</style>
</head>
<body>
<div id="tinymce"><div id="noScriptWarning"/></div>
diff --git a/chrome/content/zotero/tinymce/noteview.html b/chrome/content/zotero/tinymce/noteview.html
@@ -4,6 +4,11 @@
<title>TinyMCE</title>
<link type="text/css" rel="stylesheet" href="css/note-ui.css"/>
<style>
+table.mceLayout {
+ border-left: 0 !important;
+ border-right: 0 !important;
+ border-top: 0 !important;
+}
table.mceLayout > tbody > tr.mceLast {
top: 0;
}
diff --git a/chrome/skin/default/zotero/bindings/attachmentbox.css b/chrome/skin/default/zotero/bindings/attachmentbox.css
@@ -25,8 +25,10 @@
#reindex .toolbarbutton-icon
{
- margin: 0;
+ margin: 0 0 0 2px;
padding: 0;
+ width: 14px;
+ height: 14px;
}
#index-box > button
@@ -35,25 +37,42 @@
padding: 0;
}
-row > label:first-child
+#title
{
+ font-size: 12px;
font-weight: bold;
}
-label
+row label
{
+ margin: 0 !important;
+ padding: 0 !important;
+}
+
+row > label, row > hbox
+{
+ margin-top: 1px !important;
+ margin-bottom: 1px !important;
+ -moz-box-pack: start;
-moz-margin-start: 1px !important;
-moz-margin-end: 5px !important;
- padding: 1px 1px 0 2px;
+ padding: 0 2px 0 2px !important;
+ -moz-border-radius: 6px;
+ border: 1px solid transparent;
}
-zoteronoteeditor
+row > hbox
{
- margin: 2px 2px 0 2px;
+ -moz-box-align: center;
}
-#title
+row > label:first-child
{
- font-size: 12px;
+ text-align: right;
font-weight: bold;
+ -moz-margin-start: 5px !important;
+ -moz-margin-end: 0 !important;
+ width: 62px;
+ text-align: right;
+ font-weight:bold;
}
\ No newline at end of file
diff --git a/chrome/skin/default/zotero/bindings/noteeditor.css b/chrome/skin/default/zotero/bindings/noteeditor.css
@@ -9,24 +9,44 @@
min-width: 300px;
}
-linksbox
+row label
{
- margin-top: 4px;
+ margin: 0 !important;
+ padding: 0 !important;
}
-row > label:first-child
+row > label, row > hbox
{
- text-align: right;
+ margin-top: 1px !important;
+ margin-bottom: 1px !important;
+ -moz-box-pack: start;
+ -moz-margin-start: 1px !important;
+ -moz-margin-end: 5px !important;
+ padding: 0 2px 0 2px !important;
+ -moz-border-radius: 6px;
+ border: 1px solid transparent;
+}
+
+row > hbox
+{
+ -moz-box-align: center;
}
row > label:first-child
{
+ text-align: right;
font-weight: bold;
+ -moz-margin-start: 5px !important;
+ -moz-margin-end: 0 !important;
+ width: 62px;
+ text-align: right;
+ font-weight:bold;
}
-label
-{
- -moz-margin-start: 1px !important;
- -moz-margin-end: 5px !important;
- padding: 1px 1px 0 2px;
+vbox > hbox:first-child > linksbox {
+ margin-bottom: 4px;
+}
+
+vbox > hbox:not(:first-child) > linksbox {
+ margin-top: 4px;
}
\ No newline at end of file
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
@@ -276,9 +276,10 @@
width: 150px;
}
-#zotero-view-tabbox, #zotero-item-pane-content > groupbox
+#zotero-view-tabbox, #zotero-item-pane-content > groupbox, #zotero-item-pane-content > groupbox > .groupbox-body
{
- margin: 0;
+ margin: 0 !important;
+ padding: 0 !important;
}
#zotero-view-tabbox tabs tab
