Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1601 from syncthing/conns 

Fix GUI
This commit is contained in:
Jakob Borg 2015-04-07 15:35:54 +02:00
parent ab25cd09ed 68ff4f3842
commit 11c83670d6
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/index.html
View File

@ -293,11 +293,11 @@
<tbody> <tbody>
<tr> <tr>
<th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th> <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
<td class="text-right">{{connections['total'].inbps | binary}}B/s ({{connections['total'].inBytesTotal | binary}}B)</td> <td class="text-right">{{connections_total.inbps | binary}}B/s ({{connections_total.inBytesTotal | binary}}B)</td>
</tr> </tr>
<tr> <tr>
<th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th> <th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th>
<td class="text-right">{{connections['total'].outbps | binary}}B/s ({{connections['total'].outBytesTotal | binary}}B)</td> <td class="text-right">{{connections_total.outbps | binary}}B/s ({{connections_total.outBytesTotal | binary}}B)</td>
</tr> </tr>
<tr> <tr>
<th><span class="glyphicon glyphicon-th"></span>&emsp;<span translate>RAM Utilization</span></th> <th><span class="glyphicon glyphicon-th"></span>&emsp;<span translate>RAM Utilization</span></th>

3
gui/scripts/syncthing/core/controllers/syncthingController.js
View File

@ -24,6 +24,7 @@ angular.module('syncthing.core')
$scope.config = {}; $scope.config = {};
$scope.configInSync = true; $scope.configInSync = true;
$scope.connections = {}; $scope.connections = {};
$scope.connections_total = {};
$scope.errors = []; $scope.errors = [];
$scope.model = {}; $scope.model = {};
$scope.myID = ''; $scope.myID = '';
@ -367,6 +368,8 @@ angular.module('syncthing.core')
id; id;
prevDate = now; prevDate = now;
$scope.connections_total = data['total'];
data = data.connections;
for (id in data) { for (id in data) {
if (!data.hasOwnProperty(id)) { if (!data.hasOwnProperty(id)) {
continue; continue;

2
gui/scripts/syncthing/core/directives/validDeviceidDirective.js
View File

@ -8,7 +8,7 @@ angular.module('syncthing.core')
// we shouldn't validate // we shouldn't validate
ctrl.$setValidity('validDeviceid', true); ctrl.$setValidity('validDeviceid', true);
} else { } else {
$http.get(urlbase + '/deviceid?id=' + viewValue).success(function (resp) { $http.get(urlbase + '/svc/deviceid?id=' + viewValue).success(function (resp) {
if (resp.error) { if (resp.error) {
ctrl.$setValidity('validDeviceid', false); ctrl.$setValidity('validDeviceid', false);
} else { } else {

4
gui/scripts/syncthing/core/services/localeService.js
View File

@ -28,7 +28,7 @@ angular.module('syncthing.core')
function readBrowserLocales() { function readBrowserLocales() {
// @TODO: check if there is nice way to utilize window.navigator.languages or similiar api. // @TODO: check if there is nice way to utilize window.navigator.languages or similiar api.
return $http.get(urlbase + "/lang"); return $http.get(urlbase + "/svc/lang");
} }
function autoConfigLocale() { function autoConfigLocale() {
@ -84,7 +84,7 @@ angular.module('syncthing.core')
function useLocale(language, save2Storage) { function useLocale(language, save2Storage) {
if (language) { if (language) {
$translate.use(language).then(function () { $translate.use(language).then(function () {
if (save2Storage && typeof(localStorage) != 'undefined') if (save2Storage && typeof(localStorage) != 'undefined')
localStorage[_SYNLANG] = language; localStorage[_SYNLANG] = language;
}); });
} }

10
internal/auto/gui.files.go
View File

File diff suppressed because one or more lines are too long