Bugzilla – Attachment 9069 Details for
Bug 2780
Capitalize strings consistently
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF]Bug 2780 - Capitalize strings consistently (reports)
SIGNED-OFFBug-2780---Capitalize-strings-consistent.patch (text/plain), 76.97 KB, created by
Paul Poulain
on 2012-04-10 08:40:58 UTC
(
hide
)
Description:
[SIGNED-OFF]Bug 2780 - Capitalize strings consistently (reports)
Filename:
MIME Type:
Creator:
Paul Poulain
Created:
2012-04-10 08:40:58 UTC
Size:
76.97 KB
patch
obsolete
>From 55756fc0fb49f6762654fb1d26566e760007fbda Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Sun, 8 Apr 2012 21:29:39 +0200 >Subject: [PATCH] [SIGNED-OFF]Bug 2780 - Capitalize strings consistently > (reports) > >Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> >--- > .../prog/en/modules/reports/acquisitions_stats.tt | 10 +- > .../prog/en/modules/reports/bor_issues_top.tt | 18 ++-- > .../prog/en/modules/reports/borrowers_out.tt | 12 +- > .../prog/en/modules/reports/borrowers_stats.tt | 6 +- > .../prog/en/modules/reports/cat_issues_top.tt | 16 ++-- > .../prog/en/modules/reports/catalogue_out.tt | 20 ++-- > .../prog/en/modules/reports/catalogue_stats.tt | 12 +- > .../prog/en/modules/reports/dictionary.tt | 30 +++--- > .../en/modules/reports/guided_reports_start.tt | 112 ++++++++++---------- > .../prog/en/modules/reports/issues_avg_stats.tt | 12 +- > .../prog/en/modules/reports/issues_stats.tt | 20 ++-- > .../prog/en/modules/reports/itemslost.tt | 24 ++-- > .../prog/en/modules/reports/itemtypes.tt | 4 +- > .../prog/en/modules/reports/reports-home.tt | 24 ++-- > .../prog/en/modules/reports/reservereport.tt | 6 +- > .../prog/en/modules/reports/reserves_stats.tt | 40 ++++---- > .../prog/en/modules/reports/serials_stats.tt | 10 +- > .../prog/en/modules/reports/stats_screen.tt | 34 +++--- > 18 files changed, 205 insertions(+), 205 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >index 56121db..79d289a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports [% IF ( do_it ) %]› Acquisitions Statistics › Results[% ELSE %]› Acquisitions Statistics[% END %]</title> >+<title>Koha › Reports [% IF ( do_it ) %]› Acquisitions statistics › Results[% ELSE %]› Acquisitions statistics[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > </head> >@@ -7,7 +7,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]› <a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions Statistics</a> › Results[% ELSE %] › Acquisitions Statistics [% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]› <a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions statistics</a> › Results[% ELSE %] › Acquisitions statistics [% END %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -75,11 +75,11 @@ > </thead> > <tbody> > <tr class="hilighted"> >- <td>Placed On</td> >+ <td>Placed on</td> > <td><input type="radio" name="Line" value="aqbasket.closedate" /></td> > <td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td> > <td> From <input type="text" size="10" id="from" name="Filter" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -157,7 +157,7 @@ > <td> </td> > </tr> > <tr> >- <td>Received On</td> >+ <td>Received on</td> > <td><input type="radio" name="Line" value="aqorders.datereceived" /></td> > <td><input type="radio" name="Column" value="aqorders.datereceived" /></td> > <td> From <input type="text" size="10" id="fromRO" name="Filter" value="" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >index e6fdb85..ab4cd65 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Patrons with the most Checkouts</title> >+<title>Koha › Reports › Patrons with the most checkouts</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > </head> >@@ -24,7 +24,7 @@ function Dopop(link) { > > > [% FOREACH mainloo IN mainloop %] >- <h1>Top [% mainloo.limit %] List patrons for Checkouts</h1> >+ <h1>Top [% mainloo.limit %] List patrons for checkouts</h1> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -64,7 +64,7 @@ function Dopop(link) { > </table> > [% END %] > [% ELSE %] >- <h1>Patrons with the most Checkouts</h1> >+ <h1>Patrons with the most checkouts</h1> > <form method="post" action="/cgi-bin/koha/reports/bor_issues_top.pl"> > <fieldset class="rows"> > <ol><li><label for="from">Checkout date from:</label> <input type="text" readonly="readonly" size="10" id="from" name="Filter" /> >@@ -185,20 +185,20 @@ function Dopop(link) { > </script><span class="hint">[% INCLUDE 'date-format.inc' %]</span></li> > <li> > <label for="branch">Library: </label> >-<select name="Filter" id="branch"><option value="" > Any Library</option> >+<select name="Filter" id="branch"><option value="" > Any library</option> > [% FOREACH branchloo IN branchloop %] > <option value="[% branchloo.value %]" >[% branchloo.branchname %] </option> > [% END %] > </select> </li> > <li> >- <label for="documenttype">Item Type: </label><select name="Filter" id="documenttype"><option value="" > Any item type</option> >+ <label for="documenttype">Item type: </label><select name="Filter" id="documenttype"><option value="" > Any item type</option> > [% FOREACH itemtypeloo IN itemtypeloop %] > <option value="[% itemtypeloo.value %]" >[% itemtypeloo.description %] </option> > [% END %] > </select> > </li> > <li> >- <label for="patroncategory">Patron Category: </label><select name="Filter" id="patroncategory"><option value="" > Any Category code</option> >+ <label for="patroncategory">Patron category: </label><select name="Filter" id="patroncategory"><option value="" > Any category code</option> > [% FOREACH borcatloo IN borcatloop %] > <option value="[% borcatloo.value %]" >[% borcatloo.description %] </option> > [% END %] >@@ -214,7 +214,7 @@ function Dopop(link) { > <option value ="10">10</option> > <option value ="15">15</option> > <option value ="20">20</option> >- <option value ="">No Limit</option> >+ <option value ="">No limit</option> > <!-- <option value ="25">25</option> > <option value ="40">40</option> > <option value ="50">50</option> >@@ -223,8 +223,8 @@ function Dopop(link) { > <li><label for="criteria">By: </label> <select name="Criteria" id="criteria"> > <option value ="" selected="selected">None</option> > <option value ="branchcode">Library</option> >- <option value ="categorycode">Categorycode</option> >- <option value ="itemtype">Itemtype</option> >+ <option value ="categorycode">Category code</option> >+ <option value ="itemtype">Item type</option> > <option value ="Day">Day</option> > <option value ="Week">Week</option> > <option value ="Month">Month</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >index 47a4f6c..682e6e5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Patrons with No Checkouts</title> >+<title>Koha › Reports › Patrons with no checkouts</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > </head> >@@ -7,7 +7,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › Patrons with No Checkouts</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › Patrons with no checkouts</div> > > <div id="doc3" class="yui-t2"> > >@@ -17,7 +17,7 @@ > > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h1>Patrons with no Checkouts</h1> >+ <h1>Patrons with no checkouts</h1> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -48,11 +48,11 @@ > </table> > [% END %] > [% ELSE %] >- <h1>Patrons with no Checkouts</h1> >+ <h1>Patrons with no checkouts</h1> > <form method="post" action="/cgi-bin/koha/reports/borrowers_out.pl"> > <fieldset class="rows"> > <ol> >- <li><label for="patroncategory">Patron category: </label> <select name="Filter" id="patroncategory"><option value="" > Any Category code</option> >+ <li><label for="patroncategory">Patron category: </label> <select name="Filter" id="patroncategory"><option value="" > Any category code</option> > [% FOREACH borcatloo IN borcatloop %] > <option value="[% borcatloo.value %]" >[% borcatloo.description %] </option> > [% END %] >@@ -88,7 +88,7 @@ > </select></li> > <li><label for="criteria">By: </label><select name="Criteria" id="criteria"> > <option value ="" selected="selected">None</option> >- <option value ="categorycode">Patron Category</option> >+ <option value ="categorycode">Patron category</option> > <option value ="branchcode">Library</option> > </select></li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >index dabd316..701b24c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >@@ -104,7 +104,7 @@ > </tr> > > <tr> >- <td rowspan="2">Zip Code</td> >+ <td rowspan="2">Zip code</td> > <td><input type="radio" name="Line" value="zipcode" /></td> > <td><input type="radio" name="Column" value="zipcode" /></td> > <td><select name="Filter" size="1" id="zipcode"> >@@ -148,7 +148,7 @@ > </td> > </tr> > <tr> >- <td>Date of Birth</td> >+ <td>Date of birth</td> > <td colspan="2"></td> > <td><label for="from">From</label> <input type="text" size="10" id="from" name="Filter" /> > <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> >@@ -179,7 +179,7 @@ > //]]> > </script> > <label for="to">To</label> <input size="10" id="to" name="Filter" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >index 641cefa..4104fab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Most-Circulated Items[% IF ( do_it ) %] › Results[% END %]</title> >+<title>Koha › Reports › Most-circulated items[% IF ( do_it ) %] › Results[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > [% IF ( do_it ) %] >@@ -14,7 +14,7 @@ function Dopop(link) { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › [% IF ( do_it ) %]<a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-Circulated Items</a> › Results[% ELSE %]Most-Circulated Items[% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › [% IF ( do_it ) %]<a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a> › Results[% ELSE %]Most-Circulated Items[% END %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -25,7 +25,7 @@ function Dopop(link) { > [% IF ( do_it ) %] > > [% FOREACH mainloo IN mainloop %] >- <h1>Top [% mainloo.limit %] Most-Circulated Items</h1> >+ <h1>Top [% mainloo.limit %] Most-circulated items</h1> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -42,7 +42,7 @@ function Dopop(link) { > <th> </th> > [% FOREACH loopco IN mainloo.loopcol %] > <th>Item</th> >- <th>Count of Checkouts</th> >+ <th>Count of checkouts</th> > [% END %] > </tr> > [% FOREACH loopro IN mainloo.looprow %] >@@ -72,7 +72,7 @@ function Dopop(link) { > </table> > [% END %] > [% ELSE %] >- <h1>Most-Circulated Items</h1> >+ <h1>Most-circulated items</h1> > <form method="post" action="/cgi-bin/koha/reports/cat_issues_top.pl"> > <fieldset class="rows"> > <ol> >@@ -193,20 +193,20 @@ function Dopop(link) { > ); > </script> <span class="hint">[% INCLUDE 'date-format.inc' %]</span></li> > <li><label for="branch">Library: </label> >-<select name="Filter" id="branch"><option value="" > Any Library</option> >+<select name="Filter" id="branch"><option value="" > Any library</option> > [% FOREACH branchloo IN branchloop %] > <option value="[% branchloo.value %]" >[% branchloo.branchname %] </option> > [% END %] > </select> </li> > <li> >- <label for="documenttype">Item Type: </label><select name="Filter" id="documenttype"><option value="" > Any item type</option> >+ <label for="documenttype">Item type: </label><select name="Filter" id="documenttype"><option value="" > Any item type</option> > [% FOREACH itemtypeloo IN itemtypeloop %] > <option value="[% itemtypeloo.value %]" >[% itemtypeloo.description %] </option> > [% END %] > </select> > </li> > <li> >- <label for="patroncategory">Patron Category: </label><select name="Filter" id="patroncategory"><option value="" > Any Category code</option> >+ <label for="patroncategory">Patron category: </label><select name="Filter" id="patroncategory"><option value="" > Any Category code</option> > [% FOREACH borcatloo IN borcatloop %] > <option value="[% borcatloo.value %]" >[% borcatloo.description %] </option> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt >index 1d67e2c..281fa66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt >@@ -35,7 +35,7 @@ > [% IF ( mainloo.looptables ) %] > <h3><a name="summary" id="summary"></a>Summary</h3> > <table id="summary_table"> >- <tr><th>Group</th><th>Call Number Range</th><th>Number of Items Displayed</th><th>Total Items in Group</th> >+ <tr><th>Group</th><th>Call number range</th><th>Number of items displayed</th><th>Total items in group</th> > </tr> > [% FOREACH looptable IN mainloo.looptables %] > <tr><td><a href="#table[% looptable.coltitle %]">[% looptable.coltitle %]</a></td> >@@ -59,15 +59,15 @@ > <table> > <tr> > <th>#</th> >- <th>Call Number</th> >+ <th>Call number</th> > <th>Barcode</th> >- <th>Item Details</th> >+ <th>Item details</th> > </tr> > [% IF ( looptable.looprow ) %] > [% FOREACH loopro IN looptable.looprow %] > [% DEFAULT >- loopro.itemcallnumber="No Call Number" >- loopro.barcode="No Barcode" >+ loopro.itemcallnumber="No call number" >+ loopro.barcode="No barcode" > loopro.title="NO TITLE" > loopro.author="" > %] >@@ -91,21 +91,21 @@ > [% END %] > [% END %] > [% ELSE %] >- <h1>Items with no checkouts</h1> >+ <h1>Items with no checkouts</h1> > <form method="post" action="/cgi-bin/koha/reports/catalogue_out.pl"> > > <fieldset class="rows"> > <ol> > <li><label for="branch">Library: </label> > <select name="Filter" id="branch"> >- <option value="">Any Library</option> >+ <option value="">Any library</option> > [% FOREACH branchloo IN branchloop %] > <option value="[% branchloo.value %]">[% branchloo.branchname %]</option> > [% END %] > </select></li> > <li> >- <label for="documenttype">Item Type: </label><select name="Filter" id="documenttype"> >- <option value="">Any Item Type</option> >+ <label for="documenttype">Item type: </label><select name="Filter" id="documenttype"> >+ <option value="">Any item type</option> > [% FOREACH itemtypeloo IN itemtypeloop %] > <option value="[% itemtypeloo.value %]">[% itemtypeloo.description %]</option> > [% END %] >@@ -135,7 +135,7 @@ > <li><label for="criteria">By: </label><select name="Criteria" id="criteria"> > <option value ="" selected="selected">None</option> > <option value ="homebranch">Library</option> >- <option value ="itype">Itemtype</option> >+ <option value ="itype">Item type</option> > </select></li> > </ol> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >index 9bbf03c..88fdf68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >@@ -80,7 +80,7 @@ > <tbody> > [% IF ( haslccn ) %] > <tr> >- <td>LoC Classification</td> >+ <td>LoC classification</td> > <td><input type="radio" name="Line" value="lccn" /></td> > <td><input type="radio" name="Column" value="lccn" /></td> > <td> <label for="locFrom">From</label> <input type="text" name="Filter" id="locFrom" /> <label for="locTo">To</label> <input type="text" name="Filter" id="locTo" /></td> >@@ -102,7 +102,7 @@ > [% END %] > [% IF ( hascote ) %] > <tr> >- <td>Koha Full Call Number</td> >+ <td>Koha full call number</td> > <td><input type="radio" name="Line" value="items.itemcallnumber" /></td> > <td><input type="radio" name="Column" value="items.itemcallnumber" /></td> > <td><label for="callnoFrom">From</label> <input type="text" name="Filter" id="callnoFrom" /> <label for="callnoTo">To</label> <input type="text" name="Filter" id="callnoTo" /></td> >@@ -125,7 +125,7 @@ > <tr><td colspan="4"><input type="hidden" name="Filter" /> <input type="hidden" name="Filter" /></td></tr> > [% END %] > <tr> >- <td>Item Type</td> >+ <td>Item type</td> > <td><input type="radio" name="Line" value="[% item_itype %]" /></td> > <td><input type="radio" name="Column" value="[% item_itype %]" /></td> > <td><select name="Filter" id="[% item_itype %]"> >@@ -145,13 +145,13 @@ > <td><input type="text" name="Filter" /></td> > </tr> > <tr> >- <td>Publication Year</td> >+ <td>Publication year</td> > <td><input type="radio" name="Line" value="publicationyear" /></td> > <td><input type="radio" name="Column" value="publicationyear" /></td> > <td><label for="pubyearFrom">From</label> <input type="text" name="Filter" id="pubyearFrom" /> <label for="pubyearTo">To</label> <input type="text" name="Filter" id="pubyearTo" /></td> > </tr> > <tr> >- <td>Home Library</td> >+ <td>Home library</td> > <td><input type="radio" name="Line" value="items.homebranch" /></td> > <td><input type="radio" name="Column" value="items.homebranch" /></td> > <td><select name="Filter" id="branch"> >@@ -163,7 +163,7 @@ > </td> > </tr> > <tr> >- <td>Shelving Location</td> >+ <td>Shelving location</td> > <td><input type="radio" name="Line" value="items.location" /></td> > <td><input type="radio" name="Column" value="items.location" /></td> > <td><select name="Filter" id="location"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >index 5c0da1e..3f913d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Guided Reports › Dictionary</title> >+<title>Koha › Reports › Guided reports › Dictionary</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > <style type="text/css">fieldset.rows table { clear: none; margin: 0;}</style> >@@ -8,7 +8,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'circ-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided Reports Wizard</a> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a> > [% IF ( new_dictionary ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Name the new definition</strong> > [% ELSIF ( step_2 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 2: Choose the area </strong> > [% ELSIF ( step_3 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 3: Choose columns </strong> >@@ -29,9 +29,9 @@ > <p>Use the dictionary to define custom criteria for reporting.</p> > > [% IF ( definitions ) %] >- <h2>Current Terms</h2> >+ <h2>Current terms</h2> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> >- <input type="hidden" name="phase" value="View Dictionary" /> >+ <input type="hidden" name="phase" value="View dictionary" /> > [% IF ( areas ) %] > Filter by area <select name="areas"> > <option value="">All</option> >@@ -77,30 +77,30 @@ > [% END %] > > [% IF ( new_dictionary ) %] >-<h3>Add New Definition</h3> >+<h3>Add new definition</h3> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"><legend>Step 1 of 5: Name the new definition</legend><ol> > <li> >-<label for="definition_name">Definition Name:</label> >+<label for="definition_name">Definition name:</label> > <input type="text" id="definition_name" name="definition_name" /> > </li> > <li> >-<label for="definition_description">Definition Description:</label> >+<label for="definition_description">Definition description:</label> > <textarea name="definition_description" id="definition_description" rows="3" cols="20"></textarea> > </li> > </ol></fieldset> >- >+ > <fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" /> > <input name="submit" value="Next" type="submit" /></fieldset> > </form> > [% END %] > > [% IF ( step_2 ) %] >-<h3>Add New Definition</h3> >+<h3>Add new definition</h3> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"> > <legend>Step 2 of 5: Choose the area</legend> >-<ol><li><input type="hidden" name="phase" value="New Term step 3" /> >+<ol><li><input type="hidden" name="phase" value="New term step 3" /> > <input type="hidden" name="definition_name" value="[% definition_name %]" /> > <input type="hidden" name="definition_description" value="[% definition_description %]" /> > <label for="areas">Select table </label><select name="areas" id="areas"> >@@ -115,7 +115,7 @@ > [% END %] > > [% IF ( step_3 ) %] >-<h3>Add New Definition</h3> >+<h3>Add new definition</h3> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"> > <legend>Step 3 of 5: Choose columns</legend> >@@ -149,14 +149,14 @@ > > <td style="border: 0;"><select id="selectedColumns" name="columns" size="25" style="width:200px;height:300px;"></select> </td> </tr></table> > >-<input type="hidden" name="phase" value="New Term step 4" /> >+<input type="hidden" name="phase" value="New term step 4" /> > </fieldset> > <fieldset class="action"><input type="submit" name="submit" value="Next" /></fieldset> > </form> > [% END %] > > [% IF ( step_4 ) %] >-<h3>Add New Definition</h3> >+<h3>Add new definition</h3> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"> > <legend>Step 4 of 5: Specify a value</legend> >@@ -223,7 +223,7 @@ > > [% END %] > </ol> >-<input type="hidden" name="phase" value="New Term step 5" /> >+<input type="hidden" name="phase" value="New term step 5" /> > </fieldset> > <fieldset class="action"> > <input type="submit" name="submit" value="Next" /> >@@ -238,7 +238,7 @@ > <input type="hidden" name="definition_description" value="[% definition_description %]" /> > <input type="hidden" name="columnstring" value="[% columnstring %]" /> > >-<h3>Add New Definition</h3> >+<h3>Add new definition</h3> > > <fieldset class="rows"> > <legend>Step 5 of 5: Confirm details</legend> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index ea933aa..ba52f1c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -1,14 +1,14 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Guided Reports Wizard >+<title>Koha › Reports › Guided reports wizard > [% IF ( saved1 ) %]› Saved Reports > [% ELSIF ( create ) %]› Create from SQL >-[% ELSIF ( showsql ) %]› Saved Reports › SQL View >-[% ELSIF ( execute ) %]› Saved Reports › [% name %] Report >-[% ELSIF ( buildx ) %]› Build A Report, Step [% buildx %] of 6: >-[% IF ( build1 ) %]Choose a Module >-[% ELSIF ( build2 ) %]Pick a Report Type >-[% ELSIF ( build3 ) %]Select Columns for Display >-[% ELSIF ( build4 ) %]Select Criteria to Limit on >+[% ELSIF ( showsql ) %]› Saved reports › SQL view >+[% ELSIF ( execute ) %]› Saved reports › [% name %] Report >+[% ELSIF ( buildx ) %]› Build a report, step [% buildx %] of 6: >+[% IF ( build1 ) %]Choose a module >+[% ELSIF ( build2 ) %]Pick a report type >+[% ELSIF ( build3 ) %]Select columns for display >+[% ELSIF ( build4 ) %]Select criteria to limit on > [% ELSIF ( build5 ) %]Pick which columns to total > [% ELSIF ( build6 ) %]Select how you want the report ordered > [% END %] >@@ -66,17 +66,17 @@ $(document).ready(function(){ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >-› <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided Reports Wizard</a> >+› <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a> > › >-[% IF ( saved1 ) %]Saved Reports >+[% IF ( saved1 ) %]Saved reports > [% ELSIF ( create ) %]Create from SQL >-[% ELSIF ( showsql ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved Reports</a> › SQL View >-[% ELSIF ( execute ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved Reports</a> › <em>[% name %]</em> Report >-[% ELSIF ( buildx ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build A Report</a> › Step [% buildx %] of 6: >- [% IF ( build1 ) %]Choose a Module >- [% ELSIF ( build2 ) %]Pick a Report Type >- [% ELSIF ( build3 ) %]Select Columns for Display >- [% ELSIF ( build4 ) %]Select Criteria to Limit on >+[% ELSIF ( showsql ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> › SQL view >+[% ELSIF ( execute ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> › <em>[% name %]</em> Report >+[% ELSIF ( buildx ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a report</a> › Step [% buildx %] of 6: >+ [% IF ( build1 ) %]Choose a module >+ [% ELSIF ( build2 ) %]Pick a report type >+ [% ELSIF ( build3 ) %]Select columns for display >+ [% ELSIF ( build4 ) %]Select criteria to limit on > [% ELSIF ( build5 ) %]Pick which columns to total > [% ELSIF ( build6 ) %]Select how you want the report ordered > [% END %] >@@ -90,12 +90,12 @@ $(document).ready(function(){ > [% INCLUDE "reports-toolbar.inc" %] > > [% IF ( start ) %] >- <h2>Guided Reports</h2> >+ <h2>Guided reports</h2> > <p>Use the guided reports engine to create non standard reports. > This feature aims to provide some middle ground between the built in > canned reports and writing custom SQL reports.</p> > >- <h3>Build And Run Reports</h3> >+ <h3>Build and run reports</h3> > [% IF ( CAN_user_reports_create_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl"> > <input type="hidden" name="phase" value="Build new" /> >@@ -117,13 +117,13 @@ canned reports and writing custom SQL reports.</p> > <h3>Reports Dictionary</h3> > <p>Use the reports dictionary to define custom criteria to use in your reports</p> > <form action="/cgi-bin/koha/reports/dictionary.pl"> >-<input type="hidden" name="phase" value="View Dictionary"/> >-<input type="submit" name="submit" value="View Dictionary"/> >+<input type="hidden" name="phase" value="View dictionary"/> >+<input type="submit" name="submit" value="View dictionary"/> > </form> > [% END %] > > [% IF ( saved1 ) %] >-[% IF ( savedreports ) %]<h1>Saved Reports</h1> >+[% IF ( savedreports ) %]<h1>Saved reports</h1> > > <div id="pagertable_reports"> > [% INCLUDE 'table-pager.inc' perpage='20' %] >@@ -133,12 +133,12 @@ canned reports and writing custom SQL reports.</p> > <thead> > <tr> > <th>ID</th> >- <th>Report Name</th> >+ <th>Report name</th> > <th>Type</th> > <th>Notes</th> > <th>Author</th> >- <th>Creation Date</th> >- <th>Saved Results</th> >+ <th>Creation date</th> >+ <th>Saved results</th> > <th>Saved SQL</th> > <th> </th> > <th> </th> >@@ -199,10 +199,10 @@ canned reports and writing custom SQL reports.</p> > > > [% IF ( build1 ) %] >-<h1>Build A Report</h1> >+<h1>Build a report</h1> > <form action="/cgi-bin/koha/reports/guided_reports.pl"> > <fieldset class="rows"> >-<legend>Step 1 of 6: Choose a Module to Report on</legend> >+<legend>Step 1 of 6: Choose a module to report on</legend> > <ol><li><label for="areas">Choose: </label><select name="areas" id="areas"> > [% FOREACH area IN areas %] > <option value="[% area.id %]">[% area.name %]</option> >@@ -222,7 +222,7 @@ canned reports and writing custom SQL reports.</p> > <h1>Build A Report</h1> > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> > <input type="hidden" name="area" value="[% area %]" /> >-<fieldset class="rows"><legend>Step 2 of 6: Pick a Report Type</legend> >+<fieldset class="rows"><legend>Step 2 of 6: Pick a report type</legend> > <ol><li><label for="types">Choose: </label> > <select id="types" name="types"> > <option value="1">Tabular</option> >@@ -249,7 +249,7 @@ canned reports and writing custom SQL reports.</p> > [% END %] > > [% IF ( build3 ) %] >-<h3>Step 3 of 6: Select Columns for Display</h3> >+<h3>Step 3 of 6: Select columns for display</h3> > <p>Note: Be careful selecting when selecting columns. If your choice is too broad it could result in a very large report that will either not complete, or slow your system down.</p> > > <form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> >@@ -303,7 +303,7 @@ canned reports and writing custom SQL reports.</p> > <input type="hidden" name="area" value="[% area %]" /> > <input type="hidden" name="type" value="[% type %]" /> > <input type="hidden" name="column" value="[% column %]" /> >- <fieldset><legend>Step 4 of 6: Select Criteria to Limit on</legend> >+ <fieldset><legend>Step 4 of 6: Select criteria to limit on</legend> > <table> > [% FOREACH criteri IN criteria %] > <tr> >@@ -314,7 +314,7 @@ canned reports and writing custom SQL reports.</p> > [% IF ( criteri.date ) %] > <td> > <input type="text" size="10" id="[% criteri.name %]_value" name="[% criteri.name %]_value" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom[% criteri.name %]" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom[% criteri.name %]" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "[% criteri.name %]_value", >@@ -337,7 +337,7 @@ canned reports and writing custom SQL reports.</p> > [% IF ( criteri.daterange ) %] > <td>from > <input type="text" size="10" id="from_[% criteri.name %]_value" name="from_[% criteri.name %]_value" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfromfrom_[% criteri.name %]" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfromfrom_[% criteri.name %]" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "from_[% criteri.name %]_value", >@@ -348,7 +348,7 @@ canned reports and writing custom SQL reports.</p> > </script> > to > <input type="text" size="10" id="to_[% criteri.name %]_value" name="to_[% criteri.name %]_value" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfromto_[% criteri.name %]" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfromto_[% criteri.name %]" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "to_[% criteri.name %]_value", >@@ -377,7 +377,7 @@ canned reports and writing custom SQL reports.</p> > </fieldset> > > [% IF ( definitions ) %] >-<fieldset><legend>Dictionary Definitions</legend><table> >+<fieldset><legend>Dictionary definitions</legend><table> > [% FOREACH definition IN definitions %] > <tr><td><input type="checkbox" name="definition" value="[% definition.id %]" /> [% definition.name %]</td></tr> > [% END %] >@@ -413,7 +413,7 @@ canned reports and writing custom SQL reports.</p> > [% END %] > </table></fieldset> > >-<fieldset class="action"><input type="hidden" name="phase" value="Choose These Operations" /> >+<fieldset class="action"><input type="hidden" name="phase" value="Choose these operations" /> > <input type="button" name="back" value="<< Back" onclick="javascript:history.back()" /> > <input type="submit" name="submit" value="Next >>" /></fieldset> > </form> >@@ -443,14 +443,14 @@ canned reports and writing custom SQL reports.</p> > </table></fieldset> > > <fieldset class="action"> >-<input type="hidden" name="phase" value="Build Report" /> >+<input type="hidden" name="phase" value="Build report" /> > <input type="submit" name="submit" value="Finish" /></fieldset> > </form> > [% END %] > > > [% IF ( showreport ) %] >-<h1>Confirm Custom Report</h1> >+<h1>Confirm custom report</h1> > <p>Your report will be generated with the following SQL statement.</p> > <p> > [% sql |html %] >@@ -470,13 +470,13 @@ canned reports and writing custom SQL reports.</p> > <input type="hidden" name="sql" value="[% sql |html %]" /> > <input type="hidden" name="type" value="[% type %]" /> > <fieldset class="rows"> >-<legend>Save Your Custom Report</legend> >+<legend>Save your custom report</legend> > <ol> >- <li><label for="reportname">Report Name: </label><input type="text" id="reportname" name="reportname" /></li> >+ <li><label for="reportname">Report name: </label><input type="text" id="reportname" name="reportname" /></li> > <li><label for="notes">Notes:</label> <textarea name="notes" id="notes"></textarea></li> > </ol></fieldset> >-<fieldset class="action"><input type="hidden" name="phase" value="Save Report" /> >-<input type="submit" name="submit" value="Save Report" /></fieldset> >+<fieldset class="action"><input type="hidden" name="phase" value="Save report" /> >+<input type="submit" name="submit" value="Save report" /></fieldset> > </form> > [% END %] > >@@ -490,7 +490,7 @@ canned reports and writing custom SQL reports.</p> > [% IF sql_param.input == 'date' %] > <p> > [% sql_param.entry %]: <input id="date_[% sql_param_entry %]" type="text" value="" size="10" name="sql_params"> >- <img id="date_picker_[% sql_param_entry %]" alt="Show Calendar" src="/intranet-tmpl/prog/en/lib/calendar/cal.gif"> >+ <img id="date_picker_[% sql_param_entry %]" alt="Show calendar" src="/intranet-tmpl/prog/en/lib/calendar/cal.gif"> > <script type="text/javascript"> > Calendar.setup( { > inputField : "date_[% sql_param_entry %]", >@@ -526,8 +526,8 @@ canned reports and writing custom SQL reports.</p> > <fieldset class="action"> > <label for="format">Download the report: </label> > <select name="format" id="format"> >-<option value="csv">Comma Separated Text</option> >-<option value="tab">Tab Separated Text</option> >+<option value="csv">Comma separated text</option> >+<option value="tab">Tab separated text</option> > </select> > <input type="hidden" name="sql" value="[% sql |html %]" /> > <input type="hidden" name="phase" value="Export" /> >@@ -539,9 +539,9 @@ canned reports and writing custom SQL reports.</p> > [% IF ( create ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> > <fieldset class="rows"> >-<legend>Create Report From SQL</legend> >+<legend>Create report from SQL</legend> > <ol> >- <li><label for="reportname">Report Name:</label> >+ <li><label for="reportname">Report name:</label> > [% IF ( reportname ) %]<input type="text" id="reportname" name="reportname" value="[% reportname %]" /> > [% ELSE %]<input type="text" id="reportname" name="reportname" />[% END %] > </li> >@@ -562,7 +562,7 @@ canned reports and writing custom SQL reports.</p> > </div> > </fieldset> > >-<fieldset class="action"><input type="hidden" name="phase" value="Save Report" /> >+<fieldset class="action"><input type="hidden" name="phase" value="Save report" /> > <input type="submit" name="submit" value="Save Report" /> <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a> > </fieldset> > </form> >@@ -582,8 +582,8 @@ Sub report:<select name="subreport"> > [% END %] > </select> > <br /> >-<input type="hidden" name="phase" value="Save Compound" /> >-<input type="submit" name="submit" value="Save Compound" /> >+<input type="hidden" name="phase" value="Save compound" /> >+<input type="submit" name="submit" value="Save compound" /> > </form> > [% END %] > >@@ -594,7 +594,7 @@ Sub report:<select name="subreport"> > > > [% IF ( retresults ) %] >-<h1>Saved Report Results</h1> >+<h1>Saved report results</h1> > <h2>[% name %]</h2> > <p>[% notes %]</p> > <table> >@@ -621,7 +621,7 @@ Sub report:<select name="subreport"> > <fieldset class="rows"> > <legend>Edit SQL report</legend> > <ol> >-<li><label for="reportname">Report Name:</label><input type="text" id="reportname" name="reportname" value="[% reportname %]" size="50" /></li> >+<li><label for="reportname">Report name:</label><input type="text" id="reportname" name="reportname" value="[% reportname %]" size="50" /></li> > <li><label for="notes">Notes:</label><textarea id="notes" name="notes" cols="50" rows="2">[% notes %]</textarea></li> > <li><textarea id="sql" name="sql" rows="10" cols="60">[% sql %]</textarea></li> > </ol> >@@ -643,9 +643,9 @@ Sub report:<select name="subreport"> > [% IF ( id ) %] > <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Run%20this%20report">Run this report</a></li> > [% END %] >- <li>Access this report from the: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved Reports Page</a></li> >- <li>Schedule this report to run using the: <a href="/cgi-bin/koha/tools/scheduler.pl">Scheduler Tool</a></li> >- <li>Return to: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Guided Reports</a></li> >+ <li>Access this report from the: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports page</a></li> >+ <li>Schedule this report to run using the: <a href="/cgi-bin/koha/tools/scheduler.pl">Scheduler tool</a></li> >+ <li>Return to: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Guided reports</a></li> > </ul> > [% END %] > [% END %] >@@ -664,7 +664,7 @@ Sub report:<select name="subreport"> > [% END %] > </div> > <fieldset class="action"><input type="hidden" name="phase" value="Use saved" /> >-<input type="submit" name="submit" value="Saved Reports" /></fieldset> >+<input type="submit" name="submit" value="Saved reports" /></fieldset> > </form> > [% END %] > >@@ -681,7 +681,7 @@ Sub report:<select name="subreport"> > <h3>Filter</h3> > <ol> > <li><label for="filter_date">Date: >- <img src="[% themelang %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show Calendar" /></label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filter_date %]" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show calendar" /></label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filter_date %]" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > <script type="text/javascript"> > Calendar.setup( >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >index 311e355..4e1d324 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >@@ -7,7 +7,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]› <a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average Checkout Period</a> › Results [% ELSE %]› Average Checkout Period[% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]› <a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average checkout period</a> › Results [% ELSE %]› Average checkout period[% END %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -17,7 +17,7 @@ > > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h1>Average Checkout Period</h1> >+ <h1>Average checkout period</h1> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -107,7 +107,7 @@ > ); > </script> > <label for="to">To</label> <input size="10" id="to" name="Filter" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >@@ -154,7 +154,7 @@ > <td><input type="radio" name="Line" value="returndate" /></td> > <td><input type="radio" name="Column" value="returndate" /></td> > <td > <label for="fromRO">From</label> <input type="text" size="10" id="fromRO" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > function validate1(date) { > var day = date.getDate(); >@@ -183,7 +183,7 @@ > ); > </script> > <label for="toRO">To</label> <input type="text" size="10" id="toRO" name="Filter" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >@@ -245,7 +245,7 @@ > </tr> > <!-- Modified according to statistics table > <tr> >- <td>Issuing Library</td> >+ <td>Issuing library</td> > <td><input type="radio" name="Line" value="issuingbranch"></td> > <td><input type="radio" name="Column" value="issuingbranch"></td> > <td >[% CGIBranch %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >index 1ff9016..0c47d91 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >@@ -84,7 +84,7 @@ > <td><input type="radio" name="Line" value="datetime" /></td> > <td><input type="radio" name="Column" value="datetime" /></td> > <td><label for="from">From</label> <input type="text" size="10" id="from" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -112,7 +112,7 @@ > //]]> > </script> > <label for="to">To</label> <input size="10" id="to" name="Filter" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -156,7 +156,7 @@ > </select> > </td> > <td> >- <label for="PeriodDaySel">Select Day: </label><select name="PeriodDaySel" id="PeriodDaySel"> >+ <label for="PeriodDaySel">Select day: </label><select name="PeriodDaySel" id="PeriodDaySel"> > <option value =""></option> > <option value ="Monday">Monday</option> > <option value ="Tuesday">Tuesday</option> >@@ -166,7 +166,7 @@ > <option value ="Saturday">Saturday</option> > <option value ="Sunday">Sunday</option> > </select> >- <label for="PeriodMonthSel">Select Month:</label> <select name="PeriodMonthSel" id="PeriodMonthSel"> >+ <label for="PeriodMonthSel">Select month:</label> <select name="PeriodMonthSel" id="PeriodMonthSel"> > <option value =""></option> > <option value ="January">January</option> > <option value ="February">February</option> >@@ -184,7 +184,7 @@ > </td> > </tr> > <tr> >- <td>Patron Category</td> >+ <td>Patron category</td> > <td><input type="radio" name="Line" value="borrowers.categorycode" /></td> > <td><input type="radio" name="Column" value="borrowers.categorycode" /></td> > <td><select name="Filter" id="borcat"> >@@ -196,7 +196,7 @@ > </td> > </tr> > <tr class="highlight"> >- <td>Item Type</td> >+ <td>Item type</td> > <td><input type="radio" name="Line" value="itemtype" /></td> > <td><input type="radio" name="Column" value="itemtype" /></td> > <td><select name="Filter" id="itemtype"> >@@ -232,7 +232,7 @@ > </td> > </tr> > <tr> >- <td>Shelving Location</td> >+ <td>Shelving location</td> > <td><input type="radio" name="Line" value="items.location" /></td> > <td><input type="radio" name="Column" value="items.location" /></td> > <td><select name="Filter" id="location"> >@@ -244,13 +244,13 @@ > </td> > </tr> > <tr class="highlight"> >- <td>Item Call Number</td> >+ <td>Item call number</td> > <td></td> > <td></td> > <td>From <input type="text" name="Filter" size="10" /> (inclusive) to <input type="text" name="Filter" size="10" /> (exclusive) </td> > </tr> > [% IF ( hassort1 ) %] >- <tr><td>Patron sort1</td> >+ <tr><td>Patron sort 1</td> > <td><input type="radio" name="Line" value="borrowers.sort1" /></td> > <td><input type="radio" name="Column" value="borrowers.sort1" /></td> > <td><select name="Filter" id="sort1"> >@@ -263,7 +263,7 @@ > </tr> > [% END %] > [% IF ( hassort2 ) %] >- <tr class="highlight"><td>Patron sort2</td> >+ <tr class="highlight"><td>Patron sort 2</td> > <td><input type="radio" name="Line" value="borrowers.sort2" /></td> > <td><input type="radio" name="Column" value="borrowers.sort2" /></td> > <td><select name="Filter" id="sort2"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index d21bec4..8fb7872 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -1,12 +1,12 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Lost Items</title> >+<title>Koha › Reports › Lost items</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="rep_itemslost" class="rep"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>[% IF ( get_items ) %] › <a href="/cgi-bin/koha/reports/itemslost.pl">Lost Items</a> › Results[% ELSE %] › Lost Items[% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>[% IF ( get_items ) %] › <a href="/cgi-bin/koha/reports/itemslost.pl">Lost Items</a> › Results[% ELSE %] › Lost items[% END %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -14,7 +14,7 @@ > <div id="yui-main"> > <div class="yui-b"> > >-<h1>Lost Items</h1> >+<h1>Lost items</h1> > > [% IF ( get_items ) %] > >@@ -30,13 +30,13 @@ > <tr> > <th>Title</th> > <th>Author</th> >- <th>Lost Code</th> >+ <th>Lost code</th> > <th>Barcode</th> > <th>Date last seen</th> > <th>Price</th> >- <th>Rep.Price</th> >+ <th>Rep.price</th> > <th>Library</th> >- <th>Itemtype</th> >+ <th>Item type</th> > <th>Current location</th> > <th>Location</th> > <th>Notes</th> >@@ -76,12 +76,12 @@ > <option value="title">Title</option> > <option value="author">Author</option> > <option value="homebranch">Home library</option> >- <option value="itype">Itemtypes</option> >+ <option value="itype">Item types</option> > <option value="barcode">Barcode</option> > <option value="price">Price</option> >- <option value="replacementprice">Replacement Price</option> >- <option value="lib">Lost Code</option> >- <option value="datelastseen">Date Last Seen</option> >+ <option value="replacementprice">Replacement price</option> >+ <option value="lib">Lost code</option> >+ <option value="datelastseen">Date last seen</option> > <option value="location">Location</option> > </select></li> > >@@ -95,7 +95,7 @@ > [% END %] > [% END %] > </select></li> >- <li><label for="itemtypesfilter">Item Type: </label><select name="itemtypesfilter" id="itemtypesfilter"> >+ <li><label for="itemtypesfilter">Item type: </label><select name="itemtypesfilter" id="itemtypesfilter"> > <option value="">All</option> > [% FOREACH itemtypeloo IN itemtypeloop %] > [% IF ( itemtypeloo.selected ) %]<option value="[% itemtypeloo.value %]" selected="selected">[% itemtypeloo.description %]</option> >@@ -105,7 +105,7 @@ > [% END %] > </select></li> > >- <li><label for="loststatusfilter">Lost Status: </label><select name="loststatusfilter" id="loststatusfilter"> >+ <li><label for="loststatusfilter">Lost status: </label><select name="loststatusfilter" id="loststatusfilter"> > <option value="">All</option> > [% FOREACH loststatusloo IN loststatusloop %] > [% IF ( loststatusloo.selected ) %]<option value="[% loststatusloo.authorised_value %]" selected="selected">[% loststatusloo.lib %]</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >index 307eefc..6a30dc9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Catalog by Item Types</title> >+<title>Koha › Reports › Catalog by item types</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> >@@ -14,7 +14,7 @@ $(document).ready(function() { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>[% IF ( do_it ) %] › <a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by Item Type</a> › Results[% ELSE %] › Catalog by Item Type[% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>[% IF ( do_it ) %] › <a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by Item Type</a> › Results[% ELSE %] › Catalog by item type[% END %]</div> > > <div id="doc3" class="yui-t2"> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >index 9f9d532..32c1803 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >@@ -14,17 +14,17 @@ > > <div class="yui-g"> > <h1>Reports</h1> >- <div class="yui-u first"><h2>Guided Reports</h2> >+ <div class="yui-u first"><h2>Guided reports</h2> > <ul> >- <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided Reports Wizard</a></li> >- [% IF ( CAN_user_reports_create_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build New</a></li>[% END %] >- [% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Use Saved</a></li>[% END %] >+ <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a></li> >+ [% IF ( CAN_user_reports_create_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build new</a></li>[% END %] >+ [% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Use saved</a></li>[% END %] > [% IF ( CAN_user_reports_create_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">Create from SQL</a></li>[% END %] > </ul> > >- <h5>Reports Dictionary</h5> >+ <h5>Reports dictionary</h5> > <ul> >- <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View Dictionary</a></li> >+ <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li> > </ul> > > <h2>Statistics wizards</h2> >@@ -37,10 +37,10 @@ > <li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li> > </ul></div> > >- <div class="yui-u"><h2>Top Lists</h2> >+ <div class="yui-u"><h2>Top lists</h2> > <ul> > <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons checking out the most</a></li> >- <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-Circulated Items</a></li> >+ <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li> > </ul> > > <h2>Inactive</h2> >@@ -52,11 +52,11 @@ > <h2>Other</h2> > <ul> > <li><a href="/cgi-bin/koha/reports/itemslost.pl">Items lost</a></li> >- <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by itemtype</a></li> >+ <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by item type</a></li> > <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li> >- <li><a href="http://schema.koha-community.org/" target="blank">Koha Database Schema</a></li> >- <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha Reports Library</a></li> >- <!--<li><a href="/cgi-bin/koha/reports/stats.screen.pl">Till Reconciliation</a></li> --> >+ <li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li> >+ <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha reports library</a></li> >+ <!--<li><a href="/cgi-bin/koha/reports/stats.screen.pl">Till reconciliation</a></li> --> > </ul></div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt >index 3abe04e..c2cbc4f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt >@@ -1,12 +1,12 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Hold Report › All Holds</title> >+<title>Koha › Hold Report › All holds</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="rep_reservereport" class="rep"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › All Holds</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › All holds</div> > > <div id="doc3" class="yui-t2"> > >@@ -15,7 +15,7 @@ > <div class="yui-b"> > > <table> >- <tr><th>Name</th><th>Hold Date</th><th>Title</th><th>Class</th></tr> >+ <tr><th>Name</th><th>Hold date</th><th>Title</th><th>Class</th></tr> > [% FOREACH dataloo IN dataloop %] > <tr> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >index 0fe8c07..00600eb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >@@ -85,7 +85,7 @@ > </thead> > <tbody> > <tr > >- <td>Hold Status </td> >+ <td>Hold status </td> > <td><input type="radio" name="Line" value="reservestatus" /></td> > <td><input type="radio" name="Column" value="reservestatus" checked="checked" /></td> > <td> >@@ -101,7 +101,7 @@ > <td><input type="radio" name="Line" value="reservedate" /></td> > <td><input type="radio" name="Column" value="reservedate" /></td> > <td><label for="filter_reservedate_begin">From</label> <input type="text" size="10" id="filter_reservedate_begin" name="filter_reservedate_begin" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openreservedateFrom" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openreservedateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -129,7 +129,7 @@ > //]]> > </script> > <label for="filter_reservedate_end">To</label> <input size="10" id="filter_reservedate_end" name="filter_reservedate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openreservedateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openreservedateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -163,7 +163,7 @@ > <td><input type="radio" name="Line" value="notificationdate" /></td> > <td><input type="radio" name="Column" value="notificationdate" /></td> > <td><label for="filter_notificationdate_begin">From</label> <input type="text" size="10" id="filter_notificationdate_begin" name="filter_notificationdate_begin" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="opennotificationdateFrom" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="opennotificationdateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -191,7 +191,7 @@ > //]]> > </script> > <label for="filter_notificationdate_end">To</label> <input size="10" id="filter_notificationdate_end" name="filter_notificationdate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="opennotificationdateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="opennotificationdateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -225,7 +225,7 @@ > <td><input type="radio" name="Line" value="reminderdate" /></td> > <td><input type="radio" name="Column" value="reminderdate" /></td> > <td><label for="filter_reminderdate_begin">From</label> <input type="text" size="10" id="filter_reminderdate_begin" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openreminderdateFrom" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openreminderdateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -253,7 +253,7 @@ > //]]> > </script> > <label for="filter_reminderdate_end">To</label> <input size="10" id="filter_reminderdate_end" name="filter_reminderdate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openreminderdateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openreminderdateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -287,7 +287,7 @@ > <td><input type="radio" name="Line" value="waitingdate" /></td> > <td><input type="radio" name="Column" value="waitingdate" /></td> > <td><label for="filter_waitingdate_begin">From</label> <input type="text" size="10" id="filter_waitingdate_begin" name="filter_waitingdate_begin" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openwaitingdateFrom" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openwaitingdateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -315,7 +315,7 @@ > //]]> > </script> > <label for="filter_waitingdate_end">To</label> <input size="10" id="filter_waitingdate_end" name="filter_waitingdate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openwaitingdateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openwaitingdateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -349,7 +349,7 @@ > <td><input type="radio" name="Line" value="cancellationdate" /></td> > <td><input type="radio" name="Column" value="cancellationdate" /></td> > <td><label for="filter_cancellationdate_begin">From</label> <input type="text" size="10" id="filter_cancellationdate_begin" name="filter_cancellationdate_begin" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="opencancellationdateFrom" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="opencancellationdateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -377,7 +377,7 @@ > //]]> > </script> > <label for="filter_cancellationdate_end">To</label> <input size="10" id="filter_cancellationdate_end" name="filter_cancellationdate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="opencancellationdateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="opencancellationdateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -407,7 +407,7 @@ > </td> > </tr> > <tr> >- <td>Patron Category</td> >+ <td>Patron category</td> > <td><input type="radio" name="Line" value="borrowers.categorycode" /></td> > <td><input type="radio" name="Column" value="borrowers.categorycode" /></td> > <td><select name="filter_categorycode" id="borcat"> >@@ -419,7 +419,7 @@ > </td> > </tr> > <tr class="highlight"> >- <td>Item Type</td> >+ <td>Item type</td> > <td><input type="radio" name="Line" value="items.itype" /></td> > <td><input type="radio" name="Column" value="items.itype" /></td> > <td><select name="filter_items.itype" id="itype"> >@@ -431,7 +431,7 @@ > </td> > </tr> > <tr> >- <td>Pickup Library</td> >+ <td>Pickup library</td> > <td><input type="radio" name="Line" value="reserves.branchcode" checked="checked" /></td> > <td><input type="radio" name="Column" value="reserves.branchcode" /></td> > <td><select name="filter_reserves.branchcode" id="resbranchcode"> >@@ -443,7 +443,7 @@ > </td> > </tr> > <tr class="highlight"> >- <td>Holding Library</td> >+ <td>Holding library</td> > <td><input type="radio" name="Line" value="items.holdingbranch" /></td> > <td><input type="radio" name="Column" value="items.holdingbranch" /></td> > <td><select name="filter_items.holdingbranch" id="holdingbranch"> >@@ -455,7 +455,7 @@ > </td> > </tr> > <tr> >- <td>Home Library</td> >+ <td>Home library</td> > <td><input type="radio" name="Line" value="items.homebranch" /></td> > <td><input type="radio" name="Column" value="items.homebranch" /></td> > <td><select name="filter_items.homebranch" id="homebranch"> >@@ -479,7 +479,7 @@ > </td> > </tr> > <tr> >- <td>Shelving Location</td> >+ <td>Shelving location</td> > <td><input type="radio" name="Line" value="items.location" /></td> > <td><input type="radio" name="Column" value="items.location" /></td> > <td><select name="filter_items.location" id="location"> >@@ -491,13 +491,13 @@ > </td> > </tr> > <tr class="highlight"> >- <td>Item Call Number</td> >+ <td>Item call number</td> > <td></td> > <td></td> > <td>From <input type="text" name="filter_items.itemcallnumber_begin" size="10" /> (inclusive) to <input type="text" name="filter_items.itemcallnumber_endex" size="10" /> (exclusive) </td> > </tr> > [% IF ( hassort1 ) %] >- <tr><td>Patron sort1</td> >+ <tr><td>Patron sort 1</td> > <td><input type="radio" name="Line" value="borrowers.sort1" /></td> > <td><input type="radio" name="Column" value="borrowers.sort1" /></td> > <td><select name="filter_borrowers.sort1" id="sort1"> >@@ -510,7 +510,7 @@ > </tr> > [% END %] > [% IF ( hassort2 ) %] >- <tr class="highlight"><td>Patron sort2</td> >+ <tr class="highlight"><td>Patron sort 2</td> > <td><input type="radio" name="Line" value="borrowers.sort2" /></td> > <td><input type="radio" name="Column" value="borrowers.sort2" /></td> > <td><select name="filter_borrowers.sort2" id="sort2"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >index 10df0cf..c42bc45 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › serials subscriptions stats</title> >+<title>Koha › Reports › Serials subscriptions stats</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> > .sql {display: none;} >@@ -19,7 +19,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › Items with no checkouts</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › Serials subscriptions stats</div> > > <div id="doc3" class="yui-t2"> > <div id="bd"> >@@ -35,9 +35,9 @@ > <th>Title</th> > <th>Subscription id</th> > <th>Branch</th> >- <th>Call Number</th> >- <th>Subscription Begin</th> >- <th>Subscription End</th> >+ <th>Call number</th> >+ <th>Subscription begin</th> >+ <th>Subscription end</th> > </tr> > </thead> > <tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt >index 3c6f9cb..282ef98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Till Reconciliation</title> >+<title>Koha › Reports › Till reconciliation</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > >@@ -7,7 +7,7 @@ > <body id="rep_stats_screen" class="rep"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'circ-search.inc' %] >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › Till Reconciliation >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › Till reconciliation > </div> > > <div id="doc3" class="yui-t2"> >@@ -16,13 +16,13 @@ > <div id="yui-main"> > <div class="yui-b"> > >-<h1>Till Reconciliation</h1> >+<h1>Till reconciliation</h1> > > <fieldset><legend>Search between two dates</legend> > <form action="stats.screen.pl" method="post"> > <label for="from">Start Date: </label> > <input type="text" name="time" size="10" value="[% IF ( date ) %][% date %][% ELSE %]today[% END %]" id="from" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom1" alt="Show Calendar" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom1" alt="Show calendar" style="cursor: pointer;" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "from", >@@ -33,7 +33,7 @@ > </script> > <label for="to">End Date: </label> > <input type="text" name="time2" size="10" value="[% IF ( date2 ) %][% date2 %][% ELSE %]tomorrow[% END %]" id="to" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonto1" alt="Show Calendar" style="cursor: pointer;" /> >+ <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonto1" alt="Show calendar" style="cursor: pointer;" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "to", >@@ -42,7 +42,7 @@ > align : "Tl" > }); > </script> >- <input type="submit" value="To Screen" name="submit" class="submit" /> >+ <input type="submit" value="To screen" name="submit" class="submit" /> > <!-- <input type="submit" value="To Excel" name="submit" class="button"> --></fieldset> > </form> > >@@ -53,12 +53,12 @@ > <th>Library</th> > <th>Date/time</th> > <th>Surname</th> >- <th>Firstname</th> >+ <th>First name</th> > <th>Description</th> >- <th>Charge Type</th> >- <th>Invoice Amount</th> >- <th>Payment Type</th> >- <th>Payment Amount</th> >+ <th>Charge type</th> >+ <th>Invoice amount</th> >+ <th>Payment type</th> >+ <th>Payment amount</th> > </tr> > > [% FOREACH loop IN loop1 %] >@@ -88,10 +88,10 @@ > <th>Library</th> > <th>Date/time</th> > <th>Surname</th> >- <th>Firstname</th> >+ <th>First name</th> > <th>Description</th> >- <th>Charge Type</th> >- <th>Invoice Amount</th> >+ <th>Charge type</th> >+ <th>Invoice amount</th> > </tr> > > [% FOREACH loop IN loop2 %] >@@ -119,10 +119,10 @@ > <th>Library</th> > <th>Date/time</th> > <th>Surname</th> >- <th>Firstname</th> >+ <th>First name</th> > <th>Description</th> >- <th>Charge Type</th> >- <th>Invoice Amount</th> >+ <th>Charge type</th> >+ <th>Invoice amount</th> > </tr> > > [% FOREACH loop IN loop3 %] >-- >1.7.5.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 2780
:
8804
|
8805
|
8807
|
8808
|
8810
|
8812
|
8813
|
8815
|
8817
|
8818
|
8819
|
8820
|
8821
|
8823
|
8829
|
8832
|
8840
|
8841
|
8842
|
8843
|
8844
|
8845
|
8846
|
8847
|
8848
|
8849
|
8850
|
8851
|
8852
|
8853
|
8854
|
8866
|
8870
|
8871
|
8875
|
8880
|
8882
|
8883
|
8884
|
8926
|
8928
|
8929
|
8930
|
8935
|
8954
|
8960
|
8977
|
8978
|
8979
|
8980
|
8981
|
8983
|
8984
|
8985
|
8986
|
8987
|
8988
|
8989
|
8990
|
8991
|
8992
|
8993
|
8994
|
8995
|
8996
|
9013
|
9014
|
9015
|
9016
|
9017
|
9018
|
9019
|
9020
|
9021
|
9022
|
9023
|
9024
|
9025
|
9026
|
9027
|
9028
|
9029
|
9047
|
9048
|
9052
|
9054
|
9055
|
9056
|
9057
|
9058
|
9068
|
9069
|
9070
|
9071
|
9072
|
9073
|
9089
|
9091
|
9092