[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/circ reserv... [dev_week]

[Ryan Higgins]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Ryan Higgins <rych>     07/01/11 06:48:08

Modified files:
        koha-tmpl/intranet-tmpl/npl/en/circ: reserve.tmpl 

Log message:
        adding 'get from stacks' and 'remove from reserveshelf' lists

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/reserve.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.2&r2=1.1.2.1.2.3

Patches:
Index: reserve.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/Attic/reserve.tmpl,v
retrieving revision 1.1.2.1.2.2
retrieving revision 1.1.2.1.2.3
diff -u -b -r1.1.2.1.2.2 -r1.1.2.1.2.3
--- reserve.tmpl        15 Dec 2006 23:51:13 -0000      1.1.2.1.2.2
+++ reserve.tmpl        11 Jan 2007 06:48:08 -0000      1.1.2.1.2.3
@@ -1,11 +1,71 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: 
Transfers<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+<script>
+function Dopop(link) {
+        
newin=window.open(link,'width=400,height=500,toolbar=false,scrollbars=yes');
+}
+</script>
+
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
+<!-- TMPL_IF NAME="openreserves" -->
+<h1> Open / Unfilled Reserves </h1>
+<p><a href="/cgi-bin/koha/circ/reserve.pl">View all reserves </a></p>
+<p><a href="/cgi-bin/koha/circ/reserve.pl?op=cancelled">View cancelled 
reserves </a></p>
+<div id="resultlist" >
+
+<table>
+<tr>
+<th>Title / Author</th>
+<th>Open Reserves</th>
+<th>Notes</th>
+<th>Available Items on Shelf</th>
+</tr>
+<!-- TMPL_LOOP NAME="reserveloop" -->
+<tr>
+<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
-->"><!-- TMPL_VAR NAME="title" --></a> / <!-- TMPL_VAR NAME="author" --> </td>
+<td><!-- TMPL_VAR NAME="numreserves" --></td>
+<td>
+<!-- TMPL_VAR NAME="notes" -->
+</td>
+<td>
+<!-- TMPL_LOOP NAME="iteminfo" -->
+<!-- TMPL_VAR NAME="location" --> : <!-- TMPL_VAR NAME="itemcallnumber" --> 
(<!-- TMPL_VAR NAME="barcode" -->)
+<br />
+<!-- /TMPL_LOOP -->
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+</div>
+
+<!-- TMPL_ELSE -->
+
+<!-- TMPL_IF NAME="cancelledreserves" -->
+<h1> Cancelled Reserves </h1>
+<h3>These items should be pulled from the reserve shelf</h3>
+<p><a href="/cgi-bin/koha/circ/reserve.pl">View all reserves </a></p>
+<p><a href="/cgi-bin/koha/circ/reserve.pl?op=open">View reserved items in 
stacks </a></p>
+<div id="resultlist" >
+
+<table>
+<tr>
+<th>Borrower</th>
+<th>Item</th>
+<th>Reserve Date</th>
+</tr>
+<!-- TMPL_LOOP NAME="reserveloop" -->
+<tr>
+<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR 
NAME="firstname" --></a></td>
+<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
-->"><!-- TMPL_VAR NAME="title" --></a> / <!-- TMPL_VAR NAME="itemcallnumber" 
--> ( <!-- TMPL_VAR NAME="barcode" --> )<td> <!-- TMPL_VAR NAME="reservedate" 
--></td>
+</tr><!-- /TMPL_LOOP --></table></div>
+
+<!-- TMPL_ELSE -->
 
 <h1>Items Reserved <!-- as of <!-- TMPL_VAR NAME="todaysdate" --> --></h1>
+<p><a href="/cgi-bin/koha/circ/reserve.pl?op=open">View reserved items in 
stacks </a></p>
+<p><a href="/cgi-bin/koha/circ/reserve.pl?op=cancelled">View cancelled 
reserves </a></p>
 <div id="filters">
 <br />
 <form method="post" >
@@ -82,20 +142,19 @@
                        <th>Reserve Date  <a class="print" 
href="/cgi-bin/koha/circ/reserve.pl?order=date&amp;type=intranet&amp;to=<!-- 
TMPL_VAR NAME="to" -->&amp;from=<!-- TMPL_VAR NAME="from" -->">[Sort]</a> </th>
                        <th>Patron  <a class="print" 
href="/cgi-bin/koha/circ/reserve.pl?order=borrower&amp;type=intranet&amp;to=<!--
 TMPL_VAR NAME="to" -->&amp;from=<!-- TMPL_VAR NAME="from" -->">[Sort]</a></th>
                        <th>Title  <a class="print" 
href="/cgi-bin/koha/circ/reserve.pl?order=biblio&amp;type=intranet&amp;to=<!-- 
TMPL_VAR NAME="to" -->&amp;from=<!-- TMPL_VAR NAME="from" -->">[Sort]</a></th>
-                       <th>Location</th>
+                       <th>Status</th>
                        <th>Notes</th>
+                       <th></th>
                </tr>
-               
                <!-- TMPL_LOOP NAME="reserveloop" -->
                        <tr>
                                <td><!-- TMPL_VAR NAME="priority" --></td>
                                <td>
                                        <!-- TMPL_VAR NAME="reservedate" -->
                                        in <!-- TMPL_VAR NAME="branch" -->
-                                       <!-- TMPL_IF NAME="statusw" 
-->Waiting<!-- /TMPL_IF --><!-- TMPL_IF NAME="statusf" -->Fullfilled<!-- 
/TMPL_IF -->
                                </td>
                                <td>
-                                       <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR 
Name="bornum"-->"><!-- TMPL_VAR NAME="name" --></a><br /><!-- TMPL_VAR 
NAME="phone" --><br />
+                                       <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR 
Name="bornum"-->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR 
NAME="firstname" --></a><br /><!-- TMPL_VAR NAME="phone" --><br />
                                <!-- TMPL_IF NAME="email" --><a 
href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR 
NAME="title" -->">
        <!-- TMPL_VAR NAME="email" --></a><!--/TMPL_IF-->
                                        
@@ -105,12 +164,17 @@
                                                <a 
href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
-->"><!-- TMPL_VAR NAME="title" --></a><br /><!-- TMPL_VAR NAME="author" -->
                                        
                                </td>
-                               <td><!-- TMPL_VAR NAME="holdingbranch" --> <!-- 
TMPL_VAR NAME="itemcallnumber" --></td>
+                               <td><!-- TMPL_IF NAME="statusw" -->Waiting ( 
<!-- TMPL_VAR NAME="itemcallno" --> )<!-- /TMPL_IF --><!-- TMPL_IF 
NAME="statusf" -->Fullfilled ( <!-- TMPL_VAR NAME="itemcallno" --> )<!-- 
/TMPL_IF -->
+                                       <!-- TMPL_IF NAME="onshelf" --> On 
Shelf: <!-- TMPL_VAR NAME="onshelf" --> <!-- /TMPL_IF -->
+       </td>
        
                                <td><!-- TMPL_VAR NAME="notes" --></td>
+                               <td><a 
href='Javascript:Dopop("reserve.pl?borrower=<!-- TMPL_VAR NAME="bornum" 
-->&amp;biblionum=<!-- TMPL_VAR NAME="biblionumber" -->&amp;op=slip");' >Print 
Slip</a></td>
                        </tr>
                <!-- /TMPL_LOOP -->
                </table>
        </div>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->