[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports itemtypes.tmpl,1.1,1.2 reports-home.tmpl,1.2,1.3

[Owen Leonard]

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

Modified Files:
        itemtypes.tmpl reports-home.tmpl 
Log Message:
Mostly cosmetic changes, including more informative page titles

Index: itemtypes.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/itemtypes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** itemtypes.tmpl      1 Apr 2004 21:35:58 -0000       1.1
--- itemtypes.tmpl      13 Apr 2004 17:06:38 -0000      1.2
***************
*** 1,11 ****
! <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
! <div id="mainbloc">
  <!-- TMPL_IF name="do_it" -->
  <!-- TMPL_LOOP name="mainloop" -->
!       <h1>Koha : Reports on itemtypes <!--TMPL_IF name="branch" --> for 
branch = <!-- TMPL_VAR name="branch" --><!-- /TMPL_IF --></h1>
!       <table>
                <tr>
!                       <th>Item type</th>
!                       <th>count</th>
                </tr>
                        <!-- TMPL_LOOP name="loopitemtype" -->
--- 1,13 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- 
TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
! <div id="main">
  <!-- TMPL_IF name="do_it" -->
  <!-- TMPL_LOOP name="mainloop" -->
!       <div class="table"><table>
!       <caption>Item counts <!--TMPL_IF name="branch" --> for <!-- TMPL_VAR 
name="branch" --><!-- /TMPL_IF --></caption>
                <tr>
!                       <th>Item Type</th>
!                       <th>Item Count</th>
                </tr>
                        <!-- TMPL_LOOP name="loopitemtype" -->
***************
*** 18,32 ****
                                <th>TOTAL</th>
                                <th><!-- TMPL_VAR name="total" --></th>
!       </table>
  <!-- /TMPL_LOOP -->
  <!-- TMPL_ELSE -->
!       <h1>View catalogue group by itemtypes</h1>
        <form method="post">
!               Select a branch (or don't if you want the report for all 
branches) <!-- TMPL_VAR name="CGIbranch" -->
!               <input type="submit" value="OK" class="button">
!               <input type="hidden" name="report_name" value="<!--TMPL_VAR 
name="report_name" -->">
!               <input type="hidden" name="do_it" value="1">
        </form>
  <!-- /TMPL_IF -->
  </div>
! <!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
--- 20,37 ----
                                <th>TOTAL</th>
                                <th><!-- TMPL_VAR name="total" --></th>
!       </table></div>
  <!-- /TMPL_LOOP -->
  <!-- TMPL_ELSE -->
!       <h1>Item Type Report</h1>
!       <div class="form">
!       <h3>View a count of items with each item type</h3>
        <form method="post">
!               Select a branch (leave blank to show all branches) <!-- 
TMPL_VAR name="CGIbranch" -->
!               <input type="submit" value="Submit" class="submit" />
!               <input type="hidden" name="report_name" value="<!--TMPL_VAR 
name="report_name" -->" />
!               <input type="hidden" name="do_it" value="1" />
        </form>
  <!-- /TMPL_IF -->
  </div>
! </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: reports-home.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** reports-home.tmpl   1 Apr 2004 21:35:58 -0000       1.2
--- reports-home.tmpl   13 Apr 2004 17:06:38 -0000      1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- 
TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 6,9 ****
--- 6,16 ----
  <div id="main"><h3>Reports</h3>
  <div class="details"><ul><li><a 
href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconciliation:</a> Daily 
Report (yesterday)</li>
+ <<<<<<< reports-home.tmpl
+       <li><a href="/cgi-bin/koha/stats.pl?time=today">Till 
Reconciliation:</a> Daily Report (today)</li>
+       <li><a href="/cgi-bin/koha/overdue.pl">Overdue items</a></li>
+       <li><a 
href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
+               <li><a 
href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by 
itemtype</a></li>
+       <li><a 
href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues
 by borrower category</a></li>
+ =======
  <li><a href="/cgi-bin/koha/stats.pl?time=today">Till Reconciliation:</a> Daily
  Report (today)</li>
***************
*** 12,15 ****
--- 19,23 ----
        <li><a 
href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by 
itemtype</a></li>
        <li><a 
href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues
 by borrower category</a></li>
+ >>>>>>> 1.2
  </ul></div></div>