[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en opac-zoomsearch... [dev_week]

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Joshua Ferraro <kados>  06/07/23 20:30:44

Modified files:
        koha-tmpl/opac-tmpl/npl/en: opac-zoomsearch.tmpl 
        koha-tmpl/opac-tmpl/npl/en/includes: catsearch.js 
                                             opac-colors.npl.css 

Log message:
        additional cleanup. With a resident simple search in the masthead
        we can now remove the simple search from the zoomopac script and replace
        it by a 'Format/Date' search.
        
        Also, simplifying the Advanced Search page based on feedback from 
        several users.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-zoomsearch.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.10&r2=1.1.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/catsearch.js?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.3&r2=1.1.2.1.2.4

Patches:
Index: opac-zoomsearch.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-zoomsearch.tmpl,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -b -r1.1.2.10 -r1.1.2.11
--- opac-zoomsearch.tmpl        23 Jul 2006 19:47:26 -0000      1.1.2.10
+++ opac-zoomsearch.tmpl        23 Jul 2006 20:30:44 -0000      1.1.2.11
@@ -7,15 +7,16 @@
 <div id="main">
 <ul class="link-tabs">
 
-<li id="simple_formButton"<!-- TMPL_IF name="simple_search" --> class="on"<!-- 
TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a 
href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=simple" 
onclick="changeSearch('simple'); return false;">Simple Search</a>  </li>
 <li id="advanced_formButton"<!-- TMPL_IF name="advanced_search" --> 
class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a 
href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=advanced" 
onclick="changeSearch('advanced'); return false;">Advanced Search</a>  </li>
+<li id="format_formButton"<!-- TMPL_IF name="format_search" --> class="on"<!-- 
TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a 
href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=format" 
onclick="changeSearch('format'); return false;">Format / Date</a>  </li>
+
 <li id="power_formButton"<!-- TMPL_IF name="power_search" --> class="on"<!-- 
TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a 
href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=power" 
onclick="changeSearch('power'); return false;">Power</a>  </li>
 <li id="proximity_formButton"<!-- TMPL_IF name="proximity_search" --> 
class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a 
href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=proximity" 
onclick="changeSearch('proximity'); return false;">Proximity</a>  </li>
 </ul>
 
 <!-- SIMPLE SEARCH -->
 
-<div class="content-block"  id="simple" <!-- TMPL_IF name="simple_search" --> 
style="display:block;"<!-- TMPL_ELSE -->style="display:none"<!-- /TMPL_IF -->>
+<div class="content-block"  id="format" <!-- TMPL_IF name="format_search" --> 
style="display:block;"<!-- TMPL_ELSE -->style="display:none"<!-- /TMPL_IF -->>
 
 <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" -->
 <!-- TMPL_ELSE --><div id="sidebar">
@@ -27,11 +28,12 @@
 </form></div>
 <!-- /TMPL_IF --><!-- /TMPL_IF -->
 
-<form name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" 
id="simple_search_form">
+<form name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" 
id="format_search_form">
 <input type="hidden" name="query_form" value="ccl" />
 <input type="hidden" name="op" value="get_results" />
-<input name="ccl_query" type="text" id="ccl_search" size="38" /><a href="#" 
class="help" 
onclick="window.open('http://indexdata.dk/yaz/doc/tools.tkl#id2548157','CCL 
Query Syntax','width=600,top=50,left=50,resizable,scrollbars,height=650'); 
return false;">[ ? ]</a>
-<p style="text-align:center;"><input type="submit" value="Catalog Search" 
class="submit" /></p></form>
+<a href="#" class="help" 
onclick="window.open('http://indexdata.dk/yaz/doc/tools.tkl#id2548157','CCL 
Query Syntax','width=600,top=50,left=50,resizable,scrollbars,height=650'); 
return false;">[ ? ]</a>
+<input name="ccl_query" type="text" id="ccl_search" size="38" />
+<input type="submit" value="Catalog Search" class="submit" /></form>
 <!-- LIVESEARCH -->
 <!--
 <form style="margin:0px;" name="searchform" method="get" 
action="/cgi-bin/koha/opac-zoomsearch.pl" id="searchform">
@@ -50,7 +52,7 @@
 </form>
 -->
 <!-- /LIVESEARCH -->
-       <p>Find the latest additions: <br /><a 
href="/cgi-bin/koha/opac-zoomsearch.pl" onclick="showForm(); return 
false;">Search by Format and Date</a></p>
+       <p>Find the latest additions: <br /><a href="#format_date" 
onclick="showForm(); return false;">Search by Format and Date</a></p>
 <script type="text/javascript">        
        function showForm() {
                var format_date = document.getElementById('format_date');
@@ -89,8 +91,6 @@
 </form>
 </div>
 
-       <p><em class="new">New!</em> You can now <strong>renew items 
online</strong>!  <a 
href="http://www.athenscounty.lib.oh.us/online-renewals.html";>Find out more</a> 
or <a href="/cgi-bin/koha/opac-user.pl">log in to your account</a> to try it 
now.</p>
-       
 <br/><br/><br/>
 <div class="content-block">
     <h3>Recent acquisitions</h3>
@@ -202,7 +202,7 @@
                 <option value="@attr 4=1 @attr 6=3 @attr 1=4">Exact 
Title</option>
                 <option value="@attr 1=1003 @attr 4=1 @attr 
5=1">Author</option>
                 <option value="@attr 1=21">Subject</option>
-               <option value="@attr 1=5">Series</option>
+               <option selected="selected" value="@attr 1=5">Series</option>
                <option value="@attr 1=1018">Publisher</option>
                <option value="@attr 1=8001">Acquisition Date</option>
                <option value="@attr 1=12">Call Number</option>
@@ -210,17 +210,12 @@
         <input type="text" name="query5" />
         <input type="hidden" name="op5" value="@and" />
 </td></tr>
-</table>
 
-               <p><input type="submit" value="Search" class="submit" /></p>
 
-<h3>Other Options:</h3>
-<table>
         <tr><td>
-               <label for="query6">Collection Code</label></td><td>
         <input type="hidden" name="op6" value="@and" />
         <select name="query6" id="query6">
-               <option value="">Any</option>
+               <option value="">All Types...</option>
                 <!-- TMPL_LOOP NAME="itemtypeloop" -->
                 <option <!-- TMPL_IF NAME='selected' 
-->selected="selected"<!-- /TMPL_IF --> value="@attr 1=1031 <!-- TMPL_VAR 
NAME='value' -->"><!-- TMPL_VAR NAME='description' --></option>
                 <!-- /TMPL_LOOP -->
@@ -228,20 +223,18 @@
 
      <tr><td>   
         <input type="hidden" name="op7" value="@and" />
-       <label for="query7">Library Branch</label></td><td>
        <select name="query7" id="query7">
-               <option value="">Any</option>
+               <option value="" selected="selected" >All Branches...</option>
                <!-- TMPL_LOOP NAME="branchloop" -->
-                <option <!-- TMPL_IF NAME='selected' 
-->selected="selected"<!-- /TMPL_IF --> value="@attr 1=1019 <!-- TMPL_VAR 
NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
+                <option value="@attr 1=1019 <!-- TMPL_VAR NAME='value' 
-->"><!-- TMPL_VAR NAME='branchname' --></option>
        <!-- /TMPL_LOOP -->
         </select>
 </td></tr>
 
        
        <tr><td><input type="hidden" name="op8" value="@and" />
-<label for="query8">Audience: </label></td><td>
                <select name="query8" id="query8">
-               <option value="">Any</option>
+               <option value="">All Audiences...</option>
                <option value="@or @or @or @attr 1=8822 a @attr 1=8822 b @attr 
1=8822 c @attr 1=8822 j">Juvenile</option>
                <option value="@or @attr 1=8822 d">Young Adult</option>
        </select>
@@ -249,18 +242,16 @@
 
        
        <tr><td><input type="hidden" name="op9" value="@and" />
-               <label for="query9">Content: </label></td><td>
                <select name="query9" id="query9">
-               <option value="">Any</option>
+               <option value="">All Contents...</option>
                <option value="@attr 1=8833 1">Fiction</option>
                <option value="@attr 1=8833 0">Non Fiction</option>
                <option value="@attr 1=8834 b">Biography</option>
        </select></td></tr>
 
        <tr><td><input type="hidden" name="op10" value="@and" />
-       <label for="query10">Format: </label></td><td>
        <select name="query10" id="query10">
-               <option value="">Any</option>
+               <option value="">All Formats...</option>
         <option value="@and @attr 1=8700 t @attr 1=8701 a">Regular 
Print</option>
         <option value="@and @attr 1=8700 t @attr 1=8701 b">Large Print</option>
         <option value="@and @attr 1=8700 v @attr 1=8701 f">Videocassette 
(VHS)</option>

Index: includes/catsearch.js
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/catsearch.js,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- includes/catsearch.js       11 Jul 2006 14:06:57 -0000      1.1.2.2
+++ includes/catsearch.js       23 Jul 2006 20:30:44 -0000      1.1.2.3
@@ -1,13 +1,13 @@
 function hideSearchsTypes() {
-         document.getElementById('simple').style.display = 'none';
+         document.getElementById('format').style.display = 'none';
             document.getElementById('advanced').style.display = 'none';
             document.getElementById('power').style.display = 'none';
             document.getElementById('proximity').style.display = 'none';
                }
 
                function resetButtonsColors() {
-                       document.getElementById('simple_formButton').className 
= 'off';
                        
document.getElementById('advanced_formButton').className = 'off';
+            document.getElementById('format_formButton').className = 'off';
                        document.getElementById('power_formButton').className = 
'off';
                        
document.getElementById('proximity_formButton').className = 'off';
                }

Index: includes/opac-colors.npl.css
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-colors.npl.css,v
retrieving revision 1.1.2.1.2.3
retrieving revision 1.1.2.1.2.4
diff -u -b -r1.1.2.1.2.3 -r1.1.2.1.2.4
--- includes/opac-colors.npl.css        23 Jul 2006 18:02:09 -0000      
1.1.2.1.2.3
+++ includes/opac-colors.npl.css        23 Jul 2006 20:30:44 -0000      
1.1.2.1.2.4
@@ -466,7 +466,7 @@
        border-right : 2px solid #333333;
 }
 
-#loose_form label, #keyword_form label, #precise_form label, #cql_form label, 
#advanced label, #simple label, #power label, #proximity label {
+#loose_form label, #keyword_form label, #precise_form label, #cql_form label, 
#advanced label, #format label, #power label, #proximity label {
        color : #000066;
 }