Bug 27661: Update about for message broker status
authorMartin Renvoize <martin.renvoize@ptfs-europe.com>
Tue, 9 Feb 2021 13:53:55 +0000 (13:53 +0000)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Tue, 23 Feb 2021 12:16:07 +0000 (13:16 +0100)
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>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt

index 84766fd..a35ca3b 100644 (file)
@@ -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
index a1ef6a8..09b1a26 100644 (file)
                 </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"><strong>Error</strong> </th><td>Zebra server seems not to be available. Is it started?</td></tr>
+            <td class="status_fatal"><strong>Zebra server seems not to be available. Is it started?</strong></td>
             [% ELSIF (errZebraConnection) %]
-            <tr><th scope="row"><strong>Warning</strong> </th><td>Error message from Zebra: [% ( errZebraConnection ) | html %] </td></tr>
+            <td class="status_warn"><strong>Error message from Zebra: [% ( errZebraConnection ) | html %]</strong></td>
+            [% ELSE %]
+            <td class="status_ok">Running</td>
             [% END %]
+            </tr>
             <tr>
                 <th scope="row">Message broker: </th>
-                <td>
-                    Status:
-                    [% IF warnConnectBroker %]
-                        <span class="status_warn">connection failed</span>
-                    [% ELSE %]
-                        <span class="status_ok">running</span>
-                    [% END %]
-                </td>
+                [% IF warnConnectBroker %]
+                <td class="status_warn"><strong>Using SQL Polling</strong></td>
+                [% ELSE %]
+                <td class="status_ok">Using RabbitMQ</td>
+                [% END %]
             </tr>
             <tr>
               <th scope="row">Date and time: </th>