[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbookfund.tmpl,1.29,1.30 auth_tag_structure.tmpl,1.3,1.4 viewlog.tmpl,1.2,NONE

[Paul POULAIN]

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

Modified Files:
        aqbookfund.tmpl auth_tag_structure.tmpl 
Removed Files:
        viewlog.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: aqbookfund.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** aqbookfund.tmpl     12 Jul 2005 13:59:39 -0000      1.29
--- aqbookfund.tmpl     26 Oct 2005 09:17:07 -0000      1.30
***************
*** 50,53 ****
--- 50,60 ----
                                <!--/TMPL_IF-->
                                </td>
+                               <td align="center">
+                               <!--TMPL_IF Name="branchcode"-->
+                                       <!--TMPL_VAR Name="branchcode"-->
+                               <!--TMPL_ELSE -->
+                                       &nbsp;
+                               <!--/TMPL_IF-->
+                               </td>
                                <td>
                                        <a 
href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR 
NAME="aqbudgetid" -->">
***************
*** 150,154 ****
        </p>
        <p>
!               <label>Branch</label><!-- TMPL_VAR NAME="CGIbranch"-->&nbsp;
                <br/> Select one if budget is branch specific, otherwise, leave 
it blank.
        </p>
--- 157,168 ----
        </p>
        <p>
!               <label>Branch</label>
!                       <select name="branch">
!                               <option value="">Default</option>
!                               <!-- TMPL_LOOP name="branchloop" -->
!                                       <option value="<!-- TMPL_VAR 
name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF 
-->><!-- TMPL_VAR name="branchname" --></option>
!                               <!-- /TMPL_LOOP -->
!                       </select>
! 
                <br/> Select one if budget is branch specific, otherwise, leave 
it blank.
        </p>

Index: auth_tag_structure.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** auth_tag_structure.tmpl     1 Mar 2005 13:40:54 -0000       1.3
--- auth_tag_structure.tmpl     26 Oct 2005 09:17:07 -0000      1.4
***************
*** 165,174 ****
                <input type="submit" class="button" value="Add Tag" title="Add 
Tag" alt="Add Tag" >
                <!-- TMPL_IF NAME="isprevpage" -->
!                       <a href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->">
                        <input type="image" src="<!-- TMPL_VAR NAME="interface" 
-->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" 
alt="previous" border="0">
                        </a>
                <!-- /TMPL_IF -->
                <!-- TMPL_IF NAME="nextpage" -->
!                       <a href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->">
                                <input type="image" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" 
title="next" alt="next" border="0">
                        </a>
--- 165,174 ----
                <input type="submit" class="button" value="Add Tag" title="Add 
Tag" alt="Add Tag" >
                <!-- TMPL_IF NAME="isprevpage" -->
!                       <a href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
                        <input type="image" src="<!-- TMPL_VAR NAME="interface" 
-->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" 
alt="previous" border="0">
                        </a>
                <!-- /TMPL_IF -->
                <!-- TMPL_IF NAME="nextpage" -->
!                       <a href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
                                <input type="image" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" 
title="next" alt="next" border="0">
                        </a>

--- viewlog.tmpl DELETED ---