[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmp... [dev_week]
Joshua Ferraro
jmf at kados.org
Tue Jul 11 16:06:57 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/07/11 14:06:57
Modified files:
koha-tmpl/opac-tmpl/npl/en: opac-detail.tmpl
opac-dictionary.tmpl opac-main.tmpl
opac-MARCdetail.tmpl
opac-results.tmpl
opac-searchresults.tmpl
opac-user.tmpl opac-zoomsearch.tmpl
koha-tmpl/opac-tmpl/npl/en/includes: catsearch.js livesearch.js
main.js masthead.inc
navigation.inc
opac-colors.npl.css
opac-colors.smfpl.css
opac-layout.css
opac-layout.smfpl.css
Added files:
koha-tmpl/opac-tmpl/npl/en: opac-catalogue-home.tmpl
opac-cql.tmpl
Log message:
sync with rel_2_2 and some minor updates
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.19&r2=1.1.2.19.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.5&r2=1.1.2.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.14&r2=1.3.2.14.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8.2.1&r2=1.1.2.8.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl?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/opac-searchresults.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11&r2=1.1.2.11.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11&r2=1.1.2.11.2.1
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.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-catalogue-home.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-cql.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
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.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/livesearch.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/main.js?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
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&r2=1.1.2.8.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4&r2=1.2.2.4.2.1
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.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.smfpl.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.1&r2=1.1.2.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.smfpl.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
Patches:
Index: opac-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.19.2.1
diff -u -b -r1.1.2.19 -r1.1.2.19.2.1
--- opac-detail.tmpl 27 Apr 2006 17:02:20 -0000 1.1.2.19
+++ opac-detail.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.19.2.1
@@ -134,7 +134,11 @@
<!-- TMPL_IF name="notforloantext" -->
<!-- TMPL_VAR name="notforloantext" -->
<!-- TMPL_ELSE -->
- Available
+ <!-- TMPL_IF name="itemlost"-->
+ Item Lost
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_IF NAME="wthdrawn" -->Item Cancelled<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
</td>
Index: opac-dictionary.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-dictionary.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.5.2.1
diff -u -b -r1.1.2.5 -r1.1.2.5.2.1
--- opac-dictionary.tmpl 11 Apr 2006 21:22:24 -0000 1.1.2.5
+++ opac-dictionary.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.5.2.1
@@ -120,6 +120,9 @@
<!-- /TMPL_IF -->
<script language="JavaScript" type="text/javascript">
function SelectEntry(myentry, myindex, wclose){
+ re = /<.*?>/
+ myentry=myentry.replace(/<.*?>/g,"");
+ myentry=myentry.replace(/<\/.*?>/,"");
if (window.opener.document.getElementById(myindex).value!=""){
window.opener.document.getElementById(myindex).value = window.opener.document.getElementById(myindex).value+" "+myentry
} else {
Index: opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3.2.14
retrieving revision 1.3.2.14.2.1
diff -u -b -r1.3.2.14 -r1.3.2.14.2.1
--- opac-main.tmpl 27 Apr 2006 17:02:20 -0000 1.3.2.14
+++ opac-main.tmpl 11 Jul 2006 14:06:57 -0000 1.3.2.14.2.1
@@ -83,7 +83,7 @@
<div class="content-block">
<h3>You're logged in as <em><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></em> <span class="print">(<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)</span><!-- /TMPL_LOOP --></h3>
<p><a href="/cgi-bin/koha/opac-user.pl">my library home</a> | <a href="/cgi-bin/koha/opac-account.pl">my fines</a> |
- <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a> | <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- TMPL_IF NAME="opacreadinghistory" -->| <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF --> <!-- TMPL_IF name="virtualshelves" --> | <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></p>
+ <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a> | <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- TMPL_IF NAME="opacreadinghistory" -->| <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF --> <!-- TMPL_IF name="virtualshelves" --> | <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my virtual shelves</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></p>
<!-- TMPL_IF name="textmessaging"-->
<h3>Message from the library</h3>
<p class="error"><!-- TMPL_VAR name="textmessaging" --></p>
Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl,v
retrieving revision 1.1.2.8.2.1
retrieving revision 1.1.2.8.2.2
diff -u -b -r1.1.2.8.2.1 -r1.1.2.8.2.2
--- opac-MARCdetail.tmpl 2 Jun 2006 23:11:24 -0000 1.1.2.8.2.1
+++ opac-MARCdetail.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.8.2.2
@@ -32,7 +32,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
@@ -54,7 +54,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
@@ -76,7 +76,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
@@ -98,7 +98,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
@@ -120,7 +120,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
@@ -142,7 +142,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
@@ -164,7 +164,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
@@ -186,7 +186,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
@@ -208,7 +208,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
@@ -230,7 +230,7 @@
<!-- TMPL_LOOP name="subfield" -->
<p>
<label class="labelsubfield">
- <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR name="marc_lib" -->
</label>
<!-- TMPL_VAR name="marc_value" -->
Index: opac-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-results.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- opac-results.tmpl 7 Jun 2006 18:56:58 -0000 1.1.2.3
+++ opac-results.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.4
@@ -1,80 +1,145 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- <!-- TMPL_IF NAME="searchdesc" -->Results of Search for '<!-- TMPL_VAR NAME="searchdesc" -->'<!-- TMPL_ELSE -->You did not specify any search criteria<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<div id="main">
-<!-- TMPL_IF NAME="searchdesc" -->
- <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span></h3>
-<!-- TMPL_ELSE -->
- <h3>You did not specify any search criteria</h3>
-<!-- /TMPL_IF -->
-<form action='/cgi-bin/koha/opac-zoomsearch.pl' method='get'>
- <input type='hidden' name='query_form' value='pqf'/>
- <input type='hidden' name='op' value='get_results'/>
-
-<!-- TMPL_LOOP NAME="FORMINPUTS" -->
-<input type='hidden' name=<!-- TMPL_VAR NAME="field" --> value=<!-- TMPL_VAR NAME="value" -->>
+<!-- Facets -->
+<div id="nav">
+<ul>
+<li>Relevant Subjects</li>
+<!-- TMPL_LOOP NAME="FACETS" -->
+ <li><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&pqf_query=@attr 1=21 "<!-- TMPL_VAR NAME="facetsubject" -->""><!-- TMPL_VAR NAME="facetsubject" --></a> (<!-- TMPL_VAR NAME="facetcount" -->)<ul>
+ <!-- TMPL_LOOP NAME="facetcountersubs" -->
+ <!-- TMPL_VAR NAME="facetsubjectsub" -->
+ <!-- /TMPL_LOOP -->
+ </ul>
+ </li>
<!-- /TMPL_LOOP -->
- <select name='reorder_query'>
- <option value='' selected>Relevance</option>
- <option value="1=4 i< ">Title Ascending</option>
- <option value="1=4 i< 1=30 i>">Title Ascending, Date Descending</option>
- <option value=" 1=1003 i< 1=30 i>">Author Ascending, Date Descending</option>
- <option value="1=32 i> ">Date of Acquisition, Relevance</option>
- <option value="1=30 i>">Date of Publication, Relevance</option>
+</ul>
+</div>
- </select>
+<div id="main">
- <input type='submit' value='resort'/>
-</form>
+<!-- TMPL_IF NAME="searchdesc" -->
- <div class="pages">
+<h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span></h3>
+ <!-- <h4><!-- TMPL_VAR NAME="total" --> Records Found</h4> -->
+ <div class="pages">
<!-- Row of numbers corresponding to search result pages -->
-
<!-- TMPL_LOOP NAME="numbers" -->
<!-- TMPL_IF NAME="highlight" -->
- <span class="current">
- <!-- TMPL_VAR NAME="number" -->
- </span>
- <!-- TMPL_ELSE -->
- <span class="pages">
- <a class="pages" href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&pg=<!-- TMPL_VAR NAME="pg" -->&reorder_query=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME=number --></a>
- </span>
+ <span class="current"><!-- TMPL_VAR NAME="number" --></span> <!-- TMPL_ELSE --><a class="nav" href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&pg=<!-- TMPL_VAR NAME="pg" -->&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->"><!-- TMPL_VAR NAME=number --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</div>
<div id="results"><!-- TMPL_IF name=total -->
Results <b><!-- TMPL_VAR NAME="starting" --></b> - <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="total" --></b> records.
<!-- TMPL_ELSE -->
- No results found.
+ <p>
+ No results match your search for "<!-- TMPL_VAR NAME="searchdesc" -->" in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
+ </p>
+ <p>
+ <!-- TMPL_VAR NAME="search_error" -->
+ </p>
<!-- /TMPL_IF --></div>
+<!-- TMPL_ELSE -->
+ <h3>You did not specify any search criteria</h3>
+<!-- /TMPL_IF -->
+
<!-- Search Results Table -->
<!-- TMPL_IF NAME="total" -->
+<!-- TMPL_IF NAME="scan" -->
+<h1>Scan Index:</h1>
+ <form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
+ <input type="hidden" name="query_form" value="power" />
+ <input type="hidden" name="op" value="get_results" />
+<table>
+
+ <tr><td>
+ Scan Index for: <input type="text" name="query1" id="power-query1" size="35" value="" />
+ </td>
+ </tr><tr><td>
+ <label for="use1">Indexed in:</label>
+ <select name="use1" id="use1">
+ <option value="@attr 1=1016">Any Word</option>
+ <option value="@attr 1=1016 @attr 6=2">Any Phrase</option>
+ <option value="@attr 1=4">Title</option>
+ <option value="@attr 1=4 @attr 6=2">Title Phrase</option>
+ <option value="@attr 1=1003">Author</option>
+ <option value="@attr 1=21">Subject</option>
+ <option value="@attr 1=21 @attr 6=2">Subject Phrase</option>
+ <option value="@attr 1=5">Series</option>
+ <option value="@attr 1=1018">Publisher</option>
+ <option value="@attr 1=63">Notes</option>
+ <option value="@attr 1=6">Journal Title</option>
+ <option value="@attr 1=7">ISBN</option>
+ <option value="@attr 1=8">ISSN</option>
+ </select>
+ <input type="hidden" name="scan" value="1" />
+</td></tr>
+</table>
+</form>
+
+<form action="opac-searchresults.pl" method="get" name="myform">
+<table>
+ <tr>
+ <th>Term/Phrase</th>
+ <th>Count</th>
+ </tr>
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
+
+ <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->><td>
+ <a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&pqf_query= <!-- TMPL_VAR NAME="scan_use" escape="url" --> "<!-- TMPL_VAR NAME="title" -->""><!-- TMPL_VAR NAME="title" --></a>
+ </td>
+ <td>
+ <!-- TMPL_VAR NAME="subtitle" -->
+ </td></tr>
+<!-- /TMPL_LOOP -->
+
+</table>
+</form>
+<!-- TMPL_ELSE -->
+<div id="sort"><form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
+ <input type="hidden" name="op" value="get_results" />
+ <input type="hidden" name="pqf_query" value="<!-- TMPL_VAR NAME="pqf_query" escape="html" -->" />
+ <input type="hidden" name="ccl_query" value="<!-- TMPL_VAR NAME="ccl_query" escape="html" -->" />
+ <input type="hidden" name="cql_query" value="<!-- TMPL_VAR NAME="cql_query" escape="html" -->" />
+ <label for="then_sort_by">Re-sort by:</label>
+ <select name="then_sort_by" id="then_sort_by">
+ <option value="">Relevance</option>
+ <option value="1=4 <i 1=8803 >i">Title Ascending, Date Descending</option>
+ <option value="1=1003 <i 1=8803 >i">Author Ascending, Date Descending</option>
+ <option value="1=1003 <i 1=8803 <i">Author Ascending, Date Descending</option>
+
+ </select>
+ <input type="submit" value="Sort" class="submit" />
+</form>
+</div>
+
<!-- TMPL_IF NAME="opacbookbag" -->
<form action="opac-searchresults.pl" method="get" name="myform">
-<input type="submit" class="icon addchecked" value="Add Checked Items to Book Bag" onclick="addMultiple(); return false;"> <input type="reset" value="Clear All" class="icon clearall"><!-- /TMPL_IF -->
+<input type="submit" class="icon addchecked" value="Add Checked Items to Book Bag" onclick="addMultiple(); return false;"/> <input type="reset" value="Clear All" class="icon clearall"/><!-- /TMPL_IF -->
<table>
<tr>
<th><!--TMPL_IF NAME="opacbookbag" --><a href="#" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a><!-- TMPL_ELSE --> <!-- /TMPL_IF --></th>
<!-- TMPL_IF NAME="AmazonContent" -->
- <th colspan="2">Title</th>
+ <th colspan="2"><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=4 <i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↓</a>Title<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=4 >i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↑</a></th>
<!-- TMPL_ELSE -->
- <th>Title</th>
+ <th><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&pqf_sort_by=@or @attr 7=1 @attr 1=4 0&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">Title</a></th>
<!-- /TMPL_IF -->
- <th>Author</th>
- <th>Call Number</th>
- <th>Available at</th>
+ <th><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=1003 <i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↓</a>Author<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=1003 >i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↑</a></th>
+
+ <th nowrap><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=1003 <i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↓</a>Call Num<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=1003 >i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↑</a></th>
+ <th>Availablity</th>
</tr>
<!-- Actual Search Results -->
+
<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
<td><!--TMPL_IF NAME="opacbookbag" --><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><!-- /TMPL_IF --><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /><!--TMPL_IF NAME="opacbookbag" --></label><br /><input type="checkbox" name="bibid" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><!-- /TMPL_IF --></td>
<!-- TMPL_IF NAME="AmazonContent" -->
-<td><div id="menu"> <a class="p1" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF NAME="isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="Book Cover Image" class="thumbnail" /><!--<img class="large" src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01._PE_SCLZZZZZZZ_.jpg" title="Enlarged view of image" alt="Enlarged view of image" />
---></a></div></td>
+<td><div class="menu"> <a class="p1" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF NAME="isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="Book Cover Image" class="thumbnail" /></a></div></td>
<!-- /TMPL_IF -->
<td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
@@ -85,46 +150,31 @@
<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF --></td>
- <td><a href="/cgi-bin/koha/opac-zoomsearch.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->&resultsperpage=20&orderby=biblio.title&op=do_search"><!-- TMPL_VAR NAME="author" --></a></td>
+ <td><a href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=ccl&op=get_results&ccl_query=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a></td>
<td><!-- TMPL_VAR NAME="classification" --></td>
- <td><!-- TMPL_VAR name="location" --><br /></td></tr><!-- /TMPL_LOOP -->
+ <td><!-- TMPL_VAR name="location" --><br /></td></tr>
+ <!-- /TMPL_LOOP -->
</table>
</form>
-
+<!-- /TMPL_IF -->
<div class="pages">
-
<!-- Row of numbers corresponding to search result pages -->
-
<!-- TMPL_LOOP NAME="numbers" -->
<!-- TMPL_IF NAME="highlight" -->
- <span class="current">
- <!-- TMPL_VAR NAME="number" -->
- </span>
- <!-- TMPL_ELSE -->
- <span class="pages">
- <a class="pages" href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" --><!-- /TMPL_LOOP -->&pg=<!-- TMPL_VAR NAME="pg" -->&reorder_query=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME=number --></a>
- </span>
+ <span class="current"><!-- TMPL_VAR NAME="number" --></span> <!-- TMPL_ELSE --><a class="nav" href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&pg=<!-- TMPL_VAR NAME="pg" -->&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->"><!-- TMPL_VAR NAME=number --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</div>
-
-
-
-
-
-
-
<!-- TMPL_ELSE -->
-Sorry, there were no results.
<!-- /TMPL_IF -->
-<!-- Hide from NPL -->
+
<!-- TMPL_IF name="suggestion" -->
<div class="note">Not finding what you're looking for?<br /> Make a <a href="opac-suggestions.pl?op=add">purchase suggestion</a></div>
<!-- /TMPL_IF -->
-<!-- /Hide from NPL -->
</div>
+
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-searchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.11.2.1
diff -u -b -r1.1.2.11 -r1.1.2.11.2.1
--- opac-searchresults.tmpl 27 Apr 2006 17:02:20 -0000 1.1.2.11
+++ opac-searchresults.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.11.2.1
@@ -70,7 +70,7 @@
<td><a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->&resultsperpage=20&orderby=biblio.title&op=do_search"><!-- TMPL_VAR NAME="author" --></a></td>
<td><!-- TMPL_VAR NAME="classification" --></td>
<td><!-- TMPL_VAR name="totitem" -->
- </td><td><!-- TMPL_LOOP name="CN" --><!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" --> <!-- TMPL_IF name="date_due" --> <i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i><!-- TMPL_ELSE --><!-- TMPL_IF name="itemcallnumber" --> (<!-- TMPL_VAR name="itemcallnumber" -->)<!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td></tr><!-- /TMPL_LOOP -->
+ </td><td><!-- TMPL_LOOP name="CN" --><!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" --><!-- TMPL_IF name="cnt" -->(<!-- TMPL_VAR name="cnt" -->)<!--/TMPL_IF--> <!-- TMPL_IF name="date_due" --> <i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i><!-- TMPL_ELSE --><!-- TMPL_IF name="itemcallnumber" --> (<!-- TMPL_VAR name="itemcallnumber" -->)<!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td></tr><!-- /TMPL_LOOP -->
</table>
</form>
Index: opac-user.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.11.2.1
diff -u -b -r1.1.2.11 -r1.1.2.11.2.1
--- opac-user.tmpl 1 Mar 2006 22:37:13 -0000 1.1.2.11
+++ opac-user.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.11.2.1
@@ -8,7 +8,7 @@
<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
<h2>Welcome <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> <span class="print">(<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)</span></h2>
<p> <!-- Hide from NPL--> <a href="/cgi-bin/koha/opac-account.pl">my fines</a> | <!-- Hide from NPL -->
- <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a> <!-- TMPL_IF name="OpacPasswordChange" --> | <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" -->| <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF --> <!-- TMPL_IF name="virtualshelves" --> | <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></p>
+ <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a> <!-- TMPL_IF name="OpacPasswordChange" --> | <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" -->| <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF --> <!-- TMPL_IF name="virtualshelves" --> | <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my virtual shelves</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></p>
<!-- TMPL_IF name="textmessaging"-->
<div class="error"><h3>Message from the library</h3>
<p><!-- TMPL_VAR name="textmessaging" --></p></div>
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.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- opac-zoomsearch.tmpl 10 Jun 2006 19:52:01 -0000 1.1.2.3
+++ opac-zoomsearch.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.4
@@ -11,14 +11,14 @@
<div id="main">
<ul class="link-tabs">
-<li id="cql_formButton"<!-- TMPL_IF name="cql_search" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=cql" onclick="changeSearch('cql'); return false;">Simple Search</a> </li>
+<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="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 Search</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 Search</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 (cql) SEARCH -->
+<!-- SIMPLE SEARCH -->
-<div class="content-block" id="cql" <!-- TMPL_IF name="cql_search" --> style="display:block;"<!-- TMPL_ELSE -->style="display:none"<!-- /TMPL_IF -->>
+<div class="content-block" id="simple" <!-- TMPL_IF name="simple_search" --> style="display:block;"<!-- TMPL_ELSE -->style="display:none"<!-- /TMPL_IF -->>
<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" -->
<!-- TMPL_ELSE --><div id="sidebar">
@@ -40,14 +40,19 @@
<p style="text-align:center;"><input type="submit" value="Catalog Search" class="submit" /></p>
</form> -->
-
-<!-- LIVESEARCh -->
+<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="55" /><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 -->
<form style="margin:0px;" name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" id="searchform">
-<input type="hidden" name="query_form" value="cql" />
+<input type="hidden" name="query_form" value="ccl" />
<input type="hidden" name="op" value="get_results" />
<div>
-<input name="cql_query" type="text" autocomplete="off" id="keyword" size="15" onkeypress="liveSearchStart()" />
+<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>
@@ -58,7 +63,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>
<script>
function showForm() {
@@ -89,11 +94,12 @@
</select>
<br/>
<input type="hidden" name="op3" value="@and" />
- <input type="hidden" name="search_point3" value="@attr 1=8803 @attr 2=4 @attr 4=109" />
+ <input type="hidden" name="search_point3" value="@attr 1=8802 @attr 2=4 @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>
@@ -101,6 +107,7 @@
<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/>
<!--
<h2>PQF Search</h2>
@@ -111,7 +118,6 @@
<input type="submit" value="Search" class="submit" />
</form>
-->
-
</div>
<!-- ADVANCED SEARCH -->
@@ -134,7 +140,7 @@
<option 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=894k">Call Number</option>
+ <option value="@attr 1=9">Call Number</option>
</select>
<input type="text" name="query1" />
<tr><td colspan="2"><select name="search_point2" id="search_point2">
@@ -146,7 +152,7 @@
<option 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=8006">Call Number</option>
+ <option value="@attr 1=9">Call Number</option>
</select>
<input type="text" name="query2" />
<input type="hidden" name="op2" value="@and" /> </td></tr>
@@ -160,7 +166,7 @@
<option 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=8006">Call Number</option>
+ <option value="@attr 1=9">Call Number</option>
</select>
<input type="text" name="query3" />
<input type="hidden" name="op3" value="@and" /></td></tr>
@@ -175,7 +181,7 @@
<option 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=8006">Call Number</option>
+ <option value="@attr 1=9">Call Number</option>
</select>
<input type="text" name="query4" />
<input type="hidden" name="op4" value="@and" /></td></tr>
@@ -190,15 +196,11 @@
<option 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=8006">Call Number</option>
+ <option value="@attr 1=9">Call Number</option>
</select>
<input type="text" name="query5" />
<input type="hidden" name="op5" value="@and" />
</td></tr>
-<tr><td>
- Turn on Smart Search<input type="checkbox" name="scan" value="1" />
-
-</td></tr>
</table>
<p><input type="submit" value="Search" class="submit" /></p>
@@ -250,15 +252,13 @@
<label for="query10">Format: </label></td><td>
<select name="query10" id="query10">
<option value="">Any</option>
- <optgroup label="Video and DVD">
- <option value="@and @attr 1=8701 @attr 1=8702 ">All Videos and DVDs</option>
- <option value="@and @attr 1=8701 @attr 1=8702">DVD</option>
- <option value="@and @attr 1=8701 @attr 1=8702">Video</option>
- </optgroup>
- </optgroup>
- <option value="d">Large Print</option>
- <option value="f">Braille</option>
- <option value="">Electronic</option></td></tr>
+ <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>
+ <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>
+
</table>
</div>
@@ -266,9 +266,11 @@
<div class="sidebar-box">
<h4>Results:</h4>
<p><label for="advanced_sort_by">Sort by</label></td><td>
- <select name="sort_by" id="advanced_sort_by">
+ <select name="then_sort_by" id="advanced_sort_by">
<option value="">Default</option>
- <option value="@or @or @attr 7=1 @attr 1=4 0 @attr 7=2 @attr 1=30 1">Title,Date</option>
+ <option value="1=4 <i 1=8802 >i">Title, Date</option>
+ <option value="1=1003 <i 1=8802 >i">Author, Date </option>
+
</select></p>
<p><label for="adv-results_per_page">Results per page</label></td><td>
<select name="results_per_page" id="adv-results_per_page">
@@ -301,6 +303,7 @@
<option value="@attr 1=1003">Author</option>
<option value="@attr 1=21">Subject</option>
<option value="@attr 1=5">Series</option>
+ <option value="@attr 1=9">Call Number</option>
<option value="@attr 1=1018">Publisher</option>
<option value="@attr 1=63">Notes</option>
<option value="@attr 1=6">Journal Title</option>
@@ -512,14 +515,14 @@
<tr><td>
<input type="hidden" name="op4" value="@and" />
- <input type="hidden" name="use4" value="@attr 1=8803"/>
+ <input type="hidden" name="use4" value="@attr 1=8802"/>
<input type="hidden" name="relation4" value="@attr 2=4"/>
<input type="hidden" name="structure4" value="@attr 4=109"/>
<label for="power_year">Published between: </label>
<input name="query4" id="power_year" type="text"/> <label for="power_year2">and</label>
<input type="hidden" name="op5" value="@and" />
- <input type="hidden" name="use5" value="@attr 1=8803"/>
+ <input type="hidden" name="use5" value="@attr 1=8802"/>
<input type="hidden" name="relation5" value="@attr 2=2"/>
<input type="hidden" name="structure5" value="@attr 4=109"/>
<input name="query5" id="power_year2" /> <span class="ex">(format: yyyy)</span>
@@ -606,6 +609,30 @@
<p><input type="submit" value="Search" class="submit" /></p>
</form>
+
+<h1>CQL Search</h1>
+
+<form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
+ <input type="hidden" name="query_form" value="cql" />
+ <input type="hidden" name="op" value="get_results" />
+ <p><input size="55" type="text" name="cql_query" />
+ <a href="#" class="help" onclick="window.open('http://www.loc.gov/standards/sru/cql/#sample','CQL Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;">[ ? ]</a></p>
+
+<p style="text-align:center;"><input type="submit" value="Catalog Search" class="submit" /></p>
+</form>
+
+<h1>PQF/RPN Search</h1>
+
+<form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
+ <input type="hidden" name="query_form" value="pqf" />
+ <input type="hidden" name="op" value="get_results" />
+ <p><input size="55" type="text" name="pqf_query" />
+ <a href="#" class="help" onclick="window.open('http://indexdata.dk/yaz/doc/tools.tkl#PQF','PQF/RPN Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;">[ ? ]</a></p>
+
+<p style="text-align:center;"><input type="submit" value="Catalog Search" class="submit" /></p>
+</form>
+
+
</div>
<!-- PROXIMITY SEARCH -->
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.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- includes/catsearch.js 6 Jun 2006 12:36:11 -0000 1.1.2.1
+++ includes/catsearch.js 11 Jul 2006 14:06:57 -0000 1.1.2.2
@@ -1,12 +1,12 @@
function hideSearchsTypes() {
- document.getElementById('cql').style.display = 'none';
+ document.getElementById('simple').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('cql_formButton').className = 'off';
+ document.getElementById('simple_formButton').className = 'off';
document.getElementById('advanced_formButton').className = 'off';
document.getElementById('power_formButton').className = 'off';
document.getElementById('proximity_formButton').className = 'off';
Index: includes/livesearch.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/livesearch.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/livesearch.js 10 Jun 2006 19:52:20 -0000 1.1.2.2
+++ includes/livesearch.js 11 Jul 2006 14:06:57 -0000 1.1.2.3
@@ -118,11 +118,11 @@
if (typeof liveSearchParams == "undefined") {
liveSearchParams = "";
}
- if (liveSearchLast != document.forms.searchform.cql_query.value) {
+ if (liveSearchLast != document.forms.searchform.ccl_query.value) {
if (liveSearchReq && liveSearchReq.readyState < 4) {
liveSearchReq.abort();
}
- if ( document.forms.searchform.cql_query.value == "") {
+ if ( document.forms.searchform.ccl_query.value == "") {
liveSearchHide();
return false;
}
@@ -132,8 +132,8 @@
liveSearchReq = new ActiveXObject("Microsoft.XMLHTTP");
}
liveSearchReq.onreadystatechange= liveSearchProcessReqChange;
- liveSearchReq.open("GET", liveSearchRoot + "/cgi-bin/koha/livesearch.pl?cql_query=" + document.forms.searchform.cql_query.value + liveSearchParams);
- liveSearchLast = document.forms.searchform.cql_query.value;
+ liveSearchReq.open("GET", liveSearchRoot + "/cgi-bin/koha/livesearch.pl?ccl_query=" + document.forms.searchform.ccl_query.value + liveSearchParams);
+ liveSearchLast = document.forms.searchform.ccl_query.value;
liveSearchReq.send(null);
}
}
Index: includes/main.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/main.js,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- includes/main.js 8 Feb 2006 18:38:58 -0000 1.1.2.1
+++ includes/main.js 11 Jul 2006 14:06:57 -0000 1.1.2.1.2.1
@@ -5,5 +5,6 @@
// check to see if functions exist before loading them
function kohajs() {
if ( typeof window.verify_images == "function" ) verify_images();
+// if ( typeof window.liveSearchInit == "function" ) liveSearchInit();
+ if ( typeof window.runLSPrep == "function" ) runLSPrep();
}
-
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
retrieving revision 1.1.2.8.2.1
diff -u -b -r1.1.2.8 -r1.1.2.8.2.1
--- includes/masthead.inc 27 Apr 2006 17:02:20 -0000 1.1.2.8
+++ includes/masthead.inc 11 Jul 2006 14:06:57 -0000 1.1.2.8.2.1
@@ -1,14 +1,15 @@
<div id="masthead">
<h1><!-- TMPL_IF NAME="opacsmallimage" --><img alt="<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME="opacsmallimage" -->" /><!-- /TMPL_IF -->Library Catalog Search</h1>
-<div class="menu"><form action="/cgi-bin/koha/opac-search.pl" method="post">
-<p><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A "shopping cart" for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF --></p> <p><label for="value">Search the Catalog</label>
- <input type="hidden" name="op" value="do_search" />
- <input type="hidden" name="type" value="opac" />
- <input type="hidden" name="marclist" value="" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="contains" />
- <input type="text" size="12" name="value" id="value" /> <input type="submit" class="submit" name="Go" value="Search" /></form></p></div>
+<div class="menu">
+
+<form style="margin:0px;" name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" id="searchform">
+<input type="hidden" name="op" value="get_results" />
+<input name="ccl_query" type="text"/>
+<input type="submit" value="Search" class="submit" />
+</form>
+
+<p><a href="/cgi-bin/koha/opac-zoomsearch.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A "shopping cart" for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF --></p> <p><label for="value">Search the Catalog</label></p>
+
<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><div id="members">
<ul>
Index: includes/navigation.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.4.2.1
diff -u -b -r1.2.2.4 -r1.2.2.4.2.1
--- includes/navigation.inc 3 Feb 2006 20:57:44 -0000 1.2.2.4
+++ includes/navigation.inc 11 Jul 2006 14:06:57 -0000 1.2.2.4.2.1
@@ -1 +1,4 @@
-<div id="nav"><!-- TMPL_VAR NAME="OpacNav" --></div>
+<div id="nav"><ul><!-- Display for NPL --><li><a href="http://www.athenscounty.lib.oh.us/index.html">home</a></li><li><a href="http://www.athenscounty.lib.oh.us/library.html">your library</a></li><li><a href="http://www.athenscounty.lib.oh.us/readers/index.html">reader's connection</a></li><li><a href="http://www.athenscounty.lib.oh.us/kids/index.html">kids' page</a></li><!-- /Display for NPL --><li><a href="/cgi-bin/koha/opac-zoomsearch.pl">library catalog</a><ul><li><a href="/cgi-bin/koha/opac-zoomsearch.pl">Advanced Search</a></li><!-- Display for NPL --><li><a href="/opac-zoomsearch.php">Search by Format and Date</a></li><!-- /Display for NPL --></ul></li><!-- Display for NPL --> <li><a href="http://www.athenscounty.lib.oh.us/programs.html">programs</a></li><li><a href="http://www.athenscounty.lib.oh.us/branch.html">branches</a></li><li><a href="http://www.athenscounty.lib.oh.us/bookmobile.html">the bookmobile</a></li><li><a href="http://www.oplin.org">OPLIN</a></li><li><a href="http://www.athenscounty.lib.oh.us/contact.html">contact the library</a></li><!-- /Display for NPL --></ul>
+
+ <a href="http://www.athenscounty.lib.oh.us/know-it-now.html"> <img src="http://www.athenscounty.lib.oh.us/img/knowitnow_banner3.gif" alt="Know it Now 24x7 Online Reference Service" width="157" height="86" border="0" vspace="5" /></a>
+ </div>
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.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- includes/opac-colors.npl.css 2 Jun 2006 23:11:24 -0000 1.1.2.1.2.1
+++ includes/opac-colors.npl.css 11 Jul 2006 14:06:57 -0000 1.1.2.1.2.2
@@ -372,6 +372,9 @@
background-color : #FFFFCC;
}
+.search-main {
+}
+
.sidebar-box {
border : 1px dashed #CCCC99;
}
@@ -459,7 +462,7 @@
border-right : 2px solid #333333;
}
-#loose_form label, #keyword_form label, #precise_form label, #cql_form label {
+#loose_form label, #keyword_form label, #precise_form label, #cql_form label, #advanced label, #simple label, #power label, #proximity label {
color : #000066;
}
@@ -472,3 +475,16 @@
#search-footer a {
background-color: #D8DEB8;
}
\ No newline at end of file
+
+td.search-options {
+ background-color : #FFFFE3;
+ border-bottom: 1px solid #BEBF84;
+}
+
+td.search-options select {
+ background-color: #FFFFEC;
+}
+
+a.help {
+ background-color : #FFFFEC;
+}
Index: includes/opac-colors.smfpl.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-colors.smfpl.css,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- includes/opac-colors.smfpl.css 13 Mar 2006 19:49:45 -0000 1.1.2.1
+++ includes/opac-colors.smfpl.css 11 Jul 2006 14:06:57 -0000 1.1.2.1.2.1
@@ -613,4 +613,10 @@
#starFull {
}
+.MARCtag { /* style for tag definition (700 - Statement of responsability) */
+ color:#000066;
+ background-color:#EEEEEE;
+}
+.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
+}
Index: includes/opac-layout.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-layout.css,v
retrieving revision 1.1.2.4.2.1
retrieving revision 1.1.2.4.2.2
diff -u -b -r1.1.2.4.2.1 -r1.1.2.4.2.2
--- includes/opac-layout.css 2 Jun 2006 23:11:24 -0000 1.1.2.4.2.1
+++ includes/opac-layout.css 11 Jul 2006 14:06:57 -0000 1.1.2.4.2.2
@@ -280,7 +280,7 @@
}
.content-block {
- margin : 15px;
+ margin : 5px;
padding : 5px;
width : 90%;
}
@@ -708,13 +708,18 @@
}
#search-sidebar {
- width : 33%;
+ width : 30%;
margin : 10px;
padding : 3px;
float : right;
font-size : 80%;
}
+.search-main {
+ width : 65%;
+ float: left;
+}
+
.sidebar-box {
margin-bottom : 0;
}
@@ -727,8 +732,9 @@
margin-left : 10px;
}
-.sidebar-box label {
+#search-sidebar .sidebar-box label {
display : block;
+ text-align : left;
}
.sidebar-box p {
@@ -838,13 +844,13 @@
ul.link-tabs {
list-style-type : none;
- margin: 10px 10px -2px 0;
+ margin: 9px 0 -2px 5px;
padding : 0;
}
ul.link-tabs li {
display: inline;
- padding: 5px;
+ padding: 0px;
}
ul.link-tabs li a {
@@ -864,13 +870,13 @@
padding: 2px 3px 2px 4px;
}
-#loose_form label, #keyword_form label, #precise_form label, #cql_form label {
+#loose_form label, #keyword_form label, #precise_form label, #cql_form label, #advanced label, #cql label, #power label, #proximity label {
font-size: 90%;
font-weight : bold;
text-align: right;
}
-#loose_form, #keyword_form, #precise_form, #cql_form {
+#loose_form, #keyword_form, #precise_form, #cql_form, #advanced, #cql, #power, #proximity {
margin: 5px;
width : 96%;
}
@@ -885,3 +891,29 @@
text-decoration: none;
padding: 2px 5px;
}
\ No newline at end of file
+
+td.search-options select {
+ font-size : 80%;
+}
+
+#sort {
+ margin : .3em;
+}
+
+#sort, #sort select, #sort input {
+ font-size: 80%;
+}
+
+a.help {
+ font-size : 80%;
+ padding : 3px;
+ text-decoration : none;
+}
+
+#power_formButton, #proximity_formButton {
+ font-size : 75%;
+}
+
+ul.link-tabs li#power_formButton a, ul.link-tabs li#proximity_formButton a {
+ padding: 2px 4px 3px 4px;
+}
\ No newline at end of file
Index: includes/opac-layout.smfpl.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-layout.smfpl.css,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- includes/opac-layout.smfpl.css 25 Mar 2006 15:02:05 -0000 1.1.2.1
+++ includes/opac-layout.smfpl.css 11 Jul 2006 14:06:57 -0000 1.1.2.1.2.1
@@ -423,7 +423,9 @@
.marcsubfieldname {
font-family : Arial, Geneva, Helvetica, sans-serif;
+ font-size: 70%;
padding : 3px;
+ width: 18%;
}
.subfield {
@@ -834,3 +836,34 @@
background: url(../images/bluestars.png) top left no-repeat;
}
+div.tabbloc {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 80%;
+}
+
+div.tab {
+ display: block;
+ float:left;
+ margin-right:0px;
+ width:100%;
+}
+
+div.tab p {
+ margin : 0;
+ padding : 3px 0;
+}
+
+.MARCtag { /* style for tag definition (700 - Statement of responsability) */
+ font-weight:bold;
+ clear : both;
+ margin : 0;
+ padding : 2px 0;
+}
+
+.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
+ clear : both;
+ font-weight : bold;
+ float:left;
+ width: 12em;
+ margin-left:30px;
+}
Index: opac-catalogue-home.tmpl
===================================================================
RCS file: opac-catalogue-home.tmpl
diff -N opac-catalogue-home.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ opac-catalogue-home.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.1
@@ -0,0 +1,226 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Advanced Search
+<!-- TMPL_INCLUDE NAME="doc-head-close-cat.inc" -->
+<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+
+<div id="main">
+
+ <h1>Catalogue Search</h1>
+
+<ul class="link-tabs">
+<li id="cql_formButton"<!-- TMPL_IF name="cql_search" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-catalogue-home.pl?search_type=cql" onclick="changeSearch('cql_form'); return false;">Simple Search</a> </li>
+
+<li id="keyword_formButton"<!-- TMPL_IF name="keyword_search" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-catalogue-home.pl?search_type=keyword" onclick="changeSearch('keyword_form'); return false;">Advanced Search</a> </li>
+
+ <li id="loose_formButton"<!-- TMPL_IF name="loose_search" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-catalogue-home.pl?search_type=loose" onclick="changeSearch('loose_form'); return false;">Power Search</a> </li>
+
+ <li id="precise_formButton"<!-- TMPL_IF name="precise_search" -->class="on"<!-- TMPL_ELSE -->class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-catalogue-home.pl?search_type=precise" onclick="changeSearch('precise_form'); return false;">Number Search</a></li>
+</ul>
+
+<!-- SIMPLE SEARCH -->
+
+<div class="content-block" id="cql_form"<!-- TMPL_IF name="cql_search" --> style="display:block;"<!-- TMPL_ELSE --> style="display:none;"<!-- /TMPL_IF -->>
+<form name="cql_form" action="/cgi-bin/koha/opac-catalogue-home.pl" method="post">
+ <input type="hidden" name="op" value="do_search" />
+ <input type="hidden" name="search_type" value="cql" />
+ <input type="hidden" name="startfrom" value="0" />
+ <input type="hidden" name="zoom" value="1" />
+ <input type="hidden" name="number_to_display" value="20" />
+<p><input type="text" size="60" name="cql" value="<!-- TMPL_VAR name="cql" -->" /></p>
+rpn <input type="checkbox" name="rpn"/>
+<p><input class="submit" type="submit" value="Search" /></p>
+</form>
+</div>
+
+<!-- ADVANCED SEARCH -->
+
+<div class="content-block" id="keyword_form"<!-- TMPL_IF name="keyword_search" --> style="display:block;"<!-- TMPL_ELSE --> style="display:none;"<!-- /TMPL_IF -->>
+<form onsubmit="return checkKeywordSearch()" name="keyword_form" action="/cgi-bin/koha/opac-catalogue-home.pl" method="post">
+<input type="hidden" name ="op" value="do_search" />
+<input type="hidden" name ="search_type" value="keyword" />
+<input type="hidden" name="zoom" value="1" />
+<table>
+ <tr><td><label for="keyword">Keyword(s):</label></td>
+ <td colspan="3"><input type="text" size="25" id="keyword" name="keyword" value="<!-- TMPL_VAR name="keyword" -->" /></td></tr>
+
+<tr><td><label for="branch">Library Branch:</label></td>
+ <td colspan="3"> <select name="branch" id="branch">
+ <option value="">Any Branch</option>
+ <!-- TMPL_LOOP name="branches" -->
+ <option value="<!-- TMPL_VAR name="branchcode" -->"<!-- TMPL_IF name="sel" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+ <!-- /TMPL_LOOP -->
+ </select></td></tr>
+
+<tr><td><label for="callno">Call Number:</label></td>
+ <td colspan="3"> <input type="text" size="25" id="callno" name="callno" value="<!-- TMPL_VAR name="callno" -->" ></td></tr>
+
+<!-- TMPL_IF NAME="stacks" --><tr><td><label for="stack">Shelving:</label></td>
+ <td colspan="3">
+ <select id="stack" name="stack">
+ <option value="">All</option>
+ <!-- TMPL_LOOP name="stacks" -->
+ <option value="<!-- TMPL_VAR name="authorised_value" -->" <!-- TMPL_IF name="sel" --> selected="selected"<!-- /TMPL_IF --> ><!-- TMPL_VAR name="lib" --></option>
+ <!-- /TMPL_LOOP -->
+ </select></td></tr><!-- /TMPL_IF -->
+
+<tr><td><label for="class">Format:</label></td>
+ <td colspan="3"> <select name="class" id="class">
+ <option value="">All</option>
+ <!-- TMPL_LOOP name="itemtype" -->
+ <option value="<!-- TMPL_VAR name="itemtype" -->"><!-- TMPL_VAR name="description" --></option>
+ <!-- /TMPL_LOOP -->
+ </select></td></tr>
+
+<tr><td><label for="date_from">Publication Year from:</label></td>
+ <td colspan="3"> <input type="text" size="10" id="date_from" name="date_from" value="<!-- TMPL_VAR name="date_from" -->" />
+ <label for="date_to"> to:</label>
+ <input type="text" size="10" id="date_to" name="date_to" value="<!-- TMPL_VAR name="date_to" -->" /></td></tr>
+
+<tr><td><label for="anywords">All words, any order<br> (Allows for misspelling)</label></td>
+ <td><input type="radio" id="anywords" name="ttype" value="normal"<!-- TMPL_IF name="normal" --> checked="checked"<!-- /TMPL_IF --> /></td><td><label for="exact">As a phrase</label></td>
+ <td><input type="radio" id="exact" name="ttype" value="exact"<!-- TMPL_IF name="exact" --> checked="checked"<!-- /TMPL_IF --> /></td></tr>
+
+
+<tr><td><label for="number_to_display">Results per page: </label></td>
+ <td colspan="3"><select name="number_to_display" id="number_to_display">
+ <option value="10">10</option>
+ <option value="20" selected="selected">20</option>
+ <option value="50">50</option>
+ <option value="100">100</option>
+ </select></td></tr>
+</table>
+
+ <p><input class="submit" type="submit" value="Search" /></p>
+
+</form>
+</div>
+
+<!-- "POWER SEARCH" -->
+<div class="content-block" id="loose_form"<!-- TMPL_IF name="loose_search" --> style="display:block;"<!-- TMPL_ELSE --> style="display:none;"<!-- /TMPL_IF -->>
+<form onsubmit="return checkLooseSearch();" name="loose_form" action="/cgi-bin/koha/opac-catalogue-home.pl" method="post">
+ <input type="hidden" name="zoom" value="1" />
+ <input name="op" value="do_search" type="hidden">
+ <input name="search_type" value="loose" type="hidden">
+ <input name="startfrom" value="0" type="hidden">
+<table>
+<!-- TMPL_LOOP name="search_conditions" -->
+<tr>
+ <td><select type="text" id="field_name<!-- TMPL_VAR name="num" -->" name="field_name<!-- TMPL_VAR name="num" -->">
+ <option value="all"<!-- TMPL_IF name="all" --> selected="selected"<!-- /TMPL_IF -->>Anywhere</option>
+ <option value="title"<!-- TMPL_IF name="title" --> selected="selected"<!-- /TMPL_IF -->>Title</option>
+ <option value="author"<!-- TMPL_IF name="author" --> selected="selected"<!-- /TMPL_IF -->>Author</option>
+ <option value="subject"<!-- TMPL_IF name="subject" --> selected="selected"<!-- /TMPL_IF -->>Subject</option>
+ <option value="series"<!-- TMPL_IF name="series" --> selected="selected"<!-- /TMPL_IF -->>Series Title</option>
+ <option value="publisher"<!-- TMPL_IF name="publisher" --> selected="selected"<!-- /TMPL_IF -->>Publisher</option>
+ <option value="publicationyear"<!-- TMPL_IF name="publicationyear" --> selected="selected"<!-- /TMPL_IF --> >Publication year</option>
+ <option value="callno" <!-- TMPL_IF name="callno" --> selected="selected"<!-- /TMPL_IF -->>Call Number</option>
+ </select> <label for="field_value<!-- TMPL_VAR name="num" -->">for</label> <input name="field_value<!-- TMPL_VAR name="num" -->" id="field_value<!-- TMPL_VAR name="num" -->" type="text" /><a href="#" title="Dictionary Search" onclick="openDictionary(document.loose_form.field_name<!-- TMPL_VAR name="num" -->.value, document.loose_form.field_value<!-- TMPL_VAR name="num" -->.value, 'opener.document.loose_form.field_value<!-- TMPL_VAR name="num" -->')); return false;"><strong>...</strong></a>
+</td>
+<td>
+<select name="ttype<!-- TMPL_VAR name="num" -->">
+ <option value="exact"<!-- TMPL_IF name="exact" --> selected="selected"<!-- /TMPL_IF -->>exact</option>
+ <option value="normal"<!-- TMPL_IF name="normal" --> selected="selected"<!-- /TMPL_IF -->>fuzzy</option>
+</select>
+
+<select name="atype<!-- TMPL_VAR name="num" -->">
+<option value="start"<!-- TMPL_IF name="start" --> selected="selected"<!-- /TMPL_IF -->>phrase</option>
+<option value="wonder"<!-- TMPL_IF name="wonder" --> selected="selected"<!-- /TMPL_IF -->>natural</option></select>
+
+</td>
+<td><!-- TMPL_IF name="with_op" -->
+ <select id="op<!-- TMPL_VAR name="num" -->" name="op<!-- TMPL_VAR name="num" -->">
+ <option value="and"<!-- TMPL_IF name="and" --> selected="selected"<!-- /TMPL_IF -->>AND
+ </option>
+ <option value="or"<!-- TMPL_IF name="or" --> selected="selected"<!-- /TMPL_IF -->>OR
+ </option>
+ <option value="not"<!-- TMPL_IF name="not" --> selected="selected"<!-- /TMPL_IF -->>NOT
+ </option>
+ </select><!-- TMPL_ELSE -->
+ <!-- /TMPL_IF --></td>
+</tr>
+<!-- /TMPL_LOOP -->
+
+<tr>
+ <td><label for="branch">Library<br> Branch: </label></td><td colspan="2"><select id="branch" name="branch">
+ <option value="">All</option>
+<!-- TMPL_LOOP name="branches" -->
+<option value="<!-- TMPL_VAR name="branchcode" -->"<!-- TMPL_IF name="sel" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+ <!-- /TMPL_LOOP -->
+ </select></td></tr>
+
+<!-- TMPL_IF NAME="stacks" --><tr><td><label for="stack">Shelving</label></td>
+ <td><select name="stack" id="stack">
+ <option value="">All</option>
+ <!-- TMPL_LOOP name="stacks" -->
+ <option value="<!-- TMPL_VAR name="authorised_value" -->"<!-- TMPL_IF name="sel" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR name="lib" --></option>
+ <!-- /TMPL_LOOP -->
+ </select></td></tr><!-- /TMPL_IF -->
+
+<tr>
+ <td><label for="class">Format: </label></td><td colspan="2"><select name="class" id="class">
+ <option value="">All</option>
+<!-- TMPL_LOOP name="itemtype" -->
+ <option value="<!-- TMPL_VAR name="itemtype" -->"<!-- TMPL_IF name="sel" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
+ <!-- /TMPL_LOOP -->
+ </select></td></tr>
+
+<tr>
+ <td><label for="date_from">Publication <br />Year From: </label></td><td colspan="2"><input size="10" id="date_from" name="date_from" type="text">
+ <label for="date_to">To:</label>
+ <input size="10" id="date_to" name="date_to" type="text"></td></tr></table>
+<table>
+<tr><td><label for="number_to_display">Results per page:</label> <select name="number_to_display" id="number_to_display">
+ <option value="10">10</option>
+ <option value="20" selected="selected">20</option>
+ <option value="50">50</option>
+ <option value="100">100</option>
+ </select></td><td colspan="2"><label for="order">Ordered by:</label>
+ <select id="order" name="order">
+ <option value="" selected>Relevance</option>
+ <option value="@attr 7=1 @attr 1=4 0 @attr 7=2 @attr 1=30 1 " >Title Ascending, Date Descending</option>
+ <option value="@attr 7=1 @attr 1=1003 0 @attr 7=2 @attr 1=30 1 ">Author Ascending, Date Descending</option>
+ <option value="@attr 7=2 @attr 1=32 0 @attr 7=2 @attr 1=30 1 ">Date of Acquisition, Relevance</option>
+ <option value="@attr 7=2 @attr 1=30 0 @attr 7=2 @attr 1=4 1 ">Date of Publication, Relevance</option>
+ </select></td></tr>
+</table>
+ <p>
+ <input class="submit" value="Search" type="submit" /></p>
+
+
+ </form>
+</div>
+
+<!-- NUMBER SEARCH -->
+<div class="content-block" id="precise_form"<!-- TMPL_IF name="precise_search" --> style="display:block;"<!-- TMPL_ELSE --> style="display:none;"<!-- /TMPL_IF -->>
+<form onsubmit="return checkPreciseSearch();" name="precise_form" action="/cgi-bin/koha/opac-catalogue-home.pl" method="post">
+
+ <input type="hidden" name = "op" value="do_search" />
+ <input type="hidden" name = "search_type" value="precise" />
+ <input type="hidden" name="zoom" value="1" />
+ <table>
+ <tr><td><label for="barcode">Barcode:</label></td>
+ <td><input type="text" size="15" id="barcode" name="itemnumber" value="<!-- TMPL_VAR name="itemnumber" -->" onchange="if(this.value != '') {this.form.isbn.value = ''; this.form.biblionumber.value = ''}" /> </td></tr>
+
+ <tr><td><label for="isbn">ISBN:</label></td>
+ <td><input type="text" size="15" id="isbn" name="isbn" value="<!-- TMPL_VAR name="isbn" -->" onchange="if(this.value != '') {this.form.itemnumber.value = ''; this.form.biblionumber.value = ''} " /></td></tr>
+
+ <tr> <td><label for="biblionumber">Biblio Number:</label></td>
+ <td><input type="text" size="15" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" onchange="if(this.value != '') {this.form.itemnumber.value = ''; this.form.isbn.value = ''} " /></td></tr>
+
+
+ <tr><td> <label for="branch">Library Branch:</label></td>
+ <td><select id="branch" name="branch">
+ <option value="">Any Branch</option>
+ <!-- TMPL_LOOP name="branches" -->
+ <option value="<!-- TMPL_VAR name="branchcode" -->" <!-- TMPL_IF name="sel" --> selected="selected"<!-- /TMPL_IF --> ><!-- TMPL_VAR name="branchname" --></option>
+ <!-- /TMPL_LOOP -->
+ </select>
+
+ </td></tr>
+ </table>
+
+ <p> <input class="submit" type="submit" value="Search" /></p>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-cql.tmpl
===================================================================
RCS file: opac-cql.tmpl
diff -N opac-cql.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ opac-cql.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.1
@@ -0,0 +1,53 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> -- Library Catalog
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+
+<div id="main">
+
+<div class="content-block">
+
+<!-- TMPL_IF NAME="loggedinusername" -->
+<!-- TMPL_ELSE --><div id="sidebar">
+<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
+<h3>Log in to Check Your Account</h3>
+<p><label for="userid">Card Number:</label><!-- Hide from NPL --><input type="text" id="userid" size="10" name="userid" /><!-- /Hide from NPL --> <!-- Display for NPL // <input type="text" id="userid" size="10" name="userid" onblur="ValidateCode();" /> //Display for NPL --></p>
+<p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
+<p><input type="submit" value="Log In" class="submit" /></p>
+</form></div>
+<!-- /TMPL_IF -->
+
+<form action="/cgi-bin/koha/opac-cql.pl">
+<h3>Search the Library Catalog</h3>
+<p>
+<label for="value">Enter CQL:</label>
+<textarea name="cql" cols=40 rows=5></textarea>
+ <p><input type="submit" value="Search" class="submit" /></p>
+ <p>
+<!-- TMPL_IF NAME="CQL"-->
+<h3> Results </h3>
+<table>
+<!-- TMPL_LOOP NAME="results"-->
+<tr><td>title</td><td><!-- TMPL_VAR NAME="title" --></td></tr>
+<!-- /TMPL_LOOP -->
+</table>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="loggedinusername" -->
+<div class="content-block">
+<h3>You're logged in as <em><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></em> <span class="print">(<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)</span><!-- /TMPL_LOOP --></h3>
+<p><a href="/cgi-bin/koha/opac-user.pl">my library home</a> | <!-- Hide from NPL--> <a href="/cgi-bin/koha/opac-account.pl">my fines</a> | <!-- Hide from NPL -->
+ <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a> | <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a> <!-- TMPL_IF name="virtualshelves" --> | <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></p>
+ <!-- TMPL_IF name="textmessaging"-->
+ <h3>Message from the library</h3>
+ <p><!-- TMPL_VAR name="textmessaging" --></p>
+ <!-- /TMPL_IF -->
+<form method="post" action="/cgi-bin/koha/opac-logout.pl">
+<p><input type="submit" class="submit" name="logout" value="Log Out" /></p>
+</form>
+</div><!-- /TMPL_IF -->
+
+
+</div>
+
+</body>
+</html>
More information about the Koha-cvs
mailing list