[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/reports acquisitions_stats.tmpl,1.4,1.5 borrowers_stats.tmpl,1.5,1.6 issues_stats.tmpl,1.5,1.6

[Paul POULAIN]

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

Modified Files:
        acquisitions_stats.tmpl borrowers_stats.tmpl issues_stats.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: acquisitions_stats.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/acquisitions_stats.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acquisitions_stats.tmpl     17 Mar 2005 14:53:03 -0000      1.4
--- acquisitions_stats.tmpl     26 Oct 2005 09:17:07 -0000      1.5
***************
*** 256,260 ****
                <!-- TMPL_VAR NAME="CGIextChoice" -->
                <!-- TMPL_VAR NAME="CGIsepChoice" -->
-       </p>
        </div>
        <p>
--- 256,259 ----

Index: borrowers_stats.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** borrowers_stats.tmpl        9 Mar 2005 14:21:57 -0000       1.5
--- borrowers_stats.tmpl        26 Oct 2005 09:17:07 -0000      1.6
***************
*** 99,104 ****
                        <td>&nbsp;</td>
                        </tr>
                        <!-- TMPL_IF name="hassort1" -->
!                               <tr>
                                <td>Sort1</td>
                                <td align="center"><input type="radio" 
name="Line" value="sort1"></td>
--- 99,110 ----
                        <td>&nbsp;</td>
                        </tr>
+                       <tr>
+                               <td>Branch</td>
+                               <td align="center"><input type="radio" 
name="Line" value="branchcode"></td>
+                               <td align="center"><input type="radio" 
name="Column" value="branchcode"></td>
+                               <td ><!-- TMPL_VAR NAME="CGIBranch" --></td>
+                       </tr>
                        <!-- TMPL_IF name="hassort1" -->
!                               <tr class="hilighted" >
                                <td>Sort1</td>
                                <td align="center"><input type="radio" 
name="Line" value="sort1"></td>
***************
*** 108,112 ****
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF name="hassort2" -->
!                               <tr class="hilighted" >
                                <td>Sort2</td>
                                <td align="center"><input type="radio" 
name="Line" value="sort2"></td>
--- 114,118 ----
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF name="hassort2" -->
!                               <tr>
                                <td>Sort2</td>
                                <td align="center"><input type="radio" 
name="Line" value="sort2"></td>

Index: issues_stats.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/issues_stats.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** issues_stats.tmpl   20 Jul 2005 09:52:31 -0000      1.5
--- issues_stats.tmpl   26 Oct 2005 09:17:07 -0000      1.6
***************
*** 207,211 ****
                        <p><input type="radio" name="Cellvalue" value="1" 
checked> Count issues </p>
                        <p><input type="radio" name="Cellvalue" value="2" > 
Count borrowers </p>
!                       <p><input type="radio" name="Cellvalue" value="3"> 
Circulation rate </p>
        </div>
        <div id="bloc25">
--- 207,212 ----
                        <p><input type="radio" name="Cellvalue" value="1" 
checked> Count issues </p>
                        <p><input type="radio" name="Cellvalue" value="2" > 
Count borrowers </p>
!                       <p><input type="radio" name="Cellvalue" value="3"> 
Count Items </p>
!                       <p><input type="radio" name="Cellvalue" value="4"> 
Circulation rate </p>
        </div>
        <div id="bloc25">