From 86faac9ed09d044a2640e981563d62a0b93d127e Mon Sep 17 00:00:00 2001
From: "Steve Nyemba, The Architect" <steve@the-phi.com>
Date: Thu, 11 Oct 2018 01:51:19 -0500
Subject: [PATCH] bug fix layout

---
 src/api/static/css/default.css                | 32 ++++++++++++++++
 src/api/templates/dashboard/apps/summary.html |  7 +++-
 src/api/templates/dashboard/user-emails.html  | 38 ++++++++++++++-----
 src/utils/charting.py                         |  4 +-
 src/utils/ml/analytics.py                     |  6 +--
 5 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/src/api/static/css/default.css b/src/api/static/css/default.css
index ad8045f..78bf146 100644
--- a/src/api/static/css/default.css
+++ b/src/api/static/css/default.css
@@ -66,4 +66,36 @@ body {
 .button:hover{
     background-color:#4682B4 ;
     color:#ffffff;
+}
+
+
+
+.data-frame {
+    display:grid;
+    margin:4px;
+    padding:4px;
+    grid-template-rows: 80% 20%;
+    grid-gap:2px;
+    height:85%;
+    
+    overflow:hidden;
+    
+}
+
+.data-frame .comment {
+    grid-row: 2;
+    padding:4px;
+    
+    font-size:12px;
+    color:gray;
+    font-weight: lighter;
+    font-family: verdana;
+    
+    
+}
+.data-frame .grid {
+    grid-row:1;
+    width:100%;
+    padding:4px;
+
 }
\ No newline at end of file
diff --git a/src/api/templates/dashboard/apps/summary.html b/src/api/templates/dashboard/apps/summary.html
index b660ec5..dcb6c8d 100644
--- a/src/api/templates/dashboard/apps/summary.html
+++ b/src/api/templates/dashboard/apps/summary.html
@@ -19,7 +19,7 @@
     .board {
         display:grid ;
         grid-template-rows: 32px auto;
-        grid-gap:10px;
+        grid-gap:4px;
         
         
     }
@@ -50,7 +50,10 @@
         width:100%;
 
     }
-    .widget .chart iframe {width:100%; height:200px; overflow:hidden}
+    .widget .chart iframe {
+        width:100%; 
+        height:220px; 
+        overflow:hidden}
     
     input[type=text] {
         border:0px;
diff --git a/src/api/templates/dashboard/user-emails.html b/src/api/templates/dashboard/user-emails.html
index 18eb124..719aebf 100644
--- a/src/api/templates/dashboard/user-emails.html
+++ b/src/api/templates/dashboard/user-emails.html
@@ -118,16 +118,34 @@ $(document).ready(function(){
 }) ;
 </script>
 
-    <div id="uid" style="display:none">{{uid|safe}}</div>
-    <div class="search-box border" style="padding:2px; margin-bottom:4px; display:grid; grid-template-columns: auto 64px">
-        <input type="text" id="search" placeholder="[Enter Email Address]" onkeyup="on_keyup(event)"/>
-        <div class="default" style="display:grid; grid-template-columns: 50% 50%; grid-gap:2px">
-            <div class="active" align="center" onclick="save_emails()"><i class="fa fa-check"></i></div>
-            <div class="active" align="center" onclick="clear_emails()"><i class="fa fa-times"></i></div>
+    
+    
+    <div class="data-frame">
+        <div class="grid">
+                <div id="uid" style="display:none">{{uid|safe}}</div>
+                <div class="search-box border" style="padding:2px; margin-bottom:4px; display:grid; grid-template-columns: auto 64px">
+                    <input type="text" id="search" placeholder="[Enter Email Address]" onkeyup="on_keyup(event)"/>
+                    <div class="default" style="display:grid; grid-template-columns: 50% 50%; grid-gap:2px">
+                        <div class="active" align="center" onclick="save_emails()"><i class="fa fa-check"></i></div>
+                        <div class="active" align="center" onclick="clear_emails()"><i class="fa fa-times"></i></div>
+                    </div>
+                </div>        
+    
+                <div id="emails"></div>
+                <div id="email_pager" style="height:32px;"></div>
         </div>
+        <div class="comment border-top">
+        
+                Enter emails of people that should be notified :
+                <ul>
+                    <li type="square" >Should an application crash be detected</li>
+                    <li type="square" >Or if a folder/disk threashold is reached.</li>
+        
+                </ul>
+            
+        </div>
+            
     </div>
-    <div>
-    <div id="emails"></div>
-    <div id="email_pager"></div>
     
-    </div>
+    
+    
diff --git a/src/utils/charting.py b/src/utils/charting.py
index 42fc1e4..c5cef07 100644
--- a/src/utils/charting.py
+++ b/src/utils/charting.py
@@ -104,7 +104,7 @@ class HTMLGraph(Graph):
         
         dataset = {"data":X,"backgroundColor":colors,"datalabels":labels}
         # dataset["title"] = title
-        config = {"type":"doughnut"}
+        config = {"type":"doughnut","responsive":True}
         config["data"] = {"datasets":[dataset],"labels":labels}
         config["options"] = {"responsive":True,"legend":{"position":"right","display":False},"title":{"display":True,"text":title},"animation":{"animateScale":True,"animateRotate":True}}
         
@@ -125,7 +125,7 @@ class HTMLGraph(Graph):
         labels = self.args['labels']
         title = self.args['title']
         series = self.args['series']
-        config = {"type":"line","data":{"datasets":[],"labels":labels}}
+        config = {"type":"line","responsive":True,"data":{"datasets":[],"labels":labels}}
         config["options"] = {"responsive":True,"legend":{"position":"right","display":False},"title":{"display":True,"text":title},"animation":{"animateScale":True,"animateRotate":True}}
         if 'legend' not in self.args['remove'] :
             config['options']['legend']["display"] = True
diff --git a/src/utils/ml/analytics.py b/src/utils/ml/analytics.py
index c279aab..6c91149 100644
--- a/src/utils/ml/analytics.py
+++ b/src/utils/ml/analytics.py
@@ -103,10 +103,10 @@ class apps(analytics) :
         q = []
         for row in slogs :
             
-            r.append( {"x":[row['crash'],row['idle'],row['running']],"labels":['Crash','Idle','Running'],"title":row['node'],"date":row['date']})
+            r.append( {"x":[row['crash'],row['idle'],row['running']],"labels":['Crash','Idle','Running'],"title":"","date":row['date']})
             # q.append({"x":[[row['cpu'],row['mem']]],"labels":["CPU","RAM"],"title":"Resources","date":row['date'],"title":row['node'],"series":[ 'CPU','RAM' ]})
             
-            q.append({"x":[[row['cpu'],0],[0,row['mem']]],"labels":["",""],"title":"","date":row['date'],"title":row['node'],"series":[ 'CPU','RAM' ],"ylabel":"% Resource Used"})
+            q.append({"x":[[row['cpu'],0],[0,row['mem']]],"labels":["",""],"date":row['date'],"title":"","series":[ 'CPU','RAM' ],"ylabel":"% Resource Used"})
             
         self.set('status',r)            
         self.set('resource',q)
@@ -140,7 +140,7 @@ class folders(analytics):
         else:
             max_size = 0
         self.set('max_size',max_size)
-	    for id in logs :
+        for id in logs :
             
             row = pd.DataFrame(logs[id]['log'])
             size = row.size_in_kb.mean() * .001