[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull lateissues.tmpl,1.1.2.1,1.1.2.2 statecollection.tmpl,1.2.2.3,1.2.2.4

[Owen Leonard]

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

Modified Files:
      Tag: rel_2_2
        lateissues.tmpl statecollection.tmpl 
Log Message:
Synching with default template

Index: lateissues.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/lateissues.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** lateissues.tmpl     10 Jan 2005 17:05:03 -0000      1.1.2.1
--- lateissues.tmpl     28 Sep 2005 18:49:30 -0000      1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials 
Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials 
Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 8,16 ****
  <h1>Late issues</h1>
  <form action="lateissues.pl" method="post">
- <label for="supplier">Supplier: </label>
- <!-- TMPL_VAR name="CGIsupplier" -->
- <input type="submit" value="Filter" class="submit">
- </form>
- <!-- TMPL_IF NAME="lateissues" -->
        <table>
                <tr>
--- 8,11 ----
***************
*** 21,24 ****
--- 16,30 ----
                        <th colspan="2">&nbsp;</th>
                </tr>
+               
+       <tr>
+               <td><!-- TMPL_VAR name="CGIsupplier" --></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><!-- TMPL_IF NAME="bookselleremail" --><p><a href="mailto:<!-- TMPL_VAR 
name="bookselleremail" -->"><!-- TMPL_VAR name="bookselleremail" --></a><!-- 
/TMPL_IF -->
+                                       </p><!-- /TMPL_IF --></td>
+               <td><input type="submit" value="Filter" class="submit" /></td>
+               <td colspan="3">&nbsp;</td>     
+       </tr>
+               
  <!-- TMPL_LOOP name="lateissues" -->
                        <tr>
***************
*** 31,35 ****
        <!-- /TMPL_LOOP -->
        </table>
! <!-- /TMPL_IF -->
  </div>
  
--- 37,41 ----
        <!-- /TMPL_LOOP -->
        </table>
! </form>
  </div>
  

Index: statecollection.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** statecollection.tmpl        19 Sep 2005 20:46:14 -0000      1.2.2.3
--- statecollection.tmpl        28 Sep 2005 18:49:30 -0000      1.2.2.4
***************
*** 54,60 ****
                                        <!-- /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" -->
--- 54,60 ----
                                        <!-- /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" -->