From 4cf9a59b400a97b51ab25720eaf40c60d81e2d42 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sun, 1 Nov 2020 02:02:04 +0000
Subject: [PATCH] Bug 24012: (QA follow-up) Use standard patterns

- Removes the scss change in favor of adding the space to the
  HTML as is the usual pattern when using Font Awesome icons
- Removes the span with the inline style to make things appear as
  black by default (no danger here in it being locked?)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../intranet-tmpl/prog/css/src/staff-global.scss   | 14 --------------
 .../prog/en/modules/admin/aqbudgetperiods.tt       |  4 ++--
 2 files changed, 2 insertions(+), 16 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 a7d7836645..a698ec9bf9 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -2327,19 +2327,6 @@ li {
     }
 }
 
-#activeperiodst {
-    i.fa.fa-lock {
-        padding: .3em;
-    }
-}
-
-#inactiveperiodst {
-    i.fa.fa-lock {
-        padding: .3em;
-    }
-}
-
-
 #basketcount {
     span {
         display: inline;
@@ -2594,7 +2581,6 @@ 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 37c81056ca..fbd971f7ca 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 ) %]
-                  <i class="fa fa-lock"></i><span style="color:red;">Locked</span>&nbsp;
+                    <i class="fa fa-lock"></i> 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 ) %]<i class="fa fa-lock"></i><span style="color:red;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
+                  <td>[% IF ( period_loo.budget_period_locked ) %]<i class="fa fa-lock"></i> Locked[% END %]</td>
                   <td class="data">[% period_loo.budget_period_total | $Price %]</td>
                   <td>
                         [% PROCESS action_menu block_budget=period_loo %]
-- 
2.39.5