octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 03:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Show liveness indicator (beating heart)"

Browse Source 
This reverts commit 84c4298cd53445b38ff7a82e9abd772057975ef9.

Conflicts:
	gui/app.js
	gui/index.html
This commit is contained in:
Jakob Borg 2014-05-20 00:58:05 +02:00
parent a8c510cc72
commit 1aef03288a
3 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto/gui.files.go
View File

File diff suppressed because one or more lines are too long

27
gui/app.js
View File

@ -5,13 +5,12 @@
var syncthing = angular.module('syncthing', []); var syncthing = angular.module('syncthing', []);
var urlbase = 'rest'; var urlbase = 'rest';
var refreshInterval = 10000; // ms
syncthing.controller('SyncthingCtrl', function ($scope, $http) { syncthing.controller('SyncthingCtrl', function ($scope, $http) {
var prevDate = 0; var prevDate = 0;
var getOK = true;
var restarting = false; var restarting = false;
$scope.getOK = true;
$scope.connections = {}; $scope.connections = {};
$scope.config = {}; $scope.config = {};
$scope.myID = ''; $scope.myID = '';
@ -21,8 +20,6 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
$scope.seenError = ''; $scope.seenError = '';
$scope.model = {}; $scope.model = {};
$scope.repos = {}; $scope.repos = {};
$scope.lastUpdated = new Date();
$scope.heartbeat = 0;
// Strings before bools look better // Strings before bools look better
$scope.settings = [ $scope.settings = [
@ -46,11 +43,10 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
]; ];
function getSucceeded() { function getSucceeded() {
$scope.lastUpdated = new Date(); if (!getOK) {
if (!$scope.getOK) {
$scope.init(); $scope.init();
$('#networkError').modal('hide'); $('#networkError').modal('hide');
$scope.getOK = true; getOK = true;
} }
if (restarting) { if (restarting) {
$scope.init(); $scope.init();
@ -63,18 +59,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
if (restarting) { if (restarting) {
return; return;
} }
if ($scope.getOK) { if (getOK) {
$('#networkError').modal({backdrop: 'static', keyboard: false}); $('#networkError').modal({backdrop: 'static', keyboard: false});
$scope.getOK = false; getOK = false;
$scope.heartbeat = 0;
}
}
function heartbeat() {
if ($scope.getOK){
$scope.$apply(function () {
$scope.heartbeat = ($scope.heartbeat + 1) % 5;
});
} }
} }
@ -458,9 +445,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
}; };
$scope.init(); $scope.init();
setInterval($scope.refresh, 10000);
setInterval($scope.refresh, refreshInterval);
setInterval(heartbeat, 650);
}); });
function nodeCompare(a, b) { function nodeCompare(a, b) {

11
gui/index.html
View File

@ -88,10 +88,6 @@
.ng-cloak { .ng-cloak {
display: none !important; display: none !important;
} }
.navbar-text {
margin-top: 14px;
}
</style> </style>
</head> </head>
@ -102,10 +98,7 @@
<nav class="navbar navbar-top navbar-default" role="navigation"> <nav class="navbar navbar-top navbar-default" role="navigation">
<div class="container"> <div class="container">
<span class="navbar-brand"><img class="logo" src="st-logo-128.png" width="32" height="32" /> Syncthing<small> | {{thisNodeName()}}</small></span> <span class="navbar-brand"><img class="logo" src="st-logo-128.png" width="32" height="32" /> Syncthing<small> | {{thisNodeName()}}</small></span>
<div class="navbar-right"> <button type="button" class="btn btn-primary btn-sm pull-right navbar-btn" ng-click="editSettings()"><span class="glyphicon glyphicon-cog"></span> Settings</button>
<p class="navbar-text" title="Time of last contact with backend"><small><span ng-class="{'text-muted': heartbeat == 0}" class="glyphicon glyphicon-heart"></span> {{lastUpdated | date:'HH:mm'}}</small></p>
<button type="button" class="btn btn-primary btn-sm navbar-btn" ng-click="editSettings()"><span class="glyphicon glyphicon-cog"></span> Settings</button>
</div>
</div> </div>
</nav> </nav>
@ -233,7 +226,7 @@
<h5>This Node</h5> <h5>This Node</h5>
<ul class="list-unstyled" ng-repeat="nodeCfg in thisNode()"> <ul class="list-unstyled" ng-repeat="nodeCfg in thisNode()">
<li> <li>
<span class="text-monospace">{{nodeName(nodeCfg)}}</span> <span class="text-monospace">{{nodeName(nodeCfg)}}</span>&emsp;
<ul class="list-no-bullet"> <ul class="list-no-bullet">
<li> <li>
<div class="li-column" title="Current RAM utilization"> <div class="li-column" title="Current RAM utilization">