From 22e65e22b0339369e24e426f349e42987de859f2 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 17 Jul 2014 14:42:45 -0400
Subject: [PATCH] Advanced Search translations.
---
languages/en.ini | 1 +
themes/bootstrap/js/advanced_search.js | 10 +++++-----
themes/bootstrap/js/advanced_search_eds.js | 4 ++--
.../bootstrap/templates/search/advanced/globals.phtml | 1 +
.../bootstrap/templates/search/advanced/layout.phtml | 6 +++---
themes/bootstrap3/js/advanced_search.js | 10 +++++-----
themes/bootstrap3/js/advanced_search_eds.js | 4 ++--
.../bootstrap3/templates/search/advanced/globals.phtml | 1 +
.../bootstrap3/templates/search/advanced/layout.phtml | 6 +++---
9 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/languages/en.ini b/languages/en.ini
index 372884dcad9..ea33519f012 100644
--- a/languages/en.ini
+++ b/languages/en.ini
@@ -340,6 +340,7 @@ Fine = Fine
Fines = Fines
fine_limit_patron = "You have reached your fines limit and cannot renew items"
First = First
+First Edition = "First Edition"
First Name = "First Name"
fix_metadata = "Yes, fix the metadata; I'll wait"
for search = "for search"
diff --git a/themes/bootstrap/js/advanced_search.js b/themes/bootstrap/js/advanced_search.js
index 226531b5c19..d23eee174c4 100644
--- a/themes/bootstrap/js/advanced_search.js
+++ b/themes/bootstrap/js/advanced_search.js
@@ -21,7 +21,7 @@ function addSearch(group, term, field)
}
newSearch += ">" + searchFields[key] + "</option>";
}
- newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-inline delete" title="Remove this term">×</a></div>';
+ newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-inline delete">×</a></div>';
// Insert it
$("#group" + group + "Holder").before(newSearch);
@@ -61,18 +61,18 @@ function addGroup(firstTerm, firstField, join)
if(join == 'AND') {
newGroup += ' selected';
}
- newGroup += '>ALL Terms</option>'
+ newGroup += '>' +searchJoins['AND'] + '</option>'
+ '<option value="OR"';
if(join == 'OR') {
newGroup += ' selected';
}
- newGroup += '>ANY Terms</option>'
+ newGroup += '>' +searchJoins['OR'] + '</option>'
+ '<option value="NOT"';
if(join == 'NOT') {
newGroup += ' selected';
}
- newGroup += '>NO Terms</option>'
- + '</select><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="Remove Group">×</a></div><div class="span8 pull-left switch-margins row-fluid"><div class="span3 text-right"><span class="help-inline">'+searchLabel+':</span></div>'
+ newGroup += '>' +searchJoins['NOT'] + '</option>'
+ + '</select><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="'+deleteSearchGroupString+'">×</a></div><div class="span8 pull-left switch-margins row-fluid"><div class="span3 text-right"><span class="help-inline">'+searchLabel+':</span></div>'
+ '<div class="span9"><i id="group'+nextGroup+'Holder" class="icon-plus-sign"></i> <a href="#" onClick="addSearch('+nextGroup+')">'+addSearchString+'</a></div></div></div>';
$('#groupPlaceHolder').before(newGroup);
diff --git a/themes/bootstrap/js/advanced_search_eds.js b/themes/bootstrap/js/advanced_search_eds.js
index df09591d796..2163b990217 100644
--- a/themes/bootstrap/js/advanced_search_eds.js
+++ b/themes/bootstrap/js/advanced_search_eds.js
@@ -40,7 +40,7 @@ function addSearch(group, term, field, op)
}
newSearch += ">" + searchFields[key] + "</option>";
}
- newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-inline delete" title="Remove this term">×</a></div>';
+ newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-inline delete">×</a></div>';
// Insert it
$("#group" + group + "Holder").before(newSearch);
@@ -77,7 +77,7 @@ function addGroup(firstTerm, firstField, join)
var newGroup = '<div id="group'+nextGroup+'" class="group well clearfix">'
+ '<input type="hidden" name="bool'+nextGroup+'[]" value="AND"/>'
+ '<div class="span11"><div id="group'+nextGroup+'Holder" class="span9 offset3"><i class="icon-plus-sign"></i> <a href="#" onClick="addSearch('+nextGroup+')">'+addSearchString+'</a></div></div>'
- + '<div class="span1"><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="Remove Group">×</a></div></div>';
+ + '<div class="span1"><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="'+deleteSearchGroupString+'">×</a></div></div>';
$('#groupPlaceHolder').before(newGroup);
addSearch(nextGroup, firstTerm, firstField);
diff --git a/themes/bootstrap/templates/search/advanced/globals.phtml b/themes/bootstrap/templates/search/advanced/globals.phtml
index 747aae95bea..0a7a5e6d630 100644
--- a/themes/bootstrap/templates/search/advanced/globals.phtml
+++ b/themes/bootstrap/templates/search/advanced/globals.phtml
@@ -7,6 +7,7 @@ searchJoins["AND"] = "<?=$this->transEsc("search_AND")?>";
searchJoins["OR"] = "<?=$this->transEsc("search_OR")?>";
searchJoins["NOT"] = "<?=$this->transEsc("search_NOT")?>";
var addSearchString = "<?=$this->transEsc("add_search")?>";
+var addGroupString = "<?=$this->transEsc("add_search_group")?>";
var searchLabel = "<?=$this->transEsc("adv_search_label")?>";
var searchFieldLabel = "<?=$this->transEsc("in")?>";
var deleteSearchGroupString = "<?=$this->transEsc("del_search")?>";
diff --git a/themes/bootstrap/templates/search/advanced/layout.phtml b/themes/bootstrap/templates/search/advanced/layout.phtml
index 5214140c8e1..463d10ee4ae 100644
--- a/themes/bootstrap/templates/search/advanced/layout.phtml
+++ b/themes/bootstrap/templates/search/advanced/layout.phtml
@@ -49,13 +49,13 @@
<div id="groupJoin" class="pull-right hidden">
<label for="join"><?=$this->transEsc("search_match")?>:</label>
<select id="search_bool0" name="join">
- <option value="AND"<? if($searchDetails && $searchDetails->getOperator()=='ALL'):?> selected<?endif?>><?= $this->transEsc('ALL Groups') ?></option>
- <option value="OR"<? if($searchDetails && $searchDetails->getOperator()=='OR'):?> selected<?endif?>><?= $this->transEsc('ANY Groups') ?></option>
+ <option value="AND"<? if($searchDetails && $searchDetails->getOperator()=='ALL'):?> selected<?endif?>><?= $this->transEsc('group_AND') ?></option>
+ <option value="OR"<? if($searchDetails && $searchDetails->getOperator()=='OR'):?> selected<?endif?>><?= $this->transEsc('group_OR') ?></option>
</select>
</div>
</div>
<div id="groupPlaceHolder" class="row-fluid">
- <i class="icon-plus-sign"></i> <a href="#" onClick="addGroup()"><?= $this->transEsc('Add Group') ?></a>
+ <i class="icon-plus-sign"></i> <a href="#" onClick="addGroup()"><?= $this->transEsc('add_search_group') ?></a>
</div>
<input type="submit" value="<?= $this->transEsc('Find')?>" class="btn btn-primary pull-right"/>
<? if (isset($this->extraAdvancedControls)): ?>
diff --git a/themes/bootstrap3/js/advanced_search.js b/themes/bootstrap3/js/advanced_search.js
index 9e2ad0480fa..a39df9b9e9d 100644
--- a/themes/bootstrap3/js/advanced_search.js
+++ b/themes/bootstrap3/js/advanced_search.js
@@ -20,7 +20,7 @@ function addSearch(group, term, field)
}
newSearch += ">" + searchFields[key] + "</option>";
}
- newSearch += '</select></div><div class="col-md-1"><a class="help-block delete" href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="delete" title="Remove this term">×</a></div></div>';
+ newSearch += '</select></div><div class="col-md-1"><a class="help-block delete" href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="delete">×</a></div></div>';
// Insert it
$("#group" + group + "Holder").before(newSearch);
@@ -57,23 +57,23 @@ function addGroup(firstTerm, firstField, join)
+ '<div class="col-md-9"><i id="group'+nextGroup+'Holder" class="fa fa-plus-circle"></i> <a href="#" onClick="addSearch('+nextGroup+')">'+addSearchString+'</a></div></div></div>'
+ '<div class="col-md-3">'
+ '<label for="search_bool'+nextGroup+'">'+searchMatch+': </label>'
- + '<a href="#" onClick="deleteGroup('+nextGroup+')" class="close hidden" title="Remove Group">×</a>'
+ + '<a href="#" onClick="deleteGroup('+nextGroup+')" class="close hidden" title="'+deleteSearchGroupString+'">×</a>'
+ '<select id="search_bool'+nextGroup+'" name="bool'+nextGroup+'[]" class="form-control">'
+ '<option value="AND"';
if(join == 'AND') {
newGroup += ' selected';
}
- newGroup += '>ALL Terms</option>'
+ newGroup += '>' +searchJoins['AND'] + '</option>'
+ '<option value="OR"';
if(join == 'OR') {
newGroup += ' selected';
}
- newGroup += '>ANY Terms</option>'
+ newGroup += '>' +searchJoins['OR'] + '</option>'
+ '<option value="NOT"';
if(join == 'NOT') {
newGroup += ' selected';
}
- newGroup += '>NO Terms</option>'
+ newGroup += '>' +searchJoins['NOT'] + '</option>'
+ '</select></div></div>';
$('#groupPlaceHolder').before(newGroup);
diff --git a/themes/bootstrap3/js/advanced_search_eds.js b/themes/bootstrap3/js/advanced_search_eds.js
index ad661f831b3..0dcf7ec2ef9 100644
--- a/themes/bootstrap3/js/advanced_search_eds.js
+++ b/themes/bootstrap3/js/advanced_search_eds.js
@@ -40,7 +40,7 @@ function addSearch(group, term, field, op)
}
newSearch += ">" + searchFields[key] + "</option>";
}
- newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-block delete" title="Remove this term">×</a></div>';
+ newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-block delete">×</a></div>';
// Insert it
$("#group" + group + "Holder").before(newSearch);
@@ -77,7 +77,7 @@ function addGroup(firstTerm, firstField, join)
var newGroup = '<div id="group'+nextGroup+'" class="group well clearfix">'
+ '<input type="hidden" name="bool'+nextGroup+'[]" value="AND"/>'
+ '<div class="span11"><div id="group'+nextGroup+'Holder" class="span9 offset3"><i class="icon-plus-sign"></i> <a href="#" onClick="addSearch('+nextGroup+')">'+addSearchString+'</a></div></div>'
- + '<div class="span1"><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="Remove Group">×</a></div></div>';
+ + '<div class="span1"><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="'+deleteSearchGroupString+'">×</a></div></div>';
$('#groupPlaceHolder').before(newGroup);
addSearch(nextGroup, firstTerm, firstField);
diff --git a/themes/bootstrap3/templates/search/advanced/globals.phtml b/themes/bootstrap3/templates/search/advanced/globals.phtml
index 747aae95bea..0a7a5e6d630 100644
--- a/themes/bootstrap3/templates/search/advanced/globals.phtml
+++ b/themes/bootstrap3/templates/search/advanced/globals.phtml
@@ -7,6 +7,7 @@ searchJoins["AND"] = "<?=$this->transEsc("search_AND")?>";
searchJoins["OR"] = "<?=$this->transEsc("search_OR")?>";
searchJoins["NOT"] = "<?=$this->transEsc("search_NOT")?>";
var addSearchString = "<?=$this->transEsc("add_search")?>";
+var addGroupString = "<?=$this->transEsc("add_search_group")?>";
var searchLabel = "<?=$this->transEsc("adv_search_label")?>";
var searchFieldLabel = "<?=$this->transEsc("in")?>";
var deleteSearchGroupString = "<?=$this->transEsc("del_search")?>";
diff --git a/themes/bootstrap3/templates/search/advanced/layout.phtml b/themes/bootstrap3/templates/search/advanced/layout.phtml
index 19374801090..9fd307760a7 100644
--- a/themes/bootstrap3/templates/search/advanced/layout.phtml
+++ b/themes/bootstrap3/templates/search/advanced/layout.phtml
@@ -49,12 +49,12 @@
<div id="groupJoin" class="form-inline pull-right hidden">
<label for="join"><?=$this->transEsc("search_match")?>:</label>
<select id="search_bool0" name="join" class="form-control">
- <option value="AND"<? if($searchDetails && $searchDetails->getOperator()=='ALL'):?> selected<?endif?>><?= $this->transEsc('ALL Groups') ?></option>
- <option value="OR"<? if($searchDetails && $searchDetails->getOperator()=='OR'):?> selected<?endif?>><?= $this->transEsc('ANY Groups') ?></option>
+ <option value="AND"<? if($searchDetails && $searchDetails->getOperator()=='ALL'):?> selected<?endif?>><?= $this->transEsc('group_AND') ?></option>
+ <option value="OR"<? if($searchDetails && $searchDetails->getOperator()=='OR'):?> selected<?endif?>><?= $this->transEsc('group_OR') ?></option>
</select>
</div>
</div>
- <i id="groupPlaceHolder" class="fa fa-plus-circle"></i> <a href="#" onClick="addGroup()"><?= $this->transEsc('Add Group') ?></a>
+ <i id="groupPlaceHolder" class="fa fa-plus-circle"></i> <a href="#" onClick="addGroup()"><?= $this->transEsc('add_search_group') ?></a>
<input class="btn btn-primary pull-right" type="submit" value="<?= $this->transEsc('Find')?>">
<? if (isset($this->extraAdvancedControls)): ?>
<?=$this->extraAdvancedControls ?>
--
GitLab