[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtransfers.tmpl,1.14,1.15 returns.tmpl,1.21,1.22

[Paul POULAIN]

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

Modified Files:
	branchtransfers.tmpl returns.tmpl 
Log Message:
big commit, still breaking things...

* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** branchtransfers.tmpl	31 Aug 2005 15:53:03 -0000	1.14
--- branchtransfers.tmpl	26 Oct 2005 09:17:07 -0000	1.15
***************
*** 70,73 ****
--- 70,74 ----
  
  <!-- TMPL_ELSE -->
+ 		<!-- TMPL_IF NAME="allmessages" -->
  	<table>
  	<tr><th class="circulation">Messages</th></tr>
***************
*** 98,102 ****
  	<!-- /TMPL_LOOP -->&nbsp;
  	</td></tr></table>
! 
  	<form method="post" action="/cgi-bin/koha/circ/branchtransfers.pl">
  	<p><b>Select Destination Branch: </b><select name="tobranchcd">
--- 99,103 ----
  	<!-- /TMPL_LOOP -->&nbsp;
  	</td></tr></table>
! <!-- /TMPL_IF -->
  	<form method="post" action="/cgi-bin/koha/circ/branchtransfers.pl">
  	<p><b>Select Destination Branch: </b><select name="tobranchcd">
***************
*** 116,120 ****
  
  	</form>
! 	<!-- TMPL_IF Name="transferred" -->
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
--- 117,121 ----
  
  	</form>
! 	<!-- TMPL_IF Name="trsfitemloop" -->
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
***************
*** 122,132 ****
  		<tr><th class="circulation">Barcode</th><th class="circulation">Title</th><th class="circulation">Author</th><th class="circulation">Type</th><th class="circulation">From</th><th class="circulation">To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
! 			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
  			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcode" --></a></td>
! 			<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
! 			<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
! 			<td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="itemtype" --></td>
! 			<td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="frbrname" --></td>
! 			<td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="tobrname" --></td>
  			</tr>
  		<!-- /TMPL_LOOP -->
--- 123,133 ----
  		<tr><th class="circulation">Barcode</th><th class="circulation">Title</th><th class="circulation">Author</th><th class="circulation">Type</th><th class="circulation">From</th><th class="circulation">To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
! 			<!-- TMPL_IF NAME="color" --><tr class="hilighted"><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><td align="center">
  			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcode" --></a></td>
! 			<td><!-- TMPL_VAR NAME="title" --></td>
! 			<td><!-- TMPL_VAR NAME="author" --></td>
! 			<td align="center"><!-- TMPL_VAR NAME="itemtype" --></td>
! 			<td align="center"><!-- TMPL_VAR NAME="frbrname" --></td>
! 			<td align="center"><!-- TMPL_VAR NAME="tobrname" --></td>
  			</tr>
  		<!-- /TMPL_LOOP -->

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** returns.tmpl	31 Aug 2005 15:53:53 -0000	1.21
--- returns.tmpl	26 Oct 2005 09:17:07 -0000	1.22
***************
*** 136,140 ****
  			<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->','Member'); return false;">
  				<!-- TMPL_VAR NAME="riborcnum" -->
! 			</a>
  			<!-- TMPL_VAR NAME="riborsurname" -->, <!-- TMPL_VAR NAME="ribortitle" --> <!-- TMPL_VAR NAME="riborfirstname" --></p>
  			<!-- TMPL_IF Name="flagset" -->
--- 136,141 ----
  			<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->','Member'); return false;">
  				<!-- TMPL_VAR NAME="riborcnum" -->
! 			</a> 
! 			<!-- TMPL_IF NAME="boremail" -->(<a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- TMPL_VAR Name="boremail" --></a>)<!-- /TMPL_IF -->
  			<!-- TMPL_VAR NAME="riborsurname" -->, <!-- TMPL_VAR NAME="ribortitle" --> <!-- TMPL_VAR NAME="riborfirstname" --></p>
  			<!-- TMPL_IF Name="flagset" -->