diff --git a/chrome/chromeFiles/content/scholar/itemPane.js b/chrome/chromeFiles/content/scholar/itemPane.js
index cb413c0c9f..75eb55717a 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.js
+++ b/chrome/chromeFiles/content/scholar/itemPane.js
@@ -129,7 +129,7 @@ ScholarItemPane = new function()
function changeTypeTo(id)
{
- if(id != _itemBeingEdited.getType() && confirm('Are you sure you want to change the item type? Certain fields may be lost.'))
+ if(id != _itemBeingEdited.getType() && confirm(Scholar.getString('pane.item.changeType')))
{
_itemBeingEdited.setType(id);
_itemBeingEdited.save();
@@ -321,7 +321,7 @@ ScholarItemPane = new function()
function removeSelectedNote()
{
if(_notesField.value != "")
- if(!confirm("Are you sure you want to delete the selected note?"))
+ if(!confirm(Scholar.getString('pane.item.notes.delete.confirm')))
return;
var id = _selectedNoteID();
@@ -348,7 +348,7 @@ ScholarItemPane = new function()
function addNote()
{
modifySelectedNote();
- _notesMenu.appendItem('Untitled Note',null);
+ _notesMenu.appendItem(Scholar.getString('pane.item.notes.untitled'),null);
_notesMenu.selectedIndex = _notesMenu.firstChild.childNodes.length-1;
onNoteSelected();
@@ -380,7 +380,7 @@ ScholarItemPane = new function()
if(t == "")
{
- return "Untitled Note";
+ return Scholar.getString('pane.item.notes.untitled');
}
else
{
@@ -392,7 +392,7 @@ ScholarItemPane = new function()
{
var c = _notesMenu.firstChild.childNodes.length;
- _notesLabel.value = c + " note" + (c != 1 ? "s" : "") + ":";
+ _notesLabel.value = Scholar.getString('pane.item.notes.count.'+(c != 1 ? "plural" : "singular")).replace('%1',c) + ":";
}
function _selectedNoteID()
diff --git a/chrome/chromeFiles/content/scholar/itemPane.xul b/chrome/chromeFiles/content/scholar/itemPane.xul
index 934b36c275..f22f63659e 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.xul
+++ b/chrome/chromeFiles/content/scholar/itemPane.xul
@@ -5,12 +5,12 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
+
-
-
-
-
+
+
+
+
@@ -19,15 +19,15 @@
-
-
+
+
-
+
diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/overlay.js
index ab2500c54d..5647ad6fab 100644
--- a/chrome/chromeFiles/content/scholar/overlay.js
+++ b/chrome/chromeFiles/content/scholar/overlay.js
@@ -136,9 +136,9 @@ var ScholarPane = new function()
label.hidden = false;
if(itemsView && itemsView.selection.count)
- label.value = itemsView.selection.count + " items selected";
+ label.value = Scholar.getString('pane.item.selected.multiple').replace('%1', itemsView.selection.count);
else
- label.value = "No items selected";
+ label.value = Scholar.getString('pane.item.selected.zero');
}
}
@@ -218,9 +218,9 @@ var ScholarPane = new function()
menu.childNodes[2].setAttribute('disabled', true);
if(itemsView && itemsView.selection.count > 1)
- menu.childNodes[2].setAttribute('label', 'Remove Selected Items...');
+ menu.childNodes[2].setAttribute('label', Scholar.getString('pane.items.menu.remove.multiple'));
else
- menu.childNodes[2].setAttribute('label', 'Remove Selected Item...');
+ menu.childNodes[2].setAttribute('label', Scholar.getString('pane.items.menu.remove'));
}
}
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
index 2cccbad89e..be263b3c9d 100644
--- a/chrome/chromeFiles/content/scholar/overlay.xul
+++ b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -26,22 +26,22 @@
-
+
-
+
-
+
@@ -63,7 +63,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
-
+
@@ -168,6 +168,7 @@
\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/preferences.xul b/chrome/chromeFiles/content/scholar/preferences.xul
index 9d01e1b243..0b3152c889 100644
--- a/chrome/chromeFiles/content/scholar/preferences.xul
+++ b/chrome/chromeFiles/content/scholar/preferences.xul
@@ -12,7 +12,7 @@
-
+
\ No newline at end of file
diff --git a/chrome/chromeFiles/locale/en-US/scholar/preferences.dtd b/chrome/chromeFiles/locale/en-US/scholar/preferences.dtd
index 1862b396a1..23caadc9e1 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/preferences.dtd
+++ b/chrome/chromeFiles/locale/en-US/scholar/preferences.dtd
@@ -1,2 +1,3 @@
-
\ No newline at end of file
+
+
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
index 8dd63d0f11..24ef7e934b 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
+++ b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
@@ -1,12 +1,12 @@
-
-
+
+
+
+
-
-
-
-
+
+
@@ -20,12 +20,8 @@
+
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
index 9bf83e4639..ff0081e3d6 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
+++ b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
@@ -1,13 +1,22 @@
-pane.items.delete = Are you sure you want to delete the selected item?
-pane.items.delete.multiple = Are you sure you want to delete the selected items?
pane.collections.delete = Are you sure you want to delete the selected project?
pane.collections.delete.multiple = Are you sure you want to delete the selected projects?
pane.collections.rename = Rename Project:
-
-pane.collections.library = Library
+pane.collections.library = My Library
pane.collections.untitled = Untitled Project
-metadata.savechanges = Do you want to save changes to '%1'?
+pane.items.delete = Are you sure you want to delete the selected item?
+pane.items.delete.multiple = Are you sure you want to delete the selected items?
+pane.items.menu.remove = Remove Selected Item...
+pane.items.menu.remove.multiple = Remove Selected Items...
+
+pane.item.selected.zero = No items selected
+pane.item.selected.multiple = %1 items selected
+
+pane.item.changeType = Are you sure you want to change the item type? Certain fields may be lost.
+pane.item.notes.untitled = Untitled Note
+pane.item.notes.delete.confirm = Are you sure you want to delete the selected note?
+pane.item.notes.count.singular = %1 note
+pane.item.notes.count.plural = %1 notes
itemFields.title = Title
itemFields.dateAdded = Date Added
@@ -15,7 +24,6 @@ itemFields.dateModified = Modified
itemFields.source = Source
itemFields.rights = Rights
itemFields.notes = Notes
-
itemFields.series = Series
itemFields.volume = Volume
itemFields.number = Number
diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css
index 93709aeb15..6893d5bb78 100644
--- a/chrome/chromeFiles/skin/default/scholar/overlay.css
+++ b/chrome/chromeFiles/skin/default/scholar/overlay.css
@@ -5,10 +5,11 @@ vbox #scholar-pane
padding: 4px;
}
-tree #collections-tree
+#collections-pane
{
- min-width: 100px;
+ min-width: 150px;
max-width: 200px;
+ width: 150px;
}
#collections-tree treechildren::-moz-tree-image
@@ -21,9 +22,37 @@ tree #collections-tree
background: #f5f5f5;
}
-tree #items-tree
+#items-pane
{
+ min-width: 300px;
+}
+#item-pane
+{
+ width: 300px;
+ min-width: 300px;
+}
+
+#scholar-pane toolbar
+{
+ border-bottom: none;
+ background: #f5f5f5;
+ height: 24px;
+}
+
+#scholar-pane toolbar toolbarbutton
+{
+
+}
+
+#scholar-pane toolbar .toggler
+{
+ margin: 4px;
+}
+
+#scholar-toolbar-name
+{
+ font-size: larger;
}
#tb-collection-add
@@ -46,38 +75,12 @@ tree #items-tree
list-style-image: url('chrome://scholar/skin/toolbar-item-add.png');
}
-#scholar-pane toolbar
-{
- border-bottom: none;
- background: #f5f5f5;
- height: 24px;
-}
-
-#scholar-pane toolbar toolbarbutton
-{
-
-}
-
-#scholar-pane toolbar .toggler
-{
- margin: 4px;
-}
-
#tb-search
{
width: 150px;
}
-#scholar-splitter
-{
- border-top: none;
- border-bottom: 1px solid #A3A3A3;
- min-height: 4px;
- max-height: 4px;
- background: #f5f5f5 !important;
-}
-
-#scholar-metadata
+#scholar-info
{
overflow: auto;
}
@@ -87,6 +90,10 @@ tree #items-tree
-moz-user-focus: ignore;
}
+#scholar-view-item
+{
+ margin-left: 5px;
+}
#scholar-view-item tabpanels
{
padding: 8px 0px 0px 0px;
@@ -106,4 +113,13 @@ tree #items-tree
textbox[multiline="true"][type="timed"]
{
-moz-binding: url('chrome://scholar/content/customControls.xml#timed-textarea');
+}
+
+#scholar-splitter
+{
+ border-top: none;
+ border-bottom: 1px solid #A3A3A3;
+ min-height: 4px;
+ max-height: 4px;
+ background: #f5f5f5 !important;
}
\ No newline at end of file