koha-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,

From: Owen Leonard
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4.2.4,1.4.2.5 memberentry.tmpl,1.3.2.5,1.3.2.6 moremember.tmpl,1.5.2.7,1.5.2.8
Date: Wed, 14 Sep 2005 13:24:56 -0700 
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24806/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
        member.tmpl memberentry.tmpl moremember.tmpl 
Log Message:
Synching with default template: Adding independentbranch logic

Index: member.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** member.tmpl 30 Jun 2005 20:34:09 -0000      1.4.2.4
--- member.tmpl 14 Sep 2005 20:24:53 -0000      1.4.2.5
***************
*** 13,16 ****
--- 13,17 ----
      <th>Name</th>
      <th>Cat</th>
+       <th>Branch</th>
      <th>Address</th>
      <th>OD/Issues</th>
***************
*** 30,33 ****
--- 31,35 ----
        <td><a class="searchresults" 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR 
NAME="firstname" --></a> </td>
        <td><!-- TMPL_VAR NAME="categorycode" --></td>
+         <td><!-- TMPL_VAR name="branchcode" --></td>
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city 
--></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>

Index: memberentry.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -r1.3.2.5 -r1.3.2.6
*** memberentry.tmpl    30 Jun 2005 20:36:49 -0000      1.3.2.5
--- memberentry.tmpl    14 Sep 2005 20:24:53 -0000      1.3.2.6
***************
*** 27,31 ****
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="ERROR_gender" -->
!                               <li><a href="sex">Sex</a></li>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="ERROR_address" -->
--- 27,31 ----
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="ERROR_gender" -->
!                               <li><a href="#sex">Sex</a></li>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="ERROR_address" -->
***************
*** 41,44 ****
--- 41,47 ----
                                <li><a href="#cardnumber">Invalid Card 
Number</a></li>
                        <!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="ERROR_branch" -->
+                               <li><a href="#branch">Patron must be at the 
same branch as you</a></li>
+                       <!-- /TMPL_IF -->
                        </ul>
                </div>
***************
*** 142,146 ****
        <!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member 
Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" 
--></span></td></tr><!-- /TMPL_UNLESS -->
        <tr><th><label for="categorycode">Category:</label> </th><td><!-- 
TMPL_VAR NAME="catcodepopup" --></td></tr>
!       <tr><th><label for="branchcode">Branch:</label></th><td><!-- TMPL_VAR 
NAME="CGIbranch" --></td></tr>    
        <tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> 
class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> 
class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card 
Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" 
size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF 
NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF 
NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
  </table>
--- 145,149 ----
        <!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member 
Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" 
--></span></td></tr><!-- /TMPL_UNLESS -->
        <tr><th><label for="categorycode">Category:</label> </th><td><!-- 
TMPL_VAR NAME="catcodepopup" --></td></tr>
!       <tr><th><label for="branchcode"><a name="branch" 
id="branch">Branch:</a></label></th><td><!-- TMPL_VAR NAME="CGIbranch" 
--></td></tr>   
        <tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> 
class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> 
class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card 
Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" 
size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF 
NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF 
NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
  </table>

Index: moremember.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -C2 -r1.5.2.7 -r1.5.2.8
*** moremember.tmpl     8 Aug 2005 16:57:34 -0000       1.5.2.7
--- moremember.tmpl     14 Sep 2005 20:24:53 -0000      1.5.2.8
***************
*** 10,25 ****
                         <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 -->
  
! <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="submit" 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="submit" value="Modify Privileges" /></form>
  
  
! <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>
--- 10,25 ----
                         <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" --> <!-- TMPL_UNLESS 
NAME="unvalidlibrarian"--><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_UNLESS --><!-- /TMPL_IF --><!-- 
/Hide from NPL -->
  
! <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><!-- 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 --><!-- /TMPL_UNLESS -->
  
! <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><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="submit" value="Change Password" /></form><!-- /TMPL_UNLESS 
-->
  
!  <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><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="submit" value="Modify Privileges" /></form><!-- 
/TMPL_UNLESS -->
  
  
! <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><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><!-- /TMPL_UNLESS -->
  
  </div>
***************
*** 120,130 ****
                <tr>
                        <!-- TMPL_IF name="totaldue" --><th>Total 
Due:</th><td>$<!-- TMPL_VAR name="totaldue" --></td></tr><!-- TMPL_ELSE 
--><td>No Outstanding Charges</td><!-- /TMPL_IF --></table>
! <p><form class="inline" action="/cgi-bin/koha/boraccount.pl" 
method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR 
name="bornum" -->" /><input type="submit" value="View Account" class="submit" 
/></form>
! 
  
        <form class="inline" action="/cgi-bin/koha/pay.pl" method="get"><input 
type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" /><input 
type="submit" value="Pay Fines" class="submit" /></form>
  
! 
! </p></div>
  
  <form class="inline" action="renewscript.pl" method="post">
--- 120,128 ----
                <tr>
                        <!-- TMPL_IF name="totaldue" --><th>Total 
Due:</th><td>$<!-- TMPL_VAR name="totaldue" --></td></tr><!-- TMPL_ELSE 
--><td>No Outstanding Charges</td><!-- /TMPL_IF --></table>
! <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><p><form class="inline" 
action="/cgi-bin/koha/boraccount.pl" method="get"><input type="hidden" 
name="bornum" value="<!-- TMPL_VAR name="bornum" -->" /><input type="submit" 
value="View Account" class="submit" /></form>
  
        <form class="inline" action="/cgi-bin/koha/pay.pl" method="get"><input 
type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" /><input 
type="submit" value="Pay Fines" class="submit" /></form>
  
! </p><!-- /TMPL_UNLESS --></div>
  
  <form class="inline" action="renewscript.pl" method="post">
***************
*** 139,143 ****
                <!-- Hide from NPL --><th>Charge</th><!-- /Hide from NPL -->
                <th>Price</th>
!               <th>Renew</th>
                <th>Return</th>
        </tr>
--- 137,141 ----
                <!-- Hide from NPL --><th>Charge</th><!-- /Hide from NPL -->
                <th>Price</th>
!               <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><th>Renew</th><!-- 
/TMPL_UNLESS -->
                <th>Return</th>
        </tr>
***************
*** 157,161 ****
                <!-- Hide from NPL --><td class="credit"><!-- TMPL_VAR 
name="charge" --></td><!-- /Hide from NPL -->
                <td class="credit"><!-- TMPL_VAR name="replacementprice" 
--></td>
!               <td>
                <!-- TMPL_IF name="norenew" -->
                        <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR 
name="biblionumber" -->">Reserved</a>
--- 155,159 ----
                <!-- Hide from NPL --><td class="credit"><!-- TMPL_VAR 
name="charge" --></td><!-- /Hide from NPL -->
                <td class="credit"><!-- TMPL_VAR name="replacementprice" 
--></td>
!               <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><td>
                <!-- TMPL_IF name="norenew" -->
                        <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR 
name="biblionumber" -->">Reserved</a>
***************
*** 163,175 ****
                        <input type="checkbox" name="renew_item_<!-- TMPL_VAR 
name="itemnumber" -->" value="y"<!-- TMPL_IF name="red" 
-->checked="checked"<!-- /TMPL_IF --> />
                <!-- /TMPL_IF -->
!               </td>
                <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- 
TMPL_VAR name="barcode" -->">Return</a></td>
        </tr>
        <!-- /TMPL_LOOP --><!-- TMPL_ELSE --><tr><td colspan="7">Patron has no 
issues.</td></tr><!-- /TMPL_IF -->
        </tbody>
!       </table><p><input type="submit" class="submit" value="Renew Checked 
Items" /></p>
  </form>
  
! <form class="inline" action="renewscript.pl" method="post"><input 
type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" /><!-- 
TMPL_LOOP NAME="issueloop" --><!-- TMPL_UNLESS NAME="norenew" --><input 
type="hidden" name="renew_item_<!-- TMPL_VAR name="itemnumber" -->" value="y" 
/><!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><input type="submit" class="submit" 
value="Renew All" /></form>
  
  
--- 161,173 ----
                        <input type="checkbox" name="renew_item_<!-- TMPL_VAR 
name="itemnumber" -->" value="y"<!-- TMPL_IF name="red" 
-->checked="checked"<!-- /TMPL_IF --> />
                <!-- /TMPL_IF -->
!               </td><!-- /TMPL_UNLESS -->
                <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- 
TMPL_VAR name="barcode" -->">Return</a></td>
        </tr>
        <!-- /TMPL_LOOP --><!-- TMPL_ELSE --><tr><td colspan="7">Patron has no 
issues.</td></tr><!-- /TMPL_IF -->
        </tbody>
!       </table><!-- TMPL_UNLESS NAME="unvalidlibrarian"--><p><input 
type="submit" class="submit" value="Renew Checked Items" /></p><!-- 
/TMPL_UNLESS -->
  </form>
  
! <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><form class="inline" 
action="renewscript.pl" method="post"><input type="hidden" name="bornum" 
value="<!-- TMPL_VAR name="bornum" -->" /><!-- TMPL_LOOP NAME="issueloop" 
--><!-- TMPL_UNLESS NAME="norenew" --><input type="hidden" 
name="renew_item_<!-- TMPL_VAR name="itemnumber" -->" value="y" /><!-- 
/TMPL_UNLESS --><!-- /TMPL_LOOP --><input type="submit" class="submit" 
value="Renew All" /></form><!-- /TMPL_UNLESS -->
  
  
***************
*** 206,210 ****
  
  </table>              <!-- TMPL_IF name="reserveloop" -->
!                       <p><input type="submit" class="cancel" name="submit" 
value="Cancel Marked Requests" /></p>
                <!-- /TMPL_IF --></form>
  
--- 204,208 ----
  
  </table>              <!-- TMPL_IF name="reserveloop" -->
!                       <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><p><input 
type="submit" class="cancel" name="submit" value="Cancel Marked Requests" 
/></p><!-- /TMPL_UNLESS -->
                <!-- /TMPL_IF --></form>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]