[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/catalogue I... [dev_week]

Owen Leonard oleonard at athenscounty.lib.oh.us
Thu Jul 13 21:27:40 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Owen Leonard <oleonard>	06/07/13 19:27:40

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/catalogue: ISBDdetail.tmpl 
	                                          MARCdetail.tmpl 
	                                          detail.tmpl 

Log message:
	Wrapping reserve, cataloging controls in user privilege checks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/ISBDdetail.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/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.5.2.1&r2=1.3.2.5.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.11.2.1&r2=1.4.2.11.2.2

Patches:
Index: ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/ISBDdetail.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
--- ISBDdetail.tmpl	11 Jul 2006 14:03:23 -0000	1.1.2.3.2.1
+++ ISBDdetail.tmpl	13 Jul 2006 19:27:40 -0000	1.1.2.3.2.2
@@ -7,7 +7,7 @@
 
 <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="View Brief Display" /></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get">
 <input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit" value="View MARC" /></form>  <form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" onclick="openWindow('/cgi-bin/koha/detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->', 'printview'); return false;" /></form><!-- TMPL_IF name="subscriptionsnumber" --> <form action="bull-home.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Subscription(s)" /></form><!-- /TMPL_IF --><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Place Reserve" class="submit" /></form> <form action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
+<input type="submit" class="submit" value="View MARC" /></form>  <form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" onclick="openWindow('/cgi-bin/koha/detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->', 'printview'); return false;" /></form><!-- TMPL_IF name="subscriptionsnumber" --> <form action="bull-home.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Subscription(s)" /></form><!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reserveforothers" --><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Place Reserve" class="submit" /></form><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="CAN_user_editcatalogue" --><form action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
 </div>
 
 	<div class="isbd">

Index: MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3.2.5.2.1
retrieving revision 1.3.2.5.2.2
diff -u -b -r1.3.2.5.2.1 -r1.3.2.5.2.2
--- MARCdetail.tmpl	11 Jul 2006 14:03:23 -0000	1.3.2.5.2.1
+++ MARCdetail.tmpl	13 Jul 2006 19:27:40 -0000	1.3.2.5.2.2
@@ -5,10 +5,10 @@
 
 <div id="main">
 <h2>MARC Record <em><!-- TMPL_VAR NAME="biblionumber" --></em></h2>
-<div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="View Brief Display" /></form> <form action="ISBDdetail.pl" method="get" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="View ISBD" /></form> <!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
-		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" onclick="openWindow('/cgi-bin/koha/detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->', 'printview'); return false;" /></form> <!-- TMPL_IF name="subscriptionsnumber" --><form action="/cgi-bin/koha/bull-home.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" value="Subscription(s)" class="submit" /></form><!-- /TMPL_IF -->  </div>
+<div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="View Brief Display" /></form> <form action="ISBDdetail.pl" method="get" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="View ISBD" /></form> <!-- TMPL_IF NAME="CAN_user_reserveforothers" --><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
+		<!-- /TMPL_IF --><!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" onclick="openWindow('/cgi-bin/koha/detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->', 'printview'); return false;" /></form> <!-- TMPL_IF name="subscriptionsnumber" --><form action="/cgi-bin/koha/bull-home.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" value="Subscription(s)" class="submit" /></form><!-- /TMPL_IF -->  </div>
 
-<div id="controls"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form name="duplicate"><h4>Duplicate</h4> using <!--TMPL_VAR Name="framework" -->Framework <input type="submit" class="submit" value="Duplicate" onclick="Addbiblio('duplicate'); return false;" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
+<!-- TMPL_IF NAME="CAN_user_editcatalogue" --><div id="controls"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form name="duplicate"><h4>Duplicate</h4> using <!--TMPL_VAR Name="framework" -->Framework <input type="submit" class="submit" value="Duplicate" onclick="Addbiblio('duplicate'); return false;" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div><!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="0XX" -->
 <table class="marc">

Index: detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl,v
retrieving revision 1.4.2.11.2.1
retrieving revision 1.4.2.11.2.2
diff -u -b -r1.4.2.11.2.1 -r1.4.2.11.2.2
--- detail.tmpl	11 Jul 2006 14:01:30 -0000	1.4.2.11.2.1
+++ detail.tmpl	13 Jul 2006 19:27:40 -0000	1.4.2.11.2.2
@@ -11,8 +11,8 @@
 
 <div class="tabitem"><form action="MARCdetail.pl" method="get">
 <input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit" value="View MARC" /></form> <form action="ISBDdetail.pl" method="get" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="View ISBD" /></form> <form action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input type="submit" class="submit" value="View Item Details" /></form> 	<form action="bookshelves/addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Add to Shelf" onclick="openWindow('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->', 'popped'); return false;" /></form> <form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="openWindow('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->','printview'); return false;" /></form> <!-- TMPL_IF name="subscriptionsnumber" --><form action="bull-home.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Subscription(s)" /></form><!-- /TMPL_IF --><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Reserves" class="submit" /></form>
-	<!-- /TMPL_IF --></div>
+<input type="submit" class="submit" value="View MARC" /></form> <form action="ISBDdetail.pl" method="get" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="View ISBD" /></form> <form action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input type="submit" class="submit" value="View Item Details" /></form> 	<form action="bookshelves/addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Add to Shelf" onclick="openWindow('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->', 'popped'); return false;" /></form> <form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="openWindow('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->','printview'); return false;" /></form> <!-- TMPL_IF name="subscriptionsnumber" --><form action="bull-home.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Subscription(s)" /></form><!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reserveforothers" --><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Reserves" class="submit" /></form>
+	<!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
 <div class="details"><!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="amazonisbn" --><div style="float:right"><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="amazonisbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a></div><!-- TMPL_ELSE --><div style="float:right"><img border="0" src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="Book Cover Image" /></div><!-- /TMPL_IF --><!-- /TMPL_IF -->
 





More information about the Koha-cvs mailing list