[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.36,1.37 returns.tmpl,1.19,1.20

[Paul POULAIN]

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

Modified Files:
        circulation.tmpl returns.tmpl 
Log Message:
synch'ing 2.2 and head

Index: circulation.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** circulation.tmpl    1 Mar 2005 13:40:53 -0000       1.36
--- circulation.tmpl    4 May 2005 08:52:53 -0000       1.37
***************
*** 31,38 ****
                <!-- TMPL_IF NAME="borrowernumber" -->
                        <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>
                        <p>
--- 31,39 ----
                <!-- TMPL_IF NAME="borrowernumber" -->
                        <h2 class="circulation">Borrower information</h2>
!                       <p><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR 
NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->)
!                               <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" --> " class="button circulation">
!                                       detail
                                </a>
+                               <a 
href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR 
name="borrowernumber" -->&amp;modify=edit&amp;destination=circ" class="button 
circulation">edit</a>
                        </p>
                        <p>
***************
*** 287,291 ****
                                        <td class="problem"><!-- TMPL_VAR 
NAME="title" --></td>
                                        <td class="problem"><!-- TMPL_VAR 
NAME="author" --></td>
!                                       <td class="problem"><!-- TMPL_VAR 
NAME="dewey" --> <!-- TMPL_VAR NAME="subclass" --></td>
                                <!-- TMPL_ELSE -->
                                        <td>
--- 288,292 ----
                                        <td class="problem"><!-- TMPL_VAR 
NAME="title" --></td>
                                        <td class="problem"><!-- TMPL_VAR 
NAME="author" --></td>
!                                       <td class="problem"><!-- TMPL_VAR 
NAME="itemcallnumber" --></td>
                                <!-- TMPL_ELSE -->
                                        <td>

Index: returns.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** returns.tmpl        18 Apr 2005 18:54:12 -0000      1.19
--- returns.tmpl        4 May 2005 08:52:54 -0000       1.20
***************
*** 88,92 ****
        
        ">
!                               <input type="submit" value="Print" 
class="button circulation">
                                </form>
                        <!-- /TMPL_IF -->
--- 88,92 ----
        
        ">
!                               <input type="submit" value="Yes" class="button 
circulation">
                                </form>
                        <!-- /TMPL_IF -->