[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull lateissues.tmpl,1.1,1.2 search.tmpl,1.2,1.3 statecollection.tmpl,1.9,1.10 subscription-detail.tmpl,1.12,1.13 subscription-renew.tmpl,1.1,1.2

[Paul POULAIN]

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

Modified Files:
        lateissues.tmpl search.tmpl statecollection.tmpl 
        subscription-detail.tmpl subscription-renew.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: lateissues.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lateissues.tmpl     3 Dec 2004 14:34:55 -0000       1.1
--- lateissues.tmpl     26 Oct 2005 09:16:11 -0000      1.2
***************
*** 17,21 ****
                                </td>
                                <td>
!                                       &nbsp;
                                </td>
                                <td>
--- 17,25 ----
                                </td>
                                <td>
!                                       <p>
!                                       <!-- TMPL_IF name="phone" -->Phone: 
<!-- TMPL_VAR name="phone" --><!-- /TMPL_IF -->
!                                       <!-- TMPL_IF name="booksellerfax" 
-->Fax: <!-- TMPL_VAR name="booksellerfax" --><!-- /TMPL_IF -->
!                                       <!-- TMPL_IF name="bookselleremail" 
--></p><p><a href="mailto:<!-- TMPL_VAR name="bookselleremail" -->" 
class="button bull"><!-- TMPL_VAR name="bookselleremail" --></a><!-- /TMPL_IF 
-->
!                                       </p>
                                </td>
                                <td>

Index: search.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search.tmpl 5 Aug 2004 16:35:43 -0000       1.2
--- search.tmpl 26 Oct 2005 09:16:11 -0000      1.3
***************
*** 4,8 ****
  <h1 class="catalogue">Catalogue search</h1>
  
! <form name="f" method="post">
        <input type="hidden" name="op" value="do_search">
        <input type="hidden" name="type" value="intranet">
--- 4,8 ----
  <h1 class="catalogue">Catalogue search</h1>
  
! <form name="f" action="/cgi-bin/koha/bull/subscription-bib-search.pl" 
method="post">
        <input type="hidden" name="op" value="do_search">
        <input type="hidden" name="type" value="intranet">
***************
*** 16,20 ****
                        <input type="hidden" name="excluding" value="">
                        <input type="hidden" name="operator" value="contains">
!                       <input type="text" name="value" onchange="sql_update()">
                </p>
        </div>
--- 16,20 ----
                        <input type="hidden" name="excluding" value="">
                        <input type="hidden" name="operator" value="contains">
!                       <input type="text" name="value">
                </p>
        </div>
***************
*** 42,63 ****
  </form>
  
! <script>
! function sql_update() {
! document.f.sql.value="";
!       for (i=0 ; i<document.f.marclist.length ; i++) {
!               if (document.f.value[i].value.length>0) {
!                       document.f.sql.value = document.f.sql.value+
!                                                                               
document.f.and_or[i].value + ' (' +
!                                                                               
document.f.excluding[i].value + ' ' +
!                                                                               
document.f.marclist[i].value + ' ' +
!                                                                               
document.f.operator[i].value + ' ' +
!                                                                               
'\''+document.f.value[i].value + '\') ';
!               }
!       }
! }
! 
  function AddStatement() {
  
!       document.forms[0].op.value="AddStatement";
        document.f.submit();
  }
--- 42,49 ----
  </form>
  
! <script language="Javascript" type="text/javascript">
  function AddStatement() {
  
!       document.forms['f'].op.value="AddStatement";
        document.f.submit();
  }

Index: statecollection.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** statecollection.tmpl        22 Sep 2005 15:34:17 -0000      1.9
--- statecollection.tmpl        26 Oct 2005 09:16:11 -0000      1.10
***************
*** 60,66 ****
                                        <!-- /TMPL_IF -->
                                        <!--TMPL_IF name="status5" -->
!                                               <option value="5" selected>Not 
issued</option>
                                        <!-- TMPL_ELSE -->
!                                               <option value="5">Not 
issued</option>
                                        <!-- /TMPL_IF -->
                                        <!--TMPL_IF name="status6" -->
--- 60,66 ----
                                        <!-- /TMPL_IF -->
                                        <!--TMPL_IF name="status5" -->
!                                               <option value="5" selected>Not 
published</option>
                                        <!-- TMPL_ELSE -->
!                                               <option value="5">Not 
published</option>
                                        <!-- /TMPL_IF -->
                                        <!--TMPL_IF name="status6" -->

Index: subscription-detail.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** subscription-detail.tmpl    22 Sep 2005 15:34:17 -0000      1.12
--- subscription-detail.tmpl    26 Oct 2005 09:16:11 -0000      1.13
***************
*** 165,168 ****
--- 165,169 ----
                <th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Planned 
date&nbsp;&nbsp;&nbsp;&nbsp;</th>
                <th 
class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;&nbsp;</th>
+               <th 
class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Note&nbsp;&nbsp;&nbsp;&nbsp;</th>
        </tr>
        <!-- TMPL_LOOP name="serialslist" -->
***************
*** 189,192 ****
--- 190,196 ----
                                </select>
                        </td>
+                       <td>
+                               <!-- TMPL_VAR name="notes" -->
+                       </td>
                </tr>
        <!-- /TMPL_LOOP -->

Index: subscription-renew.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-renew.tmpl     12 Aug 2004 14:37:36 -0000      1.1
--- subscription-renew.tmpl     26 Oct 2005 09:16:11 -0000      1.2
***************
*** 4,8 ****
  <h1 class="bull">subscription renewal for <!-- TMPL_VAR name="bibliotitle" 
--></h1>
  
! <form name="f" method="post">
        <div id="bloc25">
                <input type="hidden" name="op" value="renew">
--- 4,8 ----
  <h1 class="bull">subscription renewal for <!-- TMPL_VAR name="bibliotitle" 
--></h1>
  
! <form name="f" action="/cgi-bin/koha/bull/subscription-renew.pl" 
method="post">
        <div id="bloc25">
                <input type="hidden" name="op" value="renew">