From 5916c8d5058bc80d7743cf99a0433552758739de Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Sat, 24 Oct 2020 18:02:59 +0000 Subject: [PATCH] Bug 24012: Budget 'Locked" text colour changed and lock icon added MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test plan: 1. Go to Administration 2. Click on Budgets 3. Add a new bdget and check the 'Lock budget' box 4. Click on the 'Inactive budgets' tab 5. Note that 'Locked' is displayed in green 6. Apply patch 7. Compile the sass files (setup detailed here:https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_interface ) by running: yarn build 8. Refresh the page and notice the 'Locked' text is now red, and there is a lock icon to the left of the text Sponsored-by: Catalyst IT Signed-off-by: Séverine QUEUNE --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 13 +++++++++++++ .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index a698ec9..79d6bb3 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2581,6 +2581,19 @@ li { display: none; } +#activeperiodst { + i.fa.fa-lock { + padding: .3em; + } +} + +#inactiveperiodst { + i.fa.fa-lock { + padding: .3em; + } +} + + // Override core jQueryUI widgets .ui-widget-content { background: #FFFFFF none; 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 f3dbc3a..37c8105 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -441,7 +441,7 @@ [% period_active.budget_period_enddate | $KohaDates %] [% IF ( period_active.budget_period_locked ) %] - Locked  + Locked  [% END %] [% period_active.budget_period_total | $Price %] @@ -475,7 +475,7 @@ [% 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 [% ELSE %][% END %] + [% IF ( period_loo.budget_period_locked ) %]Locked [% ELSE %][% END %] [% period_loo.budget_period_total | $Price %] [% PROCESS action_menu block_budget=period_loo %] -- 2.1.4