diff --git a/chrome/content/zotero/lookup.xul b/chrome/content/zotero/lookup.xul
index 1d0bd4ec1..c284eed8f 100644
--- a/chrome/content/zotero/lookup.xul
+++ b/chrome/content/zotero/lookup.xul
@@ -8,18 +8,19 @@
id="zotero-search-dialog"
title="Search"
orient="vertical"
+ buttons="accept,cancel"
ondialogaccept="return Zotero_Lookup.accept();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- &zotero.lookup.description;
-
+ &zotero.lookup.description;
+
-
-
+
+
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 0a6e055d9..ff634a7e8 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -181,7 +181,6 @@
-
@@ -191,6 +190,7 @@
+
diff --git a/chrome/content/zotero/recognizePDF.js b/chrome/content/zotero/recognizePDF.js
index ec5e9879f..e5ddfc222 100644
--- a/chrome/content/zotero/recognizePDF.js
+++ b/chrome/content/zotero/recognizePDF.js
@@ -25,7 +25,7 @@
*/
const Zotero_RecognizePDF_SUCCESS_IMAGE = "chrome://zotero/skin/tick.png";
const Zotero_RecognizePDF_FAILURE_IMAGE = "chrome://zotero/skin/cross.png";
-const Zotero_RecognizePDF_LOADING_IMAGE = "chrome://zotero/skin/indicator.gif";
+const Zotero_RecognizePDF_LOADING_IMAGE = "chrome://global/skin/icons/loading_16.png";
const DOIre = /\bdoi\: *([^\s]+)/i;
/**
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 7576203d5..b39c35c25 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -57,6 +57,7 @@
+
@@ -66,6 +67,7 @@
+
@@ -100,7 +102,7 @@
-
+
@@ -174,4 +176,12 @@
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 987b194da..9ad2eb4b1 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -532,5 +532,10 @@ recognizePDF.limit = Query limit reached. Try again later.
recognizePDF.complete.label = Metadata Retrieval Complete.
recognizePDF.close.label = Close
+rtfScan.boxTitle = Select a file to scan
+rtfScan.scanning.label = Scanning RTF Document...
+rtfScan.saving.label = Formatting RTF Document...
+rtfScan.rtf = Rich Text Format (.rtf)
+
lookup.failure.title = Lookup Failed
-lookup.failure.description = Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
\ No newline at end of file
+lookup.failure.description = Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
diff --git a/chrome/skin/default/zotero/indicator.gif b/chrome/skin/default/zotero/indicator.gif
deleted file mode 100644
index 529e72f45..000000000
Binary files a/chrome/skin/default/zotero/indicator.gif and /dev/null differ
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 84edf71f1..708beceed 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -151,6 +151,11 @@ window[active="true"] #zotero-pane[fullscreenmode="true"][platform="mac"]
list-style-image: url('chrome://zotero/skin/toolbar-item-add.png');
}
+#zotero-tb-lookup
+{
+ list-style-image: url('chrome://zotero/skin/toolbar-lookup.png');
+}
+
#zotero-tb-item-from-page
{
list-style-image: url('chrome://zotero/skin/toolbar-item-from-page.png');
@@ -221,6 +226,20 @@ window[active="true"] #zotero-pane[fullscreenmode="true"][platform="mac"]
list-style-image: url(chrome://zotero/skin/drive_network.png);
}
+#zotero-tb-sync {
+ list-style-image: url(chrome://zotero/skin/arrow_rotate_static.png);
+ margin-left: -2px;
+ margin-right: -2px;
+}
+
+#zotero-tb-sync[status=animate] {
+ list-style-image: url(chrome://zotero/skin/arrow_rotate_animated.png);
+}
+
+#zotero-tb-sync[status=error] {
+ list-style-image: url(chrome://zotero/skin/arrow_rotate_error.png);
+}
+
#zotero-tb-sync #zotero-last-sync-time
{
color: gray;
diff --git a/chrome/skin/default/zotero/toolbar-lookup.png b/chrome/skin/default/zotero/toolbar-lookup.png
new file mode 100755
index 000000000..dac3c9050
Binary files /dev/null and b/chrome/skin/default/zotero/toolbar-lookup.png differ
diff --git a/chrome/skin/default/zotero/treeitem-podcast.png b/chrome/skin/default/zotero/treeitem-podcast.png
index f54bf736c..6f6d3406c 100644
Binary files a/chrome/skin/default/zotero/treeitem-podcast.png and b/chrome/skin/default/zotero/treeitem-podcast.png differ
diff --git a/chrome/skin/default/zotero/treeitem-radioBroadcast.png b/chrome/skin/default/zotero/treeitem-radioBroadcast.png
index 3e8712ae2..f54bf736c 100644
Binary files a/chrome/skin/default/zotero/treeitem-radioBroadcast.png and b/chrome/skin/default/zotero/treeitem-radioBroadcast.png differ
diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index 0b48c8f0f..0b5156c4b 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -225,15 +225,11 @@ zoteromergepane {
.zotero-small-progress-indicator {
- list-style-image: url(chrome://zotero/skin/arrow_rotate_static.png);
+ list-style-image: url(chrome://global/skin/icons/notloading_16.png);
margin-left: -2px;
margin-right: -2px;
}
.zotero-small-progress-indicator[status=animate] {
- list-style-image: url(chrome://zotero/skin/arrow_rotate_animated.png);
-}
-
-.zotero-small-progress-indicator[status=error] {
- list-style-image: url(chrome://zotero/skin/arrow_rotate_error.png);
+ list-style-image: url(chrome://global/skin/icons/loading_16.png);
}
\ No newline at end of file
diff --git a/translators/Open WorldCat (Search).js b/translators/Open WorldCat (Search).js
deleted file mode 100644
index 20ee4f9b3..000000000
--- a/translators/Open WorldCat (Search).js
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "translatorID":"e07e9b8c-0e98-4915-bb5a-32a08cb2f365",
- "translatorType":12,
- "label":"Open WorldCat (Search)",
- "creator":"Simon Kornblith",
- "target":"http://partneraccess.oclc.org/",
- "minVersion":"1.0.0b3.r1",
- "maxVersion":"",
- "priority":100,
- "inRepository":true,
- "lastUpdated":"2007-03-22 18:15:00"
-}
-
-function detectSearch(item) {
- if(item.itemType == "book" || item.itemType == "bookSection") {
- return true;
- }
- return false;
-}
-
-// creates an item from an Open WorldCat document
-function processOWC(doc) {
- var spanTags = doc.getElementsByTagName("span");
- for(var i=0; i 1) { // multiple items
+ var items = [];
+ var titles = [];
+ for(var i in elems) {
+ var item = new Zotero.Item();
+ Zotero.Utilities.parseContextObject(elems[i].nodeValue, item);
+ items.push(item);
+ titles.push(item.title);
+ }
+
+ titles = Zotero.selectItems(titles);
+ if(!titles) return true;
+
+ // accumulate appropriate types
+ var i = 0;
+ try {
+ var xpath = doc.evaluate('//div/img[@class="icn"][contains(@src, "icon-")][1]/@src', doc, null, XPathResult.ANY_TYPE, null);
+ while(elem = xpath.iterateNext()) {
+ var type = getZoteroType(elem.nodeValue);
+ if(type) items[i].itemType = type;
+ i++;
+ }
+ } catch(e) {}
+
+ // complete items
+ for(var i in titles) {
+ items[i].complete();
+ }
+ } else { // single item
+ generateItem(doc, elems[0]).complete();
+ }
+}
+
+function doSearch(item) {
+ if(item.contextObject) {
+ var co = item.contextObject;
+ } else {
+ var co = Zotero.Utilities.createContextObject(item);
+ }
+
+ Zotero.Utilities.loadDocument("http://www.worldcat.org/search?q=isbn%3A"+item.ISBN+"&=Search&qt=results_page", function(doc) {
+ var node = doc.evaluate('//span[@class="Z3988"]/@title', doc, null, XPathResult.ANY_TYPE, null).iterateNext();
+ if(!node) Zotero.done(false);
+
+ var item = generateItem(doc, node);
+ item.complete();
+
+ Zotero.done();
+ }, null);
+
+ Zotero.wait();
+}
\ No newline at end of file
diff --git a/translators/Worldcat.org.js b/translators/Worldcat.org.js
deleted file mode 100644
index 8b763a8d7..000000000
--- a/translators/Worldcat.org.js
+++ /dev/null
@@ -1,63 +0,0 @@
-{
- "translatorID":"490909d7-7d79-4c7a-a136-77df618d4db2",
- "translatorType":4,
- "label":"Worldcat.org",
- "creator":"Michael Berkowitz",
- "target":"http://(www.)?worldcat.org/",
- "minVersion":"1.0.0b4.r5",
- "maxVersion":"",
- "priority":100,
- "inRepository":true,
- "lastUpdated":"2009-03-06 20:38:37"
-}
-
-function detectWeb(doc, url) {
- if (url.match(/search?/) && doc.evaluate('//input[@id="itemid"]', doc, null, XPathResult.ANY_TYPE, null).iterateNext()) {
- return "multiple";
- } else {
- var type = doc.evaluate('//tbody/tr/td[2][img]', doc, null, XPathResult.ANY_TYPE, null).iterateNext().textContent.toLowerCase().match(/(\w+);/)[1];
- switch (type) {
- case "book": return "book";
- case "article": return "journalArticle";
- case "recording":
- case "disc": return "audioRecording";
- case "tape": return "videoRecording";
- }
- }
-}
-
-function ENify(str) {
- return str.match(/^[^&]+/)[0] + '?page=endnote&client=worldcat.org-detailed_record';
-}
-function doWeb(doc, url) {
- var n = doc.documentElement.namespaceURI;
- var ns = n ? function(prefix) {
- if (prefix == 'x') return n; else return null;
- } : null;
-
- var books = new Array();
- if (detectWeb(doc, url) == "multiple") {
- var items = new Object();
- var titles = doc.evaluate('//div[@class="name"]/a', doc, ns, XPathResult.ANY_TYPE, null);
- var title;
- while (title = titles.iterateNext()) {
- items[title.href] = Zotero.Utilities.trimInternal(title.textContent);
- }
- items = Zotero.selectItems(items);
- for (var i in items) {
- books.push(ENify(i));
- }
- } else {
- var link = doc.evaluate('//a[contains(text(), "EndNote")]', doc, null, XPathResult.ANY_TYPE, null).iterateNext().href;
- books = [link];
- }
-
- Zotero.Utilities.HTTP.doGet(books, function(text) {
- text = text.replace("MUSIC", "PAMP");
- var translator = Zotero.loadTranslator("import");
- translator.setTranslator("32d59d2d-b65a-4da4-b0a3-bdd3cfb979e7");
- translator.setString(text);
- translator.translate();
- }, function () { Zotero.done(); });
- Zotero.wait();
-}
\ No newline at end of file