add score description, simplify chart layout

FairwindsOps · May 15, 2019 · 374d167 · 374d167
1 parent aaec318
commit 374d167
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 55 deletions.
diff --git a/pkg/dashboard/assets/css/dashboard.css b/pkg/dashboard/assets/css/dashboard.css
@@ -1,34 +1,58 @@
-.charts {
-  height: 405px;
-}
-
 .card.cluster {
   margin-top: 15px;
+  padding: 40px;
+  position: relative;
 }
 
 .card h3 {
   margin: 0;
   font-weight: 300;
   font-size: 28px;
-  padding: 15px 20px 30px;
+  padding: 20px 20px;
 }
 
 .card.cluster h3 {
-  padding-bottom: 20px;
+  padding: 0px;
+  padding-bottom: 10px;
 }
 
 .card.namespace h3 strong {
   font-weight: bold;
 }
 
 .cluster-overview {
-  height: 204px;
+  position: relative;
+  top: -60px;
+  margin-bottom: -60px;
 }
 
-.cluster-overview .cluster-score {
-  width: 200px;
+.cluster-overview .graph {
+  display: inline-block;
+  width: 35%;
+  margin-left: -10px;
+  margin-right: 10px;
+}
+
+.cluster-overview .cluster-score,
+.cluster-overview .result-messages {
   display: inline-block;
-  margin-left: 20px;
+  width: 32%;
+  vertical-align: top;
+  padding-top: 65px;
+}
+
+.cluster-overview .result-messages {
+  padding-top: 90px;
+}
+
+.cluster-overview .graph canvas {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.cluster-overview .score-description {
+  font-size: 11px;
+  line-height: 1.3em;
 }
 
 .cluster-overview .cluster-score .weather {
@@ -42,7 +66,7 @@
   line-height: 28px;
   font-weight: 200;
   color: #555;
-  margin-bottom: 25px;
+  margin-bottom: 11px;
 }
 
 .cluster-overview .cluster-score .scores {
@@ -65,28 +89,31 @@
   margin: 10px 26px;
 }
 
-#clusterScoreChart {
-  width: 550px;
-  position: relative;
-  top: -270px;
-  left: 120px;
+.cluster-overview .result-messages ul {
+  font-size: 20px;
+  line-height: 35px;
 }
 
-.cluster-overview .result-messages {
-  margin: 0 20px;
+.cluster-overview-footer {
+  position: absolute;
+  bottom: 0px;
+  right: 10px;
+  left: 40px;
+}
+
+.cluster-overview-footer p {
   display: inline-block;
-  position: relative;
-  left: -100px;
-  top: -80px;
-  font-weight: 200;
+  font-size: 11px;
+  color: #777;
+  width: 48%;
 }
 
-.cluster-overview .result-messages ul {
-  position: relative;
-  top: 0px;
-  left: 400px;
-  font-size: 20px;
-  line-height: 35px;
+.cluster-overview-footer p.kubernetes-overview {
+  text-align: right;
+}
+
+.cluster-overview-footer p.kubernetes-overview .kubernetes-stat {
+  margin-left: 15px;
 }
 
 .kubernetes-overview ul {
@@ -99,8 +126,6 @@
 .kubernetes-overview li {
   display: inline-block;
   margin: 20px 0 0 10px;
-  font-size: 11px;
-  color: #777;
 }
 
 .kubernetes-overview li span {
@@ -207,6 +232,10 @@ ul.message-list {
   color: #6a6a6a;
 }
 
+.cluster-overview ul.message-list {
+  margin: 0px;
+}
+
 ul.message-list li {
   margin-bottom: 5px;
 }

diff --git a/pkg/dashboard/assets/css/main.css b/pkg/dashboard/assets/css/main.css
@@ -2,7 +2,7 @@ body {
   margin: 0;
   font-family: 'Muli', 'Helvetica', 'Arial', sans-serif;
   background: #f5f5f5;
-  line-height: 1.3rem;
+  line-height: 1.3em;
 }
 
 .navbar {

diff --git a/pkg/dashboard/templates/dashboard.gohtml b/pkg/dashboard/templates/dashboard.gohtml
@@ -3,10 +3,15 @@
     <h3>Cluster Overview</h3>
     <div class="cluster-overview">
       <div class="cluster-score">
-        <div class="weather"><i class="fas {{ getWeatherIcon .AuditData.ClusterSummary.Results.Totals }}"></i></div>
-        <div class="sailing">{{ getWeatherText .AuditData.ClusterSummary.Results.Totals }}</div>
-        <div class="scores"><span>Grade: </span><strong>{{ getGrade .AuditData.ClusterSummary.Results.Totals }}</strong></div>
-        <div class="scores"><span>Score: </span><strong>{{ getScore .AuditData.ClusterSummary.Results.Totals }}%</strong></div>
+        <div class="score-details">
+          <div class="weather"><i class="fas {{ getWeatherIcon .AuditData.ClusterSummary.Results.Totals }}"></i></div>
+          <div class="sailing">{{ getWeatherText .AuditData.ClusterSummary.Results.Totals }}</div>
+          <div class="scores"><span>Grade: </span><strong>{{ getGrade .AuditData.ClusterSummary.Results.Totals }}</strong></div>
+          <div class="scores"><span>Score: </span><strong>{{ getScore .AuditData.ClusterSummary.Results.Totals }}%</strong></div>
+        </div>
+      </div>
+      <div class="graph">
+        <canvas width="275" height="275" id="clusterScoreChart"></canvas>
       </div>
       <div class="result-messages">
         <ul class="message-list">
@@ -15,27 +20,29 @@
           <li class="error"><i class="message-icon fas fa-times"></i> {{ .AuditData.ClusterSummary.Results.Totals.Errors }} checks had errors</li>
         </ul>
       </div>
-      <canvas id="clusterScoreChart"></canvas>
     </div>
-    <div class="kubernetes-overview">
-      <ul>
-        <li>
-          <span>Kubernetes Version:</span>
-          <strong>{{.AuditData.ClusterSummary.Version}}</strong>
-        </li>
-        <li>
-          <span>Nodes:</span>
-          <strong>{{.AuditData.ClusterSummary.Nodes}}</strong>
-        </li>
-        <li>
-          <span>Pods:</span>
-          <strong>{{.AuditData.ClusterSummary.Pods}}</strong>
-        </li>
-        <li>
-          <span>Namespaces:</span>
-          <strong>{{.AuditData.ClusterSummary.Namespaces}}</strong>
-        </li>
-      </ul>
+    <div class="cluster-overview-footer">
+      <p class="score-description">
+        Score is the percentage of passing checks. Warnings get half the weight of errors.
+      </p>
+      <p class="kubernetes-overview">
+          <span class="kubernetes-stat">
+            <span>Kubernetes Version:</span>
+            <strong>{{.AuditData.ClusterSummary.Version}}</strong>
+          </span>
+          <span class="kubernetes-stat">
+            <span>Nodes:</span>
+            <strong>{{.AuditData.ClusterSummary.Nodes}}</strong>
+          </span>
+          <span class="kubernetes-stat">
+            <span>Pods:</span>
+            <strong>{{.AuditData.ClusterSummary.Pods}}</strong>
+          </span>
+          <span class="kubernetes-stat">
+            <span>Namespaces:</span>
+            <strong>{{.AuditData.ClusterSummary.Namespaces}}</strong>
+          </span>
+      </p>
     </div>
   </div>