File 0007-UI-Fix-typos-in-RC-description-for-m-s-bsc... of Package hawk2

Overview Repositories Revisions Requests Users Attributes Meta

File 0007-UI-Fix-typos-in-RC-description-for-m-s-bsc-1009867.patch of Package hawk2

From 12f69c26800411c8caa6fc2476b559cd89c41b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Fri, 11 Nov 2016 15:45:32 -0500
Subject: [PATCH 07/10] UI: Fix typos in RC description for m/s (bsc#1009867)

---
 hawk/app/views/nodes/events.html.haml     | 9 ++++++---
 hawk/app/views/resources/events.html.haml | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/hawk/app/views/nodes/events.html.haml b/hawk/app/views/nodes/events.html.haml
index d1c231b..233425b 100644
--- a/hawk/app/views/nodes/events.html.haml
+++ b/hawk/app/views/nodes/events.html.haml
@@ -41,14 +41,17 @@
     case 5: desc = __('installation error'); break;
     case 6: desc = __('configuration error'); break;
     case 7: desc = __('not running'); break;
-    case 8: desc = __('running (master); break;'); break;
-    case 9: desc = __('failed (master); break;'); break;
+    case 8: desc = __('running (master)'); break;
+    case 9: desc = __('failed (master)'); break;
     default: desc = __('other'); break;
     };
     return '<abbr title="' + desc + '">' + value + '</abbr>';
   }
   function eventsRowStyle(row, index) {
-    if (parseInt(row.rc) != 0) {
+    var rc = parseInt(row.rc);
+    if (rc == 8) {
+      return { classes: "info" };
+    } else if (rc != 0) {
       return { classes: "danger" };
     }
     return {};
diff --git a/hawk/app/views/resources/events.html.haml b/hawk/app/views/resources/events.html.haml
index f6640c1..d5af28e 100644
--- a/hawk/app/views/resources/events.html.haml
+++ b/hawk/app/views/resources/events.html.haml
@@ -41,8 +41,8 @@
     case 5: desc = __('installation error'); break;
     case 6: desc = __('configuration error'); break;
     case 7: desc = __('not running'); break;
-    case 8: desc = __('running (master); break;'); break;
-    case 9: desc = __('failed (master); break;'); break;
+    case 8: desc = __('running (master)'); break;
+    case 9: desc = __('failed (master)'); break;
     default: desc = __('other'); break;
     };
     return '<abbr title="' + desc + '">' + value + '</abbr>';
-- 
2.10.1

Places

File 0007-UI-Fix-typos-in-RC-description-for-m-s-bsc-1009867.patch of Package hawk2

Places