[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmp
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.20,1.21 newbiblio.tmpl,1.18,1.19 order.tmpl,1.21,1.22 recieve.tmpl,1.12,1.13 suggestion-select.tmpl,1.4,1.5 |
|
Date: |
Wed, 04 May 2005 01:53:27 -0700 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17782/koha-tmpl/intranet-tmpl/default/en/acqui
Modified Files:
basket.tmpl newbiblio.tmpl order.tmpl recieve.tmpl
suggestion-select.tmpl
Log Message:
synch'ing 2.2 and head
Index: basket.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** basket.tmpl 1 Apr 2005 14:41:31 -0000 1.20
--- basket.tmpl 4 May 2005 08:52:49 -0000 1.21
***************
*** 24,28 ****
<tr valign="top" bgcolor="#ffdf61">
<th class="acquisition doNotPrint">Order</th>
! <th class="acquisition">Publisher<a
href="basket.pl?basket=<!-- TMPL_VAR name="basketno"
-->&order=biblioitems.publishercode" class="doNotPrint">[order]</a></th>
<th class="acquisition">Isbn</th>
<th class="acquisition">Title</th>
--- 24,28 ----
<tr valign="top" bgcolor="#ffdf61">
<th class="acquisition doNotPrint">Order</th>
! <th class="acquisition">Publisher<a
href="basket.pl?basket=<!-- TMPL_VAR name="basketno"
-->&order=biblioitems.publishercode" class="acquisition
doNotPrint">[order]</a></th>
<th class="acquisition">Isbn</th>
<th class="acquisition">Title</th>
***************
*** 33,40 ****
<th class="acquisition">Total</th>
<th class="acquisition doNotPrint">Fund <a
href="basket.pl?basket=<!-- TMPL_VAR name="basketno"
-->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]</a></th>
! <!-- TMPL_UNLESS name="closedate" -->
! <th class="doNotPrint">Remove</th>
! <!-- /TMPL_UNLESS -->
!
</tr>
<!-- TMPL_LOOP NAME="books_loop" -->
--- 33,41 ----
<th class="acquisition">Total</th>
<th class="acquisition doNotPrint">Fund <a
href="basket.pl?basket=<!-- TMPL_VAR name="basketno"
-->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]</a></th>
! <!-- TMPL_IF name="active" -->
! <!-- TMPL_UNLESS name="closedate" -->
! <th class="acquisition
doNotPrint">Remove</th>
! <!-- /TMPL_UNLESS -->
! <!-- /TMPL_IF -->
</tr>
<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 54,64 ****
<td><!-- TMPL_VAR NAME="line_total"
--></td>
<td class="doNotPrint"><!-- TMPL_VAR
NAME="bookfundid" --></td>
! <!-- TMPL_UNLESS name="closedate" -->
! <td class="doNotPrint">
! <a
href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!--
TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR
NAME="biblionumber" -->">
! <img
src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket"
title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
! </a>
! </td>
! <!-- /TMPL_UNLESS -->
</tr>
<!-- /TMPL_LOOP -->
--- 55,67 ----
<td><!-- TMPL_VAR NAME="line_total"
--></td>
<td class="doNotPrint"><!-- TMPL_VAR
NAME="bookfundid" --></td>
! <!-- TMPL_IF name="active" -->
! <!-- TMPL_UNLESS
name="closedate" -->
! <td class="doNotPrint">
! <a
href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!--
TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR
NAME="biblionumber" -->">
! <img
src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket"
title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
! </a>
! </td>
! <!-- /TMPL_UNLESS -->
! <!-- /TMPL_IF -->
</tr>
<!-- /TMPL_LOOP -->
***************
*** 85,106 ****
<!-- /TMPL_IF -->
</div>
! <!-- TMPL_UNLESS name="closedate" -->
! <div id="bloc25">
! <h2 class="acquisition">Add order line</h2>
! <form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
! <input type="hidden" name="booksellerid" value="<!--
TMPL_VAR NAME="booksellerid" -->">
! <input type="hidden" name="basketno" value="<!--
TMPL_VAR NAME="basketno" -->">
! <p>from an existing biblio: </b><input type="text"
size="25" name="search"><input type="submit" class="button acquisition"
value="Search"></p>
! <p>or
! <a
href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR
NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"
class="button acquisition">
! from a suggestion
! </a>
! <a
href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR
NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"
class="button acquisition">
! New biblio
! </a>
! </p>
! </form>
! </div>
! <!-- /TMPL_UNLESS -->
</div>
<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
--- 88,111 ----
<!-- /TMPL_IF -->
</div>
! <!-- TMPL_IF name="active" -->
! <!-- TMPL_UNLESS name="closedate" -->
! <div id="bloc25">
! <h2 class="acquisition">Add order line</h2>
! <form action="/cgi-bin/koha/acqui/newbasket2.pl"
method="post">
! <input type="hidden" name="booksellerid"
value="<!-- TMPL_VAR NAME="booksellerid" -->">
! <input type="hidden" name="basketno"
value="<!-- TMPL_VAR NAME="basketno" -->">
! <p>from an existing biblio: </b><input
type="text" size="25" name="search"><input type="submit" class="button
acquisition" value="Search"></p>
! <p>or
! <a
href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR
NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"
class="button acquisition">
! from a suggestion
! </a>
! <a
href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR
NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"
class="button acquisition">
! New biblio
! </a>
! </p>
! </form>
! </div>
! <!-- /TMPL_UNLESS -->
! <!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
Index: newbiblio.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** newbiblio.tmpl 7 Mar 2005 15:26:17 -0000 1.18
--- newbiblio.tmpl 4 May 2005 08:52:49 -0000 1.19
***************
*** 52,58 ****
function check(f) {
! quantity=f.quantity.value;
! title=f.title.value;
!
if (title == "") {
alert("Title can't be empty");
--- 52,57 ----
function check(f) {
! quantity=f.quantity.value
! title=f.title.value
if (title == "") {
alert("Title can't be empty");
Index: order.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** order.tmpl 17 Sep 2004 12:32:46 -0000 1.21
--- order.tmpl 4 May 2005 08:52:50 -0000 1.22
***************
*** 47,51 ****
<a
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->"
class="button acquisition">View</a>
<!-- TMPL_ELSE
-->
! <a
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->"
class="button acquisition">modify</a>
<!-- /TMPL_IF
-->
</td>
--- 47,55 ----
<a
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->"
class="button acquisition">View</a>
<!-- TMPL_ELSE
-->
! <!--
TMPL_IF name="active" -->
!
<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno"
-->" class="button acquisition">modify</a>
! <!--
TMPL_ELSE -->
!
<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno"
-->" class="button acquisition">View</a>
! <!--
/TMPL_IF -->
<!-- /TMPL_IF
-->
</td>
Index: recieve.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** recieve.tmpl 14 Sep 2004 12:32:13 -0000 1.12
--- recieve.tmpl 4 May 2005 08:52:50 -0000 1.13
***************
*** 65,71 ****
<td colspan="5" rowspan=2 bgcolor="#ffdf61">
<b>HELP</b>
! <br>
! The total at the bottom of the page should be within a
few cents of the total for the invoice.<p>
! When you have finished this invoice save the changes.
</td>
<td colspan="2" align="right"><b>GST</b></td>
--- 65,69 ----
<td colspan="5" rowspan=2 bgcolor="#ffdf61">
<b>HELP</b>
! <p>The total at the bottom of the page should
be within a few cents of the total for the invoice.</p>
</td>
<td colspan="2" align="right"><b>GST</b></td>
Index: suggestion-select.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** suggestion-select.tmpl 13 Sep 2004 15:28:58 -0000 1.4
--- suggestion-select.tmpl 4 May 2005 08:52:50 -0000 1.5
***************
*** 45,49 ****
</td>
<td <!-- TMPL_IF name="even"
-->class="hilighted"<!-- /TMPL_IF -->>
! <!-- TMPL_VAR NAME="usermanagedby"
--><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR
NAME="firstnamemanagedby" -->
</td>
<td <!-- TMPL_IF name="even"
-->class="hilighted"<!-- /TMPL_IF -->>
--- 45,49 ----
</td>
<td <!-- TMPL_IF name="even"
-->class="hilighted"<!-- /TMPL_IF -->>
! <!-- TMPL_VAR NAME="surnamemanagedby"
--><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR
NAME="firstnamemanagedby" -->
</td>
<td <!-- TMPL_IF name="even"
-->class="hilighted"<!-- /TMPL_IF -->>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.20,1.21 newbiblio.tmpl,1.18,1.19 order.tmpl,1.21,1.22 recieve.tmpl,1.12,1.13 suggestion-select.tmpl,1.4,1.5,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities auth_finder.tmpl,1.7,1.8 authorities.tmpl,1.8,1.9 detail.tmpl,1.3,1.4 searchresultlist-auth.tmpl,1.6,1.7
- Next by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en about.tmpl,1.13,1.14
- Previous by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities auth_finder.tmpl,1.7,1.8 authorities.tmpl,1.8,1.9 detail.tmpl,1.3,1.4 searchresultlist-auth.tmpl,1.6,1.7
- Next by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en about.tmpl,1.13,1.14
- Index(es):