diff --git a/chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml b/chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml
index 4c8799992..845edac8c 100644
--- a/chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml
+++ b/chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml
@@ -110,7 +110,9 @@
if(conditionsBox.hasChildNodes())
for(var i = 0, len=conditionsBox.childNodes.length; i < len; i++)
+ {
conditionsBox.childNodes[i].updateSearch();
+ }
return this.search.save();
]]>
@@ -133,8 +135,8 @@
@@ -160,18 +162,28 @@
var conditions = Scholar.SearchConditions.getStandardConditions();
for(var i=0, len=conditions.length; i
+
+
+
+
+
+
+
+
@@ -200,10 +279,28 @@
{
this.dontupdate = true; //so that the search doesn't get updated while we are creating controls.
- this.id('conditionsmenu').value = condition['condition'];
+ // Handle collectionID/savedSearchID
+ switch (condition['condition'])
+ {
+ case 'savedSearchID':
+ this.id('conditionsmenu').value = 'collectionID';
+ var prefix = 'S';
+ break;
+
+ case 'collectionID':
+ this.id('conditionsmenu').value = 'collectionID';
+ var prefix = 'C';
+
+ // fall through
+
+ default:
+ this.id('conditionsmenu').value = condition['condition'];
+ var prefix = '';
+ }
+
this.id('operatorsmenu').value = condition['operator'];
- this.id('valuefield').value = condition['value'];
-
+ this.value = prefix + condition['value'];
+
this.dontupdate = false;
}
@@ -218,7 +315,35 @@
{
var condition = this.id('conditionsmenu').value;
var operator = this.id('operatorsmenu').value;
- var value = this.id('valuefield').value;
+
+ // Regular text field
+ if (!this.id('valuefield').hidden)
+ {
+ var value = this.id('valuefield').value;
+ }
+
+ // Handle special C1234 and S5678 form for
+ // collections and searches
+ else if (this.id('conditionsmenu').value=='collectionID')
+ {
+ var letter = this.id('valuemenu').value.substr(0,1);
+ if (letter=='C')
+ {
+ condition = 'collectionID';
+ }
+ else if (letter=='S')
+ {
+ condition = 'savedSearchID';
+ }
+ var value = this.id('valuemenu').value.substr(1);
+ }
+
+ // Regular drop-down menu
+ else
+ {
+ var value = this.id('valuemenu').value;
+ }
+
this.parent.search.updateCondition(this.conditionID, condition, operator, value);
}
]]>
@@ -258,6 +383,9 @@
+
diff --git a/chrome/chromeFiles/content/scholar/xpcom/search.js b/chrome/chromeFiles/content/scholar/xpcom/search.js
index 39c53d877..342a69e64 100644
--- a/chrome/chromeFiles/content/scholar/xpcom/search.js
+++ b/chrome/chromeFiles/content/scholar/xpcom/search.js
@@ -563,7 +563,8 @@ Scholar.SearchConditions = new function(){
isNot: true
},
table: 'savedSearches',
- field: 'savedSearchID'
+ field: 'savedSearchID',
+ special: true
},
{
@@ -577,7 +578,7 @@ Scholar.SearchConditions = new function(){
},
{
- name: 'itemType',
+ name: 'itemTypeID',
operators: {
is: true,
isNot: true
@@ -593,7 +594,8 @@ Scholar.SearchConditions = new function(){
isNot: true
},
table: 'itemTags',
- field: 'tagID'
+ field: 'tagID',
+ special: true
},
{
@@ -657,19 +659,38 @@ Scholar.SearchConditions = new function(){
delete _conditions[i];
}
+ var sortKeys = [];
+ var sortValues = [];
+
// Separate standard conditions for menu display
for (var i in _conditions){
// Standard conditions a have associated tables
- if (_conditions[i]['table'] &&
+ if (_conditions[i]['table'] && !_conditions[i]['special'] &&
// If a template condition, not the original (e.g. 'field')
(!_conditions[i]['template'] || i!=_conditions[i]['name'])){
- _standardConditions.push({
+
+ try {
+ var localized = Scholar.getString('searchConditions.' + i)
+ }
+ catch (e){
+ var localized = Scholar.getString('itemFields.' + i);
+ }
+
+ sortKeys.push(localized);
+ sortValues[localized] = {
name: i,
+ localized: localized,
operators: _conditions[i]['operators']
- });
+ };
}
}
+ // Alphabetize by localized name
+ sortKeys = sortKeys.sort();
+ for each(var i in sortKeys){
+ _standardConditions.push(sortValues[i]);
+ }
+
_initialized = true;
}
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
index 5813821db..b9d23f2a4 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
+++ b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
@@ -106,5 +106,12 @@ searchOperator.greaterThan = is greater than
searchOperator.isBefore = is before
searchOperator.isAfter = is after
+searchConditions.collectionID = Collection
+searchConditions.itemTypeID = Item Type
+searchConditions.tag = Tag
+searchConditions.note = Note
+searchConditions.creator = Creator
+searchConditions.thesisType = Thesis Type
+
exportOptions.exportNotes = Export Notes
exportOptions.exportFileData = Export Files
\ No newline at end of file
diff --git a/chrome/chromeFiles/skin/default/scholar/scholar.css b/chrome/chromeFiles/skin/default/scholar/scholar.css
index 0cce3ace0..13b559b61 100644
--- a/chrome/chromeFiles/skin/default/scholar/scholar.css
+++ b/chrome/chromeFiles/skin/default/scholar/scholar.css
@@ -66,6 +66,7 @@ seealsobox
scholarsearch
{
-moz-binding: url('chrome://scholar/content/bindings/scholarsearch.xml#search-box');
+ width:60em;
}
searchcondition
@@ -73,6 +74,11 @@ searchcondition
-moz-binding: url('chrome://scholar/content/bindings/scholarsearch.xml#search-condition');
}
+searchcondition menulist[id="operatorsmenu"]
+{
+ width:15em;
+}
+
.clicky, .unclicky
{
-moz-border-radius: 6px;