[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.22,1.23 histsearch.tmpl,1.5,1.6 newbiblio.tmpl,1.20,1.21 suggestion-select.tmpl,1.5,1.6 |
|
Date: |
Wed, 26 Oct 2005 02:15:58 -0700 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29883/koha-tmpl/intranet-tmpl/default/en/acqui
Modified Files:
basket.tmpl histsearch.tmpl newbiblio.tmpl
suggestion-select.tmpl
Log Message:
big commit, still breaking things...
* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not
be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued
Index: basket.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** basket.tmpl 20 Jun 2005 14:13:22 -0000 1.22
--- basket.tmpl 26 Oct 2005 09:15:56 -0000 1.23
***************
*** 61,77 ****
<!-- TMPL_ELSE -->
<td>
- <p>
<a
href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber"
-->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!--
TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
<!-- TMPL_VAR
NAME="author" -->
<!-- TMPL_IF
name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! <!-- TMPL_IF
name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! </p>
</td>
<!-- /TMPL_IF -->
! <td class="number"><!-- TMPL_VAR
NAME="rrp" --></td>
! <td class="doNotPrint number"><!--
TMPL_VAR NAME="ecost" --></td>
! <td class="number"><!-- TMPL_VAR
NAME="quantity" --></td>
! <td class="number"><!-- TMPL_VAR
NAME="line_total" --></td>
! <td class="doNotPrint"><!-- TMPL_VAR
NAME="bookfundid" --></td>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS
name="closedate" -->
--- 61,75 ----
<!-- TMPL_ELSE -->
<td>
<a
href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber"
-->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!--
TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
<!-- TMPL_VAR
NAME="author" -->
<!-- TMPL_IF
name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! <!-- TMPL_IF
name="notes" --></p><p class="doNotPrint"><i><!--TMPL_VAR name="notes"
--></i><!-- /TMPL_IF -->
</td>
<!-- /TMPL_IF -->
! <td class="number"><p><!-- TMPL_VAR
NAME="rrp" --></p></td>
! <td class="doNotPrint number"><p><!--
TMPL_VAR NAME="ecost" --></p></td>
! <td class="number"><p><!-- TMPL_VAR
NAME="quantity" --></p></td>
! <td class="number"><p><!-- TMPL_VAR
NAME="line_total" --></p></td>
! <td class="doNotPrint"><p><!-- TMPL_VAR
NAME="bookfundid" --></p></td>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS
name="closedate" -->
***************
*** 101,119 ****
<p><!-- TMPL_VAR NAME="grand_total_est"
--></p>
</td>
- <td class="acquisition number">
- <p><!-- TMPL_VAR NAME="sub_total"
--></p>
- <p><!-- TMPL_VAR NAME="gist" --></p>
- <p><!-- TMPL_VAR NAME="grand_total"
--></p>
- </td>
<td class="acquisition">
- <p><!-- TMPL_VAR name="qty_total"
--></p>
<p> </p>
<p> </p>
- </td>
- <td class="acquisition">
<p> </p>
<p> </p>
<p> </p>
</td>
<td class="acquisition">
<p> </p>
--- 99,117 ----
<p><!-- TMPL_VAR NAME="grand_total_est"
--></p>
</td>
<td class="acquisition">
<p> </p>
<p> </p>
<p> </p>
+ </td>
+ <td class="acquisition number">
+ <p><!-- TMPL_VAR name="qty_total"
--></p>
<p> </p>
<p> </p>
</td>
+ <td class="acquisition number">
+ <p><!-- TMPL_VAR NAME="sub_total"
--></p>
+ <p><!-- TMPL_VAR NAME="gist" --></p>
+ <p><!-- TMPL_VAR NAME="grand_total"
--></p>
+ </td>
<td class="acquisition">
<p> </p>
Index: histsearch.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** histsearch.tmpl 21 Jun 2005 10:09:39 -0000 1.5
--- histsearch.tmpl 26 Oct 2005 09:15:56 -0000 1.6
***************
*** 7,13 ****
<tr>
<th class="acquisition"> </th>
- <th class="acquisition">Title</th>
- <th class="acquisition">Author</th>
<th class="acquisition">Supplier</th>
<th class="acquisition">Placed on</th>
<th class="acquisition">Recieved on</th>
--- 7,12 ----
<tr>
<th class="acquisition"> </th>
<th class="acquisition">Supplier</th>
+ <th class="acquisition">Title/Author</th>
<th class="acquisition">Placed on</th>
<th class="acquisition">Recieved on</th>
***************
*** 17,32 ****
</tr>
<tr>
! <form>
<th class="acquisition">
Filter on
</th>
<th class="acquisition">
! <input type="text" name="title"
value="<!-- TMPL_VAR name="title"-->">
</th>
<th class="acquisition">
<input type="text" name="author"
value="<!-- TMPL_VAR name="author" -->">
</th>
<th class="acquisition">
! <input type="text" name="name"
value="<!-- TMPL_VAR name="name" -->">
</th>
<th class="acquisition">
--- 16,89 ----
</tr>
<tr>
! <form action="/cgi-bin/koha/acqui/histsearch.pl"
method="get">
<th class="acquisition">
Filter on
</th>
<th class="acquisition">
! <input type="text" name="name"
value="<!-- TMPL_VAR name="name" -->">
</th>
<th class="acquisition">
+ <input type="text" name="title"
value="<!-- TMPL_VAR name="title"-->">/
<input type="text" name="author"
value="<!-- TMPL_VAR name="author" -->">
</th>
<th class="acquisition">
! From <img src="<!-- TMPL_VAR
Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0"
vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
! <input type="text" readonly="readonly"
size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR
name="from_placed_on" -->">
! <script language="JavaScript"
type="text/javascript">
! function validate1(date) {
! var day =
date.getDate();
! var month =
date.getMonth() + 1;
! var year =
date.getFullYear();
! var weekDay =
date.getDay();
! var dayMonth = month +
'-' + day;
! var dateString = year +
'-' + month + '-' + day;
! var dateTo =
document.getElementById('to').value.split("-");
! var limitDate = new
Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
! if (date > limitDate) {
! return true;
! } else {
! return false;
! }
! }
! Calendar.setup(
! {
! inputField :
"from",
! ifFormat :
"%Y-%m-%d",
! button :
"openCalendarFrom",
! disableFunc :
validate1,
! dateStatusFunc
: validate1
! }
! );
! </script>
! <br/>
! To <img src="<!-- TMPL_VAR
Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo"
style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
! <input readonly="readonly" size="10"
id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->"
type="text">
! <script type="text/javascript">
! function validate2(date) {
! var day =
date.getDate();
! var month =
date.getMonth() + 1;
! var year =
date.getFullYear();
! var weekDay =
date.getDay();
! var dayMonth = month +
'-' + day;
! var dateString = year +
'-' + month + '-' + day;
! var dateFrom =
document.getElementById('from').value.split("-");
! var limitDate = new
Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
! if (limitDate > date) {
! return true;
! } else {
! return false;
! }
! }
!
! Calendar.setup(
! {
! inputField :
"to",
! ifFormat :
"%Y-%m-%d",
! button :
"openCalendarTo",
! disableFunc :
validate2,
! dateStatusFunc
: validate2
! }
! );
! </script>
</th>
<th class="acquisition">
***************
*** 108,137 ****
<!-- TMPL_LOOP NAME="suggestions_loop" -->
<tr>
! <td>
! <!-- TMPL_VAR Name="count"-->
! </td>
! <td>
! <a href="basket.pl?basket=<!-- TMPL_VAR
name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a>
! </td>
! <td>
! <!-- TMPL_VAR NAME="author" -->
! </td>
! <td>
<!-- TMPL_VAR NAME="name" -->
</td>
! <td>
<!-- TMPL_VAR name="creationdate" -->
</td>
! <td>
<!-- TMPL_VAR name="datereceived" -->
</td>
! <td>
<!-- TMPL_VAR name="quantity" -->
</td>
! <td>
<!-- TMPL_VAR name="ecost" -->
</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
</div>
--- 165,239 ----
<!-- TMPL_LOOP NAME="suggestions_loop" -->
<tr>
! <!-- TMPL_IF name="toggle" -->
! <td class="hilighted">
! <!-- TMPL_ELSE -->
! <td>
! <!-- /TMPL_IF -->
! <!-- TMPL_VAR NAME="count" -->
! </td>
! <!-- TMPL_IF name="toggle" -->
! <td class="hilighted">
! <!-- TMPL_ELSE -->
! <td>
! <!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="name" -->
</td>
! <!-- TMPL_IF name="toggle" -->
! <td class="hilighted">
! <!-- TMPL_ELSE -->
! <td>
! <!-- /TMPL_IF -->
! <p><a href="basket.pl?basket=<!--
TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></p>
! <p><!-- TMPL_VAR NAME="author" --></p>
! </td>
! <!-- TMPL_IF name="toggle" -->
! <td class="hilighted">
! <!-- TMPL_ELSE -->
! <td>
! <!-- /TMPL_IF -->
<!-- TMPL_VAR name="creationdate" -->
</td>
! <!-- TMPL_IF name="toggle" -->
! <td class="hilighted">
! <!-- TMPL_ELSE -->
! <td>
! <!-- /TMPL_IF -->
<!-- TMPL_VAR name="datereceived" -->
</td>
! <!-- TMPL_IF name="toggle" -->
! <td class="hilighted number">
! <!-- TMPL_ELSE -->
! <td class="number">
! <!-- /TMPL_IF -->
<!-- TMPL_VAR name="quantity" -->
</td>
! <!-- TMPL_IF name="toggle" -->
! <td class="hilighted number">
! <!-- TMPL_ELSE -->
! <td class="number">
! <!-- /TMPL_IF -->
<!-- TMPL_VAR name="ecost" -->
</td>
+ <!-- TMPL_IF name="toggle" -->
+ <td class="hilighted">
+ <!-- TMPL_ELSE -->
+ <td>
+ <!-- /TMPL_IF -->
+
+ </td>
+
</tr>
<!-- /TMPL_LOOP -->
+ <tr>
+ <th class="acquisition"> </th>
+ <th class="acquisition"> </th>
+ <th class="acquisition"> </th>
+ <th class="acquisition"> </th>
+ <th class="acquisition"> </th>
+ <th class="acquisition"> </th>
+ <th class="acquisition"><!-- TMPL_VAR name="total_qty"
--></th>
+ <th class="acquisition"><!-- TMPL_VAR
name="total_price" --></th>
+ <th class="acquisition"> </th>
+ </tr>
</table>
</div>
Index: newbiblio.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** newbiblio.tmpl 22 Jun 2005 09:36:24 -0000 1.20
--- newbiblio.tmpl 26 Oct 2005 09:15:56 -0000 1.21
***************
*** 171,187 ****
<p>
<label class="label100">Replacement Cost </label>
! <input type="text" size="20" name="rrp" value="<!--
TMPL_VAR NAME="rrp" -->" onchange="update(this.form)">
</p>
<p>
<label class="label100">Budgeted Cost</label>
! <input type="text" size="20" name="ecost" value="<!--
TMPL_VAR NAME="ecost" -->" onchange="update(this.form)">
</p>
<p>
<label class="label100">Budgeted GST</label>
! <input type="text" size="20" name="GST" value=""
onchange="update(this.form)">
</p>
<p>
<label class="label100"><b>BUDGETED TOTAL</b></label>
! <input type="text" size="20" name="total" value=""
onchange="update(this.form)">
</p>
<p>
--- 171,187 ----
<p>
<label class="label100">Replacement Cost </label>
! <input type="text" size="20" name="rrp" value="<!--
TMPL_VAR NAME="rrp" -->">
</p>
<p>
<label class="label100">Budgeted Cost</label>
! <input type="text" size="20" name="ecost" value="<!--
TMPL_VAR NAME="ecost" -->">
</p>
<p>
<label class="label100">Budgeted GST</label>
! <input type="text" size="20" name="GST" value="">
</p>
<p>
<label class="label100"><b>BUDGETED TOTAL</b></label>
! <input type="text" size="20" name="total" value="">
</p>
<p>
Index: suggestion-select.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** suggestion-select.tmpl 4 May 2005 08:52:50 -0000 1.5
--- suggestion-select.tmpl 26 Oct 2005 09:15:56 -0000 1.6
***************
*** 10,14 ****
</tr>
<tr>
! <form>
<th class="acquisition">
<p>Filter on :
--- 10,14 ----
</tr>
<tr>
! <form action="/cgi-bin/koha/acqui/suggestion-select.pl"
method="get">
<th class="acquisition">
<p>Filter on :
***************
*** 57,61 ****
<!-- /TMPL_LOOP -->
</table>
- <form>
</div>
<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
\ No newline at end of file
--- 57,60 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.22,1.23 histsearch.tmpl,1.5,1.6 newbiblio.tmpl,1.20,1.21 suggestion-select.tmpl,1.5,1.6,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/z3950 z3950-daemon-launch.sh,1.5,1.6
- Next by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities auth_finder.tmpl,1.8,1.9 authorities-home.tmpl,1.5,1.6 authorities.tmpl,1.10,1.11 detail.tmpl,1.5,1.6
- Previous by thread:
[Koha-cvs] CVS: koha/z3950 z3950-daemon-launch.sh,1.5,1.6
- Next by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities auth_finder.tmpl,1.8,1.9 authorities-home.tmpl,1.5,1.6 authorities.tmpl,1.10,1.11 detail.tmpl,1.5,1.6
- Index(es):