[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.35,1.36

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/en/circ

Modified Files:
        circulation.tmpl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: circulation.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** circulation.tmpl    15 Dec 2004 10:47:10 -0000      1.35
--- circulation.tmpl    1 Mar 2005 13:40:53 -0000       1.36
***************
*** 32,37 ****
                        <h2 class="circulation">Borrower information</h2>
                        <p>
!                               <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->" onclick="openWindow(this,'Member', 480, 640)">
!                                       <!-- TMPL_VAR NAME="firstname" --> <!-- 
TMPL_VAR NAME="surname" -->
                                </a>
                        </p>
--- 32,37 ----
                        <h2 class="circulation">Borrower information</h2>
                        <p>
!                               <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" --> " onclick="openWindow(this,'Member', 480, 640)">
!                                       <!-- TMPL_VAR NAME="firstname" --> <!-- 
TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->)
                                </a>
                        </p>
***************
*** 45,49 ****
                        <p><!-- TMPL_VAR NAME="issuecount" --> Issues<!-- 
TMPL_IF NAME="overduecount" -->, <!-- TMPL_VAR NAME="overduecount" --> 
Overdue<!-- /TMPL_IF --></p>
                        <p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
! 
                <!-- TMPL_ELSE -->
                                <h2 class="circulation">
--- 45,58 ----
                        <p><!-- TMPL_VAR NAME="issuecount" --> Issues<!-- 
TMPL_IF NAME="overduecount" -->, <!-- TMPL_VAR NAME="overduecount" --> 
Overdue<!-- /TMPL_IF --></p>
                        <p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
!                       <!-- TMPL_IF NAME="dbarred" -->
!                               <span class="error">Debarred:</span> Patron is 
debarred 
!                               <form 
action="/cgi-bin/koha/members/setdebar.pl" method="post">
!                                       <input type="hidden" 
name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
!                                       <input type="hidden" name="cardnumber" 
value="<!-- TMPL_VAR NAME="cardnumber" -->" />
!                                       <input type="hidden" value="circ" 
name="destination" />
!                                       <input type="hidden" name="status" 
value="0" />
!                                       <input type="submit" class="button 
circulation" value="Lift Debarment" />
!                               </form>
!                       <!-- /TMPL_IF -->
                <!-- TMPL_ELSE -->
                                <h2 class="circulation">