language cleanups

switch from HTML::Template to HTML::Template::Pro for report plugins

diff --git a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl
index 096b4c7..9956a8d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl
@@ -1,18 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- Add to Virtual Shelf
+Koha &rsaquo; Add to Virtual Shelf
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <h1>Add 
     <i><!-- TMPL_VAR NAME="title" --></i>
     <!-- TMPL_IF NAME="author" -->
         by <!-- TMPL_VAR NAME="author" -->
-    <!-- /TMPL_IF --> to a Virtual Shelf
+    <!-- /TMPL_IF --> to a virtual shelf
 </h1>
 
 <form name="f1" method="POST" action="/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl">
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
     
-    <b>Select an Existing Bookshelf</b>
+    <b>Select an existing shelf</b>
     <p>
         <label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" -->
     </p>
@@ -21,10 +21,10 @@ Koha -- Add to Virtual Shelf
 </form>
 <p>...or...</p>
 <form name="f2" method="POST" action="/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl">
-    <b>Add to a New Bookshelf:</b>
+    <b>Add to a new shelf:</b>
         <p>
             <label for="newbookshelf">
-                Shelf Name:
+                Shelf name:
             </label>
             <input type="text" name="newbookshelf" id="newbookshelf" size="40" />
         </p>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl
index d08b2f0..032b956 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- Add to Virtual Shelf
+Koha &rsaquo; Add to Virtual Shelf
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
@@ -8,10 +8,10 @@ Koha -- Add to Virtual Shelf
 <!-- TMPL_IF Name="viewshelf" -->
 
 <div id="action">
-    <a class="button" href="/cgi-bin/koha/bookshelves/shelves.pl">Back to Virtual Shelves</a>
+    <a class="button" href="/cgi-bin/koha/bookshelves/shelves.pl">Back to virtual Shelves</a>
     <!-- TMPL_IF name="manageshelf" -->
     <a class="button" href="/cgi-bin/koha/bookshelves/shelves.pl?op=modif&shelf=<!-- TMPL_VAR Name="shelfnumber" -->">
-        Modify this Shelf</a>
+        Modify this shelf</a>
     <!-- /TMPL_IF -->
 </div>
 
@@ -70,7 +70,7 @@ Koha -- Add to Virtual Shelf
         <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" />
         <input type="hidden" name="shelves" value="1" />
         <input type="submit" class="icon delete"
-               value="Delete this Shelf"
+               value="Delete this shelf"
                onclick="return confirmDelete('Are you sure you want to delete this shelf?')" />
         <!-- /TMPL_UNLESS -->
         <!-- /TMPL_IF -->
@@ -91,7 +91,7 @@ Koha -- Add to Virtual Shelf
 <br />
 <form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
     <table>
-        <tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
+        <tr><th colspan="2">Add an item to this shelf by barcode</th></tr>
         <tr>
             <td>
                 <label for="addbarcode">Barcode:</label>
@@ -118,9 +118,9 @@ Koha -- Add to Virtual Shelf
         <!-- /TMPL_LOOP -->
     <form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl">
         <input type="hidden" name="shelves" value="1">
-        <h3>Create a New a Virtual Shelf</h3>
+        <h3>Create a new virtual shelf</h3>
         <table>
-        <tr><th scope="row"><label for="addshelf">Shelf Name:</label> </th><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
+        <tr><th scope="row"><label for="addshelf">Shelf name:</label> </th><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
         <tr><th scope="row"><label for="owner">Owner:</label> </th><td><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></td></tr>
         <tr><th scope="row"><label for="category">Category:</label> </th><td><select name="category" id="category">
                                     <option value="1">Private</option>
@@ -130,16 +130,16 @@ Koha -- Add to Virtual Shelf
             <li>A <b>private</b> virtual shelf is managed by you and can be seen only by you.</li>
             <li> A <b>public</b> virtual shelf can be seen by everybody, but managed only by you.</li>
         </ul>
-                                <p><input type="submit" value="Add New Shelf"></p>
+                                <p><input type="submit" value="Add a new shelf"></p>
                     </form>
         
         <!-- TMPL_IF NAME="numberCanManage" -->
         <!-- TMPL_IF NAME="shelvesloop" -->
         <form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl" name="mainform">
                     <input type="hidden" name="shelves" value="1" />
-                    <h3>Delete Virtual Shelves</h3>
+                    <h3>Delete virtual shelves</h3>
                     <table>
-                        <tr><th>&nbsp;</th><th>Shelf Name</th><th>Contents</th></tr>
+                        <tr><th>&nbsp;</th><th>Shelf name</th><th>Contents</th></tr>
                         <!-- TMPL_LOOP Name="shelvesloop" -->
                         <!-- TMPL_IF name="canmanage" -->
                         <tr>
@@ -156,20 +156,20 @@ Koha -- Add to Virtual Shelf
                         <!-- /TMPL_IF -->
                         <!-- /TMPL_LOOP -->
                     </table>
-        <input type="submit" value="Delete Shelves" /></form>
+        <input type="submit" value="Delete shelves" /></form>
         <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
         <br />
-        <p><form class="inline" action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" value="Back to Virtual Shelves" /></form></p>
+        <p><form class="inline" action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" value="Back to virtual shelves" /></form></p>
 
     <!-- TMPL_ELSE -->
     <!-- TMPL_IF name="edit" -->
         <form method="post">
             <input type="hidden" name="op" value="modifsave">
             <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
-<h3>Modify Virtual Shelf <!-- TMPL_VAR name="shelfname"--></h3>
+<h3>Modify virtual shelf <!-- TMPL_VAR name="shelfname"--></h3>
             <table>
-            <tr><td><label for="shelfname">Shelf Name: </label></td><td><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
+            <tr><td><label for="shelfname">Shelf name: </label></td><td><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
             <tr><td><label for="owner">Owner: </label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
             <tr><td><label for="category">Category: </label></td><td><select id="category" name="category">
                     <!-- TMPL_IF name="category1" -->
@@ -187,19 +187,19 @@ Koha -- Add to Virtual Shelf
             <ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
                 <li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
             </ul>
-            <p><input type="submit" value="Save Changes"></p>
+            <p><input type="submit" value="Save changes"></p>
 
         </form>
 <!-- /TMPL_IF -->
-<h3>Virtual Shelves</h3>
+<h3>Virtual shelves</h3>
 
 <table>
-<tr><th>Shelf Name</th><th>Category</th><th>Content Size</th><th>&nbsp;</th></tr>
+<tr><th>Shelf name</th><th>Category</th><th>Content size</th><th>&nbsp;</th></tr>
 <!-- TMPL_LOOP Name="shelvesloop" -->
 <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="/cgi-bin/koha/bookshelves/shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="/cgi-bin/koha/bookshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
             <!-- /TMPL_LOOP -->
         </table>
-        <p><form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" /></form></p>
+        <p><form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or remove virtual shelves" /></form></p>
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
index c641ae0..0f9cc48 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue: Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Catalogue &rsaquo; Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
@@ -7,7 +7,7 @@
 <!-- TMPL_IF NAME="expanded_options" -->
 <h1>Advanced Search</h1>
 <!-- TMPL_ELSE -->
-<h1>Search the Library Catalogue</h1>
+<h1>Search the Catalogue</h1>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="if_expanded_options_actually_worked" -->
@@ -38,7 +38,7 @@
 <!-- /REMOTE DATABASES -->
 <!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
-<h3>Search the Library Catalogue</h3>
+<h3>Search the catalogue:</h3>
 <!-- /TMPL_IF -->
 
 <!-- BOOLEAN SEARCH OPTIONS -->
@@ -91,7 +91,7 @@
     </fieldset>
 <!-- /BOOLEAN SEARCH OPTIONS -->
 <fieldset style="margin-right:20%">
-    <legend>Itemtype to: match any of the following </legend>
+    <legend>Itemtype limit to any of the following:</legend>
     <p>
       <!--TMPL_LOOP Name="itemtypeloop"-->
         <input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" title="<!--TMPL_VAR Name="description" -->"/>
@@ -442,7 +442,7 @@
             <!-- TMPL_ELSE -->
             <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
             <!-- /TMPL_IF -->
-            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New Search]</a> 
+            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New search]</a> 
             </p>
 <!-- /SEARCH BUTTONS -->
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl
index 349039f..c15fb5a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl
@@ -1,9 +1,9 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging Home<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Cataloguing<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
-       <h1>Catalog Maintenance</h1>
+       <h1>Koha &rsaquo; Catalogue Maintenance</h1>
        <!-- TMPL_IF name="noitemsfound" -->
                No items found
        <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc
new file mode 100644 (file)
index 0000000..7907ad4
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc
@@ -0,0 +1,5 @@
+<div id="submenu">
+        <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Home</a>
+</div>
+
+<div id="main">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl
index b8947f0..bdfbccb 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl
@@ -1,25 +1,24 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Guarantor search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<h1>Search guarantor</h1>
-       Search on
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Guarantor Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<h1>Search for guarantor</h1>
        <form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
                <input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->"> Ordered by
                <select name="orderby">
                        <option value="surname,firstname">Surname</option>
-                       <option value="cardnumber">cardnumber</option>
+                       <option value="cardnumber">Cardnumber</option>
                </select>
-               <input type="submit" class="button" value="OK">
+               <input type="submit" class="button" value="Search">
        </form>
 </div>
 
 <!--TMPL_IF NAME="results" -->
-       <p>filter on <!-- TMPL_VAR NAME="member" -->, <!-- TMPL_VAR Name ="numresults" --> members found</p>
+       <p>Searched for <!-- TMPL_VAR NAME="member" -->, <!-- TMPL_VAR Name ="numresults" --> borrower(s) found:</p>
        <table>
                <tr>
-                       <th>cardnumber</th>
-                       <th>surname</th>
-                       <th>firstname</th>
+                       <th>Cardnumber</th>
+                       <th>Surname</th>
+                       <th>Firstname</th>
                        <th>Date of birth</th>
-                       <th>address</th>
+                       <th>Address</th>
                </tr>
                <!-- TMPL_LOOP NAME="resultsloop" -->
                        <!-- TMPL_IF NAME="background" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
index 9aac66d..5bcd235 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
@@ -20,7 +20,7 @@
        </h1>
        <!-- TMPL_ELSE -->
        <h1 >
-               Modify children borrower <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
+               Modify child borrower <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
        </h1>
        <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="check_member" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl
index e1ead3c..282893d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
@@ -77,7 +77,7 @@
             <tr class="hilighted">
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>Borrower Category</td>
+                <td>Borrower category</td>
                 <td><input type="text" name="Filter" value="" /></td>
             </tr>
             <tr class="hilighted">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl
index 7985aa4..6132f87 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
@@ -11,7 +11,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
-               <h1>Items with no Issues</h1>
+               <h1>Items with no issues</h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->
@@ -83,7 +83,7 @@
                        <tr>
                                <td>&nbsp;</td>
                                <td>&nbsp;</td>
-                               <td>Document Type</td>
+                               <td>Document type</td>
                                <td><input type="text" name="Filter" value="" /></td>
                        </tr>
                </tbody>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl
index e874803..cbf70f1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Reports <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc"-->
 <!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
@@ -12,7 +12,7 @@
 
 <h1>Reports</h1>
 
-       <h2>Stat wizards</h2>
+       <h2>Statistics wizards</h2>
        <ul>
                <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
                <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></li>
@@ -23,22 +23,20 @@
 
        <h2>Top Lists</h2>
        <ul>
-               <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></li>
+               <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing borrowers</a></li>
                <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></li>
        </ul>
-       <h2>Outsiders</h2>
+       <h2>Inactive</h2>
        <ul>
                <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Borrowers without issues</a></li>
                <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items not issued</a></li>
        </ul>
 
 
-       <h2>Other stats</h2>
-       <p>on catalogue</p>
+       <h2>Other</h2>
        <ul>
                <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
        </ul>
-       <p>on issues</p>
        <ul>
                <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/reports/issues_avg_stats.pl">Average loan time</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl
index 82663af..5d1b032 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Reviews waiting for Approval --
+Koha &rsaquo; Reviews waiting for Approval &rsaquo;
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!--TMPL_INCLUDE NAME="menu-reviews.inc" -->
 
 <h1>Reviews</h1>
 
@@ -43,7 +43,7 @@ Reviews waiting for Approval --
     <!-- /TMPL_LOOP -->
 </table>
 <!-- TMPL_ELSE -->
-<b>No review has to be approved or deleted.</b>
+<b>No reviews awaiting approval or deletion</b>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/reports/issues_by_borrower_category.plugin b/reports/issues_by_borrower_category.plugin
index 888a21d..473590f 100644 (file)
--- a/reports/issues_by_borrower_category.plugin
+++ b/reports/issues_by_borrower_category.plugin
@@ -23,7 +23,7 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
+use HTML::Template::Pro;
 use C4::Search;
 use C4::Output;
 use C4::Koha;

diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin
index 4443b86..9458afe 100644 (file)
--- a/reports/itemtypes.plugin
+++ b/reports/itemtypes.plugin
@@ -23,7 +23,7 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
+use HTML::Template::Pro;
 use C4::Search;
 use C4::Output;
 use C4::Koha;

diff --git a/reports/manager.pl b/reports/manager.pl
index 8628a1a..f73a8e0 100755 (executable)
--- a/reports/manager.pl
+++ b/reports/manager.pl
@@ -50,6 +50,7 @@ unless (opendir(DIR, "$cgidir")) {
        $cgidir = C4::Context->intranetdir."/reports/";
 } 
 my $plugin = $cgidir.$report_name.".plugin";
+warn "PLUGIN:".$plugin;
 require $plugin;
 if ($do_it) {
        my $results = calculate(\@values);