Attachment 117023 Details for Bug 27661 – Bug 27661: Update about for message broker status

[patch] Bug 27661: Update about for message broker status

Bug-27661-Update-about-for-message-broker-status.patch (text/plain), 3.48 KB, created by Marcel de Rooy on 2021-02-19 07:59:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2021-02-19 07:59:32 UTC

Size: 3.48 KB

patch

obsolete

>From c148afd646c2ca228555a23c3eceb0646269e63b Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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 <oleonard@myacpl.org>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> .../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 @@
> </td>
> </tr>
> <tr><th scope="row">Zebra version: </th><td>[% zebraVersion | html %]</td></tr>
>+ <tr><th scope="row">Zebra status: </th>
> [% IF (errZebraConnection == 10000) %]
>- <tr><th scope="row">Error </th><td>Zebra server seems not to be available. Is it started?</td></tr>
>+ <td class="status_fatal">Zebra server seems not to be available. Is it started?</td>
> [% ELSIF (errZebraConnection) %]
>- <tr><th scope="row">Warning </th><td>Error message from Zebra: [% ( errZebraConnection ) | html %] </td></tr>
>+ <td class="status_warn">Error message from Zebra: [% ( errZebraConnection ) | html %]</td>
>+ [% ELSE %]
>+ <td class="status_ok">Running</td>
> [% END %]
>+ </tr>
> <tr>
> <th scope="row">Message broker: </th>
>- <td>
>- Status:
>- [% IF warnConnectBroker %]
>- connection failed
>- [% ELSE %]
>- running
>- [% END %]
>- </td>
>+ [% IF warnConnectBroker %]
>+ <td class="status_warn">Using SQL Polling</td>
>+ [% ELSE %]
>+ <td class="status_ok">Using RabbitMQ</td>
>+ [% END %]
> </tr>
> <tr>
> <th scope="row">Date and time: </th>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

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