[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.5,1.6 memberentry.tmpl,1.5,1.6 moremember.tmpl,1.8,1.9

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31886/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
        member.tmpl memberentry.tmpl moremember.tmpl 
Log Message:
Synching with rel_2_2.

Index: member.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** member.tmpl 10 Jan 2005 16:49:17 -0000      1.5
--- member.tmpl 2 May 2005 20:21:12 -0000       1.6
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
!         <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- 
TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
!         <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- 
TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->

Index: memberentry.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** memberentry.tmpl    17 Feb 2005 21:28:45 -0000      1.5
--- memberentry.tmpl    2 May 2005 20:21:12 -0000       1.6
***************
*** 49,53 ****
                <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" -->">
--- 49,53 ----
                <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" -->">
***************
*** 84,93 ****
        <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="othernames">Prefered Name:</label></th><td colspan="4"><input type="text" 
id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR 
NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
  
!       <tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing 
Address</legend><label for="address"<!-- TMPL_IF NAME="ERROR_address" --> 
class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> 
</label><input type="text" id="address" name="address" size="25" value="<!-- 
TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> 
class="focus"<!-- /TMPL_IF -->>
  <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- 
/TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input 
type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" 
-->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->>
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" 
name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" 
-->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="streetaddress">Address:</label><input type="text" 
id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR 
NAME="streetaddress" -->">
  <br><label for="streetcity">City, State: </label><input type="text" 
id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR 
NAME="streetcity" -->">
  <br><label for="homezipcode">Zip Code:</label><input type="text" 
id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- 
TMPL_VAR NAME="homezipcode" -->">
--- 84,93 ----
        <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="othernames">Prefered Name:</label></th><td colspan="4"><input type="text" 
id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR 
NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
  
!       <tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing 
Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> 
class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> 
</label><input type="text" id="streetaddress" name="streetaddress" size="25" 
value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> 
class="focus"<!-- /TMPL_IF -->>
  <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- 
/TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input 
type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" 
-->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->>
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" 
name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" 
-->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" 
name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->">
  <br><label for="streetcity">City, State: </label><input type="text" 
id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR 
NAME="streetcity" -->">
  <br><label for="homezipcode">Zip Code:</label><input type="text" 
id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- 
TMPL_VAR NAME="homezipcode" -->">
***************
*** 118,123 ****
                </table></div><!-- /TMPL_UNLESS -->
  
- 
- <!-- TMPL_IF NAME="modify" -->
  <div class="table members"><table>
        <caption>Flags</caption>
--- 118,121 ----
***************
*** 126,130 ****
                                <!-- /TMPL_LOOP -->
  </table></div>
-                       <!-- /TMPL_IF -->
  
  <div class="table members"><table>
--- 124,127 ----

Index: moremember.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** moremember.tmpl     17 Feb 2005 18:02:54 -0000      1.8
--- moremember.tmpl     2 May 2005 20:21:12 -0000       1.9
***************
*** 10,17 ****
                         <form method="post" 
action="/cgi-bin/koha/circ/circulation.pl"><input name="findborrower" 
type="hidden" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input 
type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /><input 
type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input 
type="submit" class="submit" value="Issue" /></form>
  
! <!-- Hide from NPL --><!-- TMPL_IF name="IS_ADULT" --> <form 
action="/cgi-bin/koha/jmemberentry.pl" method="post"> <input type="submit" 
name="submit" value="Add Child" class="submit" alt="Add Child" /><input 
type="hidden" name="type" value="add" /><input type="hidden" name="bornum" 
value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></form><!-- /TMPL_IF --><!-- 
/Hide from NPL -->
  
! <!-- TMPL_IF name="I" --> <form 
action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input 
type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input 
type="submit" name="modify" class="submit" value="Modify" /></form>
! <!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl" 
method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR 
NAME="bornum" -->" /> <input type="submit" class="submit" name="modify" 
value="Edit" /></form>
  <!-- /TMPL_IF -->
  
--- 10,17 ----
                         <form method="post" 
action="/cgi-bin/koha/circ/circulation.pl"><input name="findborrower" 
type="hidden" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input 
type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /><input 
type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input 
type="submit" class="submit" value="Issue" /></form>
  
! <!-- Hide from NPL --><!-- TMPL_IF name="IS_ADULT" --> <form 
action="/cgi-bin/koha/jmemberentry.pl" method="post"> <input type="submit" 
name="submit" value="Add Child" class="submit" alt="Add Child" /><input 
type="hidden" name="type" value="add" /><input type="hidden" 
name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" 
/></form><!-- /TMPL_IF --><!-- /Hide from NPL -->
  
! <!-- TMPL_IF name="I" --> <form 
action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input 
type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" /> 
<input type="submit" name="modify" class="submit" value="Edit" /></form>
! <!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl" 
method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="bornum" -->" /> <input type="submit" class="submit" name="modify" 
value="Edit" /></form>
  <!-- /TMPL_IF -->
  
***************
*** 21,25 ****
  
  
! <form action="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR 
NAME="bornum" -->" onclick="confirm_deletion(); return false;"><input 
type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->"><input 
type="submit" class="cancel" value="Delete"></form>
  
  </div>
--- 21,25 ----
  
  
! <form action="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR 
NAME="bornum" -->" onclick="confirm_deletion(); return false;"><input 
type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" 
-->"><input type="submit" class="cancel" value="Delete"></form>
  
  </div>
***************
*** 35,41 ****
  <div class="compact">
  <table>
! <tr><th>Name:</th><td><!-- TMPL_IF name="IS_ADULT" --><!-- TMPL_IF 
NAME="title" --><!-- TMPL_VAR NAME="title" -->. <!-- /TMPL_IF --><!-- TMPL_VAR 
NAME="firstname" --> <!-- TMPL_IF NAME="othernames" -->"<!-- TMPL_VAR 
NAME="othernames" -->" <!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" --> <!-- 
TMPL_IF NAME="initials" -->(<!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF 
--><!-- /TMPL_IF --></td></tr>
!               <tr><th>Address:</th><td><!-- TMPL_IF NAME="streetaddress" 
--><!-- TMPL_VAR NAME="streetaddress" --><br /><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="physstreet" --><!-- TMPL_VAR NAME="physstreet" --><br 
/><!-- /TMPL_IF --><!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" 
--></td></tr>
                <!-- TMPL_UNLESS name="I" -->
                <tr><th>Home Phone: </th><td><!-- TMPL_IF NAME="phone" --><!-- 
TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF 
--></td></tr><!-- /TMPL_UNLESS -->
--- 35,42 ----
  <div class="compact">
  <table>
! <tr><th>Name:</th><td><!-- TMPL_IF name="IS_ADULT" --><!-- TMPL_IF 
NAME="title" -->[<!-- TMPL_VAR NAME="title" -->]. <!-- /TMPL_IF --><!-- 
TMPL_VAR NAME="firstname" --> <!-- TMPL_IF NAME="othernames" -->"<!-- TMPL_VAR 
NAME="othernames" -->" <!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" --> <!-- 
TMPL_IF NAME="initials" -->(<!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF 
--><!-- /TMPL_IF --></td></tr>
!               <tr><th>Mailing Address:</th><td><!-- TMPL_IF 
NAME="streetaddress" --><!-- TMPL_VAR NAME="streetaddress" --><br /><!-- 
/TMPL_IF -->
! <!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" --></td></tr>
!               <!-- TMPL_IF NAME="physstreet" --><tr><th>Street 
Address:</th><td><!-- TMPL_VAR NAME="physstreet" --><br /><!-- TMPL_VAR 
NAME="streetcity" -->, <!-- TMPL_VAR NAME="homezipcode" --></td></tr><!-- 
/TMPL_IF -->
                <!-- TMPL_UNLESS name="I" -->
                <tr><th>Home Phone: </th><td><!-- TMPL_IF NAME="phone" --><!-- 
TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF 
--></td></tr><!-- /TMPL_UNLESS -->