From 7d6bd8d0af6b26a4b8443091e55bba928d33d9cb Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 24 Aug 2006 19:43:48 +0000 Subject: [PATCH] "project"=>"collection" (already "collection" in most places internally) --- chrome/chromeFiles/content/scholar/fileInterface.js | 10 +++++----- .../chromeFiles/content/scholar/ingester/browser.js | 2 +- chrome/chromeFiles/content/scholar/overlay.xul | 4 ++-- chrome/chromeFiles/locale/en-US/scholar/scholar.dtd | 10 +++++----- .../locale/en-US/scholar/scholar.properties | 8 ++++---- schema.sql | 12 ++++++------ 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/chrome/chromeFiles/content/scholar/fileInterface.js b/chrome/chromeFiles/content/scholar/fileInterface.js index d48e5963f..60f544079 100644 --- a/chrome/chromeFiles/content/scholar/fileInterface.js +++ b/chrome/chromeFiles/content/scholar/fileInterface.js @@ -2,10 +2,10 @@ var Scholar_File_Interface = new function() { var _unresponsiveScriptPreference, _importCollection, _notifyItem, _notifyCollection; this.exportFile = exportFile; - this.exportProject = exportProject; + this.exportCollection = exportCollection; this.exportItems = exportItems; this.importFile = importFile; - this.bibliographyFromProject = bibliographyFromProject; + this.bibliographyFromCollection = bibliographyFromCollection; this.bibliographyFromItems = bibliographyFromItems; /* @@ -43,7 +43,7 @@ var Scholar_File_Interface = new function() { /* * exports a collection */ - function exportProject() { + function exportCollection() { var collection = ScholarPane.getSelectedCollection(); if(!collection) throw("no collection currently selected"); @@ -181,9 +181,9 @@ var Scholar_File_Interface = new function() { } /* - * Creates a bibliography from a project + * Creates a bibliography from a collection */ - function bibliographyFromProject() { + function bibliographyFromCollection() { var collection = ScholarPane.getSelectedCollection(); if(!collection) throw("no collection currently selected"); diff --git a/chrome/chromeFiles/content/scholar/ingester/browser.js b/chrome/chromeFiles/content/scholar/ingester/browser.js index d1d359a2a..354a66bf1 100644 --- a/chrome/chromeFiles/content/scholar/ingester/browser.js +++ b/chrome/chromeFiles/content/scholar/ingester/browser.js @@ -71,7 +71,7 @@ Scholar_Ingester_Interface.scrapeThisPage = function(saveLocation) { if(saveLocation) { saveLocation = Scholar.Collections.get(saveLocation); - } else { // save to currently selected project, if a project is selected + } else { // save to currently selected collection, if a collection is selected try { saveLocation = ScholarPane.getSelectedCollection(); } catch(e) {} diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul index 75b68223c..250965438 100644 --- a/chrome/chromeFiles/content/scholar/overlay.xul +++ b/chrome/chromeFiles/content/scholar/overlay.xul @@ -54,8 +54,8 @@ - - + + diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd index 370c1ce6d..53ea6c2fc 100644 --- a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd +++ b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd @@ -20,14 +20,14 @@ - + - - - + + + - + diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties index b9d23f2a4..a8b6a2c53 100644 --- a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties +++ b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties @@ -1,8 +1,8 @@ -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.delete = Are you sure you want to delete the selected collection? +pane.collections.delete.multiple = Are you sure you want to delete the selected collections? +pane.collections.rename = Rename Collection: pane.collections.library = My Library -pane.collections.untitled = Untitled Project +pane.collections.untitled = Untitled Collection 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? diff --git a/schema.sql b/schema.sql index 013e9ce8a..d84bc0ec5 100644 --- a/schema.sql +++ b/schema.sql @@ -186,7 +186,7 @@ FOREIGN KEY (creatorTypeID) REFERENCES creatorTypes(creatorTypeID) ); - -- Collections (a.k.a. "projects") for holding items + -- Collections for holding items DROP TABLE IF EXISTS collections; CREATE TABLE collections ( collectionID INT, @@ -732,11 +732,11 @@ INSERT INTO "itemNotes" VALUES(16, 1, 'This item is note-worthy.'); INSERT INTO "itemNotes" VALUES(17, NULL, 'This is an independent note.'); - INSERT INTO collections VALUES (1241, 'Test Project', NULL); - INSERT INTO collections VALUES (3262, 'Another Test Project', NULL); - INSERT INTO collections VALUES (6856, 'Yet Another Project', NULL); - INSERT INTO collections VALUES (7373, 'A Sub-project!', 6856); - INSERT INTO collections VALUES (9233, 'A Sub-sub-project!', 7373); + INSERT INTO collections VALUES (1241, 'Test Collection', NULL); + INSERT INTO collections VALUES (3262, 'Another Test Collection', NULL); + INSERT INTO collections VALUES (6856, 'Yet Another Collection', NULL); + INSERT INTO collections VALUES (7373, 'A Sub-collection!', 6856); + INSERT INTO collections VALUES (9233, 'A Sub-sub-collection!', 7373); INSERT INTO collectionItems VALUES (6856, 14, 0); INSERT INTO collectionItems VALUES (6856, 13, 1);