diff --git a/chrome/chromeFiles/content/scholar/itemPane.js b/chrome/chromeFiles/content/scholar/itemPane.js
index e10e07805d..e3fc296565 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.js
+++ b/chrome/chromeFiles/content/scholar/itemPane.js
@@ -3,8 +3,7 @@ ScholarItemPane = new function()
var _dynamicFields;
var _creatorTypeMenu;
var _beforeRow;
- var _notesMenu;
- var _notesField;
+ var _notesList;
var _notesLabel;
var _creatorCount;
@@ -30,9 +29,8 @@ ScholarItemPane = new function()
_dynamicFields = document.getElementById('editpane-dynamic-fields');
_itemTypeMenu = document.getElementById('editpane-type-menu');
_creatorTypeMenu = document.getElementById('creatorTypeMenu');
- _notesMenu = document.getElementById('scholar-notes-menu');
- _notesField = document.getElementById('scholar-notes-field');
- _notesLabel = document.getElementById('scholar-notes-label');
+ _notesList = document.getElementById('editpane-dynamic-notes');
+ _notesLabel = document.getElementById('editpane-notes-label');
var creatorTypes = Scholar.CreatorTypes.getTypes();
for(var i = 0; i < creatorTypes.length; i++)
@@ -56,10 +54,7 @@ ScholarItemPane = new function()
* Loads an item
*/
function viewItem(thisItem)
- {
- if(_itemBeingEdited && thisItem.getID() == _itemBeingEdited.getID())
- return;
-
+ {
if(document.commandDispatcher.focusedElement)
document.commandDispatcher.focusedElement.blur();
@@ -112,19 +107,25 @@ ScholarItemPane = new function()
}
//NOTES:
- _notesMenu.removeAllItems();
+ while(_notesList.hasChildNodes())
+ _notesList.removeChild(_notesList.firstChild);
var notes = _itemBeingEdited.getNotes();
if(notes.length)
+ {
for(var i = 0; i < notes.length; i++)
- _notesMenu.appendItem(_noteToTitle(_itemBeingEdited.getNote(notes[i])),notes[i]);
- else
- addNote();
-
+ {
+ var row = document.createElement('row');
+ var button = document.createElement('label');
+ button.setAttribute('value',_noteToTitle(_itemBeingEdited.getNote(notes[i])));
+ button.setAttribute('onclick',"window.open('chrome://scholar/content/note.xul?item="+_itemBeingEdited.getID()+"¬e="+notes[i]+"','','chrome,resizable,centerscreen');");
+ button.setAttribute('class','clicky')
+ row.appendChild(button);
+
+ _notesList.appendChild(row);
+ }
+ }
_updateNoteCount();
- _notesMenu.selectedIndex = 0;
-
- onNoteSelected();
}
function changeTypeTo(id)
@@ -347,12 +348,7 @@ ScholarItemPane = new function()
function addNote()
{
- modifySelectedNote();
- _notesMenu.appendItem(Scholar.getString('pane.item.notes.untitled'),null);
- _notesMenu.selectedIndex = _notesMenu.firstChild.childNodes.length-1;
-
- onNoteSelected();
- _updateNoteCount();
+ window.open("chrome://scholar/content/note.xul?item="+_itemBeingEdited.getID(),'','chrome,resizable,centerscreen');
}
function onNoteSelected()
@@ -390,7 +386,7 @@ ScholarItemPane = new function()
function _updateNoteCount()
{
- var c = _notesMenu.firstChild.childNodes.length;
+ var c = _notesList.childNodes.length;
_notesLabel.value = Scholar.getString('pane.item.notes.count.'+(c != 1 ? "plural" : "singular")).replace('%1',c) + ":";
}
diff --git a/chrome/chromeFiles/content/scholar/itemPane.xul b/chrome/chromeFiles/content/scholar/itemPane.xul
index 30a4685cc6..aff8d278fb 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.xul
+++ b/chrome/chromeFiles/content/scholar/itemPane.xul
@@ -31,18 +31,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/chrome/chromeFiles/content/scholar/note.js b/chrome/chromeFiles/content/scholar/note.js
new file mode 100644
index 0000000000..99f8e95fcb
--- /dev/null
+++ b/chrome/chromeFiles/content/scholar/note.js
@@ -0,0 +1,33 @@
+var item;
+var noteID;
+var note;
+var _notesField;
+
+function onLoad()
+{
+ _notesField = document.getElementById('notes-box');
+ var params = new Array();
+ var b = document.location.href.substr(document.location.href.indexOf('?')+1).split('&');
+ for(var i = 0; i < b.length; i++)
+ {
+ var mid = b[i].indexOf('=');
+
+ params[b[i].substr(0,mid)] = b[i].substr(mid+1);
+ }
+ item = Scholar.Items.get(params['item']);
+ noteID = params['note'];
+
+ document.getElementById('info-label').setAttribute('value',item.getField('title'));
+ if(noteID)
+ _notesField.setAttribute('value',item.getNote(noteID));
+}
+
+function save()
+{
+ if(noteID)
+ item.updateNote(noteID,_notesField.value);
+ else
+ noteID = item.addNote(_notesField.value);
+}
+
+addEventListener("load", function(e) { onLoad(e); }, false);
\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/note.xul b/chrome/chromeFiles/content/scholar/note.xul
new file mode 100644
index 0000000000..ae4e294c2f
--- /dev/null
+++ b/chrome/chromeFiles/content/scholar/note.xul
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css
index e91b3cce46..f52c8613e3 100644
--- a/chrome/chromeFiles/skin/default/scholar/overlay.css
+++ b/chrome/chromeFiles/skin/default/scholar/overlay.css
@@ -120,11 +120,6 @@ vbox #scholar-pane
background: #666666;
}
-textbox[multiline="true"][type="timed"]
-{
- -moz-binding: url('chrome://scholar/content/customControls.xml#timed-textarea');
-}
-
#scholar-splitter
{
border-top: none;
diff --git a/chrome/chromeFiles/skin/default/scholar/scholar.css b/chrome/chromeFiles/skin/default/scholar/scholar.css
index e69de29bb2..e31bd297a7 100644
--- a/chrome/chromeFiles/skin/default/scholar/scholar.css
+++ b/chrome/chromeFiles/skin/default/scholar/scholar.css
@@ -0,0 +1,4 @@
+textbox[multiline="true"][type="timed"]
+{
+ -moz-binding: url('chrome://scholar/content/customControls.xml#timed-textarea');
+}
\ No newline at end of file
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-artwork.png b/chrome/chromeFiles/skin/default/scholar/treeitem-artwork.png
new file mode 100644
index 0000000000..4a158fef7e
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-artwork.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-bookSection.png b/chrome/chromeFiles/skin/default/scholar/treeitem-bookSection.png
new file mode 100644
index 0000000000..7d863f9497
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-bookSection.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-film.png b/chrome/chromeFiles/skin/default/scholar/treeitem-film.png
new file mode 100644
index 0000000000..b0ce7bb198
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-film.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-interview.png b/chrome/chromeFiles/skin/default/scholar/treeitem-interview.png
new file mode 100644
index 0000000000..39433cf78a
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-interview.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-letter.png b/chrome/chromeFiles/skin/default/scholar/treeitem-letter.png
new file mode 100644
index 0000000000..7348aed77f
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-letter.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-magazineArticle.png b/chrome/chromeFiles/skin/default/scholar/treeitem-magazineArticle.png
new file mode 100644
index 0000000000..ea086b0428
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-magazineArticle.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-manuscript.png b/chrome/chromeFiles/skin/default/scholar/treeitem-manuscript.png
new file mode 100644
index 0000000000..0f9ed4d483
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-manuscript.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-newspaperArticle.png b/chrome/chromeFiles/skin/default/scholar/treeitem-newspaperArticle.png
new file mode 100644
index 0000000000..6a2ecce1b8
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-newspaperArticle.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-note.png b/chrome/chromeFiles/skin/default/scholar/treeitem-note.png
new file mode 100644
index 0000000000..244e6ca045
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-note.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-thesis.png b/chrome/chromeFiles/skin/default/scholar/treeitem-thesis.png
new file mode 100644
index 0000000000..779ad58efc
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-thesis.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-website.png b/chrome/chromeFiles/skin/default/scholar/treeitem-website.png
new file mode 100644
index 0000000000..03ddd799fa
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-website.png differ