[Koha-cvs] koha C4/Auth.pm admin/systempreferences.pl koha... [rel_2_2]
Owen Leonard
oleonard at athenscounty.lib.oh.us
Thu Apr 27 19:02:20 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Owen Leonard <oleonard at savannah.gnu.org> 06/04/27 17:02:20
Modified files:
C4 : Auth.pm
admin : systempreferences.pl
koha-tmpl/opac-tmpl/npl/en/includes: masthead-user.inc
masthead.inc
masthead_adv.inc
koha-tmpl/opac-tmpl/npl/en: opac-ISBDdetail.tmpl
opac-MARCdetail.tmpl
opac-addbookbybiblionumber.tmpl
opac-detail.tmpl opac-main.tmpl
opac-searchresults.tmpl
Log message:
Enabling two new system preferences:
1. opacuserlogin shows/hides login-based features like reserves, private shelves, and login forms.
2. opacbookbag shows/hides the book bag (biblio basket)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Auth.pm.diff?only_with_tag=rel_2_2&tr1=1.36.2.17&tr2=1.36.2.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/admin/systempreferences.pl.diff?only_with_tag=rel_2_2&tr1=1.22.2.17&tr2=1.22.2.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.5&tr2=1.1.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.7&tr2=1.1.2.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.5&tr2=1.1.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.4&tr2=1.1.2.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.6&tr2=1.1.2.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.8&tr2=1.1.2.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.18&tr2=1.1.2.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl.diff?only_with_tag=rel_2_2&tr1=1.3.2.13&tr2=1.3.2.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.10&tr2=1.1.2.11&r1=text&r2=text
Patches:
Index: koha/C4/Auth.pm
diff -u koha/C4/Auth.pm:1.36.2.17 koha/C4/Auth.pm:1.36.2.18
--- koha/C4/Auth.pm:1.36.2.17 Wed Apr 19 16:22:18 2006
+++ koha/C4/Auth.pm Thu Apr 27 17:02:20 2006
@@ -208,6 +208,8 @@
opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"),
TemplateEncoding => C4::Context->preference("TemplateEncoding"),
+ opacuserlogin => C4::Context->preference("opacuserlogin"),
+ opacbookbag => C4::Context->preference("opacbookbag"),
);
}
$template->param(
Index: koha/admin/systempreferences.pl
diff -u koha/admin/systempreferences.pl:1.22.2.17 koha/admin/systempreferences.pl:1.22.2.18
--- koha/admin/systempreferences.pl:1.22.2.17 Thu Apr 20 21:26:53 2006
+++ koha/admin/systempreferences.pl Thu Apr 27 17:02:20 2006
@@ -90,6 +90,7 @@
$tabsysprefs{Disable_Dictionary}="OPAC";
$tabsysprefs{hidelostitems}="OPAC";
$tabsysprefs{LibraryName}="OPAC";
+ $tabsysprefs{opacbookbag}="OPAC";
$tabsysprefs{opaccolorstylesheet}="OPAC";
$tabsysprefs{opaccredits}="OPAC";
$tabsysprefs{opaclanguages}="OPAC";
@@ -102,6 +103,7 @@
$tabsysprefs{opacsmallimage}="OPAC";
$tabsysprefs{opacstylesheet}="OPAC";
$tabsysprefs{opacthemes}="OPAC";
+ $tabsysprefs{opacuserlogin}="OPAC";
$tabsysprefs{SubscriptionHistory}="OPAC";
$tabsysprefs{suggestion}="OPAC";
$tabsysprefs{virtualshelves}="OPAC";
Index: koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc
diff -u koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc:1.1.2.5 koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc:1.1.2.6
--- koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc:1.1.2.5 Fri Apr 21 21:26:19 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc Thu Apr 27 17:02:20 2006
@@ -1,7 +1,7 @@
<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> | <a href="" onclick="openBasket(); return false;" title="A "shopping cart" for your selections">Book Bag</a></p> <p><label for="value">Search the Catalog</label>
+<p><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="" onclick="openBasket(); return false;" title="A "shopping cart" for your selections">Book Bag</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="" />
@@ -16,7 +16,7 @@
<!-- TMPL_IF NAME="loggedinusername" --><div id="members">
<ul>
<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
- <li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li>
+ <!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li><!-- /TMPL_IF -->
<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
</ul>
Index: koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc
diff -u koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc:1.1.2.7 koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc:1.1.2.8
--- koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc:1.1.2.7 Fri Apr 21 21:26:19 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc Thu Apr 27 17:02:20 2006
@@ -1,7 +1,7 @@
<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> | <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></p> <p><label for="value">Search the Catalog</label>
+<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="" />
@@ -9,12 +9,11 @@
<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>
-<!-- <!-- TMPL_IF NAME="loggedinusername" -->
-<div class="menu"><span class="loggedin">You are logged in as <!-- TMPL_LOOP NAME="USER_INFO" --><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a><!-- /TMPL_LOOP --></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div><!-- /TMPL_IF --> -->
-<!-- TMPL_IF NAME="loggedinusername" --><div id="members">
+
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><div id="members">
<ul>
<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
- <li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li>
+ <!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li><!-- /TMPL_IF -->
<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
</ul>
@@ -24,5 +23,5 @@
<a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
</div>
<!-- /TMPL_IF -->
-<br class="clear" />
+<br class="clear" /><!-- /TMPL_IF -->
</div>
Index: koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc
diff -u koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc:1.1.2.5 koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc:1.1.2.6
--- koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc:1.1.2.5 Fri Apr 21 21:26:19 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc Thu Apr 27 17:02:20 2006
@@ -1,14 +1,11 @@
<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"><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="" 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></div><br class="clear">
-<!-- <!-- TMPL_IF NAME="loggedinusername" -->
-<div class="menu"><span class="loggedin">You are logged in as <!-- TMPL_LOOP NAME="USER_INFO" --><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a><!-- /TMPL_LOOP --></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div>
-<!-- /TMPL_IF --> -->
+<div class="menu"><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="" 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 --></div><br class="clear">
-<!-- TMPL_IF NAME="loggedinusername" --><div id="members">
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><div id="members">
<ul>
<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
- <li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li>
+ <!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li><!-- /TMPL_IF -->
<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
</ul>
@@ -18,5 +15,5 @@
<a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
</div>
<!-- /TMPL_IF -->
-<br class="clear" />
+<br class="clear" /><!-- /TMPL_IF -->
</div>
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl:1.1.2.4 koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl:1.1.2.5
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl:1.1.2.4 Wed Mar 1 22:33:59 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl Thu Apr 27 17:02:20 2006
@@ -49,11 +49,10 @@
<p><a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Click here</a> for more information on subscription(s) history</p>
<!-- /TMPL_IF -->
- <!-- TMPL_UNLESS NAME="norequests" -->
- <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
+ <!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
<input type="submit" name="submit" value="Place Reserve" class="icon reserve" />
<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
- </form>
+ </form><!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
<form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
@@ -61,9 +60,9 @@
<form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Simple View" /></form>
<form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
-
+<!-- TMPL_IF name="virtualshelves" -->
<form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
-
+<!-- /TMPL_IF -->
<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>
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl:1.1.2.6 koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl:1.1.2.7
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl:1.1.2.6 Wed Apr 12 07:08:50 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl Thu Apr 27 17:02:20 2006
@@ -5,11 +5,11 @@
<div id="main">
<h2>MARC View</h2>
-<!-- TMPL_UNLESS NAME="norequests" -->
+<!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" -->
<form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
<input type="submit" name="submit" VALUE="Place Reserve" class="icon reserve" />
<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
- </form>
+ </form><!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
<!-- Hide from NPL --><form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form><!-- /Hide from NPL -->
@@ -18,8 +18,8 @@
<form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
<!-- TMPL_IF name="virtualshelves" --><form class="inline" action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to My Virtual Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- /TMPL_IF -->
-
-<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>
+<!-- TMPL_IF name="opacbookbag" -->
+<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><!-- /TMPL_IF -->
<table><!-- TMPL_LOOP name="0XX" -->
<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl:1.1.2.8 koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl:1.1.2.9
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl:1.1.2.8 Thu Apr 27 16:23:34 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl Thu Apr 27 17:02:20 2006
@@ -14,8 +14,8 @@
<tr><th><label for="newbookshelf">New Shelf Name:</label> </th><td><input type="text" id="newbookshelf" name="newbookshelf" maxlength="40" size="40">
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"></td></tr>
<!-- Hide from NPL --><tr><th><label for="category">Shelf Type: </label></th><td><select id="category" name="category">
- <option value="1">Private</option>
- <option value="2">Public</option>
+ <!-- TMPL_IF NAME="opacuserlogin" --><option value="1">Private</option>
+ <option value="2">Public</option><!-- /TMPL_IF -->
<option value="3">Free</option>
</select></td></tr><!-- /Hide from NPL -->
</table>
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl:1.1.2.18 koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl:1.1.2.19
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl:1.1.2.18 Fri Apr 21 21:10:49 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl Thu Apr 27 17:02:20 2006
@@ -11,12 +11,12 @@
<div class="operations">
<ul>
-<!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
<li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
<!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
<li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
<!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Virtual Shelf</a></li><!-- /TMPL_IF -->
-<li><a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li>
+<!-- TMPL_IF name="opacbookbag" --><li><a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li><!-- /TMPL_IF -->
</ul>
</div>
<div class="further">
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl:1.3.2.13 koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl:1.3.2.14
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl:1.3.2.13 Mon Apr 10 18:17:28 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl Thu Apr 27 17:02:20 2006
@@ -7,7 +7,7 @@
<div class="content-block">
-<!-- TMPL_IF NAME="loggedinusername" -->
+<!-- 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>
@@ -15,7 +15,7 @@
<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 --><!-- /TMPL_IF -->
<form action="/cgi-bin/koha/opac-search.pl">
<h3>Search the Library Catalog</h3>
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl:1.1.2.10 koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl:1.1.2.11
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl:1.1.2.10 Fri Apr 21 21:30:22 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl Thu Apr 27 17:02:20 2006
@@ -34,11 +34,12 @@
<!-- Search Results Table -->
<!-- TMPL_IF NAME="total" -->
+<!-- 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">
+<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><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></th>
+ <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>
<!-- TMPL_ELSE -->
@@ -52,7 +53,7 @@
<!-- Actual Search Results -->
<!-- TMPL_LOOP NAME="results" -->
<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
- <td><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></label><br /><input type="checkbox" name="bibid" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" value="<!-- TMPL_VAR NAME="biblionumber" -->" /></td>
+ <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>
More information about the Koha-cvs
mailing list