[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/sugge... [rel_2_2]
|
From: |
Owen Leonard |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/sugge... [rel_2_2] |
|
Date: |
Thu, 18 May 2006 20:23:36 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Owen Leonard <address@hidden> 06/05/18 20:23:36
Modified files:
koha-tmpl/intranet-tmpl/npl/en/acqui: suggestion-select.tmpl
koha-tmpl/intranet-tmpl/npl/en/bull: subscription-add.tmpl
subscription-detail.tmpl
koha-tmpl/intranet-tmpl/npl/en: stats.tmpl
Log message:
Synching with default template
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.2&tr2=1.1.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl.diff?only_with_tag=rel_2_2&tr1=1.2.2.3&tr2=1.2.2.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl.diff?only_with_tag=rel_2_2&tr1=1.2.2.4&tr2=1.2.2.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl.diff?only_with_tag=rel_2_2&tr1=1.2&tr2=1.2.2.1&r1=text&r2=text
Patches:
Index: koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl
diff -u
koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl:1.1.2.2
koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl:1.1.2.3
--- koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl:1.1.2.2
Tue Apr 19 17:17:48 2005
+++ koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl Thu May
18 20:23:36 2006
@@ -19,6 +19,7 @@
<th>Suggestion</th>
<th>Suggested by</th>
<th>Accepted by</th>
+ <th>Duplicate</th>
<th> </th>
</tr>
<!-- TMPL_LOOP NAME="suggestions_loop" -->
@@ -41,6 +42,12 @@
<!-- TMPL_VAR NAME="surnamemanagedby"
--><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR
NAME="firstnamemanagedby" -->
</td>
<td>
+ <!-- TMPL_IF
name="duplicateBiblionumber" -->
+ <a href="#"
onclick="window.open('/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR
name="duplicateBiblionumber" -->')">Duplicate suspected</a>
+ <a
href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR
name="supplierid" -->&basketno=<!-- TMPL_VAR
name="basketno"-->&op=connectDuplicate&duplicateNumber=<!-- TMPL_VAR
name="duplicateBiblionumber" -->&suggestionid=<!-- TMPL_VAR
name="suggestionid" -->">Connect</a>
+ <!-- /TMPL_IF -->
+ </td>
+ <td>
<!-- 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"
-->">Order</a>
<!-- TMPL_ELSE -->
Index: koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl:1.2.2.3
koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl:1.2.2.4
--- koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl:1.2.2.3
Thu Mar 9 20:36:42 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl Thu May
18 20:23:36 2006
@@ -167,20 +167,22 @@
<td><input type="text" name="every2"
value="<!-- TMPL_VAR name="every2" -->"></td>
<td><input type="text" name="every3"
value="<!-- TMPL_VAR name="every3" -->"></td>
</tr>
- <tr>
- <th scope="row"><label for="whenmorethan1">When
more than:</label></th>
- <td><input type="text" id="whenmorethan1"
name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
- <td><input type="text" name="whenmorethan2"
value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
- <td><input type="text" name="whenmorethan3"
value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
- </tr>
<!-- TMPL_IF name="mod" -->
<tr>
<th scope="row"><label for="innerloop">The loop
is for instance:</label></th>
+ <!-- TMPL_ELSE -->
+ <td>Starting period</td>
+ <!-- /TMPL_IF -->
<td><input type="text" id="innerloop"
name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
<td><input type="text" name="innerloop2"
value="<!-- TMPL_VAR name="innerloop2" -->"></td>
<td><input type="text" name="innerloop3"
value="<!-- TMPL_VAR name="innerloop3" -->"></td>
</tr>
- <!-- /TMPL_IF -->
+ <tr>
+ <th scope="row"><label for="whenmorethan1">When
more than:</label></th>
+ <td><input type="text" id="whenmorethan1"
name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
+ <td><input type="text" name="whenmorethan2"
value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
+ <td><input type="text" name="whenmorethan3"
value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
+ </tr>
<tr>
<th scope="row"><label for="setto1">...Set back
to:</label></th>
<td><input type="text" id="setto1"
name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
Index: koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
diff -u
koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl:1.2.2.4
koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl:1.2.2.5
--- koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl:1.2.2.4
Tue Jan 10 21:30:36 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl Thu May
18 20:23:36 2006
@@ -135,13 +135,16 @@
<td><!-- TMPL_VAR name="every3" --></td>
</tr>
<tr>
- <th scope="row">When more than:</th>
- <td><!-- TMPL_VAR name="whenmorethan1" --> <!--
TMPL_IF name="innerloop1" --><br/>
- <i>(is <!-- TMPL_VAR name="innerloop1"
-->)</i><!-- /TMPL_IF --></td>
- <td><!-- TMPL_VAR name="whenmorethan2" --> <!--
TMPL_IF name="innerloop2" --><br/>
- <i>(is <!-- TMPL_VAR name="innerloop2"
-->)</i><!-- /TMPL_IF --></td>
- <td><!-- TMPL_VAR name="whenmorethan3" --> <!--
TMPL_IF name="innerloop3" --><br/>
- <i>(is <!-- TMPL_VAR name="innerloop3"
-->)</i><!-- /TMPL_IF --></td>
+ <th scope="row">Starting period</th>
+ <td><!-- TMPL_IF name="innerloop1" --><!--
TMPL_VAR name="innerloop1" --><!-- /TMPL_IF --></td>
+ <td><!-- TMPL_IF name="innerloop2" --><!--
TMPL_VAR name="innerloop2" --><!-- /TMPL_IF --></td>
+ <td><!-- TMPL_IF name="innerloop3" --><!--
TMPL_VAR name="innerloop3" --><!-- /TMPL_IF --></td>
+ </tr>
+ <tr>
+ <th scope="row">When more than</th>
+ <td><!-- TMPL_VAR name="whenmorethan1" --></td>
+ <td><!-- TMPL_VAR name="whenmorethan2" --></td>
+ <td><!-- TMPL_VAR name="whenmorethan3" --></td>
</tr>
<tr>
<th scope="row">Set back to:</th>
Index: koha/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl
diff -u /dev/null koha/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl:1.2.2.1
--- /dev/null Thu May 18 20:23:36 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl Thu May 18 20:23:36 2006
@@ -0,0 +1,34 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Statistics<!--
TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+ <div id="main">
+ <!-- TMPL_IF NAME="loop1" -->
+ <table>
+ <caption>Statistics</caption>
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ <th>Type</th>
+ <th>Date/time</th>
+ <th>Amount</th>
+ <th>Branch</th>
+ <tr>
+ <!-- TMPL_LOOP name="loop1" -->
+ <tr>
+ <td><!-- TMPL_VAR NAME="name" --></td>
+ <td><!-- TMPL_VAR NAME="description" --></td>
+ <td><!-- TMPL_VAR NAME="type" --></td>
+ <td><!-- TMPL_VAR NAME="time" --></td>
+ <td><!-- TMPL_VAR NAME="amount" --></td>
+ <td><!-- TMPL_VAR NAME="branch" --></td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+ <p>Total paid: <!-- TMPL_VAR NAME="total" --><br>Total written
off: <!-- TMPL_VAR NAME="totalw" --></p>
+ <!-- TMPL_ELSE -->
+ <h3>No statistics to report</h3>
+ <!-- /TMPL_IF -->
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/sugge... [rel_2_2],
Owen Leonard <=