[Koha-patches] [PATCH] bug 4220 add additional search buttons to advanced search
Nicole Engard
nengard at gmail.com
Wed Feb 17 07:56:04 CET 2010
This patches both the opac & the staff client. It also fixes
an issue where language appeared twice on the opac advanced
search page if you chose to see 'more options'
---
.../prog/en/modules/catalogue/advsearch.tmpl | 35 ++++++++++++++-
.../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 46 ++++++++++++-------
2 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index 1524cfc..2071374 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -82,6 +82,17 @@
</fieldset>
<!-- /BOOLEAN SEARCH OPTIONS -->
+<!-- SEARCH BUTTONS -->
+ <p><input class="submit" type="submit" accesskey="s" value="Search" />
+ <!-- TMPL_IF NAME="expanded_options" -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer Options]</a>
+ <!-- TMPL_ELSE -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
+ <!-- /TMPL_IF -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New search]</a>
+ </p>
+<!-- /SEARCH BUTTONS -->
+
<!-- ITEMTYPE LIMITS -->
<div id="itemtypelist">
<fieldset>
@@ -102,6 +113,17 @@
</div>
<!-- /ITEMTYPE LIMITS -->
+<!-- SEARCH BUTTONS -->
+ <p><input class="submit" type="submit" accesskey="s" value="Search" />
+ <!-- TMPL_IF NAME="expanded_options" -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer Options]</a>
+ <!-- TMPL_ELSE -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
+ <!-- /TMPL_IF -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New search]</a>
+ </p>
+<!-- /SEARCH BUTTONS -->
+
<!-- TMPL_IF NAME="expanded_options" -->
<!-- BASIC LIMITS -->
<fieldset>
@@ -129,7 +151,6 @@
<!-- /BASIC LIMITS -->
<!-- /TMPL_IF -->
-
<!-- TMPL_IF NAME="UNIMARC" -->
<!-- TMPL_INCLUDE NAME="subtypes_unimarc.inc" -->
<!-- TMPL_ELSE -->
@@ -205,6 +226,7 @@
<!-- TMPL_IF NAME="template-defined-limits" -->
<!-- TYPE LIMITS -->
+
<fieldset>
<legend>Limit to any of the following</legend>
@@ -249,6 +271,17 @@
<!-- /TMPL_IF -->
<!-- /TYPE LIMITS -->
+<!-- SEARCH BUTTONS -->
+ <p><input class="submit" type="submit" accesskey="s" value="Search" />
+ <!-- TMPL_IF NAME="expanded_options" -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer Options]</a>
+ <!-- TMPL_ELSE -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
+ <!-- /TMPL_IF -->
+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New search]</a>
+ </p>
+<!-- /SEARCH BUTTONS -->
+
<!-- AVAILABILITY LIMITS -->
<fieldset><legend>Location and availability: </legend>
<p>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index 31698b1..c5564fd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -104,6 +104,19 @@
</fieldset></div>
</div>
+
+ <div class="yui-g"><div class="container" style="text-align: center;"><!-- SEARCH BUTTONS -->
+
+ <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
+ <!-- TMPL_IF NAME="expanded_options" -->
+ <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer Options]</a>
+ <!-- TMPL_ELSE -->
+ <a href="/cgi-bin/koha/opac-search.pl?expanded_options=1">[More options]</a>
+ <!-- /TMPL_IF -->
+ <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New Search]</a>
+
+<!-- /SEARCH BUTTONS --></div></div>
+
<div id="pubrange" class="container">
<fieldset>
<!-- PUB RANGE OPTION -->
@@ -129,6 +142,20 @@
</table>
</fieldset>
</div>
+
+ <div class="container" style="text-align: center;"><!-- SEARCH BUTTONS -->
+
+ <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
+ <!-- TMPL_IF NAME="expanded_options" -->
+ <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer Options]</a>
+ <!-- TMPL_ELSE -->
+ <a href="/cgi-bin/koha/opac-search.pl?expanded_options=1">[More options]</a>
+ <!-- /TMPL_IF -->
+ <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New Search]</a>
+
+<!-- /SEARCH BUTTONS --></div>
+
+ <div id="language" class="container">
<fieldset><legend>Language</legend>
<!-- LANGUAGE LIMIT -->
<p><label for="language-limit">Language: </label>
@@ -145,22 +172,6 @@
<!-- /LANGUAGE LIMIT -->
</fieldset>
<!-- TMPL_IF NAME="expanded_options" -->
- <fieldset><legend>Language</label>
-<!-- LANGUAGE LIMIT -->
- <p><label for="language-limit">Language: </label>
- <select name="limit">
- <option value="">No Limit</option>
- <!-- TMPL_LOOP NAME="search_languages_loop" -->
- <!-- TMPL_IF NAME="selected" -->
- <option value="ln,rtrn:<!-- TMPL_VAR NAME="iso639_2_code" -->" selected="selected"><!-- TMPL_VAR NAME="language_description" --></option>
- <!-- TMPL_ELSE -->
- <option value="ln,rtrn:<!-- TMPL_VAR NAME="iso639_2_code" -->"><!-- TMPL_VAR NAME="language_description" --></option>
- <!-- /TMPL_IF -->
-
- <!-- /TMPL_LOOP -->
- </select></p><!-- <a href="">Show all languages</a>-->
-<!-- /LANGUAGE LIMIT -->
-</fieldset>
<!--TMPL_IF Name="usmarc"-->
<!-- SUBTYPE LIMITS -->
<div id="subtypes" class="container"><fieldset>
@@ -230,7 +241,8 @@
<!--/TMPL_IF-->
<!--/TMPL_IF-->
-</div>
+</div></div>
+
<div class="yui-g">
<div class="yui-u first">
--
1.5.6.5
More information about the Koha-patches
mailing list