[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/parameters auth_
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters auth_tag_structure.tmpl,1.2,1.3 categorie.tmpl,1.23,1.24 issuingrules.tmpl,1.4,1.5 itemtypes.tmpl,1.20,1.21 marc_subfields_structure.tmpl,1.40,1.41 |
|
Date: |
Tue, 01 Mar 2005 05:42:00 -0800 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/en/parameters
Modified Files:
auth_tag_structure.tmpl categorie.tmpl issuingrules.tmpl
itemtypes.tmpl marc_subfields_structure.tmpl
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits
done here
Index: auth_tag_structure.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** auth_tag_structure.tmpl 19 Jul 2004 19:19:54 -0000 1.2
--- auth_tag_structure.tmpl 1 Mar 2005 13:40:54 -0000 1.3
***************
*** 89,92 ****
--- 89,93 ----
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
<input type="hidden" name="op" value="delete_confirmed">
+ <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR
name="authtypecode" -->">
<input type="hidden" name="searchfield" value="<!-- TMPL_VAR
NAME="searchfield" -->">
<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
Index: categorie.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** categorie.tmpl 20 Jan 2005 20:20:01 -0000 1.23
--- categorie.tmpl 1 Mar 2005 13:40:54 -0000 1.24
***************
*** 255,261 ****
<td background="<!-- TMPL_VAR NAME="themelang"
-->/images/background-mem.gif"><b>Upper Age Limit</b></td>
<td background="<!-- TMPL_VAR NAME="themelang"
-->/images/background-mem.gif"><b>Age Required</b></td>
- <td background="<!-- TMPL_VAR NAME="themelang"
-->/images/background-mem.gif"><b>Fine</b></td>
<td background="<!-- TMPL_VAR NAME="themelang"
-->/images/background-mem.gif"><b>Overdue</b></td>
- <td background="<!-- TMPL_VAR NAME="themelang"
-->/images/background-mem.gif"><b>Issue limit</b></td>
<td background="<!-- TMPL_VAR NAME="themelang"
-->/images/background-mem.gif"><b>Reserve</b></td>
<td background="<!-- TMPL_VAR NAME="themelang"
-->/images/background-mem.gif"> </td>
--- 255,259 ----
***************
*** 270,274 ****
<td><!-- TMPL_VAR NAME="upperagelimit" --></td>
<td><!-- TMPL_VAR NAME="dateofbirthrequired"
--></td>
- <td><!-- TMPL_VAR NAME="finetype" --></td>
<td><!-- TMPL_IF NAME="overduenoticerequired"
-->
<i>Yes</i>
--- 268,271 ----
***************
*** 277,281 ****
<!-- /TMPL_IF -->
</td>
- <td><!-- TMPL_VAR NAME="issuelimit" --></td>
<td><!-- TMPL_VAR NAME="reservefee" --></td>
<td><a href="<!-- TMPL_VAR NAME="script_name"
-->?op=add_form&categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0"></a></td>
--- 274,277 ----
Index: issuingrules.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** issuingrules.tmpl 20 Jan 2005 17:38:16 -0000 1.4
--- issuingrules.tmpl 1 Mar 2005 13:40:55 -0000 1.5
***************
*** 4,9 ****
<div id="bloc25">
<h2 class="parameters">HINT for issues</h2>
! <p>Each box needs to be filled in with issuelength,maxissues</p>
! <p>eq 21,5 enables 5 issues for 21 days</p>
<h2 class="parameters">HINT for fines</h2>
<p>Each box needs to be filled in with fine,time to start
charging,charging cycle</p>
--- 4,9 ----
<div id="bloc25">
<h2 class="parameters">HINT for issues</h2>
! <p>Each box needs to be filled with issuelength, maxissues</p>
! <p> - eg: 21,5 enables 21 day loan with 5 issues</p>
<h2 class="parameters">HINT for fines</h2>
<p>Each box needs to be filled in with fine,time to start
charging,charging cycle</p>
Index: itemtypes.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** itemtypes.tmpl 13 Sep 2004 15:31:42 -0000 1.20
--- itemtypes.tmpl 1 Mar 2005 13:40:55 -0000 1.21
***************
*** 131,134 ****
--- 131,135 ----
<th class="parameters">Code</th>
<th class="parameters">Description</th>
+ <th class="parameters">not for loan</th>
<th class="parameters">Renewable</th>
<th class="parameters">Charge</th>
***************
*** 140,150 ****
<td><!-- TMPL_VAR NAME="itemtype" --></td>
<td><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_IF NAME="renewalsallowed" -->
! <!-- TMPL_VAR name="renewalsallowed"
--> time(s)
! <!-- TMPL_ELSE -->
! No
! <!-- /TMPL_IF -->
</td>
! <td><!-- TMPL_VAR NAME="rentalcharge" --></td>
<td><a href="<!-- TMPL_VAR NAME="script_name"
-->?op=add_form&itemtype=<!-- TMPL_VAR NAME="itemtype" escape="HTML" -->"><img
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0"></a></td>
<td><a href="<!-- TMPL_VAR NAME="script_name"
-->?op=delete_confirm&itemtype=<!-- TMPL_VAR NAME="itemtype" escape="HTML"
-->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
--- 141,154 ----
<td><!-- TMPL_VAR NAME="itemtype" --></td>
<td><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_IF NAME="notforloan" -->Yes<!-- /TMPL_IF
--></td>
! <td><!-- TMPL_UNLESS name="notforloan" -->
! <!-- TMPL_IF NAME="renewalsallowed" -->
! <!-- TMPL_VAR
name="renewalsallowed" --> time(s)
! <!-- TMPL_ELSE -->
! No
! <!-- /TMPL_IF -->
! <!-- /TMPL_UNLESS -->
</td>
! <td><!-- TMPL_UNLESS name="notforloan" --><!-- TMPL_VAR
NAME="rentalcharge" --><!-- /TMPL_UNLESS --></td>
<td><a href="<!-- TMPL_VAR NAME="script_name"
-->?op=add_form&itemtype=<!-- TMPL_VAR NAME="itemtype" escape="HTML" -->"><img
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0"></a></td>
<td><a href="<!-- TMPL_VAR NAME="script_name"
-->?op=delete_confirm&itemtype=<!-- TMPL_VAR NAME="itemtype" escape="HTML"
-->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
Index: marc_subfields_structure.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** marc_subfields_structure.tmpl 10 Feb 2005 22:43:53 -0000 1.40
--- marc_subfields_structure.tmpl 1 Mar 2005 13:40:55 -0000 1.41
***************
*** 16,20 ****
<table>
<!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
<td>
<h2 class="parameters">Tag <!-- TMPL_VAR
NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
--- 16,20 ----
<table>
<!-- TMPL_LOOP NAME="loop" -->
! <tr>
<td>
<h2 class="parameters">Tag <!-- TMPL_VAR
NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters auth_tag_structure.tmpl,1.2,1.3 categorie.tmpl,1.23,1.24 issuingrules.tmpl,1.4,1.5 itemtypes.tmpl,1.20,1.21 marc_subfields_structure.tmpl,1.40,1.41,
Paul POULAIN <=