Prechádzať zdrojové kódy

UI fixes with firefox

steve 8 rokov pred
rodič
commit
a8f415eb6e

+ 21 - 1
src/api/static/css/default.css

@@ -5,6 +5,26 @@ body, .default {
 	padding:10px;
 	
 }
+.jsgrid-grid-header{
+	background: #f9f9f9;
+	background-color: rgb(249, 249, 249);
+	background-image: none;
+	background-repeat: repeat;
+	background-attachment: scroll;
+	background-clip: border-box;
+	background-origin: padding-box;
+	background-position-x: 0%;
+	background-position-y: 0%;
+	background-size: auto auto;
+	max-height: 48px;
+}
+.jsgrid-grid-body {
+	overflow-x:hidden;
+	overflow-y:scroll;
+	-webkit-overflow-scrolling:touch
+}
+
+
 .small {
 	font-family:sans-serif;
 	font-size:12px;
@@ -123,4 +143,4 @@ background-image: -webkit-linear-gradient(top, #CAD5E0 0%, #F3F3F3 40%);
 
 background-image: linear-gradient(to bottom, #CAD5E0 0%, #F3F3F3 40%);
 	
-}
+}

+ 7 - 4
src/api/static/js/dashboard.js

@@ -150,8 +150,6 @@ monitor.processes.trend.render = function (logs, key,label) {
 	conf.options.scales.xAxes = [
 		{
 			
-			type: 'timeline',
-			unit:'hour',
 			gridLines: {display:false},
 			
 			time: {
@@ -168,8 +166,12 @@ monitor.processes.trend.render = function (logs, key,label) {
 	var cpu = {yAxisID:'0', label: 'CPU Usage (%)', data: [] ,backgroundColor:'transparent',borderColor:COLORS[187],fill:false,borderWidth:1}
 	var mem = {yAxisID:'0',label : 'Memory Usage(%)',data:[],backgroundColor:'transparent',borderColor:COLORS[32],fill:false,borderWidth:1}
 	var proc= {yAxisID:'1',label : 'Proc Count',data:[],backgroundColor:'transparent',borderColor:COLORS[542],fill:false,borderWidth:1}
+	var months={1:"Jan",2:"Feb",3:"Mar",4:"Apr",5:"May",6:"Jun",7:"Jul",8:"Aug",9:"Sep",10:"Oct",11:"Nov",12:"Dec"}
 	jx.utils.patterns.visitor(logs,function(item){
-		x = new Date(item.year,item.month-1,item.day,item.hour,item.minute)
+		//x = new Date(item.year,item.month-1,item.day,item.hour,item.minute)
+		day = item.day > 9? (['0',item.day]).join(''): item.day
+		month = months[item.month]
+		x = ([month,day,item.hour+':'+item.minute]).join(' ')
 		y = item[key]
 		if (_x[x] == null ){//||(_x[x] == null && _y[y] == null)) {
 			_x[x] = 1
@@ -238,9 +240,10 @@ monitor.processes.summary.init = function(logs){
 	jx.dom.set.value('app-summary-date', date)
 	jx.dom.set.value('summary_chart','')
 	jx.dom.append('summary_chart',context)
-	var conf = {width:50,height:50}
+	var conf = {}//width:50,height:40}
 	
 	conf.type = 'doughnut'
+	conf.responsive = true
 	conf.data = data
 	conf.options = {legend:{ position:'right'},repsonsive:true}
 	var chart = new Chart(context,conf)

+ 1 - 1
src/api/templates/dashboard.html

@@ -57,7 +57,7 @@
 				<div  id="app-summary-date" class="small"></div>
 			</div>
 			
-			<div class="simple-gradient shadow"  style="padding:2px; height:125px; margin:4px; margin-top:10px">
+			<div class="simple-gradient shadow"  style="padding:2px; height:150px; margin:4px; margin-top:10px">
 				<div class="left small width-half" style="margin-top:10px">
 					<div class="border-right" style="padding:4px" title="Running"><span id="total-running" class="default">0</span> <i class="fa fa-check right" style="margin:4px"></i></div>
 					<div class="border-right"  title="Crash" style="padding:4px; margin-top:2px"><span id="total-crash" class="default">0</span> <i class="fa fa-times right" style="margin:4px"></i></div>