Attachment 117006 Details for Bug 27661 – Bug 27661: (QA follow-up) Use bootstrap classes

[patch] Bug 27661: (QA follow-up) Use bootstrap classes

Bug-27661-QA-follow-up-Use-bootstrap-classes.patch (text/plain), 8.16 KB, created by Martin Renvoize (ashimema) on 2021-02-18 17:00:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-02-18 17:00:19 UTC

Size: 8.16 KB

patch

obsolete

>From c9c781eb947f22a7130bd8f0ae98e9b06de0e887 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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.
>---
> .../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 a35ca3bba8..0d23da0944 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -1645,18 +1645,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 460b079e2e..e2d727ab0b 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 @@
> <tr>
> <th scope="row">Elasticsearch: </th>
> [% IF elasticsearch_fatal_config_error %]
>- <td>[% elasticsearch_fatal_config_error | html %]</td>
>+ <td>[% elasticsearch_fatal_config_error | html %]</td>
> [% ELSE %]
> <td>
> Version:
>@@ -63,14 +63,14 @@
> |
> Status:
> [% IF elasticsearch_status.running %]
>- running
>+ running
> |
> Indices:
> [% FOREACH index IN elasticsearch_status.indexes %]
> [% index.index_name | html %] (count: <emph>[% index.count | html %]</emph>)[% UNLESS loop.last %], [% END %]
> [% END %]
> [% ELSE %]
>- not running
>+ not running
> [% END %]
> </td>
> [% 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 @@
> <tr><th scope="row">Zebra version: </th><td>[% zebraVersion | html %]</td></tr>
> <tr><th scope="row">Zebra status: </th>
> [% IF (errZebraConnection == 10000) %]
>- <td class="status_fatal">Zebra server seems not to be available. Is it started?</td>
>+ <td class="bg-danger">Zebra server seems not to be available. Is it started?</td>
> [% ELSIF (errZebraConnection) %]
>- <td class="status_warn">Error message from Zebra: [% ( errZebraConnection ) | html %]</td>
>+ <td class="bg-warning">Error message from Zebra: [% ( errZebraConnection ) | html %]</td>
> [% ELSE %]
>- <td class="status_ok">Running</td>
>+ <td class="bg-success">Running</td>
> [% END %]
> </tr>
> <tr>
> <th scope="row">Message broker: </th>
> [% IF warnConnectBroker %]
>- <td class="status_warn">Using SQL polling</td>
>+ <td class="bg-warning">Using SQL polling</td>
> [% ELSE %]
>- <td class="status_ok">Using RabbitMQ</td>
>+ <td class="bg-success">Using RabbitMQ</td>
> [% END %]
> </tr>
> <tr>
>@@ -133,8 +133,8 @@
> <td>[% current_date_and_time | $KohaDates with_hours => 1 %]</td>
> </tr>
> <tr>
>- [% 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' : '' %]
> <th scope="row">Time zone: </th>
> <td>Used: [% time_zone.actual | html %]
> [% IF time_zone.actual_bad_tz_fallback %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27661: 116575 | 116848 | 116855 | 116856 | 117006 | 117010 | 117022 | 117023 | 117024 | 117025 | 117026