Fixes for Bug 3089, Date entry fields should indicate required date format
[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / reports / acquisitions_stats.tmpl
index e8f274c..0bf5daf 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,10 +7,10 @@
 <!-- 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">
-   
+
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
        <!-- TMPL_LOOP NAME="mainloop" -->
                <h1>Acquisitions statistics </h1>
                <!-- TMPL_IF NAME="loopfilter" -->
-                       <p>Filtered on</p>
+                       <p><b>Filtered on:</b></p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->
-                                       <p><!-- TMPL_VAR NAME="crit"--> =<!--  TMPL_VAR NAME="filter" --></p>
+                                       <p><!-- TMPL_VAR NAME="crit"--><!--  TMPL_VAR NAME="filter" --></p>
                        <!-- /TMPL_LOOP -->
                <!-- /TMPL_IF-->
-               
+
                <table>
                        <tr >
                                <th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
@@ -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>
                        <tr class="hilighted">
                                <td>Placed On</td>
                                <td><input type="radio" name="Line" value="aqbasket.closedate" /></td>
-                               <td><input type="radio" name="Column" value="aqbasket.closedate" /> </td>
-                               <td> From <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
+                               <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="<!-- 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;
                                                                                        return false;
                                                                                }
                                                                        }
-                                       
+
                                                                        Calendar.setup(
                                                                                {
                                                                                        inputField : "from",
-                                                                                       ifFormat : "%Y-%m-%d",
+                                                                                       ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                                                                        button : "openCalendarFrom",
                                                                                        disableFunc : validate1,
                                                                                        dateStatusFunc : validate1
                                                                                }
                                                                        );
+                                                                       //]]>
                                                                </script>
-                                       To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
+                               <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
+                                       To <input size="10" id="to" name="Filter" type="text" value="" />
                                                <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;
                                                                                return false;
                                                                        }
                                                                }
-               
+
                                                                Calendar.setup(
                                                                        {
                                                                                inputField : "to",
-                                                                               ifFormat : "%Y-%m-%d",
+                                                                               ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                                                                button : "openCalendarTo",
                                                                                disableFunc : validate2,
                                                                                dateStatusFunc : validate2
                                                                        }
                                                                );
+                                                       //]]>
                                                        </script>
+                               <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
                                </td>
                        </tr>
-                       <tr class="hilighted"> 
+                       <tr class="hilighted">
                                <td>&nbsp;</td>
                                <td colspan="2">group by <select name="PlacedOnDisplay">
                                        <option value="">None</option>
                                        <option value ="2">Month</option>
                                        <option value ="3">Year</option>
                                        </select>
-                                       
+
                                </td>
                                <td>&nbsp;</td>
                        </tr>
                        <tr>
                                <td>Received On</td>
-                               <td><input type="radio" name="Line" value="aqorderdelivery.deliverydate" /></td>
-                               <td><input type="radio" name="Column" value="aqorderdelivery.deliverydate" /></td>
-                               <td> From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
+                               <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="" />
                                                        <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;
                                                                                        return false;
                                                                                }
                                                                        }
-                                       
+
                                                                        Calendar.setup(
                                                                                {
                                                                                        inputField : "fromRO",
-                                                                                       ifFormat : "%Y-%m-%d",
+                                                                                       ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                                                                        button : "openCalendarFromRO",
                                                                                        disableFunc : validate1,
                                                                                        dateStatusFunc : validate1
                                                                                }
                                                                        );
-                                                               </script>
-                                       To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" />
+                                                                       //]]>
+                                                                       </script>
+                               <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
+                                       To <input type="text" 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;
                                                                                return false;
                                                                        }
                                                                }
-               
+
                                                                Calendar.setup(
                                                                        {
                                                                                inputField : "toRO",
-                                                                               ifFormat : "%Y-%m-%d",
+                                                                               ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                                                                button : "openCalendarToRO",
                                                                                disableFunc : validate2,
                                                                                dateStatusFunc : validate2
                                                                        }
                                                                );
-                                                       </script>
+                                                               //]]>
+                                                               </script>
+                               <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
                                </td>
                        </tr>
-                       <tr> 
+                       <tr>
                                <td>&nbsp;</td>
                                <td colspan="2">group by <select name="ReceivedOnDisplay">
                                        <option value="">None</option>
                                        <option value ="2">Month</option>
                                        <option value ="3">Year</option>
                                        </select>
-                                       
+
                                </td>
                                <td>&nbsp;</td>
                        </tr>
                        <tr class="hilighted">
-                               <td>Supplier</td>
-                               <td><input type="radio" name="Line" value="aqbooksellers.name" /></td>
+                               <td>Vendor</td>
+                               <td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
                                <td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
                                <td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
                        </tr>
                        <tr>
+                               <td>Item Type</td>
+                               <td><input type="radio" name="Line" value="biblioitems.itemtype" /></td>
+                               <td><input type="radio" name="Column" value="biblioitems.itemtype" /></td>
+                               <td><!-- TMPL_VAR NAME="CGIItemType" --></td>
+                       </tr>
+
+                       <tr>
                                <td>Budget</td>
-                               <td><input type="radio" name="Line" value="aqorderbreakdown.bookfundid" /></td>
-                               <td><input type="radio" name="Column" value="aqorderbreakdown.bookfundid" /></td>
+                               <td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
+                               <td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>
                                <td><!-- TMPL_VAR NAME="CGIBudget" --></td>
                        </tr>
+
                        <!-- TMPL_IF Name="hassort1" -->
-                               <tr class="hilighted"> 
+                               <tr class="hilighted">
                                        <td>Sort1</td>
                                        <td><input type="radio" name="Line" value="aqorders.sort1" /></td>
                                        <td><input type="radio" name="Column" value="aqorders.sort1" /></td>
                                </tr>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF Name="hassort2" -->
-                               <!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> 
+                               <!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF -->
                                        <td>Sort2</td>
                                        <td><input type="radio" name="Line" value="aqorders.sort2" /></td>
                                        <td><input type="radio" name="Column" value="aqorders.sort2" /></td>
                                </tr>
                        <!-- /TMPL_IF -->
                </tbody>
-       </table>
-       
-       
-               <h3> Cell value </h3>
-                       <input type="radio" name="Cellvalue" value="1" checked="checked" /> Count items
-                       <input type="radio" name="Cellvalue" value="2" /> Amount
-       
-       
-               <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" />
+       </table><br />
+       </fieldset>
+
+<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>
+
+       <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>
 <!-- TMPL_INCLUDE NAME="reports-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->