[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.34,1.35 moremember.tmpl,1.34,1.35
Paul POULAIN
tipaul at users.sourceforge.net
Wed May 4 11:00:02 CEST 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20592/koha-tmpl/intranet-tmpl/default/en/members
Modified Files:
memberentry.tmpl moremember.tmpl
Log Message:
synch'ing 2.2 and head
Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** memberentry.tmpl 1 Mar 2005 13:40:54 -0000 1.34
--- memberentry.tmpl 4 May 2005 08:59:59 -0000 1.35
***************
*** 31,35 ****
Surname<br>
<!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="aERROR_ddress" -->
Postal Street Address<br>
<!-- /TMPL_IF -->
--- 31,35 ----
Surname<br>
<!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="ERROR_address" -->
Postal Street Address<br>
<!-- /TMPL_IF -->
***************
*** 43,49 ****
<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
<input type="hidden" name="type" value="borrowers">
! <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
<!-- TMPL_IF NAME="addAction" -->
<input type="hidden" name="op" value="add">
--- 43,50 ----
<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
<input type="hidden" name="type" value="borrowers">
! <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
+ <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
<!-- TMPL_IF NAME="addAction" -->
<input type="hidden" name="op" value="add">
***************
*** 153,157 ****
</tr>
<tr>
! <td colspan="2"><input type="text" name="address" size="40" value="<!-- TMPL_VAR NAME="address" -->"></td>
<td>
<input type="text" name="zipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->">
--- 154,158 ----
</tr>
<tr>
! <td colspan="2"><input type="text" name="streetaddress" size="40" value="<!-- TMPL_VAR NAME="address" -->"></td>
<td>
<input type="text" name="zipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->">
***************
*** 172,176 ****
</tr>
<tr>
! <td colspan="2"><input type="text" name="streetaddress" size="40" value="<!-- TMPL_VAR NAME="streetaddress" -->"></td>
<td>
<input type="text" name="homezipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
--- 173,177 ----
</tr>
<tr>
! <td colspan="2"><input type="text" name="physstreet" size="40" value="<!-- TMPL_VAR NAME="physstreet" -->"></td>
<td>
<input type="text" name="homezipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
***************
*** 245,249 ****
<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
</tr>
- <!-- TMPL_IF NAME="modify" -->
<tr><td colspan="5">FLAGS</td></tr>
<!-- TMPL_LOOP NAME="flagloop" -->
--- 246,249 ----
***************
*** 255,259 ****
</tr>
<!-- /TMPL_LOOP -->
- <!-- /TMPL_IF -->
<tr>
--- 255,258 ----
Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** moremember.tmpl 1 Mar 2005 13:40:54 -0000 1.34
--- moremember.tmpl 4 May 2005 08:59:59 -0000 1.35
***************
*** 16,20 ****
<label class="label100">Membership Number: </label><!-- TMPL_VAR NAME="borrowernumber" --><br>
<label class="label100">Membership Category: </label><!-- TMPL_VAR NAME="categorycode" --><br>
! <label class="label100">Joined: </label><!-- TMPL_VAR NAME="dateenrolled" -->, Expires: <!-- TMPL_VAR NAME="expiry" --><br>
<label class="label100">Joining branch: </label><!-- TMPL_VAR NAME="branchcode" -->
</p>
--- 16,21 ----
<label class="label100">Membership Number: </label><!-- TMPL_VAR NAME="borrowernumber" --><br>
<label class="label100">Membership Category: </label><!-- TMPL_VAR NAME="categorycode" --><br>
! <label class="label100">Joined: </label><!-- TMPL_VAR NAME="dateenrolled" -->,<br>
! <label class="label100"> Expires:</label><!-- TMPL_VAR NAME="expiry" --><br>
<label class="label100">Joining branch: </label><!-- TMPL_VAR NAME="branchcode" -->
</p>
***************
*** 26,30 ****
<label class="label100">DoB: </label><!-- TMPL_VAR NAME="dateofbirth" --><br>
<label class="label100">Sex: </label><!-- TMPL_VAR NAME="sex" --><br>
- Alternative
<!-- /TMPL_UNLESS -->
<label class="label100">Contact: </label><!-- TMPL_VAR NAME="contactname" --><br>
--- 27,30 ----
***************
*** 67,71 ****
<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
<!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
<!-- /TMPL_IF -->
<a href="javascript:confirm_deletion()" class="button">Delete</a>
--- 67,71 ----
<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
<!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
<!-- /TMPL_IF -->
<a href="javascript:confirm_deletion()" class="button">Delete</a>
***************
*** 173,183 ****
<!-- TMPL_LOOP NAME="issueloop" -->
<tr>
! <td><!-- TMPL_IF NAME="red" --><font color="red"><!-- /TMPL_IF -->
! <!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="red" --></font><!-- /TMPL_IF -->
<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
<!-- TMPL_VAR NAME="barcode" -->
! </a>
</td>
! <td><!-- TMPL_VAR NAME="date_due" --></td>
<td><!-- TMPL_VAR NAME="itemtype" --></td>
<td><!-- TMPL_VAR NAME="charge" --></td>
--- 173,183 ----
<!-- TMPL_LOOP NAME="issueloop" -->
<tr>
! <td><!-- TMPL_IF NAME="red" --><p class="problem"><!-- TMPL_ELSE --> <p><!-- /TMPL_IF -->
! <!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF name="itemcallnumber" --> <i>(<!-- TMPL_VAR name="itemcallnumber" -->)</i> <!-- /TMPL_IF -->
<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
<!-- TMPL_VAR NAME="barcode" -->
! </a></p>
</td>
! <td><!-- TMPL_IF NAME="red" --><p class="problem"><!-- TMPL_ELSE --> <p><!-- /TMPL_IF --><!-- TMPL_VAR NAME="date_due" --></p></td>
<td><!-- TMPL_VAR NAME="itemtype" --></td>
<td><!-- TMPL_VAR NAME="charge" --></td>
More information about the Koha-cvs
mailing list