Lots of reformatting of reports forms. Improvements to breadcrumbs. XHTML-compliance...
authorOwen Leonard <oleonard@myacpl.org>
Thu, 3 Jan 2008 22:21:23 +0000 (16:21 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Thu, 3 Jan 2008 22:29:16 +0000 (16:29 -0600)
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
16 files changed:
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
reports/itemslost.pl

index 0d96de2..a288f56 100644 (file)
@@ -677,6 +677,13 @@ fieldset.rows fieldset.action {
        padding : 1em;
 }
 
+fieldset.rows label.inline {
+       display : inline;
+       float : none;
+       margin-left : 1em;
+       width : auto;
+}
+
 fieldset.rows .inputnote {
        float : left;
        margin : .5em 0 0 10em;
index 78fa5f1..18fe1e4 100644 (file)
@@ -3,6 +3,7 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <script type="text/javascript">
+//<![CDATA[
 var debug    = "<!-- TMPL_VAR Name="debug" -->";
 var dformat  = "<!-- TMPL_VAR Name="dateformat" -->";
 var sentmsg = 0;
@@ -22,4 +23,5 @@ function Date_from_syspref(dstring) {
                return 0;
        }
 }
+//]]>
 </script>
index 21b43f8..0869b4a 100644 (file)
@@ -9,8 +9,8 @@
 
        <h5>Top Lists</h5>
        <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">Items checked out the most</a></li>
+               <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
+               <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-Circulated Items</a></li>
        </ul>
        
        <h5>Inactive</h5>
@@ -22,8 +22,8 @@
 
        <h5>Other</h5>
        <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">Catalogue by itemtype</a></li>
+               <li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost Items</a></li>
+               <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by Item Type</a></li>
                <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Checkouts by patron category</a></li>
                <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
        </ul>
index 07a93ae..e77201e 100644 (file)
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Reports &rsaquo; Acquisitions Statistics</title>
+<title>Koha &rsaquo; Reports <!-- TMPL_IF NAME="do_it" -->&rsaquo; Acquisitions Statistics &rsaquo; Results<!-- TMPL_ELSE -->&rsaquo; Acquisitions Statistics<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
@@ -7,7 +7,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Acquisitions Statistics</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> <!-- TMPL_IF NAME="do_it" -->&rsaquo; <a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions Statistics</a> &rsaquo; Results<!-- TMPL_ELSE --> &rsaquo; Acquisitions Statistics <!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -61,8 +61,9 @@
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Acquisitions statistics</h1>
        <form method="post" action="/cgi-bin/koha/reports/acquisitions_stats.pl">
+       <fieldset class="rows">
+       <legend>Acquisitions statistics</legend>
        <table>
                <thead>
                        <tr>
@@ -79,7 +80,8 @@
                                <td><input type="radio" name="Column" value="aqbasket.closedate" /> </td>
                                <td> From <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
                                                        <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" />
-                                                               <script language="JavaScript" type="text/javascript">
+                                                                       <script type="text/javascript">
+                                                                       //<![CDATA[
                                                                        function validate1(date) {
                                                                                var day = date.getDate();
                                                                                var month = date.getMonth() + 1;
                                                                                        dateStatusFunc : validate1
                                                                                }
                                                                        );
+                                                                       //]]>
                                                                </script>
                                        To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
                                                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
                                                        <script type="text/javascript">
+                                                       //<![CDATA[
                                                                function validate2(date) {
                                                                        var day = date.getDate();
                                                                        var month = date.getMonth() + 1;
                                                                                dateStatusFunc : validate2
                                                                        }
                                                                );
+                                                       //]]>
                                                        </script>
                                </td>
                        </tr>
                                <td><input type="radio" name="Column" value="aqorderdelivery.deliverydate" /></td>
                                <td> From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
                                                        <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" />
-                                                               <script language="JavaScript" type="text/javascript">
+                                                                       <script type="text/javascript">
+                                                                       //<![CDATA[
                                                                        function validate1(date) {
                                                                                var day = date.getDate();
                                                                                var month = date.getMonth() + 1;
                                                                                        dateStatusFunc : validate1
                                                                                }
                                                                        );
-                                                               </script>
+                                                                       //]]>
+                                                                       </script>
                                        To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" />
                                                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" />
-                                                       <script type="text/javascript">
+                                                               <script type="text/javascript">
+                                                               //<![CDATA[
                                                                function validate2(date) {
                                                                        var day = date.getDate();
                                                                        var month = date.getMonth() + 1;
                                                                                dateStatusFunc : validate2
                                                                        }
                                                                );
-                                                       </script>
+                                                               //]]>
+                                                               </script>
                                </td>
                        </tr>
                        <tr> 
                                </tr>
                        <!-- /TMPL_IF -->
                </tbody>
-       </table>
-       
+       </table><br />
+       </fieldset>
        
-               <h3> Cell value </h3>
-                       <input type="radio" name="Cellvalue" value="1" checked="checked" /> Count items
-                       <input type="radio" name="Cellvalue" value="2" /> Amount
+<fieldset class="rows">                <legend> Cell value </legend>
+                       <ol><li><label for="cellvalue1">Count items</label><input type="radio" name="Cellvalue" id="cellvalue1" value="1" checked="checked" /> </li>
+                       <li><label for="cellvalue2">Amount</label><input type="radio" name="Cellvalue" id="cellvalue2" value="2" /> </li></ol></fieldset>
        
-       
-               <h3> Output </h3>
-               <input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> <label for="outputscreen">To screen into the browser</label>
-               
-               <input type="radio" name="output" value="file" id="outputfile" /> <label for="outputfile">To file</label> <input type="text" name="basename" value="Export" /> into an application  
-               <!-- TMPL_VAR NAME="CGIextChoice" -->
-               <!-- TMPL_VAR NAME="CGIsepChoice" -->
-       
-       
-<p>    <input type="submit" value="OK" />
+       <fieldset class="rows">
+       <legend>Output</legend>
+<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
+<li><label for="outputfile">To a file:</label>                 <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
+               </label><!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+       </fieldset>
+
+       <fieldset class="action">
+       <input type="submit" value="Submit" />
        <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-       <input type="hidden" name="do_it" value="1" /></p>
+       <input type="hidden" name="do_it" value="1" />
+       </fieldset>
        </form>
 <!-- /TMPL_IF -->
 </div>
index 7df9d58..15f1bd8 100644 (file)
@@ -7,7 +7,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Patrons with the most Checkouts</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> <!-- TMPL_IF NAME="do_it" -->&rsaquo; <a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a> &rsaquo; Results<!-- TMPL_ELSE -->&rsaquo; Patrons with the most checkouts<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -48,15 +48,15 @@ function Dopop(link) {
                        </tr>
                                <!-- TMPL_LOOP NAME="looprow" -->
                                        <tr>
-                                               <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
                                                <!-- TMPL_VAR NAME="rowtitle" --></td>
                                                <!-- TMPL_LOOP NAME="loopcell" -->
-                                                       <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
+                                                       <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
                                                                <!-- TMPL_IF NAME="reference" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="reference" -->"><!-- /TMPL_IF -->
                                                                <!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
                                                                <!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
                                                        </td>
-                                                       <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
+                                                       <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
                                                                <!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
                                                        </td>
                                                <!-- /TMPL_LOOP -->
@@ -65,50 +65,10 @@ function Dopop(link) {
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Patrons who checked out the most items</h1>
+       <h1>Patrons with the most Checkouts</h1>
        <form method="post" action="/cgi-bin/koha/reports/bor_issues_top.pl">
-       
-       <table>
-               <thead>
-                       <tr>
-                       <th>Limit to </th>
-                       <th>By </th>
-                       <th colspan="2">Filters</th>
-                       </tr>
-               </thead>
-               <tbody>
-                       <tr>
-                               <td>
-                                       <select name="Limit">
-                                               <option value ="5" selected="selected"> 5</option>
-                                               <option value ="10">10</option>
-                                               <option value ="15">15</option>
-                                               <option value ="20">20</option>
-       <!--                                    <option value ="25">25</option>
-                                               <option value ="40">40</option>
-                                               <option value ="50">50</option>
-                                               <option value ="100">100</option>-->
-                                       </select>
-                               </td>
-                               <td>
-                                       <select name="Criteria">
-                                               <option value ="" selected="selected">None</option>
-                                               <option value ="issuingbranch">Branch</option>
-                                               <option value ="categorycode">Categorycode</option>
-                                               <option value ="itemtype">Itemtype</option>
-                                               <option value ="Day">Day</option>
-                                               <option value ="Week">Week</option>
-                                               <option value ="Month">Month</option>
-                                               <option value ="Year">Year</option>
-                                       </select>
-                               </td>
-                               <td colspan="2">&nbsp;</td>
-                       </tr>
-                       
-                       <tr class="hilighted">
-                               <td colspan="2">&nbsp;</td>
-                               <td>Issue date</td>
-                               <td> <label for="from">From</label> <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
+       <fieldset class="rows">
+       <ol><li><label for="from">Checkout date from:</label> <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
                                                        <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" />
                                                                <script language="JavaScript" type="text/javascript">
                                                                        function validate1(date) {
@@ -137,7 +97,7 @@ function Dopop(link) {
                                                                                }
                                                                        );
                                                                </script>
-                                       <label for="to">To</label> <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
+                                       <label class="inline" for="to">To: </label> <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
                                                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
                                                        <script type="text/javascript">
                                                                function validate2(date) {
@@ -165,13 +125,8 @@ function Dopop(link) {
                                                                                dateStatusFunc : validate2
                                                                        }
                                                                );
-                                                       </script>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan="2">&nbsp;</td>
-                               <td>Returns</td>
-                               <td > <label for="fromRO">From</label> <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
+                                                       </script></li>
+                               <li> <label for="fromRO">Check-in date from:</label> <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
                                                        <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFromRO" style="cursor: pointer;" alt="Show Calendar" />
                                                                <script language="JavaScript" type="text/javascript">
                                                                        function validate1(date) {
@@ -200,7 +155,7 @@ function Dopop(link) {
                                                                                }
                                                                        );
                                                                </script>
-                                       <label for="toRO">To</label> <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" />
+                                       <label class="inline" for="toRO">To: </label> <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" />
                                                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" alt="Show Calendar" border="0" />
                                                        <script type="text/javascript">
                                                                function validate2(date) {
@@ -228,53 +183,74 @@ function Dopop(link) {
                                                                                dateStatusFunc : validate2
                                                                        }
                                                                );
-                                                       </script>
-                               </td>
-                       </tr>
-                       <tr class="hilighted">
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="branch">Branch</label></td>
-                               <td><input type="text" name="Filter" id="branch" value="" /></td>
-                       </tr>
-                       <tr>
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="documenttype">Document Type</label></td>
-                               <td><input type="text" name="Filter" id="documenttype" value="" /></td>
-                       </tr>
-                       <tr class="hilighted">
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="patroncategory">Patron Category</label></td>
-                               <td><input type="text" name="Filter" id="patroncategory" value="" /></td>
-                       </tr>
-                       <tr>
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="day">Day</label></td>
-                               <td><input type="text" name="Filter" id="day" value="" /></td>
-                       </tr>
-                       <tr class="hilighted">
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="month">Month</label></td>
-                               <td><input type="text" name="Filter" id="month" value="" /></td>
-                       </tr>
-                       <tr>
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="year">Year</label></td>
-                               <td><input type="text" name="Filter" id="year" value="" /></td>
-                       </tr>
-               </tbody>
-       </table>
+                                                       </script></li>
+                       <li> 
+                               <label for="branch">Branch: </label>
+                               <input type="text" name="Filter" id="branch" value="" />
+                       </li>
+                       <li> 
+                               <label for="documenttype">Document Type: </label>
+                               <input type="text" name="Filter" id="documenttype" value="" />
+                       </li>
+                       <li> 
+                               <label for="patroncategory">Patron Category: </label>
+                               <input type="text" name="Filter" id="patroncategory" value="" />
+                       </li>
+                       <li> 
+                               <label for="day">Day: </label>
+                               <input type="text" name="Filter" id="day" value="" />
+                       </li>
+                       <li> 
+                               <label for="month">Month: </label>
+                               <input type="text" name="Filter" id="month" value="" />
+                       </li>
+                       <li> 
+                               <label for="year">Year: </label>
+                               <input type="text" name="Filter" id="year" value="" />
+                       </li>
+                                                       
+                                                       </ol>   
+       </fieldset>
        
        
-               <h3> Output </h3>
-               <input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> <label for="outputscreen">To screen into the browser</label>
-               
-               <input type="radio" name="output" value="file" id="outputfile" /> <label for="outputfile">To file</label> <input type="text" name="basename" value="Export" /> into an application  
-               <!-- TMPL_VAR NAME="CGIextChoice" -->
-               <!-- TMPL_VAR NAME="CGIsepChoice" -->
+       <fieldset class="rows">
+       <ol>
+               <li><label for="numlimit">Limit to: </label> <select name="Limit" id="numlimit">
+                                               <option value ="5" selected="selected"> 5</option>
+                                               <option value ="10">10</option>
+                                               <option value ="15">15</option>
+                                               <option value ="20">20</option>
+       <!--                                    <option value ="25">25</option>
+                                               <option value ="40">40</option>
+                                               <option value ="50">50</option>
+                                               <option value ="100">100</option>-->
+                                       </select></li>
+               <li><label for="criteria">By: </label> <select name="Criteria" id="criteria">
+                                               <option value ="" selected="selected">None</option>
+                                               <option value ="issuingbranch">Branch</option>
+                                               <option value ="categorycode">Categorycode</option>
+                                               <option value ="itemtype">Itemtype</option>
+                                               <option value ="Day">Day</option>
+                                               <option value ="Week">Week</option>
+                                               <option value ="Month">Month</option>
+                                               <option value ="Year">Year</option>
+                                       </select></li>
+       </ol>
+       </fieldset>
+
+<fieldset class="rows">
+       <legend>Output</legend>
+<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
+<li><label for="outputfile">To a file:</label>                 <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
+               </label><!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+       </fieldset>
 
-       <p><input type="submit" value="OK" />
+       <fieldset class="action">
+       <input type="submit" value="Submit" />
        <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-       <input type="hidden" name="do_it" value="1" /></p>
+       <input type="hidden" name="do_it" value="1" />
+       </fieldset>
        </form>
 <!-- /TMPL_IF -->
 
index 082dc08..7a2d569 100644 (file)
 <!-- TMPL_ELSE -->
     <h1>Patrons with no Checkouts</h1>
     <form method="post" action="/cgi-bin/koha/reports/borrowers_out.pl">
-    
-    <table>
-        <thead>
-            <tr>
-            <th>Limit to </th>
-            <th>By </th>
-            <th colspan="2">Filters</th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <td>
-                    <select name="Limit">
+    <fieldset class="rows">
+               <ol>
+                       <li><label for="patroncategory">Patron category: </label> <input type="text" name="Filter" id="patroncategory" value="" />
+</li>
+       <li><label for="to">Without issues since: </label> <input size="10" id="to" name="Filter" value="" type="text" />
+                        <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
+                            <script type="text/javascript">
+                                Calendar.setup(
+                                    {
+                                        inputField : "to",
+                                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                                        button : "openCalendarTo",
+                                    }
+                                );
+                            </script></li>
+               </ol>
+       </fieldset>
+       
+    <fieldset class="rows">
+       <legend>Limits</legend>
+               <ol>
+                       <li><label for="numberlimit">Limit to: </label><select name="Limit" id="numberlimit">
                         <option value ="" selected="selected">None</option>
                         <option value ="5"> 5</option>
                         <option value ="10">10</option>
                         <option value ="40">40</option>
                         <option value ="50">50</option>
                         <option value ="100">100</option>
-                    </select>
-                </td>
-                <td>
-                    <select name="Criteria">
+                    </select></li>
+                       <li><label for="criteria">By: </label><select name="Criteria" id="criteria">
                         <option value ="" selected="selected">None</option>
                         <option value ="categorycode">Categorycode</option>
                         <option value ="itemtype">Itemtype</option>
-                    </select>
-                </td>
-                               <td colspan="2">&nbsp;</td>
-            </tr>
-            <tr class="hilighted">
-                <td colspan="2">&nbsp;</td>
-                <td><label for="patroncategory">Patron category</label></td>
-                <td><input type="text" name="Filter" id="patroncategory" value="" /></td>
-            </tr>
-            <tr class="hilighted">
-                <td colspan="2">&nbsp;</td>
-                <td><label for="to">Without issues since</label></td>
-                <td><input size="10" id="to" name="Filter" value="" type="text" />
-                        <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
-                            <script type="text/javascript">
-                                Calendar.setup(
-                                    {
-                                        inputField : "to",
-                                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-                                        button : "openCalendarTo",
-                                    }
-                                );
-                            </script></td>
-            </tr>
-        </tbody>
-    </table>
-    
-    
-        <h3> Output </h3>
-        <input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> <label for="outputscreen">To screen into the browser</label>
-               
-               <input type="radio" name="output" value="file" id="outputfile" /> <label for="outputfile">To file</label> <input type="text" name="basename" value="Export" /> into an application  
-        <!-- TMPL_VAR NAME="CGIextChoice" -->
-        <!-- TMPL_VAR NAME="CGIsepChoice" -->
-    
-    
-    <p>
-    <input type="submit" value="OK" />
-    <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-    <input type="hidden" name="do_it" value="1" /></p>
-    </form>
+                    </select></li>
+               </ol>
+       </fieldset>
+       
+<fieldset class="rows">
+       <legend>Output</legend>
+<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
+<li><label for="outputfile">To a file:</label>                 <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
+               </label><!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+       </fieldset>
+
+       <fieldset class="action">
+       <input type="submit" value="Submit" />
+       <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+       <input type="hidden" name="do_it" value="1" />
+       </fieldset>
+       </form>
 <!-- /TMPL_IF -->
 
 </div>
index 16d70d7..b9f3086 100644 (file)
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Reports &rsaquo; Patrons statistics</title>
+<title>Koha &rsaquo; Reports <!-- TMPL_IF NAME="do_it" -->&rsaquo; Patrons statistics &rsaquo; Results<!-- TMPL_ELSE -->&rsaquo; Patrons statistics<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
@@ -7,7 +7,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Patrons statistics</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> <!-- TMPL_IF NAME="do_it" -->&rsaquo; <a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons statistics</a> &rsaquo; Results<!-- TMPL_ELSE -->&rsaquo; Patrons statistics<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -61,8 +61,9 @@
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Patrons statistics</h1>
+
        <form method="post" action="/cgi-bin/koha/reports/borrowers_stats.pl">
+       <fieldset class="rows"><legend>Patrons statistics</legend>
        <table>
                <thead>
                        <tr>
                 <td></td>
                 <td > <label for="from">From</label> <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
                     <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" />
-                    <script language="JavaScript" type="text/javascript">
-                    function validate1(date) {
+                   <script type="text/javascript">
+                                  //<![CDATA[
+                                   function validate1(date) {
                         var day = date.getDate();
                         var month = date.getMonth() + 1;
                         var year = date.getFullYear();
                             dateStatusFunc : validate1
                         }
                     );
+                                       //]]>
                     </script>
                     <label for="to">To</label> <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
                         <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
-                        <script type="text/javascript">
-                            function validate2(date) {
+                          <script type="text/javascript">
+                                                 //<![CDATA[ 
+                                                  function validate2(date) {
                                 var day = date.getDate();
                                 var month = date.getMonth() + 1;
                                 var year = date.getFullYear();
                                     dateStatusFunc : validate2
                                 }
                             );
+                                                       //]]>
                         </script>
                     </td>
                 </tr>
                                </tr>
                        <!-- /TMPL_IF -->
                </tbody>
-       </table>
-       
-       
-               <h3> Output </h3>
-               <input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> <label for="outputscreen">To screen into the browser</label>
-               
-               <input type="radio" name="output" value="file" id="outputfile" /> <label for="outputfile">To file</label> <input type="text" name="basename" value="Export" /> into an application  
-               <!-- TMPL_VAR NAME="CGIextChoice" -->
-               <!-- TMPL_VAR NAME="CGIsepChoice" -->
+       </table><br /></fieldset>
        
-       
-       <p>
-       <input type="submit" value="OK" />
+       <fieldset class="rows">
+       <legend>Output</legend>
+<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
+<li><label for="outputfile">To a file:</label>                 <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
+               </label><!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+       </fieldset>
+
+       <fieldset class="action">
+       <input type="submit" value="Submit" />
        <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-       <input type="hidden" name="do_it" value="1" /></p>
+       <input type="hidden" name="do_it" value="1" />
+       </fieldset>
        </form>
 <!-- /TMPL_IF -->
 
index f2a237f..cb85f20 100644 (file)
@@ -24,8 +24,6 @@ function Dopop(link) {
 
 <!-- TMPL_IF NAME="do_it" -->
 
-
-
        <!-- TMPL_LOOP NAME="mainloop" -->
                <h1>Top <!-- TMPL_VAR NAME="limit"--> Most-Circulated Items</h1>
                <!-- TMPL_IF NAME="loopfilter"-->
@@ -36,21 +34,19 @@ function Dopop(link) {
                <!-- /TMPL_IF-->
                
                <table>
-                       <tr>
                                <th>Rank/Biblioitemnumbers</th>
                                <!-- TMPL_LOOP NAME="loopcol" -->
                                        <th colspan="2"><!-- TMPL_VAR NAME="coltitle" --></th>
                                <!-- /TMPL_LOOP -->
-                       </tr>
-                       <tr>
+
                                <th>&nbsp;</th>
                                <!-- TMPL_LOOP NAME="loopcol" -->
                                        <th>Item</th>
                                        <th>Count of Checkouts</th>
                                <!-- /TMPL_LOOP -->
-                       </tr>
+                       
                                <!-- TMPL_LOOP NAME="looprow" -->
-                                       <tr>
+                                       
                                                <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
                                                <!-- TMPL_VAR NAME="rowtitle" --></td>
                                                <!-- TMPL_LOOP NAME="loopcell" -->
@@ -63,55 +59,16 @@ function Dopop(link) {
                                                                <!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
                                                        </td>
                                                <!-- /TMPL_LOOP -->
-                                       </tr>
+                                       
                                <!-- /TMPL_LOOP -->
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Top List On Catalogue Checkouts</h1>
+       <h1>Most-Circulated Items</h1>
        <form method="post" action="/cgi-bin/koha/reports/cat_issues_top.pl">
-       
-       <table>
-               <thead>
-                       <tr>
-                       <th>Limit to </th>
-                       <th>By </th>
-                       <th colspan="2">Filters</th>
-                       </tr>
-               </thead>
-               <tbody>
-                       <tr>
-                               <td>
-                                       <select name="Limit">
-                                               <option value="5" selected="selected"> 5</option>
-                                               <option value ="10">10</option>
-                                               <option value ="15">15</option>
-                                               <option value ="20">20</option>
-                                               <option value ="25">25</option>
-                                               <option value ="40">40</option>
-                                               <option value ="50">50</option>
-                                               <option value ="100">100</option>
-                                       </select>
-                               </td>
-                               <td>
-                                       <select name="Criteria">
-                                               <option value ="" selected="selected">None</option>
-                                               <option value ="issuingbranch">Branch</option>
-                                               <option value ="categorycode">Categorycode</option>
-                                               <option value ="itemtype">Itemtype</option>
-                                               <option value ="Day">Day</option>
-                                               <option value ="Week">Week</option>
-                                               <option value ="Month">Month</option>
-                                               <option value ="Year">Year</option>
-                                       </select>
-                               </td>
-                               <td colspan="2">&nbsp;</td>
-                       </tr>
-                       
-                       <tr class="hilighted">
-                               <td colspan="2">&nbsp;</td>
-                               <td>Issue date</td>
-                               <td> <label for="from">From</label> <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
+       <fieldset class="rows">
+       <ol>
+               <li><label for="from">Checkout date from: </label> <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
                                                        <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" />
                                                                <script language="JavaScript" type="text/javascript">
                                                                        function validate1(date) {
@@ -140,7 +97,7 @@ function Dopop(link) {
                                                                                }
                                                                        );
                                                                </script>
-                                       <label for="to">To</label> <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
+                                       <label for="to" class="inline">To:</label> <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
                                                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
                                                        <script type="text/javascript">
                                                                function validate2(date) {
@@ -168,13 +125,8 @@ function Dopop(link) {
                                                                                dateStatusFunc : validate2
                                                                        }
                                                                );
-                                                       </script>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan="2">&nbsp;</td>
-                               <td>Returns</td>
-                               <td > <label for="fromRO">From</label> <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
+                                                       </script></li>
+               <li><label for="fromRO">Check-in date from</label> <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
                                                        <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" />
                                                                <script language="JavaScript" type="text/javascript">
                                                                        function validate1(date) {
@@ -203,7 +155,7 @@ function Dopop(link) {
                                                                                }
                                                                        );
                                                                </script>
-                                       <label for="toRO">To</label> <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" />
+                                       <label for="toRO" class="inline">To: </label> <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" />
                                                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;"  border="0" />
                                                        <script type="text/javascript">
                                                                function validate2(date) {
@@ -231,55 +183,54 @@ function Dopop(link) {
                                                                                dateStatusFunc : validate2
                                                                        }
                                                                );
-                                                       </script>
-                               </td>
-                       </tr>
-                       <tr class="hilighted">
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="branch">Branch</label></td>
-                               <td><input type="text" name="Filter" id="branch" value="" /></td>
-                       </tr>
-                       <tr>
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="documenttype">Document Type</label></td>
-                               <td><input type="text" name="Filter" id="documenttype" value="" /></td>
-                       </tr>
-                       <tr class="hilighted">
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="patroncategory">Patron Category</label></td>
-                               <td><input type="text" name="Filter" id="patroncategory" value="" /></td>
-                       </tr>
-                       <tr>
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="day">Day</label></td>
-                               <td><input type="text" name="Filter" id="day" value="" /></td>
-                       </tr>
-                       <tr class="hilighted">
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="month">Month</label></td>
-                               <td><input type="text" name="Filter" id="month" value="" /></td>
-                       </tr>
-                       <tr>
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="year">Year</label></td>
-                               <td><input type="text" name="Filter" id="year" value="" /></td>
-                       </tr>
-               </tbody>
-       </table>
-       
-       
-               <h3> Output </h3>
-               <input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> <label for="outputscreen">To screen into the browser</label>
-               
-               <input type="radio" name="output" value="file" id="outputfile" /> <label for="outputfile">To file</label> <input type="text" name="basename" value="Export" /> into an application  
-               <!-- TMPL_VAR NAME="CGIextChoice" -->
-               <!-- TMPL_VAR NAME="CGIsepChoice" -->
+                                                       </script></li>
+                               <li><label for="branch">Branch: </label> <input type="text" name="Filter" id="branch" value="" /></li>
+                               <li><label for="documenttype">Document Type: </label> <input type="text" name="Filter" id="documenttype" value="" /></li>
+                               <li><label for="patroncategory">Patron Category: </label> <input type="text" name="Filter" id="patroncategory" value="" /></li>
+                               <li><label for="day">Day: </label> <input type="text" name="Filter" id="day" value="" /></li>
+                               <li><label for="month">Month: </label> <input type="text" name="Filter" id="month" value="" /></li>
+                               <li><label for="year">Year: </label> <input type="text" name="Filter" id="year" value="" /></li>
+       </ol>
+       </fieldset>
        
+       <fieldset class="rows">
+       <legend>Limits</legend>
+       <ol><li><label for="numberlimit">Limit to:</label><select name="Limit" id="numberlimit">
+                        <option value ="" selected="selected">None</option>
+                                               <option value="5" selected="selected"> 5</option>
+                                               <option value ="10">10</option>
+                                               <option value ="15">15</option>
+                                               <option value ="20">20</option>
+                                               <option value ="25">25</option>
+                                               <option value ="40">40</option>
+                                               <option value ="50">50</option>
+                                               <option value ="100">100</option>
+                                       </select></li>
+       <li><label for="criteria">By: </label><select name="Criteria" id="criteria">
+                                               <option value ="" selected="selected">None</option>
+                                               <option value ="issuingbranch">Branch</option>
+                                               <option value ="categorycode">Categorycode</option>
+                                               <option value ="itemtype">Itemtype</option>
+                                               <option value ="Day">Day</option>
+                                               <option value ="Week">Week</option>
+                                               <option value ="Month">Month</option>
+                                               <option value ="Year">Year</option>
+                                       </select></li></ol>
+       </fieldset>
        
-       <p>
-       <input type="submit" value="OK" />
+       <fieldset class="rows">
+       <legend>Output</legend>
+<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
+<li><label for="outputfile">To a file:</label>                 <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
+               </label><!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+       </fieldset>
+
+       <fieldset class="action">
+       <input type="submit" value="Submit" />
        <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-       <input type="hidden" name="do_it" value="1" /></p>
+       <input type="hidden" name="do_it" value="1" />
+       </fieldset>
        </form>
 <!-- /TMPL_IF -->
 
index f3a9de9..58ed8fc 100644 (file)
        <h1>Items with no checkouts</h1>
        <form method="post" action="/cgi-bin/koha/reports/catalogue_out.pl">
        
-       <table>
-               <thead>
-                       <tr>
-                       <th>Limit to </th>
-                       <th>By </th>
-                       <th colspan="2">Filters</th>
-                       </tr>
-               </thead>
-               <tbody>
-                       <tr>
-                               <td>
-                                       <select name="Limit">
+       <fieldset class="rows">
+               <ol>
+                       <li><label for="branchFilter">Branch: </label> <input type="text" id="branchFilter" name="Filter" value="" /></li>
+                       <li><label for="docFilter">Document type: </label> <input type="text" id="docFilter" name="Filter" value="" /></li>
+               </ol>   
+       </fieldset>
+       
+       <fieldset class="rows">
+       <legend>Limits</legend>
+               <ol>
+               <li><label for="numberlimit">Limit to: </label> <select name="Limit" id="numberlimit">
                                                <option value ="" selected="selected">None</option>
                                                <option value ="5"> 5</option>
                                                <option value ="10">10</option>
                                                <option value ="40">40</option>
                                                <option value ="50">50</option>
                                                <option value ="100">100</option>
-                                       </select>
-                               </td>
-                               <td>
-                                       <select name="Criteria">
+                                       </select></li>
+               <li><label for="criteria">By: </label><select name="Criteria" id="criteria">
                                                <option value ="" selected="selected">None</option>
                                                <option value ="homebranch">Branch</option>
                                                <option value ="itemtype">Itemtype</option>
-                                       </select>
-                               </td>
-                               <td colspan="2">&nbsp;</td>
-                       </tr>
-                       <tr class="hilighted">
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="branchFilter">Branch</label></td>
-                               <td><input type="text" id="branchFilter" name="Filter" value="" /></td>
-                       </tr>
-                       <tr>
-                               <td colspan="2">&nbsp;</td>
-                               <td><label for="docFilter">Document type</label></td>
-                               <td><input type="text" id="docFilter" name="Filter" value="" /></td>
-                       </tr>
-               </tbody>
-       </table>
-       
+                                       </select></li>
+               </ol>
+       </fieldset>
        
-               <h3> Output </h3>
-               <input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /><label for="outputscreen"> To screen into the browser</label>
-               
-               <input type="radio" name="output" id="outputfile" value="file" /> <label for="outputfile">To file</label> <input type="text" name="basename" value="Export" /> into an application  
-               <!-- TMPL_VAR NAME="CGIextChoice" -->
-               <!-- TMPL_VAR NAME="CGIsepChoice" -->
-       
-       <p><input type="submit" value="OK" />
+       <fieldset class="rows">
+       <legend>Output</legend>
+<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
+<li><label for="outputfile">To a file:</label>                 <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
+               </label><!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+       </fieldset>
+
+       <fieldset class="action">
+       <input type="submit" value="Submit" />
        <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-       <input type="hidden" name="do_it" value="1" /></p>
+       <input type="hidden" name="do_it" value="1" />
+       </fieldset>
        </form>
 <!-- /TMPL_IF -->
 
index 772f776..8e6d11e 100644 (file)
@@ -1,12 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Reports &rsaquo; Catalogue statistics</title>
+<title>Koha &rsaquo; Reports <!-- TMPL_IF NAME="do_it" -->&rsaquo; Catalogue statistics &rsaquo; Results<!-- TMPL_ELSE -->&rsaquo; Catalogue statistics<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Catalogue statistics</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> <!-- TMPL_IF NAME="do_it" -->&rsaquo; <a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue statistics</a> &rsaquo; Results<!-- TMPL_ELSE -->&rsaquo; Catalogue statistics<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Catalogue statistics</h1>
+
        <form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl">
+       <fieldset class="rows">
+       <legend>Catalogue statistics</legend>
        <table>
                <thead>
                        <tr>
                                <td><!-- TMPL_VAR NAME="CGILocation" --> </td>
                        </tr>
                </tbody>
-       </table>
-       
+       </table><br /></fieldset>
        
-               <h3> Output </h3>
-               <input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> <label for="outputscreen">To screen into the browser</label>
-               
-               <input type="radio" name="output" value="file" id="outputfile" /> <label for="outputfile">To file</label> <input type="text" name="basename" value="Export" /> into an application  
-               <!-- TMPL_VAR NAME="CGIextChoice" -->
-               <!-- TMPL_VAR NAME="CGIsepChoice" -->
+       <fieldset class="rows">
+       <legend>Output</legend>
+<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
+<li><label for="outputfile">To a file:</label>                 <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
+               </label><!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+       </fieldset>
 
-       <p><input type="submit" value="OK" />
+       <fieldset class="action">
+       <input type="submit" value="Submit" />
        <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-       <input type="hidden" name="do_it" value="1" /></p>
+       <input type="hidden" name="do_it" value="1" />
+       </fieldset>
        </form>
 <!-- /TMPL_IF -->
 </div>
index daf8c3c..e3678e8 100644 (file)
@@ -7,7 +7,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Average Checkout Period</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> <!-- TMPL_IF NAME="do_it" -->&rsaquo; <a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average Checkout Period</a> &rsaquo; Results <!-- TMPL_ELSE -->&rsaquo; Average Checkout Period<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Average checkout period statistics </h1>
+
        <form method="post" action="/cgi-bin/koha/reports/issues_avg_stats.pl">
+       <fieldset class="rows">
+       <legend>Average checkout period statistics</legend>
        <table>
                <thead>
                        <tr>
                                </tr>
                        <!-- /TMPL_IF -->
                </tbody>
-       </table>
-       
+       </table><br /></fieldset>
        
-               <h3> Output </h3>
-               <input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> <label for="outputscreen">To screen into the browser</label>
-               
-               <input type="radio" name="output" value="file" id="outputfile" /> <label for="outputfile">To file</label> <input type="text" name="basename" value="Export" /> into an application  
-               <!-- TMPL_VAR NAME="CGIextChoice" -->
-               <!-- TMPL_VAR NAME="CGIsepChoice" -->
        
-       
-       <p>
-       <input type="submit" value="OK" />
+       <fieldset class="rows">
+       <legend>Output</legend>
+<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
+<li><label for="outputfile">To a file:</label>                 <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
+               </label><!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+       </fieldset>
+
+       <fieldset class="action">
+       <input type="submit" value="Submit" />
        <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-       <input type="hidden" name="do_it" value="1" /></p>
+       <input type="hidden" name="do_it" value="1" />
+       </fieldset>
        </form>
 <!-- /TMPL_IF -->
 
index 414e5d1..b635fcc 100644 (file)
@@ -7,7 +7,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Checkouts by patron category</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> <!-- TMPL_IF NAME="do_it" -->&rsaquo; <a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Checkouts by patron category</a> &rsaquo; Results<!-- TMPL_ELSE -->&rsaquo; Checkouts by patron category<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
        </table>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Checkouts by patron category</h1>
        <form method="post" action="/cgi-bin/koha/reports/manager.pl">
-               <p><label for="borrowercategory">Select a borrower category</label> (or don't if you want to see global status) <input type="text" name="value" id="borrowercategory" /></p>
-               <p><label for="branch">Select a branch:</label> <!-- TMPL_VAR NAME="CGIbranch" --></p>
-               <input type="submit" value="OK" />
+               <fieldset class="rows">
+               <legend>Checkouts by patron category</legend>
+               <ol><li><label for="borrowercategory">Select a borrower category</label> <input type="text" name="value" id="borrowercategory" /> <span class="tip">Leave empty for all categories</span></li>
+               <li><label for="branch">Select a branch:</label> <!-- TMPL_VAR NAME="CGIbranch" --></li></ol></fieldset>
+               <fieldset class="action"><input type="submit" value="Submit" />
                <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-               <input type="hidden" name="do_it" value="1" />
+               <input type="hidden" name="do_it" value="1" /></fieldset>
        </form>
 <!-- /TMPL_IF -->
 
index f31a061..6c2484e 100644 (file)
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Reports &rsaquo; Checkout statistics</title>
+<title>Koha &rsaquo; Reports <!-- TMPL_IF NAME="do_it" -->&rsaquo; Checkout statistics &rsaquo; Results <!-- TMPL_ELSE -->&rsaquo; Checkout statistics<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
@@ -7,7 +7,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Checkout statistics</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> <!-- TMPL_IF NAME="do_it" -->&rsaquo; <a href="/cgi-bin/koha/reports/issues_stats.pl">Checkout statistics</a> &rsaquo; Results <!-- TMPL_ELSE -->&rsaquo; Checkout statistics<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
         </table>
     <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-    <h1>Checkout statistics </h1>
+
     <form method="post" action="/cgi-bin/koha/reports/issues_stats.pl">
-    <table>
+    <fieldset class="rows">
+       <legend>Checkout statistics</legend><table>
         <thead>
             <tr>
                 <th>Title</th>
@@ -81,8 +82,9 @@
                 <td><input type="radio" name="Column" value="datetime" /></td>
                 <td> <label for="from">From</label> <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
                     <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" />
-                    <script language="JavaScript" type="text/javascript">
-                    function validate1(date) {
+                   <script type="text/javascript">
+                                  //<![CDATA[ 
+                                  function validate1(date) {
                         var day = date.getDate();
                         var month = date.getMonth() + 1;
                         var year = date.getFullYear();
                             dateStatusFunc : validate1
                         }
                     );
-                    </script>
+                                       //]]>
+                                       </script>
                     <label for="to">To</label> <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
                         <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
-                        <script type="text/javascript">
-                            function validate2(date) {
+                          <script type="text/javascript">
+                                                 //<![CDATA[  
+                                                 function validate2(date) {
                                 var day = date.getDate();
                                 var month = date.getMonth() + 1;
                                 var year = date.getFullYear();
                                     dateStatusFunc : validate2
                                 }
                             );
-                        </script>
+                                                       //]]>
+                                                       </script>
                     </td>
                 </tr>
                 <tr class="hilighted"> 
             </tr>
         <!-- /TMPL_IF -->
         </tbody>
-    </table>
-        <h3> Cell value </h3>
-            <p><input type="radio" name="Cellvalue" value="1" checked="checked" /> Count checkouts </p>
-            <p><input type="radio" name="Cellvalue" value="3" /> Circulation rate </p>
-        <h3> Output </h3>
-        <input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> <label for="outputscreen">To screen into the browser</label>
-               
-               <input type="radio" name="output" value="file" id="outputfile" /> <label for="outputfile">To file</label> <input type="text" name="basename" value="Export" /> into an application  
-        <!-- TMPL_VAR NAME="CGIextChoice" -->
-        <!-- TMPL_VAR NAME="CGIsepChoice" -->
-    
-    <p>
-    <input type="submit" value="OK" />
-    <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-    <input type="hidden" name="do_it" value="1" /></p>
-    </form>
+    </table><br /></fieldset>
+
+<fieldset class="rows"><legend>Cell value </legend><ol><li><label for="cellvalue1">Count checkouts</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li>
+            <li><label for="cellvalue3">Circulation rate</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li></ol></fieldset>
+                       
+       <fieldset class="rows">
+       <legend>Output</legend>
+<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
+<li><label for="outputfile">To a file:</label>                 <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
+               </label><!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+       </fieldset>
+
+       <fieldset class="action">
+       <input type="submit" value="Submit" />
+       <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+       <input type="hidden" name="do_it" value="1" />
+       </fieldset>
+       </form>
 <!-- /TMPL_IF -->
 
 </div>
index ff44959..b907e8f 100644 (file)
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Lost Items</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a><!-- TMPL_IF NAME="get_items" --> &rsaquo; <a href="/cgi-bin/koha/reports/itemslost.pl">Lost Items</a> &rsaquo; Results<!-- TMPL_ELSE --> &rsaquo; Lost Items<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -16,6 +16,8 @@
 
 <h1>Lost Items</h1>
 
+<!-- TMPL_IF NAME="get_items" -->
+
 <div class="results">
     <!-- TMPL_IF NAME="total" -->
         <!-- TMPL_VAR NAME="total" --> lost items found
     <!-- /TMPL_IF -->
 </div>
 
-<form name="f" action="/cgi-bin/koha/reports/itemslost.pl" method="post">
-    <label for="orderbyfilter">Set result order by</label>
-    <select id="orderbyfilter" name="orderbyfilter">
-        <option value=""> --- </option>
-        <option value="homebranch">Branch</option>
-        <option value="itemtype">Itemtypes</option>
-        <option value="barcode">Barcode</option>
-        <option value="price">price</option>
-    </select>
-    <input type="submit" value="OK" />
-    <input type="hidden" name="get_items" value="1" />
-    <table>
+    <!-- TMPL_IF NAME="itemsloop" --><table>
     <tr>
         <th>Barcode</th>
         <th>Date last seen</th>
         <th>Holdingbranch</th>
         <th>Location</th>
     </tr>
-    <tr>
-        <td><input type="text" name="barcodefilter" size="6" /></td>
-        <td><!-- datelastseen --></td>
-        <td><!-- price --></td>
-        <td><select name="branchfilter">
-                <option value="">All</option>
-            <!-- TMPL_LOOP name="branchloop" -->
-                <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
-                               <!-- TMPL_ELSE -->
-                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
-                               <!-- /TMPL_IF -->
-            <!-- /TMPL_LOOP -->
-            </select></td>
-        <td><select name="itemtypesfilter">
-                <option value="">All</option>
-                <!-- TMPL_LOOP name="itemtypeloop" -->
-                <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option>
-                               <!-- TMPL_ELSE -->
-                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="description" --></option>
-                               <!-- /TMPL_IF -->
-                <!-- /TMPL_LOOP -->
-            </select></td>
-        <td><!-- holdingbranch --></td>
-        <td><!-- location --></td>
-    </tr>
      <!-- TMPL_LOOP NAME="itemsloop"-->
         <tr>
             <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->" title="<!-- TMPL_VAR NAME="itemnotes"-->">
         </tr>
     <!-- /TMPL_LOOP -->
     </table>
+       <!-- /TMPL_IF --> 
+       <!-- TMPL_ELSE -->
+       
+       <form name="f" action="/cgi-bin/koha/reports/itemslost.pl" method="post">
+<fieldset class="rows"><ol>    <li><label for="orderbyfilter">Order by: </label>
+    <select id="orderbyfilter" name="orderbyfilter">
+        <option value=""> --- </option>
+        <option value="homebranch">Branch</option>
+        <option value="itemtype">Itemtypes</option>
+        <option value="barcode">Barcode</option>
+        <option value="price">price</option>
+    </select></li>
+       
+       <li><label for="barcodefilter">Barcode: </label><input type="text" name="barcodefilter" id="barcodefilter" size="6" /></li>
+       <li><label for="branchfilter">Branch: </label><select name="branchfilter" id="branchfilter">
+                <option value="">All</option>
+            <!-- TMPL_LOOP name="branchloop" -->
+                <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
+                               <!-- TMPL_ELSE -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+                               <!-- /TMPL_IF -->
+            <!-- /TMPL_LOOP -->
+            </select></li>
+       <li><label for="itemtypesfilter">Item Type: </label><select name="itemtypesfilter" id="itemtypesfilter">
+                <option value="">All</option>
+                <!-- TMPL_LOOP name="itemtypeloop" -->
+                <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option>
+                               <!-- TMPL_ELSE -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="description" --></option>
+                               <!-- /TMPL_IF -->
+                <!-- /TMPL_LOOP -->
+            </select></li></ol></fieldset>
+<fieldset class="action">    <input type="submit" value="Submit" />
+    <input type="hidden" name="get_items" value="1" /></fieldset>
 </form>
+       
+       <!-- /TMPL_IF -->
 
 </div>
 </div>
index ab4e702..10d8060 100644 (file)
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Item Types</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a><!-- TMPL_IF NAME="do_it" --> &rsaquo; <a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Item Types</a> &rsaquo; Results<!-- TMPL_ELSE --> &rsaquo; Item Types<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
        </table>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>View catalogue group by item types</h1>
-       <form method="post">
-               Select a branch (or don't if you want the report for all branches) <!-- TMPL_VAR NAME="CGIbranch" -->
-               <input type="submit" value="OK" />
+
+       <form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">
+               <fieldset class="rows"><legend>View catalogue group by item types</legend><ol><li><label for="value">Select a branch</label> <!-- TMPL_VAR NAME="CGIbranch" -->
+               <span class="tip">Select none to see all branches</span></li></ol></fieldset>
+               <fieldset class="action"><input type="submit" value="Submit" />
                <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-               <input type="hidden" name="do_it" value="1" />
+               <input type="hidden" name="do_it" value="1" /></fieldset>
        </form>
 <!-- /TMPL_IF -->
 
index 0d87d9e..33fbfef 100755 (executable)
@@ -38,14 +38,15 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { reportss => 1 },
+        flagsrequired   => { reports => 1 },
         debug           => 1,
     }
 );
 
 my $params = $query->Vars;
+my $get_items = $params->{'get_items'};
 
-if ( $params->{'get_items'} ) {
+if ( $get_items ) {
     my $orderbyfilter   = $params->{'orderbyfilter'}   || undef;
     my $branchfilter    = $params->{'branchfilter'}    || undef;
     my $barcodefilter   = $params->{'barcodefilter'}   || undef;
@@ -59,7 +60,8 @@ if ( $params->{'get_items'} ) {
     my $items = GetLostItems( \%where, $orderbyfilter );
     $template->param(
         total     => scalar @$items,
-        itemsloop => $items
+        itemsloop => $items,
+               get_items => $get_items
     );
 }