greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/nicolargo/glances into develop

pull/738/head
Nicolargo 2015-11-25 15:29:19 +01:00
parent 611cb841fa 9a88854216
commit be97fcc414
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glances/outputs/static/html/index.html
View File

@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Glances</title>
<title ng-bind="title ">Glances</title>
<link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="stylesheet" type="text/css" href="normalize.css" />

3
glances/outputs/static/js/app.js
View File

@ -10,4 +10,7 @@ var glancesApp = angular.module('glancesApp', ['ngRoute'])
});
$locationProvider.html5Mode(true);
})
.run(function($rootScope) {
$rootScope.title = "Glances";
});

4
glances/outputs/static/js/stats_controller.js
View File

@ -1,4 +1,4 @@
glancesApp.controller('statsController', function ($scope, $interval, $routeParams, GlancesStats) {
glancesApp.controller('statsController', function ($scope, $rootScope, $interval, $routeParams, GlancesStats) {
$scope.refreshTime = 3;
$scope.sorter = {
column: "cpu_percent",
@ -78,6 +78,8 @@ glancesApp.controller('statsController', function ($scope, $interval, $routePara
$scope.statsSystem = GlancesStats.getPlugin('system');
$scope.statsUptime = GlancesStats.getPlugin('uptime');
$rootScope.title = $scope.statsSystem.hostname + ' - Glances';
$scope.is_disconnected = false;
$scope.dataLoaded = true;
}, function() {