From ef9a39e23b1bc14e1cee08655ad5d8b9dad590e5 Mon Sep 17 00:00:00 2001
From: Omer Etrog <omer.etrog@nokia.com>
Date: Thu, 13 Oct 2016 15:40:28 +0300
Subject: [PATCH] change the rca text order

Change-Id: Ideb2ef40ef5725252221f8431bad5b4f870e2f9f
---
 .../rca/rootCauseAnalysisGraph.directive.js   | 31 ++++++++++---------
 .../rca/rootCauseAnalysisGraph.html           |  2 +-
 .../rca/rootCauseAnalysisGraph.scss           |  3 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js
index 11622a6..1846882 100644
--- a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js
+++ b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js
@@ -47,7 +47,7 @@ function hzRootCauseAnalysisGraph($filter) {
         });
 
         scope.selected = getSelectedObject(u);
-        //inner.call(render, g);
+        inner.call(render, g);
       }
     }
 
@@ -159,24 +159,27 @@ function hzRootCauseAnalysisGraph($filter) {
               break;
           }
 
-          html += '<div style="height: 90px; width: 2px; background: #656a70; float: left; margin-top: 5px; margin-left: 10px;"></div>';
+          html += '<div style="height: 90px; width: 2px; background: #656a70; float: left; margin: 5px 10px 0px 3px;"></div>';
           html += '<div>';
-          html += '<div style="line-height: 2em; padding-left: 10px">';
+          html += '<div style="line-height: 2em; padding-left: 10px;text-align: left">';
           html += '<div style="font-weight: 600; font-size: 20px; color: #44575e; width:262px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;" title="' + alertName + '">' + alertName + '</div>';
+          html += '<span style="font-weight: 400; color: #44575e;">' + alertResourceType + '</span>';
+          html += '<div>';
+          html += '<span style="font-weight: 600; color: #44575e;">Resource ID:</span>';
+          html += '<span style="font-weight: 400; padding-left: 5px; color: #44575e;">' + alertResourceId + '</span>';
+          html += '</div>';
+          html += '<div>';
+          html += '<span style="font-weight: 600; color: #44575e;">Type:</span>';
+          html += '<span style="font-weight: 400; padding-left: 5px; color: #44575e;">' + alertType + '</span>';
+          html += '</div>';
           html += '<div style="font-weight: 400; color: #44575e; width:262px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">' + alertInfo + '</div>';
           html += '<div style="font-weight: 400; color: #44575e;">' + alertTimeStamp + ' | ' + alertState + ' | ' + alertSeverity;
           if (key.id == data.inspected_index) {
             html += '<span style="float: right"><i title="Root cause analysis relative to this alert" style="font-size: 27px; color: #FFFFFF" class="fa fa-thumb-tack"></i></span>';
           }
           html += '</div>';
-          html += '<div>';
-          html += '<span style="font-weight: 600; color: #44575e;">Type:</span>';
-          html += '<span style="font-weight: 400; padding-left: 5px; color: #44575e;">' + alertType + '</span>';
-          html += '</div>';
-          html += '<div>';
-          html += '<span style="font-weight: 600; color: #44575e;">Resource ID:</span>';
-          html += '<span style="font-weight: 400; padding-left: 5px; color: #44575e;">' + alertResourceId + '</span>';
-          html += '</div>';
+
+
           html += '</div></div></div>';
 
           g.setNode(value, {
@@ -198,9 +201,9 @@ function hzRootCauseAnalysisGraph($filter) {
 
         inner.call(render, g);
 
-        inner.selectAll(".clickable:not(.update)").on("click", function(d) {
-          setSelected(d);
-        });
+        //inner.selectAll(".clickable:not(.update)").on("click", function(d) {
+        //  setSelected(d);
+        //});
 
         setSelected(data.inspected_index);
       }
diff --git a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.html b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.html
index d59cba3..9913977 100644
--- a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.html
+++ b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.html
@@ -1,5 +1,5 @@
 <div class="root-cause-analysis-graph"  id="root-cause-analysis-graph">
-    <button class="center-button fa fa-refresh" ng-click="onCenterGraph()"></button>
+    <i class="center-button fa fa-refresh" ng-click="onCenterGraph()"></i>
     <svg>
         <g class="diagram"></g>
     </svg>
diff --git a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.scss b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.scss
index d47d885..70444d3 100644
--- a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.scss
+++ b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.scss
@@ -60,8 +60,7 @@
   .center-button {
     float: right;
     margin: 10px 10px 0 0;
-    color: #FFFFFF;
-    background-color: #38424B;
+    cursor: pointer;
   }