[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:51:57

Modified files:
        koha-tmpl/opac-tmpl/npl/en: opac-zoomsearch.tmpl 

Log message:
        finish moving Format/Date

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.11&r2=1.1.2.12

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.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- opac-zoomsearch.tmpl        23 Jul 2006 20:30:44 -0000      1.1.2.11
+++ opac-zoomsearch.tmpl        23 Jul 2006 20:51:57 -0000      1.1.2.12
@@ -14,9 +14,9 @@
 <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 -->
+<!-- ADVANCED SEARCH  -->
 
-<div class="content-block"  id="format" <!-- TMPL_IF name="format_search" --> 
style="display:block;"<!-- TMPL_ELSE -->style="display:none"<!-- /TMPL_IF -->>
+<div class="content-block"  id="advanced" <!-- TMPL_IF name="advanced_search" 
--> style="display:block;"<!-- TMPL_ELSE -->style="display:none"<!-- /TMPL_IF 
-->>
 
 <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" -->
 <!-- TMPL_ELSE --><div id="sidebar">
@@ -28,111 +28,6 @@
 </form></div>
 <!-- /TMPL_IF --><!-- /TMPL_IF -->
 
-<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" />
-<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">
-<input type="hidden" name="query_form" value="ccl" />
-<input type="hidden" name="op" value="get_results" />
-
-<div>
-<input name="ccl_query" type="text" autocomplete="off" id="keyword" size="15" 
onkeypress="liveSearchStart()" /><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>
-       <div id="LSResult" style="display: none;">
-       <ul id="LSShadow">
-               <li> </li>
-       </ul>
-       </div>
-</div>
-<p style="text-align:center;"><input type="submit" value="Catalog Search" 
class="submit" /></p>
-</form>
--->
-<!-- /LIVESEARCH -->
-       <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');
-               format_date.style.display='block';
-       }
-</script>
-
-<div id="format_date" style="display:none">
-<form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get" name="advanced">
-       <input type="hidden" name="query_form" value="advanced"/>
-       <input type="hidden" name="op" value="get_results" />
-       <label for="query1">Choose a Format</label>
-       <select name="query1" id="query1">
-       <option value="">Any</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 -->
-       </select>
-<br/>
-       <input type="hidden" name="op2" value="@and" />
-    <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>
-       <!-- /TMPL_LOOP -->
-        </select>
-<br/>
-<input type="hidden" name="op3" value="@and" />
-    <input type="hidden" name="search_point3" value="@attr 1=8801 @attr 4=109" 
/>
-    <label for="power_year">Limit by Copyright Date</label>
-    <input name="query3" type="text"/>
-
-<input type="submit" value="Search" class="submit" />
-
-</form>
-</div>
-
-<br/><br/><br/>
-<div class="content-block">
-    <h3>Recent acquisitions</h3>
-    <form action="/cgi-bin/koha/opac-zoomsearch.pl">
-            <input type="hidden" name="marclist" value="biblioitems.itemtype" 
/>
-            <input type="hidden" name="and_or" value="and" />
-            <input type="hidden" name="excluding" value="" />
-            <input type="hidden" name="operator" value="=" />
-            <input type="hidden" name="op" value="do_search" />
-            <input type="hidden" name="type" value="opac" />                   
                                                                 <select 
name="value">
-                    <option value="">Any item type</option>
-                        <!-- TMPL_LOOP name="itemtypeloop" -->
-                                <option value="<!-- TMPL_VAR name="value" 
-->"><!-- TMPL_VAR name="description" -->
-                                </option>
-                        <!-- /TMPL_LOOP -->
-                </select>
-            Acquired by
-            <input type="hidden" name="marclist" value="items.homebranch" />
-            <input type="hidden" name="and_or" value="and" />
-            <input type="hidden" name="excluding" value="" />
-            <input type="hidden" name="operator" value="=" />
-            <input type="hidden" name="op" value="do_search" />
-            <input type="hidden" name="type" value="opac" />
-                        <select name="value">
-                                <option value="">Any Branch</option>
-                        <!-- TMPL_LOOP name="branchloop" -->
-                        <option value="<!-- TMPL_VAR name="value" -->" <!-- 
TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name
-="branchname" --></option>
-                        <!-- /TMPL_LOOP -->
-                        </select>
-            <br />over the last <input type="text" name="desc_or_asc" size="3" 
/> days
-            <input type="hidden" name="orderby" value="biblio.timestamp" />
-            <input type="submit" value="Search" class="submit" />
-</form>
-</div>
-
-</div>
-
-<!-- ADVANCED SEARCH  -->
-
-<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>
 <form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
 <div class="search-main">
        <input type="hidden" name="query_form" value="advanced" />
@@ -292,6 +187,39 @@
 </form>
 </div>
                
+<!-- FORMAT / DATE  SEARCH -->
+
+<div class="content-block" id="format" <!-- TMPL_IF name="format_search" --> 
style="display:block;"<!-- TMPL_ELSE -->style="display:none"<!-- /TMPL_IF -->>
+<form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get" name="advanced">
+    <input type="hidden" name="query_form" value="advanced"/>
+    <input type="hidden" name="op" value="get_results" />
+    <label for="query1">Choose a Format</label>
+    <select name="query1" id="query1">
+    <option value="">Any</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 -->
+    </select>
+<br/>
+    <input type="hidden" name="op2" value="@and" />
+    <label for="query2">Limit by Branch</label>
+    <select name="query2" id="top_query2">
+        <option value="">Any</option>
+        <!-- TMPL_LOOP NAME="branchloop" -->
+                <option value="@attr 1=1019 <!-- TMPL_VAR NAME='value' 
-->"><!-- TMPL_VAR NAME='branchname' --></option>
+        <!-- /TMPL_LOOP -->
+        </select>
+<br/>
+<input type="hidden" name="op3" value="@and" />
+    <input type="hidden" name="search_point3" value="@attr 1=8801 @attr 4=109" 
/>
+    <label for="power_year">Limit by Copyright Date</label>
+    <input name="query3" type="text"/>
+    or limit to items acquired in the last <input type="text" size="3"/>days
+<input type="submit" value="Search" class="submit" />
+
+</form>
+</div>
+
 <!-- POWER SEARCH -->
 
                <div class="content-block" id="power" <!-- TMPL_IF 
name="power_search" --> style="display:block;"<!-- TMPL_ELSE 
-->style="display:none"<!-- /TMPL_IF -->>