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
This commit is contained in:
Simon Kornblith 2011-02-13 06:16:06 +00:00
parent 39cd0264cd
commit e381b552d0
10 changed files with 103 additions and 53 deletions

View File

@ -2,8 +2,3 @@ row > label:first-child
{ {
color: #7f7f7f; color: #7f7f7f;
} }
*[zoteroFontSize=small] #attachment-box
{
font-size: 10px;
}

View File

@ -2,8 +2,3 @@ row > label:first-child
{ {
color: #7f7f7f; color: #7f7f7f;
} }
*[zoteroFontSize=small] #note-editor
{
font-size: 10px;
}

View File

@ -96,7 +96,6 @@
#zotero-view-tabbox { #zotero-view-tabbox {
background-color: #fff; background-color: #fff;
padding: 0; padding: 0;
margin: 0;
} }
#zotero-item-pane-content .groupbox-body { #zotero-item-pane-content .groupbox-body {
@ -108,13 +107,9 @@
color: #7f7f7f; color: #7f7f7f;
} }
#zotero-view-tabbox > tabpanels {
margin: 0;
padding: 0;
}
#zotero-view-tabbox > tabpanels { #zotero-view-tabbox > tabpanels {
margin: 12px 0 0 0; margin: 12px 0 0 0;
padding: 0;
-moz-appearance: none; -moz-appearance: none;
} }

View File

@ -296,6 +296,8 @@
var noteEditor = this._id('note-editor'); var noteEditor = this._id('note-editor');
if (this.displayNote) { if (this.displayNote) {
if (this.displayNoteIfEmpty || this.item.getNote() != '') { if (this.displayNoteIfEmpty || this.item.getNote() != '') {
Zotero.debug("setting links on top");
noteEditor.linksOnTop = true;
noteEditor.hidden = false; noteEditor.hidden = false;
// Don't make note editable (at least for now) // Don't make note editable (at least for now)

View File

@ -134,6 +134,17 @@
</setter> </setter>
</property> </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" <property name="note"
onget="Zotero.debug('Getting note with .note deprecated -- use .item in zoteronoteeditor'); return this._item" 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"/> onset="Zotero.debug('Setting note with .note deprecated -- use .item in zoteronoteeditor'); this.item = val"/>
@ -368,7 +379,7 @@
<content> <content>
<xul:vbox xbl:inherits="flex"> <xul:vbox xbl:inherits="flex">
<xul:label id="citeLabel"/> <xul:label id="citeLabel" hidden="true"/>
<xul:textbox id="noteField" type="styled" mode="note" <xul:textbox id="noteField" type="styled" mode="note"
timeout="1000" flex="1" hidden="true"/> timeout="1000" flex="1" hidden="true"/>
<xul:textbox id="noteFieldReadOnly" type="styled" mode="note" <xul:textbox id="noteFieldReadOnly" type="styled" mode="note"

View File

@ -68,6 +68,13 @@
}); });
tinyMCE.execCommand("mceAddControl", true, "tinymce"); tinyMCE.execCommand("mceAddControl", true, "tinymce");
</script> </script>
<style>
table.mceLayout {
border-left: 0 !important;
border-right: 0 !important;
border-top: 0 !important;
}
</style>
</head> </head>
<body> <body>
<div id="tinymce"><div id="noScriptWarning"/></div> <div id="tinymce"><div id="noScriptWarning"/></div>

View File

@ -4,6 +4,11 @@
<title>TinyMCE</title> <title>TinyMCE</title>
<link type="text/css" rel="stylesheet" href="css/note-ui.css"/> <link type="text/css" rel="stylesheet" href="css/note-ui.css"/>
<style> <style>
table.mceLayout {
border-left: 0 !important;
border-right: 0 !important;
border-top: 0 !important;
}
table.mceLayout > tbody > tr.mceLast { table.mceLayout > tbody > tr.mceLast {
top: 0; top: 0;
} }

View File

@ -25,8 +25,10 @@
#reindex .toolbarbutton-icon #reindex .toolbarbutton-icon
{ {
margin: 0; margin: 0 0 0 2px;
padding: 0; padding: 0;
width: 14px;
height: 14px;
} }
#index-box > button #index-box > button
@ -35,25 +37,42 @@
padding: 0; padding: 0;
} }
row > label:first-child
{
font-weight: bold;
}
label
{
-moz-margin-start: 1px !important;
-moz-margin-end: 5px !important;
padding: 1px 1px 0 2px;
}
zoteronoteeditor
{
margin: 2px 2px 0 2px;
}
#title #title
{ {
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
} }
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: 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;
}

View File

@ -9,24 +9,44 @@
min-width: 300px; min-width: 300px;
} }
linksbox row label
{ {
margin-top: 4px; 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: 0 2px 0 2px !important;
-moz-border-radius: 6px;
border: 1px solid transparent;
}
row > hbox
{
-moz-box-align: center;
} }
row > label:first-child row > label:first-child
{ {
text-align: right; text-align: right;
} font-weight: bold;
-moz-margin-start: 5px !important;
row > label:first-child -moz-margin-end: 0 !important;
{ width: 62px;
text-align: right;
font-weight:bold; font-weight:bold;
} }
label vbox > hbox:first-child > linksbox {
{ margin-bottom: 4px;
-moz-margin-start: 1px !important; }
-moz-margin-end: 5px !important;
padding: 1px 1px 0 2px; vbox > hbox:not(:first-child) > linksbox {
margin-top: 4px;
} }

View File

@ -276,9 +276,10 @@
width: 150px; 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 #zotero-view-tabbox tabs tab