[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bookshelves addbookbybiblionumber.tmpl,1.4,1.4.2.1 shelves.tmpl,1.6.2.1,1.6.2.2
Owen Leonard
oleonard at users.sourceforge.net
Mon Aug 22 22:14:18 CEST 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14755/koha-tmpl/intranet-tmpl/default/en/bookshelves
Modified Files:
Tag: rel_2_2
addbookbybiblionumber.tmpl shelves.tmpl
Log Message:
Fix for Bug 926 (forms lack method and/or action attributes). Also hiding 'delete' functionality from shelves.tmpl when user cannot manage shelf
Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** addbookbybiblionumber.tmpl 15 Dec 2004 17:28:24 -0000 1.4
--- addbookbybiblionumber.tmpl 22 Aug 2005 20:14:15 -0000 1.4.2.1
***************
*** 2,6 ****
<div id="mainbloc">
<h2 class="catalogue">Select bookshelf</h2>
! <form>
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
--- 2,6 ----
<div id="mainbloc">
<h2 class="catalogue">Select bookshelf</h2>
! <form action="/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl" method="get">
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** shelves.tmpl 27 Apr 2005 18:19:15 -0000 1.6.2.1
--- shelves.tmpl 22 Aug 2005 20:14:15 -0000 1.6.2.2
***************
*** 3,23 ****
<div id="mainbloc">
<!-- TMPL_IF Name="viewshelf" -->
! <form>
<h1 class="catalogue"><!-- TMPL_VAR NAME="shelfname" --></h1>
<div id="bloc25">
! <h2 class="catalogue">Shelf content</h2>
<table class="small">
<tr colspan="4">
! <th class="catalogue">delete</th>
! <th class="catalogue">barcode</th>
! <th class="catalogue">title</th>
<th class="catalogue">Author</th>
</tr>
<!-- TMPL_LOOP Name="itemsloop" -->
<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
! <td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
<td><!-- TMPL_VAR NAME="barcode" --></td>
! <td><a href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
</tr>
--- 3,23 ----
<div id="mainbloc">
<!-- TMPL_IF Name="viewshelf" -->
! <form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
<h1 class="catalogue"><!-- TMPL_VAR NAME="shelfname" --></h1>
<div id="bloc25">
! <h2 class="catalogue">Shelf contents</h2>
<table class="small">
<tr colspan="4">
! <th class="catalogue"><!-- TMPL_IF name="manageshelf" -->Delete<!-- TMPL_ELSE --> <!-- /TMPL_IF --></th>
! <th class="catalogue">Barcode</th>
! <th class="catalogue">Title</th>
<th class="catalogue">Author</th>
</tr>
<!-- TMPL_LOOP Name="itemsloop" -->
<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
! <td><!-- TMPL_IF name="manageshelf" --><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td>
<td><!-- TMPL_VAR NAME="barcode" --></td>
! <td><a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
</tr>
***************
*** 35,39 ****
<!-- TMPL_IF name="manageshelf" -->
<div id="bloc25">
! <form>
<h2 class="catalogue">Add a book by barcode</h2>
<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
--- 35,39 ----
<!-- TMPL_IF name="manageshelf" -->
<div id="bloc25">
! <form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
<h2 class="catalogue">Add a book by barcode</h2>
<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
***************
*** 48,52 ****
<!-- /TMPL_IF -->
<div id="bloc25">
! <a href="shelves.pl" class="button catalogue">Shelf list</a>
</div>
<!-- TMPL_ELSE -->
--- 48,52 ----
<!-- /TMPL_IF -->
<div id="bloc25">
! <a href="/cgi-bin/koha/bookshelves/shelves.pl" class="button catalogue">Shelf list</a>
</div>
<!-- TMPL_ELSE -->
***************
*** 63,67 ****
<div id="bloc25">
<h2 class="catalogue">Select Shelves to Delete</h2>
! <form method="post">
<input type="hidden" name="shelves" value="1">
<!-- TMPL_LOOP Name="shelvesloop" -->
--- 63,67 ----
<div id="bloc25">
<h2 class="catalogue">Select Shelves to Delete</h2>
! <form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
<input type="hidden" name="shelves" value="1">
<!-- TMPL_LOOP Name="shelvesloop" -->
***************
*** 81,85 ****
</div>
<div id="bloc25">
! <form method="post">
<input type="hidden" name="shelves" value="1">
<h2 class="catalogue">Add Shelf</h2>
--- 81,85 ----
</div>
<div id="bloc25">
! <form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
<input type="hidden" name="shelves" value="1">
<h2 class="catalogue">Add Shelf</h2>
***************
*** 99,103 ****
<p>
<input type="submit" value="Add New Shelf" class="button catalogue">
! <a href="shelves.pl" class="button catalogue">back to shelf list</a>
</p>
--- 99,103 ----
<p>
<input type="submit" value="Add New Shelf" class="button catalogue">
! <a href="/cgi-bin/koha/bookshelves/shelves.pl" class="button catalogue">back to shelf list</a>
</p>
***************
*** 117,121 ****
<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td>
! <a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
<!-- TMPL_VAR NAME="shelfname" -->
</a>
--- 117,121 ----
<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td>
! <a href="/cgi-bin/koha/bookshelves/shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
<!-- TMPL_VAR NAME="shelfname" -->
</a>
***************
*** 137,141 ****
<!-- TMPL_IF name="mine" -->
<td>
! <a href="shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button catalogue">Modify</a>
<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
</td>
--- 137,141 ----
<!-- TMPL_IF name="mine" -->
<td>
! <a href="/cgi-bin/koha/bookshelves/shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button catalogue">Modify</a>
<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
</td>
***************
*** 148,152 ****
</div>
<div id="bloc25">
! <a href="shelves.pl?shelves=1" class="button catalogue">Add or Remove Book Shelves</a>
</div>
<!-- /TMPL_IF -->
--- 148,152 ----
</div>
<div id="bloc25">
! <a href="/cgi-bin/koha/bookshelves/shelves.pl?shelves=1" class="button catalogue">Add or Remove Book Shelves</a>
</div>
<!-- /TMPL_IF -->
***************
*** 155,159 ****
<!-- TMPL_IF name="edit" -->
<div id="bloc25">
! <form method="post">
<input type="hidden" name="op" value="modifsave">
<h2 class="catalogue">Modify shelf</h2>
--- 155,159 ----
<!-- TMPL_IF name="edit" -->
<div id="bloc25">
! <form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl">
<input type="hidden" name="op" value="modifsave">
<h2 class="catalogue">Modify shelf</h2>
More information about the Koha-cvs
mailing list