[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en opac-ISBDdetail... [dev_week]
Owen Leonard
oleonard at athenscounty.lib.oh.us
Wed Aug 23 18:56:22 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Owen Leonard <oleonard> 06/08/23 16:56:21
Modified files:
koha-tmpl/opac-tmpl/npl/en: opac-ISBDdetail.tmpl
opac-MARCdetail.tmpl
opac-account.tmpl
opac-advsearch.tmpl opac-auth.tmpl
opac-full-serial-issues.tmpl
opac-main.tmpl opac-passwd.tmpl
opac-readingrecord.tmpl
opac-reserve.tmpl opac-results.tmpl
opac-searchresults.tmpl
opac-shelves.tmpl
opac-suggestions.tmpl opac-user.tmpl
opac-userdetails.tmpl
opac-userupdate.tmpl
opac-zoomsearch.tmpl
Log message:
Some restructuring for new design and new stylesheets.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.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-MARCdetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8.2.2&r2=1.1.2.8.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-advsearch.tmpl?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/opac-auth.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-full-serial-issues.tmpl?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/opac-main.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.14.2.2&r2=1.3.2.14.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-reserve.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.4.2.1
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.12&r2=1.1.2.13
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.2.1&r2=1.1.2.11.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-suggestions.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-user.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11.2.3&r2=1.1.2.11.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl?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/opac-userupdate.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1&r2=1.1.4.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.15&r2=1.1.2.16
Patches:
Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.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-ISBDdetail.tmpl 27 Apr 2006 17:02:20 -0000 1.1.2.5
+++ opac-ISBDdetail.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.5.2.1
@@ -1,7 +1,6 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- ISBD
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
<div id="main">
<div class="details"><h3>ISBD</h3>
@@ -66,4 +65,6 @@
<form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
</div>
</div>
+
+<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
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.2
retrieving revision 1.1.2.8.2.3
diff -u -b -r1.1.2.8.2.2 -r1.1.2.8.2.3
--- opac-MARCdetail.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.8.2.2
+++ opac-MARCdetail.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.8.2.3
@@ -1,9 +1,9 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- MARC Details for Record No. <!-- TMPL_VAR name="biblionumber" -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
<div id="main">
+<div class="content-block">
<h2>MARC View</h2>
<!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" -->
<form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
@@ -261,7 +261,10 @@
</div>
<br class="clear" />
</div>
-<script language="JavaScript" type="text/javascript">
+</div>
+</div>
+
+<!-- TMPL_INCLUDE name="navigation.inc" --><script language="JavaScript" type="text/javascript">
function active(numlayer)
{
for (i=0; i <= 10 ; i++ ) {
@@ -275,5 +278,4 @@
}
}
</script>
-
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-account.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- opac-account.tmpl 4 Feb 2006 16:52:01 -0000 1.1.2.2
+++ opac-account.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.2.2.1
@@ -1,12 +1,14 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
-<!-- TMPL_INCLUDE name="navigation.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
<!--CONTENT-->
<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
<div id="main">
+<div class="content-block">
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+
<h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
<!-- /TMPL_LOOP -->
@@ -22,7 +24,7 @@
</thead>
<tfoot><tr>
-<th colspan="3">Total Due</th>
+<th colspan="3" class="sum">Total Due</th>
<td class="sum">$<!-- TMPL_VAR NAME="total" --></td>
</tr></tfoot>
@@ -40,4 +42,7 @@
</table>
<!-- TMPL_ELSE --><h4>You have no Fines or Charges</h4><!-- /TMPL_IF -->
</div>
+</div>
+
+<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-advsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-advsearch.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- opac-advsearch.tmpl 17 Aug 2006 18:44:15 -0000 1.1.2.1
+++ opac-advsearch.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.2
@@ -1,96 +1,57 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-close-cat.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>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<style type="text/css">
-
-.labels {
-color: #006699;
-font-family: Tahoma,Geneva,Helvetica,sans-serif;
-font-weight: bold;
-}
-
-.innertd {
-background-color: #EEEEEE;
-nowrap: nowrap;
-}
-.outer_adv {
-font-size: 100%;
-}
-</style>
+<!--TMPL_INCLUDE NAME="masthead-basic.inc" -->
+<form action="/search" method="get">
<div id="main">
-<form action="/search">
-<table class="outer_adv" border="0" cellpadding="4" cellspacing="2" bgcolor="#FFFFFF">
+<div class="content-block" id="advanced-search">
- <!-- TMPL_IF NAME="expanded_options" -->
-<!-- SEARCH BUTTONS -->
- <tr>
- <td valign="middle" align="right">
- </td>
- <td class="innertd">
- <input class="button" type="submit" accesskey="s" title="Search" value="Search"/>
- <input class="button" type="submit" accesskey="c" title="Clear all values" value="Clear"/>
- </td>
- </tr>
-<!-- /SEARCH BUTTONS -->
- <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="expanded_options" -->
+<h3>Advanced Search</h3>
+<!-- TMPL_ELSE -->
+<h3>Search the Library Catalog</h3>
+<!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="expanded_options" -->
- <!-- TMPL_IF NAME="outer_servers_loop" -->
+<!-- TMPL_IF NAME="expanded_options" -->
+<!-- TMPL_IF NAME="outer_servers_loop" -->
<!-- DATABASES -->
- <tr>
- <td valign="middle" align="right">
- <span class="labels">Select local databases:</span>
- </td>
- <td class="innertd">
- <table border="0" cellpadding="1" cellspacing="0">
+
+<fieldset>
+ <legend>Select local databases:</legend>
+ <p>
<!-- TMPL_LOOP NAME="outer_servers_loop" -->
- <tr>
<!-- TMPL_LOOP NAME="inner_servers_loop" -->
- <td>
- <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->"><img width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->"/><!-- TMPL_VAR NAME="label" --></label>
- </td>
+ <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->"><img width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR NAME="label" --></label>
<!-- /TMPL_LOOP -->
- </tr>
<!-- /TMPL_LOOP -->
- </table>
- </td>
- </tr>
+ </p>
+</fieldset>
<!-- /DATABASES -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="outer_sup_servers_loop" -->
<!-- REMOTE DATABASES -->
- <tr>
- <td valign="middle" align="right">
- <span class="labels">Select remote databases:</span>
- </td>
- <td class="innertd">
- <table border="0" cellpadding="1" cellspacing="0">
+<fieldset>
+ <legend>Select remote databases:</legend>
+ <p>
<!-- TMPL_LOOP NAME="outer_sup_servers_loop" -->
- <tr>
<!-- TMPL_LOOP NAME="inner_sup_servers_loop" -->
- <td>
<input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->"><img alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->"/><!-- TMPL_VAR NAME="label" --></label>
- </td>
<!-- /TMPL_LOOP -->
- </tr>
<!-- /TMPL_LOOP -->
- </table>
- </td>
- </tr>
+ </p>
+ </fieldset>
<!-- /REMOTE DATABASES -->
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- BOOLEAN SEARCH OPTIONS -->
+ <fieldset>
+ <!-- TMPL_IF NAME="expanded_options" --><legend>Search For:</legend><!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="search_boxes_loop" -->
- <tr>
- <td valign="middle" align="right">
- <!-- TMPL_IF NAME="search_boxes_label" --><!-- TMPL_VAR NAME="search_boxes_label" --><!-- /TMPL_IF -->
+
+ <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_IF NAME="search_boxes_label" --><p style="text-indent: 4.5em;"><!-- TMPL_ELSE --><p><!-- /TMPL_IF --><!-- TMPL_ELSE --><p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR NAME="left_content" --><!-- /TMPL_IF -->
- </td>
- <td class="innertd">
<select name="idx">
<!-- TMPL_LOOP NAME="indexes" -->
<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
@@ -101,138 +62,99 @@
<!-- TMPL_IF NAME="scan_index" --><!-- TMPL_VAR NAME="scan_index" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="add_field" --><a href="" title="Add another field">[+]</a><!-- /TMPL_IF -->
<!-- /TMPL_IF -->
+ </p>
- </td>
- </tr>
<!-- /TMPL_LOOP -->
+ </fieldset>
<!-- /BOOLEAN SEARCH OPTIONS -->
<!-- TMPL_IF NAME="expanded_options" -->
<!-- BASIC LIMITS -->
- <tr>
- <td valign="middle" align="right">
- <span class="labels">Limits:</span>
- </td>
- <td class="innertd">
- <table cellpadding="0" cellspacing="0" border="0">
-
+ <fieldset>
+ <legend>Limits:</legend>
<!-- PUB / COPY YEAR LIMIT --><!-- FIXME: add publication,copyright,acquisition options -->
- <tr valign="middle">
- <td nowrap="nowrap">
- <span class="labels">Year</span>
- </td>
- <td nowrap="nowrap">
- <input size="15" name="limit-yr" value=""/> (format: yyyy-yyyy)
- </td>
- </tr>
+ <p><label for="limit-yr">Year: </label>
+ <input size="15" name="limit-yr" id="" value=""/> (format: yyyy-yyyy)</p>
<!-- /PUB / COPY YEAR LIMIT -->
<!-- /YEAR LIMIT -->
+
<!-- LANGUAGE LIMIT -->
- <tr valign="middle">
- <td nowrap="nowrap">
- <span class="labels">Language</span>
- </td>
- <td nowrap="nowrap">
+ <p><label for="language-limit">Language: </label>
<select name="limit">
<!-- TMPL_LOOP NAME="search_languages_loop" -->
<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="language_label" --> <!-- TMPL_IF NAME="locale_label" -->(<!-- TMPL_VAR NAME="locale_label" -->)<!-- /TMPL_IF --></option>
<!-- /TMPL_LOOP -->
- </select><!-- <a href="">Show all languages</a>-->
- </td>
- </tr>
+ </select></p><!-- <a href="">Show all languages</a>-->
<!-- /LANGUAGE LIMIT -->
- </table>
- </td>
- </tr>
+ </fieldset>
<!-- /BASIC LIMITS -->
<!-- /TMPL_IF -->
<!-- TYPE LIMITS -->
- <tr>
- <td valign="middle" align="right">
- <span class="labels">Limit type to:</span>
- <div class="labels">match any of the following</div>
- </td>
- <td class="innertd">
- <table border="0" cellpadding="1" cellspacing="0">
+ <fieldset>
+ <legend>Limit type to: match any of the following <a href="http://wiki.koha.org/?id=en:opachelp#" class="help" onclick="window.open('http://wiki.koha.org/?id=en:opachelp#',' Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;">[ ? ]</a></legend>
+ <table class="itemtypes">
<!-- TMPL_LOOP NAME="outer_limit_types_loop" -->
- <tr valign="baseline">
+ <tr>
<!-- TMPL_LOOP NAME="inner_limit_types_loop" -->
- <td colspan="<!-- TMPL_VAR NAME="colspan" -->" nowrap="nowrap"><input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->" title="<!-- TMPL_VAR NAME="title" -->"><a href="http://wiki.koha.org/?id=en:opachelp#<!-- TMPL_VAR NAME="id" -->" class="help" onclick="window.open('http://wiki.koha.org/?id=en:opachelp#<!-- TMPL_VAR NAME="id" -->','<!-- TMPL_VAR NAME="label" --> Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;"><img border="0" align="middle" src="<!-- TMPL_VAR NAME="themelang">/images/<!-- TMPL_VAR NAME="icon" -->" alt="<!-- TMPL_VAR NAME="label" -->"/></a><!-- TMPL_VAR NAME="label" --></label></td>
+ <td<!-- TMPL_IF NAME="colspan" --> colspan="<!-- TMPL_VAR NAME="colspan" -->"<!-- /TMPL_IF -->><input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->" title="<!-- TMPL_VAR NAME="title" -->"><a href="http://wiki.koha.org/?id=en:opachelp#<!-- TMPL_VAR NAME="id" -->" class="help" onclick="window.open('http://wiki.koha.org/?id=en:opachelp#<!-- TMPL_VAR NAME="id" -->','<!-- TMPL_VAR NAME="label" --> Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;"><img border="0" src="<!-- TMPL_VAR NAME="themelang">/images/<!-- TMPL_VAR NAME="icon" -->" alt="<!-- TMPL_VAR NAME="label" -->" /></a><!-- TMPL_VAR NAME="label" --></label></td>
<!-- /TMPL_LOOP -->
</tr>
<!-- /TMPL_LOOP -->
- <tr>
- <td nowrap="nowrap"><a href="http://wiki.koha.org/?id=en:opachelp#" class="help" onclick="window.open('http://wiki.koha.org/?id=en:opachelp#<!-- TMPL_VAR NAME="id" -->','<!-- TMPL_VAR NAME="label" --> Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;"></a></td>
- </tr>
</table>
- </td>
- </tr>
+</fieldset>
<!-- /TYPE LIMITS -->
+
+
+</div>
+</div>
+
+<div id="sidebar">
+
<!-- TMPL_IF NAME="outer_subtype_limits_loop" -->
<!-- SUBTYPE LIMITS -->
- <tr>
- <td valign="middle" align="right">
- <span class="labels">Subtype limits:</span>
- </td>
- <td class="innertd">
+ <fieldset>
+ <legend>Subtype limits</legend><p>
<!-- TMPL_LOOP NAME="outer_subtype_limits_loop" -->
<select name="<!-- TMPL_VAR NAME="name" -->" class="subtype">
<!-- TMPL_LOOP NAME="inner_subtype_limits_loop" -->
<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->" class="menuheader"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
<!-- /TMPL_LOOP -->
</select>
- <!-- /TMPL_LOOP -->
- </td>
- <td nowrap="nowrap"><a href="http://wiki.koha.org/?id=en:opachelp#" class="help" onclick="window.open('http://wiki.koha.org/?id=en:opachelp#subtypes','Sub-types Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;"></a></td>
- </tr>
+ <!-- /TMPL_LOOP --><a href="http://wiki.koha.org/?id=en:opachelp#" class="help" onclick="window.open('http://wiki.koha.org/?id=en:opachelp#subtypes','Sub-types Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;">[ ? ]</a></p>
+</fieldset>
<!-- /SUBTYPE LIMITS -->
<!-- /TMPL_IF -->
+
+
<!-- TMPL_IF NAME="itemtypeloop" -->
- <tr>
- <td valign="middle" align="right">
- <span class="labels">Collection limits:</span>
- </td>
- <td class="innertd">
- <select name="limit">
+<fieldset><legend>Collection Code Limits: </legend>
+ <p><select name="limit">
<option value="">All Collection Codes</option>
<!-- TMPL_LOOP NAME="itemtypeloop" -->
<option value="collection-code:<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
<!-- /TMPL_LOOP -->
- </select>
- </td>
- </tr>
+ </select></p></fieldset>
<!-- /TMPL_IF -->
+
<!-- AVAILABILITY LIMITS -->
- <tr>
- <td valign="middle" align="right">
- <span class="labels">Location and availability:</span>
- </td>
- <td class="innertd">
- <select name="limit" id="branchloop">
+ <fieldset><legend>Location and availability: </legend>
+ <p><select name="limit" id="branchloop">
<!-- TMPL_LOOP NAME="branchloop" -->
<option value="<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
<!-- /TMPL_LOOP -->
</select>
- <!-- TMPL_IF NAME="expanded_options" -->
- <input type="checkbox" id="available-items" name="availabile" value="1"/><label for="available-items">Only items currently available</label>
- <!-- /TMPL_IF -->
-
- </td>
- </tr>
+ <input type="checkbox" id="available-items" name="limit" value="datedue:0000-00-00"/><label for="available-items">Only items currently available</label></p>
+ </fieldset>
<!-- /AVAILABILITY LIMITS -->
<!-- RANK LIMITS -->
- <tr>
- <td valign="middle" align="right">
- <label for="sort" class="labels">Sort by:</label>
- </td>
- <td class="innertd">
- <select id="sort_by" name="sort_by">
+<fieldset><legend>Sort by: </legend>
+ <p><select id="sort_by" name="sort_by">
<option value="">Field-weighted, Relevance Ranked</option>
- <option value="au">Author (A-Z)</option>
+ <option value="1=1003 >i 1=8801">Author (A-Z)</option>
<option value="1=1003 <i 1=8801">Author (Z-A)</option>
<option value="oclcnum">Call Number</option>
<option value="date">Date</option>
@@ -240,30 +162,23 @@
<option value="1=8801 >i"> Publication/Copyright Date: Newest to Oldest</option>
<option value="date"> Acquisition Date: Newest to Oldest</option>
<option value="date"> Acquisition Date: Oldest to Newest</option>
- <option value="ti">Title (A-Z)</option>
- <option value="ti">Title (Z-A)</option>
+ <option value="1=4 <i">Title (A-Z)</option>
+ <option value="1=4 >i">Title (Z-A)</option>
</select>
- <a href="http://wiki.koha.org/?id=en:opachelp#sort_by" class="help" onclick="window.open('http://wiki.koha.org/?id=en:opachelp#sort_by','Sort By Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;"></a>
- </td>
- </tr>
+ <a href="http://wiki.koha.org/?id=en:opachelp#sort_by" class="help" onclick="window.open('http://wiki.koha.org/?id=en:opachelp#sort_by','Sort By Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;">[ ? ]</a></p>
+</fieldset>
<!-- RANK LIMITS -->
-
-<!-- SEARCH BUTTONS -->
- <tr>
- <td valign="middle" align="right"></td>
- <td class="innertd">
- <input class="button" type="submit" accesskey="s" name="action" title="Search" value="Search"/>
- <input class="button" type="submit" accesskey="c" name="action" title="Clear all values" value="Clear"/>
- <!-- TMPL_IF NAME="expanded_options" -->
+<p><!-- TMPL_IF NAME="expanded_options" -->
<a href="/search">Fewer Options</a>
<!-- TMPL_ELSE -->
<a href="/search?expanded_options=1">More options</a>
- <!-- /TMPL_IF -->
- </td>
- </tr>
+ <!-- /TMPL_IF --></p>
+<!-- SEARCH BUTTONS -->
+ <p><input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search"/>
+ <input class="submit" type="submit" accesskey="c" name="do" title="Clear all values" value="Clear"/>
+ </p>
<!-- /SEARCH BUTTONS -->
-</table>
+</div>
</form>
-</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- opac-auth.tmpl 4 Feb 2006 16:52:01 -0000 1.1.2.3
+++ opac-auth.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.3.2.1
@@ -1,10 +1,10 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Log in to Your Account
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="navigation.inc" -->
<!--CONTENT-->
<div id="main">
+<div class="content-block">
<!-- TMPL_IF NAME="loginprompt" -->
<!-- login prompt time-->
<h3>Log In to Your Account</h3>
@@ -47,4 +47,6 @@
<!-- /TMPL_IF -->
</div>
+</div>
+<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-full-serial-issues.tmpl,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
--- opac-full-serial-issues.tmpl 9 Jun 2005 21:16:20 -0000 1.1.2.1
+++ opac-full-serial-issues.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.1.2.1
@@ -1,7 +1,6 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
@@ -76,5 +75,6 @@
<!-- /TMPL_IF -->
<!--/TMPL_LOOP -->
</script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE name="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
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.2.2
retrieving revision 1.3.2.14.2.3
diff -u -b -r1.3.2.14.2.2 -r1.3.2.14.2.3
--- opac-main.tmpl 23 Jul 2006 21:51:42 -0000 1.3.2.14.2.2
+++ opac-main.tmpl 23 Aug 2006 16:56:21 -0000 1.3.2.14.2.3
@@ -1,7 +1,6 @@
<!-- 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">
@@ -31,16 +30,9 @@
<!-- Put Interesting Things here -->
- <!-- TMPL_IF NAME="opaclanguagesdisplay" --><div class="content-block">
- <h4 class="inline">Change Language:</h4>
- <form action="/cgi-bin/koha/changelanguage.pl" method="post" class="inline">
- <select name="language">
- <!-- TMPL_LOOP NAME="languages" -->
- <option value="<TMPL_VAR NAME="language">"><!-- TMPL_VAR NAME="language" --></option>
- <!-- /TMPL_LOOP -->
- </select>
- <input type="submit" value="Switch" class="submit"/>
- </form></div><!-- /TMPL_IF -->
+
</div>
</div>
+
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-passwd.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-passwd.tmpl,v
retrieving revision 1.1.2.3.2.1
retrieving revision 1.1.2.3.2.2
diff -u -b -r1.1.2.3.2.1 -r1.1.2.3.2.2
--- opac-passwd.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.3.2.1
+++ opac-passwd.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.3.2.2
@@ -1,21 +1,20 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Change Your Password
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="navigation.inc" -->
-<!-- CONTENT -->
<div id="main">
+<div class="content-block">
-
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!-- TMPL_IF NAME= "Error_messages" -->
<h3>There was a problem with your submission</h3>
<p class="error">
<!-- TMPL_IF NAME= "PassMismatch" -->
- Passwords do not match. Please re-type your new password.
+ Passwords do not match. Please re-type your passwords.
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME= "ShortPass" -->
- Your new password must be at least 6 characters long
+ Your new password must be at least 6 characters long.
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME= "WrongPass" -->
Your current password was entered incorrectly. If this problem persists, please ask a librarian to re-set your password for you.
@@ -26,10 +25,11 @@
<h1>Change your Password</h1>
<form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="get">
<div class="form">
-<table><tr><th><label for="password">Current Password:</label></th><td><input type="password" id="Oldkey" size="25" name="Oldkey" /></td></tr>
+<table><tr><th><label for="Oldkey">Current Password:</label></th><td><input type="password" id="Oldkey" size="25" name="Oldkey" /></td></tr>
<tr><th><label for="Newkey">New Password:</label></th><td><input type="password" id="Newkey" size="25" name="Newkey" /></td></tr>
-<tr> <th><label for="Confirm">Re-Type New Password:</label></th><td><input type="password" id="Confirm" size="25" name="Confirm" /></td></tr></table>
+<tr> <th><label for="Confirm">Re-Type New Password:</label></th><td><input type="password" id="Confirm" size="25" name="Confirm" /></td></tr></table></div>
<p><input type="submit" value="Submit Changes" class="submit" /></p>
+</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME= "password_updated" -->
@@ -40,7 +40,9 @@
<p><input type="submit" class="icon back" value="Return to Your Record" /></p>
</form>
<!-- /TMPL_IF -->
-</form>
</div>
+</div>
+
+<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-readingrecord.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl,v
retrieving revision 1.1.2.3.2.1
retrieving revision 1.1.2.3.2.2
diff -u -b -r1.1.2.3.2.1 -r1.1.2.3.2.2
--- opac-readingrecord.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.3.2.1
+++ opac-readingrecord.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.3.2.2
@@ -1,9 +1,12 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
<!-- 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_INCLUDE name="usermenu.inc" -->
+
<h3>Reading History of <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h3>
<!-- TMPL_UNLESS NAME="count" -->
@@ -30,6 +33,8 @@
</table>
<!-- /TMPL_UNLESS -->
-
</div>
+</div>
+
+<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-reserve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-reserve.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.2.1
diff -u -b -r1.1.2.4 -r1.1.2.4.2.1
--- opac-reserve.tmpl 18 Apr 2006 20:42:09 -0000 1.1.2.4
+++ opac-reserve.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.4.2.1
@@ -1,11 +1,11 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Reserving <!-- TMPL_VAR NAME="title" --> for <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<div id="main">
+<div class="content-block">
<!--CONTENT-->
<!-- TMPL_IF NAME="message" -->
-<div id="main">
<!-- TMPL_IF NAME="GNA" --><p class="error"><strong>Sorry</strong>, you cannot place reserves because the library doesn't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file. </p><p class="error">Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)</p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="lost" --><p class="error"><strong>Sorry</strong>, you cannot place reserves because your library card has been marked as lost or stolen. </p><p class="error"> If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="debarred" --><p class="error"><strong>Sorry</strong>, you cannot place reserves because your account has been frozen.</p><p class="error">Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</p><!-- /TMPL_IF -->
@@ -16,12 +16,10 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="no_items_selected" --><p class="error">You must select at least one item.</p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="no_branch_selected" --><p class="error">You must select a branch for pickup!</p><!-- /TMPL_IF -->
-</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="select_item_types" -->
<!-- The first time round you select which bibitems you want -->
-<div id="main">
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
<input type="hidden" name="item_types_selected" value="1">
<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->">
@@ -66,10 +64,8 @@
<td><!-- TMPL_VAR NAME="reservecount" --></td>
<td><!-- TMPL_LOOP NAME="ITEMS" --><!-- TMPL_VAR NAME="date_due" -->, <!-- /TMPL_LOOP --></td>
</table> -->
-</div>
<p><input type="submit" class="submit" value="Confirm Reservation >>"></p>
</form>
-</div>
<!-- /TMPL_IF -->
@@ -78,7 +74,6 @@
<!-- TMPL_IF NAME="item_types_selected" -->
<!-- if the bibitems have already been selected -->
-<div id="main">
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
<input type="hidden" name="place_reserve" value="1">
<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->"><h3>Confirm Reservation</h3>
@@ -100,11 +95,12 @@
<p>Note there will be a reserve charge of <strong>$<!-- TMPL_VAR NAME="fee" --></strong></p>
<!-- /TMPL_IF -->
</div>
-<p><input type="submit" value="Finish and Place Reservation" class="submit" onclick="this.value='Please wait...'; this.disabled=true; this.form.submit();"></p>
+<p><input type="submit" value="Finish and Place Reservation" class="submit" onclick="this.value='Please wait...'; this.disabled=true; this.form.submit();"> <input type="submit" class="cancel" value="Cancel" onclick="location.href='/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'; return false;"</p>
</FORM>
<!-- /TMPL_IF -->
</div>
-</body>
-</html>
\ No newline at end of file
+</div>
+<!-- TMPL_INCLUDE name="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
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.12
retrieving revision 1.1.2.13
diff -u -b -r1.1.2.12 -r1.1.2.13
--- opac-results.tmpl 21 Aug 2006 15:39:36 -0000 1.1.2.12
+++ opac-results.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.13
@@ -70,12 +70,6 @@
<form action="/search" method="get" name="myform">
-<!-- TMPL_IF NAME="searchdesc" --><h3><!-- TMPL_IF name="total" --><strong>“<!-- TMPL_VAR NAME="searchdesc" -->”</strong> returned <!-- TMPL_VAR NAME="total" --> results<!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->. <a href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR NAME='searchdesc' -->?count=10&startPage=1"><img title="RSS Feed for search <!-- TMPL_VAR NAME='searchdesc' -->" alt="RSS Feed for search <!-- TMPL_VAR NAME='searchdesc' -->" src="<!-- TMPL_VAR NAME=themelang>/images/feed-icon-16x16.png" border="0" /></a>
-<!-- TMPL_ELSE -->
-<strong>“<!-- TMPL_VAR NAME="searchdesc" -->”</strong>
-<!-- TMPL_VAR NAME="search_error" -->
-<!-- /TMPL_IF --></h3><!-- /TMPL_IF -->
-
<!-- TMPL_IF NAME="opacbookbag" -->
<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 -->
@@ -85,10 +79,10 @@
<label for="sort_by">Re-sort by:</label>
<select name="sort_by" id="sort_by">
<option value="">Field-weighted, Relevance Ranked</option>
- <option value="1=1003 >i 1=8801">Author (A-Z)</option>
- <option value="1=1003 <i 1=8801">Author (Z-A)</option>
- <option value="1=20 >i">Call Number</option>
- <option value="date">Date</option>
+ <option value="1=1003 <i 1=8801">Author (A-Z)</option>
+ <option value="1=1003 >i 1=8801">Author (Z-A)</option>
+ <option value="1=20 <i">Call Number</option>
+ <option value="1=30 >i">Date</option>
<option value="1=8801 <i"> Publication/Copyright Date: Oldest to Newest</option>
<option value="1=8801 >i"> Publication/Copyright Date: Newest to Oldest</option>
<option value="date"> Acquisition Date: Newest to Oldest</option>
@@ -109,7 +103,7 @@
<!-- /TMPL_IF -->
<th><a href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc" -->&sort_by=1=1003 <i">↓</a>Author<a href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc" -->&sort_by=1=1003 >i">↑</a></th>
- <th nowrap="nowrap"><a href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc" -->&sort_by=1=20 <i">↓</a>Call Num<a href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc" -->&sort_by=1=20">↑</a></th>
+ <th nowrap="nowrap"><a href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc" -->&sort_by=1=20 <i">↓</a>Call Num<a href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc" -->&sort_by=1=20 >i">↑</a></th>
<th nowrap="nowrap">Availablity</th>
</tr>
<!-- Actual Search Results -->
@@ -138,11 +132,11 @@
<!-- /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 --><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_IF NAME="previous_page_offset" --><a href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="previous_page_offset" -->">Previous</a><!-- /TMPL_IF -->
+ <!-- TMPL_LOOP NAME="PAGE_NUMBERS" -->
+ <a href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="offset" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->"><!-- TMPL_IF NAME="highlight" --> ><!-- TMPL_VAR NAME="pg" -->< <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="pg" --><!-- /TMPL_IF --></a>
<!-- /TMPL_LOOP -->
+ <!-- TMPL_IF NAME="next_page_offset" --><a href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="next_page_offset" -->">Next</a><!-- /TMPL_IF -->
</div>
<!-- TMPL_IF NAME="outer_sup_results_loop" -->
<h3><!-- TMPL_LOOP NAME="outer_sup_results_loop" --></h3>
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.2.1
retrieving revision 1.1.2.11.2.2
diff -u -b -r1.1.2.11.2.1 -r1.1.2.11.2.2
--- opac-searchresults.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.11.2.1
+++ opac-searchresults.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.11.2.2
@@ -55,8 +55,8 @@
<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><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></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 -->
Index: opac-shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- opac-shelves.tmpl 27 Jan 2005 18:18:19 -0000 1.1.2.2
+++ opac-shelves.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.2.2.1
@@ -3,12 +3,13 @@
<!--TMPL_INCLUDE NAME="navigation.inc" -->
<div id="main">
+<div class="content-block">
<!-- TMPL_IF Name="viewshelf" -->
<form class="inline" action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
<table>
<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
<tr>
- <th><a href="/cgi-bin/koha/opac-shelves.pl" 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></th><th> </th><th>Title</th><th>Author</th><th>Call No.</th><th>Barcode</th><!-- TMPL_UNLESS NAME="itemsloop" --><th> </th><!-- /TMPL_UNLESS -->
+ <th><a href="/cgi-bin/koha/opac-shelves.pl" 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></th><th> </th><th>Title</th><th>Author</th><th>Call No.</th><!-- TMPL_UNLESS NAME="itemsloop" --><th> </th><!-- /TMPL_UNLESS -->
</tr>
<!-- TMPL_IF NAME="itemsloop" -->
<!-- TMPL_LOOP Name="itemsloop" -->
@@ -20,7 +21,6 @@
<td><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
<td><!-- TMPL_VAR Name="author" --></td>
<td><!-- TMPL_VAR NAME="classification" --></td>
- <td><!-- TMPL_VAR Name="barcode" --></td>
</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="icon delete" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
<!-- /TMPL_IF -->
@@ -119,7 +119,7 @@
<!-- /TMPL_IF -->
<table>
<caption>Virtual Shelves</caption>
-<tr><th>Shelf Name</th><th>Category</th><th>Content Size</th><th> </th></tr>
+<tr><th>Shelf Name</th><th>Category</th><th>Contents</th><th> </th></tr>
<!-- TMPL_LOOP Name="shelvesloop" -->
<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
<!-- /TMPL_LOOP -->
@@ -130,6 +130,7 @@
<br clear="both" />
</div>
-</body>
-</html>
+</div>
+<!-- TMPL_INCLUDE name="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
Index: opac-suggestions.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-suggestions.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-suggestions.tmpl 8 Mar 2006 21:45:29 -0000 1.1.2.5
+++ opac-suggestions.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.5.2.1
@@ -141,5 +141,6 @@
<p>Note : if you're viewing purchase suggestions submitted by anybody, the results will contain only <em>new</em> purchase suggestions. Suggestions being processed by a librarian will not be shown.</p>
<!-- /TMPL_IF -->
</div>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE name="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
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.2.3
retrieving revision 1.1.2.11.2.4
diff -u -b -r1.1.2.11.2.3 -r1.1.2.11.2.4
--- opac-user.tmpl 23 Jul 2006 21:57:25 -0000 1.1.2.11.2.3
+++ opac-user.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.11.2.4
@@ -1,14 +1,12 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="navigation.inc" -->
-<!-- CONTENT -->
<div id="main">
+<div class="content-block">
<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
<h3>Hello, <!-- 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></h3>
-<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 virtual shelves</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></p>
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!-- TMPL_IF name="textmessaging"-->
<div class="error"><h3>Message from the library</h3>
<p><!-- TMPL_VAR name="textmessaging" --></p></div>
@@ -36,18 +34,18 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME"amountlessthanzero" -->
-<div class="table"><table>
+<table>
<caption>Credits</caption>
<tr><th colspan="2">Amount</th></tr>
<tr><td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
-</table></div>
+</table>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME="waiting_count" -->
<table>
- <caption>Reserved Items Waiting</caption>
+ <caption>Reserved Items Waiting <span class="count">(<!-- TMPL_VAR NAME="waiting_count" -->)</span></caption>
<tr>
<th colspan="2">Title</th>
<th>Reserve date</th>
@@ -110,7 +108,7 @@
<!-- TMPL_IF NAME="reserves_count" -->
-<div class="table"><table>
+<!-- TMPL_IF NAME="RESERVES" --><table>
<caption>Reserves <span class="count">(<!-- TMPL_VAR NAME="reserves_count" --> total)</span></caption>
<!-- RESERVES TABLE ROWS -->
<tr>
@@ -118,7 +116,6 @@
<th>Placed On</th>
<th>Pick Up Location</th>
<th>Status</th>
-<!-- <th>Status</th> -->
</tr>
<!-- TMPL_LOOP NAME="RESERVES" -->
<tr>
@@ -131,11 +128,13 @@
<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --><!-- /TMPL_IF --></td>
</tr>
<!-- /TMPL_LOOP -->
-</table></div>
+</table><!-- /TMPL_IF -->
<p>If you no longer want a reserve, please send us an e-mail, or go to the circulation desk at your library to get it removed.</p>
<!-- /TMPL_IF -->
-
</div>
+</div>
+
+<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-userdetails.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl,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
--- opac-userdetails.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.1.2.1
+++ opac-userdetails.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.1.2.2
@@ -1,11 +1,14 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Personal Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="navigation.inc" -->
<!--CONTENT-->
<div id="main">
+<div class="content-block">
+
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+
<h2>Personal Details: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h2>
<div class="form">
@@ -23,15 +26,14 @@
<tr><th>Permanent Address:</th><td> <!-- TMPL_VAR NAME="altstreetaddress" -->, <!-- TMPL_VAR NAME="altcity" --></td></tr>
-<tr><th>Phone (Home):</th><td><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
+<tr><th>Home Phone:</th><td><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
-<tr><th>Phone (Daytime):</th><td><!-- TMPL_IF NAME="phoneday" --><!-- TMPL_VAR NAME="phoneday" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
+<tr><th>Daytime Phone:</th><td><!-- TMPL_IF NAME="phoneday" --><!-- TMPL_VAR NAME="phoneday" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
-<tr><th>Fax:</th><td><!-- TMPL_IF NAME="faxnumber" --><!-- TMPL_VAR NAME="faxnumber" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
+<tr><th>Work Fax/Phone:</th><td><!-- TMPL_IF NAME="faxnumber" --><!-- TMPL_VAR NAME="faxnumber" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
-<tr><th>E-mail:</th><td><!-- TMPL_IF NAME="emailaddress" --><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
+<tr><th>E-mail:</th><td><!-- TMPL_IF NAME="emailaddress" --><!-- TMPL_VAR NAME="emailaddress" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
-<tr><th>Textmessaging:</th><td><!-- TMPL_IF NAME="textmessaging" --><!-- TMPL_VAR NAME="textmessaging" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td></tr>
</table>
</div>
@@ -79,7 +81,8 @@
<form action="/cgi-bin/koha/opac-userupdate.pl" method="post">
<input type="submit" name="Modify" value="Modify Your Record" class="submit" />
</form>
-
</div>
-</body>
-</html>
+</div>
+
+<!-- TMPL_INCLUDE name="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
Index: opac-userupdate.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-userupdate.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -b -r1.1 -r1.1.4.1
--- opac-userupdate.tmpl 20 Oct 2004 19:15:07 -0000 1.1
+++ opac-userupdate.tmpl 23 Aug 2006 16:56:21 -0000 1.1.4.1
@@ -1,11 +1,11 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Updating Details for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
-<!-- TMPL_INCLUDE name="navigation.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
<!--CONTENT-->
<div id="main">
+<div class="content-block">
<!-- TMPL_LOOP name="BORROWER_INFO" -->
<h3>Updating Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h3>
<p>Please make any necessary changes to your record. Submitting the form will notify a library staff member, who will make the changes permanent.</p>
@@ -25,7 +25,7 @@
<tr><th><label for="faxnumber">Work/Fax phone</label></th><td><input id="faxnumber" type="text" size="25" value="<!-- TMPL_VAR name="faxnumber" -->" name="faxnumber"></td></tr>
-<tr><th><label for="emailaddress">Email</label></th><td><input id="emailaddress" type="text" size="40" value="<!-- TMPL_VAR name="emailaddress" -->" name="emailaddress"></td></tr>
+<tr><th><label for="emailaddress">E-mail</label></th><td><input id="emailaddress" type="text" size="40" value="<!-- TMPL_VAR name="emailaddress" -->" name="emailaddress"></td></tr>
</table>
</div>
<p>Clicking 'Submit Changes' will send an email to a library staff member with the information you've entered. You will then be returned to your patron record.</p>
@@ -35,5 +35,6 @@
<!-- /TMPL_LOOP -->
</div>
-</body>
-</html>
+</div>
+<!-- TMPL_INCLUDE name="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
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.15
retrieving revision 1.1.2.16
diff -u -b -r1.1.2.15 -r1.1.2.16
--- opac-zoomsearch.tmpl 25 Jul 2006 15:12:02 -0000 1.1.2.15
+++ opac-zoomsearch.tmpl 23 Aug 2006 16:56:21 -0000 1.1.2.16
@@ -2,8 +2,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.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>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!--TMPL_INCLUDE NAME="masthead-basic.inc" -->
<div id="main">
<ul class="link-tabs">
@@ -18,16 +17,6 @@
<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">
-<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><input type="text" id="userid" size="10" name="userid" /></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 --><!-- /TMPL_IF -->
-
<form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
<div class="search-main">
<input type="hidden" name="query_form" value="advanced" />
@@ -628,4 +617,6 @@
</form>
</div>
</div><!-- /main -->
+
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
More information about the Koha-cvs
mailing list