[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember-print.tmpl,1.1,1.2 moremember-receipt.tmpl,1.1,1.2 member.tmpl,1.14,1.15 memberentry.tmpl,1.33,1.34 members-home.tmpl,1.11,1.12 moremember.tmpl,1.33,1.34 readingrec.tmpl,1.13,1.14
Paul POULAIN
tipaul at users.sourceforge.net
Tue Mar 1 14:42:01 CET 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/en/members
Modified Files:
member.tmpl memberentry.tmpl members-home.tmpl moremember.tmpl
readingrec.tmpl
Added Files:
moremember-print.tmpl moremember-receipt.tmpl
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here
Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** member.tmpl 27 Oct 2004 07:49:50 -0000 1.14
--- member.tmpl 1 Mar 2005 13:40:54 -0000 1.15
***************
*** 7,10 ****
--- 7,15 ----
<form action="/cgi-bin/koha/members/member.pl" method="post">
<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">
+ order by
+ <select name="orderby">
+ <option value="surname,firstname">Surname</option>
+ <option value="cardnumber">Cardnumber</option>
+ </select>
<input type="submit" class="button" value="OK">
</form>
Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** memberentry.tmpl 15 Dec 2004 21:52:25 -0000 1.33
--- memberentry.tmpl 1 Mar 2005 13:40:54 -0000 1.34
***************
*** 45,48 ****
--- 45,49 ----
<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">
***************
*** 52,56 ****
<table>
<tr>
! <td colspan="5">Member# <!-- TMPL_VAR NAME="member" -->, Card number* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
</tr>
<tr>
--- 53,57 ----
<table>
<tr>
! <td colspan="5"><b>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</b> <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
</tr>
<tr>
***************
*** 147,151 ****
<tr>
<td colspan="2"><b>Postal Address*</b></td>
! <td><b>Zipcode</b></td>
<td><b> Town*</b></td>
<td>Joining Branch</td>
--- 148,152 ----
<tr>
<td colspan="2"><b>Postal Address*</b></td>
! <td>Zipcode</td>
<td><b> Town*</b></td>
<td>Joining Branch</td>
Index: members-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** members-home.tmpl 19 Jul 2004 20:33:52 -0000 1.11
--- members-home.tmpl 1 Mar 2005 13:40:54 -0000 1.12
***************
*** 6,10 ****
<div class="bloctitle">Member Search</div>
<form action="/cgi-bin/koha/members/member.pl" method="post">
! <input type="text" size="50" name="member" >
<input type="submit" class="button" value="OK">
<p>Renew Items, view add, modify and delete records, all by starting with this search.</p>
--- 6,15 ----
<div class="bloctitle">Member Search</div>
<form action="/cgi-bin/koha/members/member.pl" method="post">
! <p><input type="text" size="30" name="member" >
! order by
! <select name="orderby">
! <option value="surname,firstname">Surname</option>
! <option value="cardnumber">Cardnumber</option>
! </select>
<input type="submit" class="button" value="OK">
<p>Renew Items, view add, modify and delete records, all by starting with this search.</p>
Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** moremember.tmpl 27 Jan 2005 22:24:03 -0000 1.33
--- moremember.tmpl 1 Mar 2005 13:40:54 -0000 1.34
***************
*** 6,43 ****
<h2 class="members">Membership record</h2>
<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
! <p>Card number: <!-- TMPL_VAR NAME="cardnumber" --><br>
! Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
! <!-- TMPL_UNLESS name="I" -->Home Address: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
! Phone home: <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
! Phone daytime: <!-- TMPL_VAR NAME="phoneday" --><br>
! Fax: <!-- TMPL_VAR NAME="faxnumber" --><br>
! E-mail: <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
! Text messaging: <!-- TMPL_VAR NAME="textmessaging" --><br>
! Membership Number: <!-- TMPL_VAR NAME="borrowernumber" --><br>
! Membership Category: <!-- TMPL_VAR NAME="categorycode" --><br>
! Fee: $30/year, Paid<br>
! Joined: <!-- TMPL_VAR NAME="dateenrolled" -->, Expires: <!-- TMPL_VAR NAME="expiry" --><br>
! Joining branch: <!-- TMPL_VAR NAME="branchcode" -->
</p>
<p>
<!-- TMPL_IF NAME="printethnicityline" -->
! Ethnicity: <!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="I" -->
! DoB: <!-- TMPL_VAR NAME="dateofbirth" --><br>
! Sex: <!-- TMPL_VAR NAME="sex" --><br>
Alternative
<!-- /TMPL_UNLESS -->
! Contact: <!-- TMPL_VAR NAME="contactname" --><br>
! Phone: <!-- TMPL_VAR NAME="altphone" --><br>
<!-- TMPL_UNLESS name="I" -->
! Relationship: <!-- TMPL_VAR NAME="altrelationship" --><br>
<!-- /TMPL_UNLESS -->
! Notes: <!-- TMPL_VAR NAME="altnotes" -->
<!-- TMPL_IF NAME="sort1" -->
! <p>Sort field 1 : <!-- TMPL_VAR NAME="sort1" --></p>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="sort2" -->
! <p>Sort field 2 : <!-- TMPL_VAR NAME="sort2" --></p>
<!-- /TMPL_IF -->
</p>
--- 6,42 ----
<h2 class="members">Membership record</h2>
<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
! <p><label class="label100">Card number: </label><!-- TMPL_VAR NAME="cardnumber" --><br>
! <label class="label100">Postal Address: </label><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
! <!-- TMPL_UNLESS name="I" --><label class="label100">Home Address: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
! <label class="label100">Phone home: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
! <label class="label100">Phone daytime: </label><!-- TMPL_VAR NAME="phoneday" --><br>
! <label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
! <label class="label100">E-mail: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
! <label class="label100">Text messaging: </label><!-- TMPL_VAR NAME="textmessaging" --><br>
! <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>
<p>
<!-- TMPL_IF NAME="printethnicityline" -->
! <label class="label100">Ethnicity: </label><!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="I" -->
! <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>
! <label class="label100">Phone: </label><!-- TMPL_VAR NAME="altphone" --><br>
<!-- TMPL_UNLESS name="I" -->
! <label class="label100">Relationship: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
<!-- /TMPL_UNLESS -->
! <label class="label100">Notes: </label><!-- TMPL_VAR NAME="altnotes" -->
<!-- TMPL_IF NAME="sort1" -->
! <p><label class="label100">Sort field 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="sort2" -->
! <p><label class="label100">Sort field 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
<!-- /TMPL_IF -->
</p>
***************
*** 57,96 ****
</p>
<p>
! General Notes: <!--<a href="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
! <!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
</p>
!
! <!-- TMPL_IF NAME="IS_ADULT" -->
!
! <form action="/cgi-bin/koha/members/jmemberentry.pl" method="post">
! <input type="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
! <input type="hidden" name="type" value="Add">
! <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
! </form>
!
! <!-- /TMPL_IF -->
<!-- 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" class="button" 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="button" name="modify" value="Modify">
! </form>
! <!-- /TMPL_IF -->
! <form action="javascript:confirm_deletion()">
! <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
! <input type="submit" class="button" value="Delete">
! </form>
! <form action="/cgi-bin/koha/members/member-password.pl" method="post">
! <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
! <input type="submit" class="button" value="Change Password">
! </form>
! <form action="/cgi-bin/koha/members/member-flags.pl" method="post">
! <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
! <input type="submit" class="button" value="Modify User Flags">
! </form>
</div>
--- 56,84 ----
</p>
<p>
! <label class="label100">General Notes: </label>
! <!-- TMPL_VAR NAME="borrowernotes" -->
</p>
! <p>
! <label class="label100">OPAC login : </label><!-- TMPL_VAR name="userid" -->
! <!-- TMPL_IF name="password" -->(password defined)<!-- TMPL_ELSE -->(no password)<!-- /TMPL_IF -->
! </p>
! <p>
<!-- TMPL_IF NAME="I" -->
! <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>
! <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Issue books</a>
! <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Change Password</a>
! </p>
! <br/>
! <p>
! <!-- TMPL_IF NAME="IS_ADULT" -->
! <a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">Add Child</a>
! <!-- /TMPL_IF -->
! <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify User Flags</a>
! <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&print=page" class="button">Print Page</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&print=slip" class="button">Print Slip</a>
! </p>
</div>
***************
*** 168,172 ****
</div>
! <div id="bloc25">
<h2 class="members">Items currently on issue</h2>
<!-- TMPL_IF NAME="issueloop" -->
--- 156,160 ----
</div>
! <div class="bloc25">
<h2 class="members">Items currently on issue</h2>
<!-- TMPL_IF NAME="issueloop" -->
Index: readingrec.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** readingrec.tmpl 26 Nov 2004 16:48:41 -0000 1.13
--- readingrec.tmpl 1 Mar 2005 13:40:54 -0000 1.14
***************
*** 29,34 ****
</tr>
<!-- TMPL_LOOP NAME="loop_reading" -->
! <tr>
! <td><!-- TMPL_VAR NAME="biblionumber" -->
<!-- TMPL_VAR NAME="title" -->
</td>
--- 29,39 ----
</tr>
<!-- TMPL_LOOP NAME="loop_reading" -->
! <!-- TMPL_IF NAME="toggle" -->
! <tr class="hilighted">
! <!-- TMPL_ELSE -->
! <tr>
! <!-- /TMPL_IF -->
! <td>
! <!-- TMPL_VAR NAME="biblionumber" -->
<!-- TMPL_VAR NAME="title" -->
</td>
More information about the Koha-cvs
mailing list