koha-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui basket.tmpl,1.

From: Owen Leonard
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui basket.tmpl,1.2.2.1,1.2.2.2
Date: Thu, 14 Apr 2005 13:41:16 -0700 
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27877/koha-tmpl/intranet-tmpl/npl/en/acqui

Modified Files:
      Tag: rel_2_2
        basket.tmpl 
Log Message:
Making some layout and style changes to improve usability

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** basket.tmpl 20 Jan 2005 19:31:58 -0000      1.2.2.1
--- basket.tmpl 14 Apr 2005 20:41:06 -0000      1.2.2.2
***************
*** 6,10 ****
        <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS 
-->Shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a 
href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR 
NAME="name" --></a></h1><br />
        <!-- TMPL_UNLESS name="closedate" -->
!               <div class="details">
                        <table>
                        <caption>Basket Details</caption>
--- 6,10 ----
        <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS 
-->Shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a 
href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR 
NAME="name" --></a></h1><br />
        <!-- TMPL_UNLESS name="closedate" -->
!               <div class="data">
                        <table>
                        <caption>Basket Details</caption>
***************
*** 14,41 ****
                        <tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR 
NAME="booksellerid" --></td></tr>
                        <tr><th>Invoice Number:</th><td><!-- TMPL_VAR 
NAME="booksellerinvoicenumber" --></td></tr>
!                       <!-- TMPL_IF name="closedate" --><tr><th>Closed 
On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- TMPL_ELSE -->
!                       <tr><tfoot><td colspan="2"><form 
action="/cgi-bin/koha/acqui/order.pl" method="get"><input type="hidden" 
name="op" value="close" /><input type="hidden" name="basket" value="<!-- 
TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="supplier" 
value="<!-- TMPL_VAR name="booksellerid" -->" /><input type="submit" 
class="submit" value="Close this Basket" /></form></td></tfoot></tr><!-- 
/TMPL_IF -->
!                       </table>
                </div>
        <!-- /TMPL_UNLESS -->
!       <div class="details">
        <!-- TMPL_IF name="books_loop" -->
                <table>
                        <caption>Order Details</caption>
                        <tr>
!                               <th>Order</th>
!                               <th>Publisher <a href="basket.pl?basket=<!-- 
TMPL_VAR name="basketno" 
-->&amp;order=biblioitems.publishercode">[order]</a></th>
!                               <th>ISBN</th>
!                               <th>Title</th>
!                               <th>Author</th>
!                               <th>rrp</th>
!                               <th>est</th>
!                               <th>Qty</th>
!                               <th>Total</th>
!                               <th>Fund <a href="basket.pl?basket=<!-- 
TMPL_VAR name="basketno" 
-->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]</a></th>
                        </tr>
                        <!-- TMPL_LOOP NAME="books_loop" -->
!                               <tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
!                                       <td><!-- TMPL_VAR NAME="ordernumber" 
--></td>
                                        <td><!-- TMPL_VAR NAME="publishercode" 
--></td>
                                        <td><!-- TMPL_VAR NAME="isbn" --></td>
--- 14,43 ----
                        <tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR 
NAME="booksellerid" --></td></tr>
                        <tr><th>Invoice Number:</th><td><!-- TMPL_VAR 
NAME="booksellerinvoicenumber" --></td></tr>
!                       <!-- TMPL_IF name="closedate" --><tr><th>Closed 
On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- /TMPL_IF -->
!                       </table><!-- TMPL_UNLESS name="closedate" --><form 
action="/cgi-bin/koha/acqui/order.pl" method="get"><input type="hidden" 
name="op" value="close" /><input type="hidden" name="basket" value="<!-- 
TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="supplier" 
value="<!-- TMPL_VAR name="booksellerid" -->" /><input type="submit" 
class="submit" value="Close this Basket" /></form><!-- /TMPL_UNLESS -->
                </div>
        <!-- /TMPL_UNLESS -->
!       <div class="data">
        <!-- TMPL_IF name="books_loop" -->
                <table>
                        <caption>Order Details</caption>
                        <tr>
!                               <th scope="col">Order</th>
!                               <th scope="col"><a href="basket.pl?basket=<!-- 
TMPL_VAR name="basketno" 
-->&amp;order=biblioitems.publishercode">Publisher</a></th>
!                               <th scope="col">ISBN</th>
!                               <th scope="col">Title</th>
!                               <th scope="col">Author</th>
!                               <th scope="col">rrp</th>
!                               <th scope="col">est</th>
!                               <th scope="col">Qty</th>
!                               <th scope="col">Total</th>
!                               <th scope="col"><a href="basket.pl?basket=<!-- 
TMPL_VAR name="basketno" 
-->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
! <!-- TMPL_UNLESS name="closedate" -->
!                                       <th scope="col">Remove</th>
!                               <!-- /TMPL_UNLESS -->
                        </tr>
                        <!-- TMPL_LOOP NAME="books_loop" -->
!                               <!-- TMPL_IF NAME="highlight" --><tr 
class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
!                                                       <td><!-- TMPL_VAR 
NAME="ordernumber" --></td>
                                        <td><!-- TMPL_VAR NAME="publishercode" 
--></td>
                                        <td><!-- TMPL_VAR NAME="isbn" --></td>
***************
*** 47,67 ****
                                        <td><!-- TMPL_VAR NAME="line_total" 
--></td>
                                        <td><!-- TMPL_VAR NAME="bookfundid" 
--></td>
                                </tr>
                        <!-- /TMPL_LOOP -->
!                       <input type="hidden" name="number" value=<!-- TMPL_VAR 
NAME="count" -->>
!                       <input type="hidden" name="basketno" value="<!-- 
TMPL_VAR NAME="basketno" -->">
                        <tr>
!                               <td colspan="7" rowspan=3>
!                                       &nbsp;
                                </td>
!                               <th>SubTotal</th>
!                               <th><!-- TMPL_VAR NAME="currency" --> <!-- 
TMPL_VAR NAME="sub_total" --></th>
                        </tr>
                        <tr>
!                               <th>GST</th>
                                <th><!-- TMPL_VAR NAME="currency" --> <!-- 
TMPL_VAR NAME="gist" --></th>
                        </tr>
                        <tr>
!                               <th>TOTAL</th>
                                <th><!-- TMPL_VAR NAME="currency" --> <!-- 
TMPL_VAR NAME="grand_total" --></th>
                        </tr>
--- 49,74 ----
                                        <td><!-- TMPL_VAR NAME="line_total" 
--></td>
                                        <td><!-- TMPL_VAR NAME="bookfundid" 
--></td>
+                                       <!-- TMPL_UNLESS name="closedate" -->
+                                       <td>
+                                                       <a class="delete" 
href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;basketno=<!-- 
TMPL_VAR NAME="basketno" -->&amp;quantity=0&amp;biblio=<!-- TMPL_VAR 
NAME="biblionumber" -->">Delete</a>
+                                               </td>
+                                       <!-- /TMPL_UNLESS -->
                                </tr>
                        <!-- /TMPL_LOOP -->
!                       
                        <tr>
!                               <td colspan="4" rowspan="3">
!                                       &nbsp;<input type="hidden" 
name="number" value="<!-- TMPL_VAR NAME="count" -->" />
!                       <input type="hidden" name="basketno" value="<!-- 
TMPL_VAR NAME="basketno" -->" />
                                </td>
!                               <th colspan="2">SubTotal</th>
!                               <th><!-- TMPL_VAR NAME="currency" --> <!-- 
TMPL_VAR NAME="sub_total" --></th><td rowspan="3" colspan="4">&nbsp;</td>
                        </tr>
                        <tr>
!                               <th colspan="2">GST</th>
                                <th><!-- TMPL_VAR NAME="currency" --> <!-- 
TMPL_VAR NAME="gist" --></th>
                        </tr>
                        <tr>
!                               <th colspan="2">TOTAL</th>
                                <th><!-- TMPL_VAR NAME="currency" --> <!-- 
TMPL_VAR NAME="grand_total" --></th>
                        </tr>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]