From e79048d6264203a689d1da22fb636a123b63f510 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 18 Feb 2021 16:56:21 +0000 Subject: [PATCH] Bug 27661: (QA follow-up) Use bootstrap classes This patch removes the local status_* css rules in favour of using the bg-* rules that are shipped with the bootstrap version we are using and then updates the relevant lines in the template to use those classes. We also update the default table styling which adds background color to the odd table rows so that our local classes take precidence. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit ab23dfa3a14fd7d1ecdd78d755476f8afcd69efa) Signed-off-by: Fridolin Somers --- .../intranet-tmpl/prog/css/src/_tables.scss | 4 ++- .../prog/css/src/staff-global.scss | 12 ------- .../intranet-tmpl/prog/en/modules/about.tt | 32 +++++++++---------- 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss index d0fd65f481..01d25fd65f 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -333,8 +333,10 @@ tbody { tr { &:nth-child(odd) { td { - background-color: $table-odd-row; border-right: 1px solid $table-border-color; + &:not(.bg-danger):not(.bg-warning):not(.bg-info):not(.bg-success):not(.bg-primary) { + background-color: $table-odd-row; + } } } } 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 90cc3e9f21..7a7e2e7f2e 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1608,18 +1608,6 @@ input[type='text']:read-only:focus { color: #CC0000; } -.status_ok { - background-color: #90EE90 !important; -} - -.status_warn { - background-color: #FFA500 !important; -} - -.status_fatal { - background-color: #FF6347 !important; -} - // Font Awesome icons i { &.error { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index c853f41504..300b92933a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -52,7 +52,7 @@ Elasticsearch: [% IF elasticsearch_fatal_config_error %] - [% elasticsearch_fatal_config_error | html %] + [% elasticsearch_fatal_config_error | html %] [% ELSE %] Version: @@ -63,14 +63,14 @@ | Status: [% IF elasticsearch_status.running %] - running + running | Indices: [% FOREACH index IN elasticsearch_status.indexes %] [% index.index_name | html %] (count: [% index.count | html %])[% UNLESS loop.last %], [% END %] [% END %] [% ELSE %] - not running + not running [% END %] [% END %] @@ -84,9 +84,9 @@ [% ELSE %]undefined[% END %] | Status: [% IF memcached_servers %] [% IF memcached_running and is_memcached_still_active %] - running. + running. [% ELSE %] - not running. + not running. [% IF is_psgi %] Remember memcached needs to be started before Plack. [% END %] @@ -97,13 +97,13 @@ Config read from: [% SWITCH where_is_memcached_config %] [% CASE 'config_only' %] - koha-conf.xml + koha-conf.xml [% CASE 'ENV_only' %] - ENV Note that the right place to define the memcached config is in your $KOHA_CONF file + ENV Note that the right place to define the memcached config is in your $KOHA_CONF file [% CASE 'both' %] - ENV and koha-conf.xml Note that the right place to define the memcached config is in your $KOHA_CONF file. To avoid any misunderstanding you should not export the memcached config from ENV. + ENV and koha-conf.xml Note that the right place to define the memcached config is in your $KOHA_CONF file. To avoid any misunderstanding you should not export the memcached config from ENV. [% CASE # nowhere %] - Nowhere Note that the right place to define the memcached config is in your $KOHA_CONF file. Currently you do not have a valid memcached configuration defined. + Nowhere Note that the right place to define the memcached config is in your $KOHA_CONF file. Currently you do not have a valid memcached configuration defined. [% END %] [% IF effective_caching_method != 'Cache::Memcached::Fast::Safe' %] | Effective caching method: [% effective_caching_method | html %] @@ -113,19 +113,19 @@ Zebra version: [% zebraVersion | html %] Zebra status: [% IF (errZebraConnection == 10000) %] - Zebra server seems not to be available. Is it started? + Zebra server seems not to be available. Is it started? [% ELSIF (errZebraConnection) %] - Error message from Zebra: [% ( errZebraConnection ) | html %] + Error message from Zebra: [% ( errZebraConnection ) | html %] [% ELSE %] - Running + Running [% END %] Message broker: [% IF warnConnectBroker %] - Using SQL polling + Using SQL polling [% ELSE %] - Using RabbitMQ + Using RabbitMQ [% END %] @@ -133,8 +133,8 @@ [% current_date_and_time | $KohaDates with_hours => 1 %] - [% timezone_config_class = (time_zone.config_invalid) ? 'status_warn' : '' %] - [% timezone_env_class = (time_zone.env_invalid) ? 'status_warn' : '' %] + [% timezone_config_class = (time_zone.config_invalid) ? 'bg-warning' : '' %] + [% timezone_env_class = (time_zone.env_invalid) ? 'bg-warning' : '' %] Time zone: Used: [% time_zone.actual | html %] [% IF time_zone.actual_bad_tz_fallback %] -- 2.39.5