Attachment 112797 Details for Bug 24012 – Bug 24012: Budget 'Locked" text colour changed and lock icon added

[patch] Bug 24012: Budget 'Locked" text colour changed and lock icon added

Bug-24012-Budget-Locked-text-colour-changed-and-lo.patch (text/plain), 3.62 KB, created by Katrin Fischer on 2020-11-01 11:56:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-11-01 11:56:36 UTC

Size: 3.62 KB

patch

obsolete

>From 683d31bae9a8c380e9828747f78c94bcd00418b9 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Sat, 24 Oct 2020 18:02:59 +0000
>Subject: [PATCH] Bug 24012: Budget 'Locked" text colour changed and lock icon
> added
>
>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. There is a space between the
>lock icon and the 'Locked' text.
>
>Sponsored-by: Catalyst IT
>Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
>---
> koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 14 ++++++++++++++
> .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 4 ++--
> 2 files changed, 16 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 a698ec9bf9..a7d7836645 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -2327,6 +2327,19 @@ li {
> }
> }
> 
>+#activeperiodst {
>+ i.fa.fa-lock {
>+ padding: .3em;
>+ }
>+}
>+
>+#inactiveperiodst {
>+ i.fa.fa-lock {
>+ padding: .3em;
>+ }
>+}
>+
>+
> #basketcount {
> span {
> display: inline;
>@@ -2581,6 +2594,7 @@ li {
> display: none;
> }
> 
>+
> // 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 f3dbc3a6a5..37c81056ca 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 @@
> <td>[% period_active.budget_period_enddate | $KohaDates %]</td>
> <td>
> [% IF ( period_active.budget_period_locked ) %]
>- Locked&nbsp;
>+ Locked&nbsp;
> [% END %]
> </td>
> <td class="data">[% period_active.budget_period_total | $Price %]</td>
>@@ -475,7 +475,7 @@
> <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id | uri %]" title="View funds for [% period_loo.budget_period_description | html %]">[% period_loo.budget_period_description | html %]</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 ) %]Locked&nbsp;[% ELSE %][% END %] </td>
>+ <td> [% IF ( period_loo.budget_period_locked ) %]Locked&nbsp;[% ELSE %][% END %] </td>
> <td class="data">[% period_loo.budget_period_total | $Price %]</td>
> <td>
> [% PROCESS action_menu block_budget=period_loo %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24012: 112499 | 112516 | 112633 | 112649 | 112797 | 112798 | 112837 | 112875 | 112876