From 53af141f9b88253faa944e5faec76709e3435b84 Mon Sep 17 00:00:00 2001 From: Maxime Pelletier <maxime.pelletier@libeo.com> Date: Mon, 4 Mar 2013 17:22:58 -0500 Subject: [PATCH] Bug 9744 Add a column "Fund name" the the acquisition home. It also includes css to move the table below the content if the table is too big to fit in the page. Sponsored-by: CCSR --- koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css | 11 +++++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 18a4ef2..e1343e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2548,3 +2548,14 @@ a.disabled { .modal-header .closebtn{margin-top:2px;} .closebtn{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.closebtn:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} button.closebtn{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} + +#BudgetsAndFundsWrapper { + display: block; + float: left; + width: auto; +} + +#acqui_acqui_home_order { + margin-right: 50px; + min-width: 780px; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index fa6ae53..f991220 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -91,7 +91,7 @@ $(document).ready(function() { </div> -<div class="yui-u"> +<div class="yui-u" id="BudgetsAndFundsWrapper"> [% IF ( loop_budget ) %] @@ -107,6 +107,7 @@ $(document).ready(function() { <thead> <tr> <th>Fund</th> + <th>Fund name</th> <th>Owner</th> <th>Library</th> <th>Amount</th> @@ -120,6 +121,7 @@ $(document).ready(function() { <th>Total</th> <th> </th> <th> </th> + <th> </th> <th align="right" ><span class="bu_active" style="display : none;">[% total %]</span><span class="bu_inactive" >[% total_active %]</span></th> <th align="right" ><span class="bu_active" style="display : none;">[% totordered %]</span><span class="bu_inactive" >[% totordered_active %]</span></th> <th align="right" ><span class="bu_active" style="display : none;">[% totspent %]</span><span class="bu_inactive" >[% totspent_active %]</span></th> @@ -135,6 +137,7 @@ $(document).ready(function() { <tr class="highlight"> [% END %] <td align="center">[% loop_budge.budget_code %]</td> + <td>[% loop_budge.budget_name %]</td> <td align="center">[% loop_budge.budget_owner %]</td> <td align="center">[% loop_budge.budget_branchname %]</td> <td align="right" >[% loop_budge.budget_amount %]</td> @@ -149,6 +152,7 @@ $(document).ready(function() { <tr class="highlight" id = "b_inactive" style="display : none;"> [% END %] <td align="center" >[% loop_budge.budget_code %]</td> + <td>[% loop_budge.budget_name %]</td> <td align="center">[% loop_budge.budget_owner %]</td> <td align="center">[% loop_budge.budget_branchname %]</td> <td align="right" >[% loop_budge.budget_amount %]</td> -- 1.7.10.4