[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 19:47:26

Modified files:
        koha-tmpl/opac-tmpl/npl/en: opac-zoomsearch.tmpl 
        koha-tmpl/opac-tmpl/npl/en/includes: doc-head-close-cat-zoom.inc 
                                             masthead.inc 

Log message:
        valid XHTML now

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.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-cat-zoom.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8.2.3&r2=1.1.2.8.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.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- opac-zoomsearch.tmpl        23 Jul 2006 19:15:29 -0000      1.1.2.9
+++ opac-zoomsearch.tmpl        23 Jul 2006 19:47:26 -0000      1.1.2.10
@@ -2,10 +2,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close-cat-zoom.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" 
-->/includes/livesearch.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" 
-->/includes/main.js"></script>
-<style type="text/css">
-    @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/livesearch.css);
-</style>
-
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <div id="main">
@@ -16,6 +12,7 @@
 <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 -->>
@@ -33,7 +30,7 @@
 <form name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" 
id="simple_search_form">
 <input type="hidden" name="query_form" value="ccl" />
 <input type="hidden" name="op" value="get_results" />
-<input name="ccl_query" type="text" autocomplete="off" 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>
+<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>
 <!-- LIVESEARCH -->
 <!--
@@ -54,7 +51,7 @@
 -->
 <!-- /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>
-<script>       
+<script type="text/javascript">        
        function showForm() {
                var format_date = document.getElementById('format_date');
                format_date.style.display='block';
@@ -74,8 +71,8 @@
        </select>
 <br/>
        <input type="hidden" name="op2" value="@and" />
-    <label for="query2">Limit by Branch</label></td><td>
-    <select name="query2" id="query2">
+    <label for="query2">Limit by Branch</label>
+    <select name="query2" id="top_query2">
         <option value="">Any</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>
@@ -94,7 +91,6 @@
 
        <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>
        
-</form>
 <br/><br/><br/>
 <div class="content-block">
     <h3>Recent acquisitions</h3>
@@ -137,8 +133,8 @@
 
 <div class="content-block"  id="advanced" <!-- TMPL_IF name="advanced_search" 
--> style="display:block;"<!-- TMPL_ELSE -->style="display:none"<!-- /TMPL_IF 
-->>
 <h1>Advanced Search</h1>
-<div class="search-main">
 <form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
+<div class="search-main">
        <input type="hidden" name="query_form" value="advanced" />
        <!-- TMPL_LOOP NAME=PQF_QUERY_HISTORY --><input type="hidden" 
name="<!-- TMPL_VAR NAME='field' -->" value="<!-- TMPL_VAR NAME='value' 
-->"</input>
        <!-- /TMPL_LOOP -->
@@ -155,7 +151,7 @@
                <option value="@attr 1=8001">Acquisition Date</option>
                <option value="@attr 1=12">Call Number</option>
        </select>
-       <input type="text" name="query1" />
+       <input type="text" name="query1" /></td></tr>
         <tr><td colspan="2"><select name="search_point2" id="search_point2">
                 <option value="@attr 4=6 @attr 1=1016">Keyword</option>
                 <option selected="selected" value="@attr 1=4 @attr 4=1 @attr 
5=1">Title</option>
@@ -271,25 +267,25 @@
         <option value="@and @attr 1=8700 v @attr 1=8701 d">Videodisk 
(DVD)</option>
         <option value="@and @attr 1=8700 s @attr 1=8701 d">CD (Music or 
Book)</option>
         <option value="@and @attr 1=8700 c @attr 1=8701 o">CD-ROM 
(Computer)</option>
-
+       </select></td></tr>
 </table>
 </div>
 
 <div id="search-sidebar">
 <div class="sidebar-box">
 <h4>Results:</h4>
-<p><label for="advanced_sort_by">Sort by</label></td><td>
+<p><label for="advanced_sort_by">Sort by</label>
                <select name="then_sort_by" id="advanced_sort_by">
                <option value="">Default</option>
-               <option value="1=4 <i 1=8801 >i">Title, Date</option>
-               <option value="1=1003 <i 1=8801 >i">Author, Date 
Decending</option>  
-               <option value="1=1003 <i 1=8801 <i">Author, Date 
Ascending</option>
-               <option value="1=8801 >i">Date Descending</option>
-               <option value="1=8801 <i">Date Ascending</option>
+               <option value="1=4 &lt;i 1=8801 &lt;i">Title, Date</option>
+               <option value="1=1003 &lt;i 1=8801 &lt;i">Author, Date 
Decending</option>  
+               <option value="1=1003 &lt;i 1=8801 &lt;i">Author, Date 
Ascending</option>
+               <option value="1=8801 &gt;i">Date Descending</option>
+               <option value="1=8801 &lt;i">Date Ascending</option>
 
                                
                </select></p>
-<p><label for="adv-results_per_page">Results per page</label></td><td>
+<p><label for="adv-results_per_page">Results per page</label>
                <select name="results_per_page" id="adv-results_per_page">
                <option>1</option>
                <option>10</option>
@@ -300,9 +296,10 @@
                </select></p></div>
 </div>
 <br class="clear" />
-               <p><input type="submit" value="Search" class="submit" /></p>
-               </form>
-               </div>
+               
+<p><input type="submit" value="Search" class="submit" /></p>
+</form>
+</div>
                
 <!-- POWER SEARCH -->
 
@@ -621,7 +618,6 @@
                 <option>100</option>
                 </select>
        <input type="checkbox" name="scan" value="1" id="scan1" /> <label 
for="scan1">Scan Indexes</label></td></tr>
-       </td></tr>
 </table>
        <p><input type="submit" value="Search" class="submit" /></p>
 

Index: includes/doc-head-close-cat-zoom.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/doc-head-close-cat-zoom.inc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- includes/doc-head-close-cat-zoom.inc        23 Jul 2006 18:02:09 -0000      
1.1.2.3
+++ includes/doc-head-close-cat-zoom.inc        23 Jul 2006 19:47:26 -0000      
1.1.2.4
@@ -16,6 +16,13 @@
     @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR 
NAME="opaclayoutstylesheet" -->);
 </style>
     <!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="livesearch" -->
+<style type="text/css">
+       @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/livesearch.css);
+</style>
+<!-- /TMPL_IF -->
+
 <!-- Tigra Menus -->
 <style type="text/css">
 .intd td {

Index: includes/masthead.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc,v
retrieving revision 1.1.2.8.2.3
retrieving revision 1.1.2.8.2.4
diff -u -b -r1.1.2.8.2.3 -r1.1.2.8.2.4
--- includes/masthead.inc       23 Jul 2006 18:02:09 -0000      1.1.2.8.2.3
+++ includes/masthead.inc       23 Jul 2006 19:47:26 -0000      1.1.2.8.2.4
@@ -7,9 +7,9 @@
 <p>
 <input type="hidden" name="query_form" value="advanced" />
 
-<label for="quick_ccl_query">Search</label>
+<label for="masthead_search">Search</label>
 <input type="hidden" name="op" value="get_results" />
-<select name="search_point1" id="search_point1">
+<select name="search_point1" id="masthead_search">
         <option selected="selected" value="@attr 4=6 @attr 
1=1016">Keyword</option>
         <option value="@attr 1=4 @attr 4=1 @attr 5=1">Title</option>
         <option value="@attr 4=1 @attr 6=3 @attr 1=4">Exact Title</option>