Bug 16726: [FOLLOW-UP] Putting text in h1

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / aqplan.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index 89c7456..66f6b9f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -3,7 +3,7 @@
 <title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for [% budget_period_description %] by [% authcat %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
 <script type="text/javascript">
 //<![CDATA[
     function Check(f) {
@@ -47,7 +47,7 @@
                 hideAllColumns();
                 e.stopPropagation();
             } else {
-                if($(this).attr("checked")){
+                if($(this).prop("checked")){
                     showColumn(num);
                 } else {
                     hideColumn(num);
@@ -85,19 +85,13 @@
 
     [% IF ( budget_lines ) %]
 
-    [% IF ( currency ) %]<p><b>Currency = [% currency %]</b>.
-    [% IF ( show_actual ) %]
-        <b>Each cell contain both actual and estimated values.</b>
-    [% ELSE %]
-        <b>Cells contain estimated values only.</b>
-    [% END %]
-    </p>[% ELSE %]<div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div>
-[% IF ( show_actual ) %]
-        <p><b>Each cell contain both actual and estimated values.</b></p>
-    [% ELSE %]
-        <p><b>Cells contain estimated values only.</b></p>
-    [% END %]
-    [% END %]
+        [% INCLUDE 'budgets-active-currency.inc' %]
+        [% IF ( show_actual ) %]
+            <p><b>Each cell contain both actual and estimated values.</b></p>
+        [% ELSE %]
+            <p><b>Cells contain estimated values only.</b></p>
+        [% END %]
+
     <p id="selections">
         <strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span>
         [% FOREACH authvals_ro IN authvals_row %]
@@ -132,7 +126,7 @@
         [% ELSE %]
             <td>
         [% END %]
-        <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget_line.budget_id %]&amp;budget_period_id=[% budget_line.budget_period_id %]">[% budget_line.budget_name %]</a></td>
+        <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget_line.budget_id %]&amp;budget_period_id=[% budget_period_id %]">[% budget_line.budget_name %]</a></td>
         <td><span id="[% budget_line.budget_amount %]">[% budget_line.budget_amount | $Price %]&nbsp;</span>
 
 
@@ -225,6 +219,8 @@
 
 </form>
 
+        [% ELSIF not budget_period_id %]
+<div class="dialog alert">That budget does not exist! Please select a budget to continue.</div>
         [% ELSE %]
 <div class="dialog message">No funds to display for this search criteria</div>
         [% END %]
@@ -235,6 +231,7 @@
 <div class="yui-b">
 
 <form method="post" action="/cgi-bin/koha/admin/aqplan.pl">
+    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
 <fieldset class="brief">
 <h4>Filter</h4>
 [% BLOCK planning_types %]
@@ -242,6 +239,7 @@
 [%     CASE 'MONTHS'    %]<span>by months</span>
 [%     CASE 'ITEMTYPES' %]<span>by item types</span>
 [%     CASE 'BRANCHES'  %]<span>by libraries</span>
+[%     CASE             %]<span>by [% type %]</span>
 [%   END %]
 [% END %]
 <ol>
@@ -285,8 +283,10 @@
         <label for="show_actual">Show actual/estimated values</label>
     </li>
     </ol>
-<fieldset class="action">
-        <input type="submit" name="option_submit" value="Submit" /></fieldset>
+    <fieldset class="action">
+        <input type="submit" name="option_submit" value="Submit" />
+        <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
+    </fieldset>
 </fieldset>
 </form>
 [% IF ( budget_lines ) %]
@@ -309,8 +309,11 @@
         </li>
     </ol>
     <fieldset class="action">    <input type="submit" value="Submit"/>
+    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
     <input type="hidden" name="report_name" value="[% report_name %]" />
     <input type="hidden" name="output" value="file" /></fieldset>
+    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
+    <input type="hidden" name="authcat" value="[% authcat %]" />
     </fieldset>
 </form>
 [% END %]