Bugzilla – Attachment 112499 Details for
Bug 24012
Display 'Locked' budget with a lock icon
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[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.41 KB, created by
Alex Buckley
on 2020-10-26 08:19:35 UTC
(
hide
)
Description:
Bug 24012: Budget 'Locked" text colour changed and lock icon added
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2020-10-26 08:19:35 UTC
Size:
3.41 KB
patch
obsolete
>From ebf4c37166d7cdf8376b5a8cbfc59f91c91cdd8d 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 > >Sponsored-by: Catalyst IT >--- > 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 a698ec9bf92..79d6bb35271 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 f3dbc3a6a57..37c81056cab 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><span title="[% period_active.budget_period_enddate | html %]">[% period_active.budget_period_enddate | $KohaDates %]</span></td> > <td> > [% IF ( period_active.budget_period_locked ) %] >- <span style="color:green;">Locked</span> >+ <i class="fa fa-lock"></i><span style="color:red;">Locked</span> > [% 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><span title="[% period_loo.budget_period_startdate | html %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td> > <td><span title="[% period_loo.budget_period_enddate | html %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td> >- <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span> [% ELSE %][% END %] </td> >+ <td> [% IF ( period_loo.budget_period_locked ) %]<i class="fa fa-lock"></i><span style="color:red;">Locked</span> [% ELSE %][% END %] </td> > <td class="data">[% period_loo.budget_period_total | $Price %]</td> > <td> > [% PROCESS action_menu block_budget=period_loo %] >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24012
:
112499
|
112516
|
112633
|
112649
|
112797
|
112798
|
112837
|
112875
|
112876