From c148afd646c2ca228555a23c3eceb0646269e63b Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 9 Feb 2021 13:53:55 +0000 Subject: [PATCH] Bug 27661: Update about for message broker status Content-Type: text/plain; charset=utf-8 This patch updates the about page with regards to the message broker status and adds some small formatting improvements for displaying the status. Test plan 1/ Run through the yarn build process to update the CSS file. 2/ View the about page without RabbitMQ installed 3/ View the about page with RabbitMQ installed 4/ Note the formatting and message change and signoff Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy --- .../intranet-tmpl/prog/css/src/staff-global.scss | 8 ++++++-- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 21 +++++++++++---------- 2 files changed, 17 insertions(+), 12 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 84766fd401..a35ca3bba8 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1646,11 +1646,15 @@ input[type='text']:read-only:focus { } .status_ok { - background-color: #90EE90; + background-color: #90EE90 !important; } .status_warn { - background-color: #FF0000; + background-color: #FFA500 !important; +} + +.status_fatal { + background-color: #FF6347 !important; } // Font Awesome icons diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index a1ef6a8bb7..09b1a26619 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -111,21 +111,22 @@ Zebra version: [% zebraVersion | html %] + Zebra status: [% IF (errZebraConnection == 10000) %] - Error Zebra server seems not to be available. Is it started? + Zebra server seems not to be available. Is it started? [% ELSIF (errZebraConnection) %] - Warning Error message from Zebra: [% ( errZebraConnection ) | html %] + Error message from Zebra: [% ( errZebraConnection ) | html %] + [% ELSE %] + Running [% END %] + Message broker: - - Status: - [% IF warnConnectBroker %] - connection failed - [% ELSE %] - running - [% END %] - + [% IF warnConnectBroker %] + Using SQL Polling + [% ELSE %] + Using RabbitMQ + [% END %] Date and time: -- 2.11.0