[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbasket2.tmpl,1.13,1.14 order.tmpl,1.19,1.20 recieve.tmpl,1.10,1.11 suggestion-select.tmpl,1.3,1.4
Paul POULAIN
tipaul at users.sourceforge.net
Mon Sep 13 17:29:00 CEST 2004
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10180/koha-tmpl/intranet-tmpl/default/en/acqui
Modified Files:
newbasket2.tmpl order.tmpl recieve.tmpl suggestion-select.tmpl
Log Message:
some fixes for acquisition
Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** newbasket2.tmpl 12 Aug 2004 14:37:11 -0000 1.13
--- newbasket2.tmpl 13 Sep 2004 15:28:58 -0000 1.14
***************
*** 1,13 ****
<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
<div id="mainbloc">
! <h1 class="acquisition">Shopping Basket For: <!-- TMPL_VAR NAME="bookselname" --></h1>
! <a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basket=<!-- TMPL_VAR NAME="basket" -->&sub=<!-- TMPL_VAR NAME="parsub" -->">
<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Add New Biblio"></a>
! <a href="basket.pl?basket=<!-- TMPL_VAR NAME="basket" -->">
<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1uparrow.png" border="0" alt="View Basket">
</a>
<form action="/cgi-bin/koha/acqui/newbasket2.pl">
<input type="hidden" name="booksellerid" value=<!-- TMPL_VAR NAME="booksellerid" -->>
! <input type="hidden" name="basket" value=<!-- TMPL_VAR NAME="basket" -->>
<b>New Search: </b><input="text" size="25" name="search">
<input type="submit" value="Search" class="button acquisition">
--- 1,13 ----
<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
<div id="mainbloc">
! <h1 class="acquisition">Shopping basket <!-- TMPL_VAR name="basketno" --> for: <!-- TMPL_VAR NAME="bookselname" --></h1>
! <a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&sub=<!-- TMPL_VAR NAME="parsub" -->">
<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Add New Biblio"></a>
! <a href="basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">
<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1uparrow.png" border="0" alt="View Basket">
</a>
<form action="/cgi-bin/koha/acqui/newbasket2.pl">
<input type="hidden" name="booksellerid" value=<!-- TMPL_VAR NAME="booksellerid" -->>
! <input type="hidden" name="basketno" value=<!-- TMPL_VAR NAME="basketno" -->>
<b>New Search: </b><input="text" size="25" name="search">
<input type="submit" value="Search" class="button acquisition">
***************
*** 37,41 ****
<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
<td>
! <a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR NAME="sub" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basket=<!-- TMPL_VAR NAME="basket" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
<!-- TMPL_VAR NAME="title" -->
</a>
--- 37,41 ----
<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
<td>
! <a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR NAME="sub" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
<!-- TMPL_VAR NAME="title" -->
</a>
***************
*** 85,89 ****
<!-- TMPL_IF name="offsetover" -->
! <a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&offset=<!-- TMPL_VAR NAME="offset" -->&type=<!-- TMPL_VAR NAME="type" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basket=<!-- TMPL_VAR NAME="basket" -->&search=<!-- TMPL_VAR NAME="title" -->&author=<!-- TMPL_VAR NAME="author" -->">
Next
</a>
--- 85,89 ----
<!-- TMPL_IF name="offsetover" -->
! <a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&offset=<!-- TMPL_VAR NAME="offset" -->&type=<!-- TMPL_VAR NAME="type" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&search=<!-- TMPL_VAR NAME="title" -->&author=<!-- TMPL_VAR NAME="author" -->">
Next
</a>
Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** order.tmpl 12 Aug 2004 14:37:11 -0000 1.19
--- order.tmpl 13 Sep 2004 15:28:58 -0000 1.20
***************
*** 1,7 ****
<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
<div id="mainbloc">
! <h1 class="acquisition">Supplier Search Results</h1>
<div id="bloc100">
- <h2 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
<table>
<tr>
--- 1,6 ----
<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
<div id="mainbloc">
! <h1 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
<div id="bloc100">
<table>
<tr>
***************
*** 13,17 ****
<!-- TMPL_LOOP name="loop_suppliers" -->
! <tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
<td>
<!-- TMPL_IF name="active" -->
--- 12,16 ----
<!-- TMPL_LOOP name="loop_suppliers" -->
! <tr valign="top">
<td>
<!-- TMPL_IF name="active" -->
***************
*** 26,30 ****
<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
<td>
! <table width="100%" cellspacing=0 cellpadding=5 border=0>
<tr>
<th class="acquisition">Basket</th>
--- 25,29 ----
<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
<td>
! <table>
<tr>
<th class="acquisition">Basket</th>
***************
*** 38,42 ****
<td><!-- TMPL_VAR NAME="basketno" --></a></td>
<td><TMPL_VAR NAME="total"></td>
! <td><!-- TMPL_VAR NAME="authorisedby" --></td>
<td><!-- TMPL_VAR NAME="creationdate" --></td>
<td>
--- 37,44 ----
<td><!-- TMPL_VAR NAME="basketno" --></a></td>
<td><TMPL_VAR NAME="total"></td>
! <td>
! <!-- TMPL_VAR name="firstname" -->
! <!-- TMPL_VAR name="surname" -->
! </td>
<td><!-- TMPL_VAR NAME="creationdate" --></td>
<td>
Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** recieve.tmpl 12 Aug 2004 14:37:11 -0000 1.10
--- recieve.tmpl 13 Sep 2004 15:28:58 -0000 1.11
***************
*** 2,6 ****
<div id="mainbloc">
! <h1 class="acquisition">Receipt Summary for : <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i></h1>
<div id="bloc25">
--- 2,12 ----
<div id="mainbloc">
! <h1 class="acquisition">
! <!-- TMPL_IF name="invoice" -->
! Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i>
! <!-- TMPL_ELSE -->
! orders not yet recieved for <!-- TMPL_VAR NAME="name" -->
! <!-- /TMPL_IF -->
! </h1>
<div id="bloc25">
Index: suggestion-select.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** suggestion-select.tmpl 12 Aug 2004 14:37:11 -0000 1.3
--- suggestion-select.tmpl 13 Sep 2004 15:28:58 -0000 1.4
***************
*** 1,6 ****
<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
<div id="mainbloc">
-
- <!-- TMPL_IF name="op_else" -->
<h1 class="acquisition">Suggestions</h1>
<table>
--- 1,4 ----
***************
*** 51,57 ****
<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
<!-- TMPL_IF name="biblionumber" -->
! <a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&basket=<!-- TMPL_VAR NAME="basket" -->&suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
<!-- TMPL_ELSE -->
! <a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&basket=<!-- TMPL_VAR NAME="basket" -->&suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
<!-- /TMPL_IF -->
</td>
--- 49,55 ----
<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
<!-- TMPL_IF name="biblionumber" -->
! <a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
<!-- TMPL_ELSE -->
! <a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
<!-- /TMPL_IF -->
</td>
***************
*** 60,65 ****
</table>
<form>
-
- <!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
\ No newline at end of file
--- 58,61 ----
More information about the Koha-cvs
mailing list