minor circ template cleanup

[1] did some "Reserve" => "Hold" to keep language consistent
[2] Moved hold ratios report and billing report on circ
    home page to group with related reports

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl
index 229f4cd..e3bfdb8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl
@@ -30,13 +30,13 @@
 <ul>
        <li>    <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="holds to retrieve off the shelf">Holds to pull</a></li>
        <li>    <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="holds waiting for patron pickup">Holds awaiting pickup</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li>
        <li>    <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from your library">Transfers to do</a></li>
        <li>    <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to receive at your library">Transfers to receive</a></li>
        <li>    <a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li>
-       <li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Fines</a></li>
-       <li>    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a></li>
-       <li>    <a href="/cgi-bin/koha/circ/reserveratios.pl">Reserve Ratios</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdue fines</a></li>
        <li>    <a href="/cgi-bin/koha/circ/billing.pl">Billing</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a></li>
 </ul>
        
        </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index c5606a4..d752929 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Circulation Reports &rsaquo; Overdues as of <!-- TMPL_VAR NAME="todaysdate" --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Overdues as of <!-- TMPL_VAR NAME="todaysdate" --></div>
 
 <div id="doc3" class="yui-t2">
    

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index 5c32764..be954d1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -22,7 +22,7 @@
        <div id="yui-main">
        <div class="yui-b">
 
-<h1>Reserve Pull List</h1>
+<h1>Hold Pull List</h1>
 <h1>Pending holds on <!-- TMPL_VAR NAME="todaysdate" --> (from <!-- TMPL_VAR NAME="from" -->
        to <!-- TMPL_VAR NAME="to" -->)</h1>
 <div id="filters">
@@ -113,7 +113,7 @@ Calendar.setup(
                                Items Available
         </th>
         <th>
-                               Patrons with Reserves
+                               Patrons with Holds
         </th>
         <th >Title
         <a href="/cgi-bin/koha/circ/pendingreserves.pl?order=biblio&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
index 7791da1..bb35935 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation &rsaquo; Reserve Ratios</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Hold Ratios</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
@@ -14,7 +14,7 @@
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Reserve Ratios</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Hold Ratios</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -22,7 +22,7 @@
        <div id="yui-main">
        <div class="yui-b">
 
-<h1>Reserve Ratios to Calculate Items Needed<br>
+<h1>Hold Ratios to Calculate Items Needed<br>
     Calculated on <!-- TMPL_VAR NAME="todaysdate" --> <br>From <!-- TMPL_VAR NAME="from" -->
        to <!-- TMPL_VAR NAME="to" --></h1>
 <div id="filters">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index a228295..67f254b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -77,9 +77,9 @@
                                                         <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->" />
                                                         <input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->" />
                                                         <!-- TMPL_IF NAME="dotransfer" -->
-                                                        <input type="submit" value="Cancel reserve and return to : <!-- TMPL_VAR NAME="homebranch" -->" /> 
+                                                        <input type="submit" value="Cancel hold and return to : <!-- TMPL_VAR NAME="homebranch" -->" /> 
                                                         <!-- TMPL_ELSE -->
-                                                        <input type="submit" value="Cancel reserve" />
+                                                        <input type="submit" value="Cancel hold" />
                                                 <!-- /TMPL_IF -->
                                                 </form>
                                         </td>
@@ -98,4 +98,4 @@
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->