From 77c3bee6915a68ab05f7ecdb17657a43b1f4007f Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 11 Jun 2012 17:28:13 +0200
Subject: [PATCH 1/1] Bug 8117: Followup Move the "no budget" string outside
 the table

---
 .../prog/en/modules/admin/aqbudgetperiods.tt       |  140 ++++++++++----------
 1 files changed, 71 insertions(+), 69 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index e6a9afc..efd3330 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -366,80 +366,82 @@
 
     <div id="active">
       <h3>Active Budgets</h3>
-      <table id="activeperiodst">
-        <thead>
-          <tr>
-            <th>Budget name</th>
-            <th>Start date</th>
-            <th>End date</th>
-            <th>Locked</th>
-            <th>Total</th>
-            <th>Actions</th>
-          </tr>
-        </thead>
-        <tbody>
-            [% FOREACH period_active IN period_active_loop %]
-              <tr>
-              <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id %]" title="View funds for [% period_active.budget_period_description %]">[% period_active.budget_period_description %]</a></td>
-              <td>[% period_active.budget_period_startdate | $KohaDates %]</td>
-              <td>[% period_active.budget_period_enddate | $KohaDates %]</td>
-              <td>
-                [% IF ( period_active.budget_period_locked ) %]
-                  <span style="color:green;">Locked</span>&nbsp;
-                [% END %]
-              </td>
-              <td align='right'>[% period_active.budget_period_total %]</td>
-              <td>
-                <a href="[% script_name %]?op=add_form&amp;budget_period_id=[% period_active.budget_period_id |html %]">Edit</a>
-                <a href="[% script_name %]?op=delete_confirm&amp;budget_period_id=[% period_active.budget_period_id %]">Delete</a>
-                <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_active.budget_period_id %]">Add Fund</a>
-              </td>
-              </tr>
-            [% END %]
-            [% UNLESS ( period_active_loop ) %]
-              <tr><td colspan="7">No budget</td></tr>
-            [% END %]
-        </tbody>
-      </table>
-      <div class="paginationBar">[% active_pagination_bar %]</div>
-    </div>
-    <div id="inactive">
-      <h3>Inactive Budgets</h3>
-      <table id="inactiveperiodst">
-        <thead>
+      [% IF ( period_active_loop ) %]
+        <table id="activeperiodst">
+          <thead>
             <tr>
-                <th>Budget name</th>
-                <th>Start date</th>
-                <th>End date</th>
-                <th>Locked</th>
-                <th>Total</th>
-                <th>Actions</th>
+              <th>Budget name</th>
+              <th>Start date</th>
+              <th>End date</th>
+              <th>Locked</th>
+              <th>Total</th>
+              <th>Actions</th>
             </tr>
-        </thead>
-        <tbody>
-            [% FOREACH period_loo IN period_inactive_loop %]
-                [% IF ( loop.odd ) %]
-                    <tr>
-                [% ELSE %]
-                    <tr class="highlight">
-                [% END %]
-                <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id %]" title="View funds for [% period_loo.budget_period_description %]">[% period_loo.budget_period_description %]</a></td>
-                <td>[% period_loo.budget_period_startdate | $KohaDates %]</td>
-                <td>[% period_loo.budget_period_enddate | $KohaDates %]</td>
-                <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
-                <td align='right'>[% period_loo.budget_period_total %]</td>
+          </thead>
+          <tbody>
+              [% FOREACH period_active IN period_active_loop %]
+                <tr>
+                <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id %]" title="View funds for [% period_active.budget_period_description %]">[% period_active.budget_period_description %]</a></td>
+                <td>[% period_active.budget_period_startdate | $KohaDates %]</td>
+                <td>[% period_active.budget_period_enddate | $KohaDates %]</td>
+                <td>
+                  [% IF ( period_active.budget_period_locked ) %]
+                    <span style="color:green;">Locked</span>&nbsp;
+                  [% END %]
+                </td>
+                <td align='right'>[% period_active.budget_period_total %]</td>
                 <td>
-                    <a href="[% period_loo.script_name %]?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id |html %]">Edit</a>
-                    <a href="[% period_loo.script_name %]?op=delete_confirm&amp;budget_period_id=[% period_loo.budget_period_id %]">Delete</a>
-                <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id %]">Add fund</a>
+                  <a href="[% script_name %]?op=add_form&amp;budget_period_id=[% period_active.budget_period_id |html %]">Edit</a>
+                  <a href="[% script_name %]?op=delete_confirm&amp;budget_period_id=[% period_active.budget_period_id %]">Delete</a>
+                  <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_active.budget_period_id %]">Add Fund</a>
                 </td>
                 </tr>
-            [% END %]
-            [% UNLESS ( period_inactive_loop ) %]
-            <tr><td colspan="7">No budget</td></tr>
-            [% END %]
-        </tbody>
-      </table>
+              [% END %]
+          </tbody>
+        </table>
+      [% ELSE %]
+        No active budgets
+      [% END %]
+      <div class="paginationBar">[% active_pagination_bar %]</div>
+    </div>
+    <div id="inactive">
+      <h3>Inactive Budgets</h3>
+      [% IF ( period_inactive_loop ) %]
+        <table id="inactiveperiodst">
+          <thead>
+              <tr>
+                  <th>Budget name</th>
+                  <th>Start date</th>
+                  <th>End date</th>
+                  <th>Locked</th>
+                  <th>Total</th>
+                  <th>Actions</th>
+              </tr>
+          </thead>
+          <tbody>
+              [% FOREACH period_loo IN period_inactive_loop %]
+                  [% IF ( loop.odd ) %]
+                      <tr>
+                  [% ELSE %]
+                      <tr class="highlight">
+                  [% END %]
+                  <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id %]" title="View funds for [% period_loo.budget_period_description %]">[% period_loo.budget_period_description %]</a></td>
+                  <td>[% period_loo.budget_period_startdate | $KohaDates %]</td>
+                  <td>[% period_loo.budget_period_enddate | $KohaDates %]</td>
+                  <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
+                  <td align='right'>[% period_loo.budget_period_total %]</td>
+                  <td>
+                      <a href="[% period_loo.script_name %]?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id |html %]">Edit</a>
+                      <a href="[% period_loo.script_name %]?op=delete_confirm&amp;budget_period_id=[% period_loo.budget_period_id %]">Delete</a>
+                  <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id %]">Add fund</a>
+                  </td>
+                  </tr>
+              [% END %]
+          </tbody>
+        </table>
+      [% ELSE %]
+        No inactive budgets
+      [% END %]
       <div class="pages">[% inactive_pagination_bar %]</div>
     </div>
   </div>
-- 
1.7.7.3