Merge pull request #1601 from syncthing/conns

Fix GUI

gui/index.html

@@ -293,11 +293,11 @@
                 <tbody>
                   <tr>
                     <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>
                     <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>
                     <th><span class="glyphicon glyphicon-th"></span>&emsp;<span translate>RAM Utilization</span></th>

gui/scripts/syncthing/core/controllers/syncthingController.js

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

gui/scripts/syncthing/core/directives/validDeviceidDirective.js

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

gui/scripts/syncthing/core/services/localeService.js

@@ -28,7 +28,7 @@ angular.module('syncthing.core')
             function readBrowserLocales() {
                 // @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() {