From 084168d1b8409b9d1ae23f78d0c968cc53beea05 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 29 Mar 2022 17:17:36 +0000 Subject: [PATCH] Bug 30401: Convert budgets administration page tabs to Bootstrap This patch updates the budgets administration page to use Bootstrap tabs instead of jQueryUI. This patch contains indentation changes, so ignore whitespace when you use your preferred diff tool. To test, apply the patch and go to Administration -> Budgets. Check that the "Active budgets" and "Inactive budgets" work correctly. Append "?tab=2" to the page URL to confirm that the second tab is preselected. Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Fridolin Somers --- .../prog/en/modules/admin/aqbudgetperiods.tt | 149 +++++++++--------- 1 file changed, 77 insertions(+), 72 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 1560479772..8dc37d99aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -471,79 +471,84 @@ [% INCLUDE 'budgets-active-currency.inc' %]
-
    -
  • Active budgets
    • -
  • Inactive budgets
    • + - -
    - [% IF ( period_active_loop ) %] - - - - - - - - - - - - - [% FOREACH period_active IN period_active_loop %] +
    +
    + [% IF ( period_active_loop ) %] +
    Budget nameStart dateEnd dateLockedTotalActions
    + - - - - - - + + + + + + - [% END %] - -
    [% period_active.budget_period_description | html %][% period_active.budget_period_startdate | $KohaDates %][% period_active.budget_period_enddate | $KohaDates %] - [% IF ( period_active.budget_period_locked ) %] - Locked - [% END %] - [% period_active.budget_period_total | $Price %] - [% PROCESS action_menu block_budget=period_active %] - Budget nameStart dateEnd dateLockedTotalActions
    - [% ELSE %] - No active budgets - [% END %] -
    -
    - [% IF ( period_inactive_loop ) %] - - - - - - - - - - - - - [% FOREACH period_loo IN period_inactive_loop %] - - - - - - - - - [% END %] - -
    Budget nameStart dateEnd dateLockedTotalActions
    [% period_loo.budget_period_description | html %][% period_loo.budget_period_startdate | $KohaDates %][% period_loo.budget_period_enddate | $KohaDates %][% IF ( period_loo.budget_period_locked ) %] Locked[% END %][% period_loo.budget_period_total | $Price %] - [% PROCESS action_menu block_budget=period_loo %] -
    - [% ELSE %] - No inactive budgets - [% END %] -
    + + + [% FOREACH period_active IN period_active_loop %] + + [% period_active.budget_period_description | html %] + [% period_active.budget_period_startdate | $KohaDates %] + [% period_active.budget_period_enddate | $KohaDates %] + + [% IF ( period_active.budget_period_locked ) %] + Locked + [% END %] + + [% period_active.budget_period_total | $Price %] + + [% PROCESS action_menu block_budget=period_active %] + + + [% END %] + + + [% ELSE %] + No active budgets + [% END %] +
+
+ [% IF ( period_inactive_loop ) %] + + + + + + + + + + + + + [% FOREACH period_loo IN period_inactive_loop %] + + + + + + + + + [% END %] + +
Budget nameStart dateEnd dateLockedTotalActions
[% period_loo.budget_period_description | html %][% period_loo.budget_period_startdate | $KohaDates %][% period_loo.budget_period_enddate | $KohaDates %][% IF ( period_loo.budget_period_locked ) %] Locked[% END %][% period_loo.budget_period_total | $Price %] + [% PROCESS action_menu block_budget=period_loo %] +
+ [% ELSE %] + No inactive budgets + [% END %] +
+ [% END %] @@ -566,10 +571,10 @@ [% Asset.js("js/acq.js") | $raw %]