Fixes #10315: Small fixes on dashboard display

Normation · Mar 1, 2017 · cdd31dd · cdd31dd
1 parent 7b10fcd
commit cdd31dd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/HomePage.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/HomePage.scala
@@ -299,10 +299,10 @@ class HomePage extends Loggable {
                         case Some(_: VirtualMachineType) => "Virtual"
                         case Some(PhysicalMachineType)   => "Physical"
                         case _                           => "No Machine Inventory"
-                      } }.groupBy(identity).mapValues(_.size).foldLeft((Nil : List[JsExp], Nil : List[JsExp]))
+                      } }.groupBy(identity).mapValues(_.size).toList.sortBy(_._2).foldLeft((Nil : List[JsExp], Nil : List[JsExp]))
       { case ((labels,values),(label,value)) => (label :: labels, value :: values) }
       val machinesArray = JsObj("labels" -> JsArray(machines._1), "values" -> JsArray(machines._2))
-      val (osLabels,osValues) = nodeInfos.values.groupBy(_.osDetails.os.name).mapValues(_.size).foldLeft((Nil : List[JsExp], Nil : List[JsExp]))
+      val (osLabels,osValues) = nodeInfos.values.groupBy(_.osDetails.os.name).mapValues(_.size).toList.sortBy(_._2).foldLeft((Nil : List[JsExp], Nil : List[JsExp]))
       { case ((labels,values),(label,value)) => (label :: labels, value :: values) }
 
       val osArray = JsObj("labels" -> JsArray(osLabels), "values" -> JsArray(osValues))

diff --git a/rudder-web/src/main/webapp/javascript/rudder/homePage.js b/rudder-web/src/main/webapp/javascript/rudder/homePage.js
@@ -53,7 +53,7 @@ function homePage (
   }
   var stats = "Compliance based on "+ activeNodes
   if (nodeCount.pending !== null) {
-    allNodes += nodeCount.pending;
+    allNodes += nodeCount.pending.nodes;
     var pendingNodes = nodeCount.pending.nodes + " Nodes"
     var verb = "are"
     if (nodeCount.active === 1) {

diff --git a/rudder-web/src/main/webapp/secure/index.html b/rudder-web/src/main/webapp/secure/index.html
@@ -4,6 +4,7 @@
   <title>Rudder - Home</title>
   <script type="text/javascript" src="/javascript/rudder/homePage.js"></script>
   <script type="text/javascript" src="/javascript/gauge/gauge.min.js"></script>
+  <style type="text/css">body {overflow-y : scroll;}</style>
 </head>
 
 <div class="tw-bs homePage">

diff --git a/rudder-web/src/main/webapp/style/rudder/rudder-bootstrap.css b/rudder-web/src/main/webapp/style/rudder/rudder-bootstrap.css
@@ -362,19 +362,19 @@
 }
 
 #globalCompliance .progress {
-  height:90px;
-  margin: 33px 25px;
+  height:80px;
+  margin: 33px 30px;
 }
 
 #globalCompliance .progress .progress-bar {
-    line-height: 90px;
+    line-height:80px;
     font-size: 25px;
     font-weight: 600;
 }
 
 #complianceGauge {
-    float: left;
-    width: 100%;
+    max-width: 100%;
+    width:420px;
 }
 #gauge-value {
     font-weight: bold;

diff --git a/rudder-web/src/main/webapp/style/rudder/rudder-menu.css b/rudder-web/src/main/webapp/style/rudder/rudder-menu.css
@@ -517,9 +517,9 @@ a.sidebar-toggle{
   height: auto;
   padding-top: 15px;
   border-top: 2px solid #EBE7E7;
-  margin-left: 20%;
-  width: 60%;
-  position:relative
+  margin-left: 15%;
+  width: 70%;
+  position:relative;
 }
 
 .highlight{