diff --git a/gui/default/assets/lang/lang-en.json b/gui/default/assets/lang/lang-en.json index 5e4847d5..c3eb43e3 100644 --- a/gui/default/assets/lang/lang-en.json +++ b/gui/default/assets/lang/lang-en.json @@ -135,6 +135,7 @@ "Quick guide to supported patterns": "Quick guide to supported patterns", "RAM Utilization": "RAM Utilization", "Random": "Random", + "Reduced by ignore patterns": "Reduced by ignore patterns", "Release Notes": "Release Notes", "Remote Devices": "Remote Devices", "Remove": "Remove", @@ -230,6 +231,8 @@ "Yes": "Yes", "You must keep at least one version.": "You must keep at least one version.", "days": "days", + "directories": "directories", + "files": "files", "full documentation": "full documentation", "items": "items", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\".", diff --git a/gui/default/index.html b/gui/default/index.html index 1a36299e..da26c93f 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -322,12 +322,13 @@ {{model[folder.id].localFiles | alwaysNumber}} files, {{model[folder.id].localDirectories | alwaysNumber}} directories, ~{{model[folder.id].localBytes | binary}}B +
Reduced by ignore patterns
- +  Out of Sync Items - {{model[folder.id].needFiles+model[folder.id].needDirectories+model[folder.id].needSymlinks+model[folder.id].needDeletes | alwaysNumber}} items, ~{{model[folder.id].needBytes | binary}}B + {{neededItems(folder.id) | alwaysNumber}} items, ~{{model[folder.id].needBytes | binary}}B @@ -354,12 +355,6 @@ {{ folder.type.charAt(0).toUpperCase() + folder.type.slice(1) }} - -  Ignore Patterns - - Yes - -  Ignore Permissions diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index dcc3c102..9fdcefc8 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -690,6 +690,15 @@ angular.module('syncthing.core') return 'info'; }; + $scope.neededItems = function (folderID) { + if (!$scope.model[folderID]) { + return 0 + } + + return $scope.model[folderID].needFiles + $scope.model[folderID].needDirectories + + $scope.model[folderID].needSymlinks + $scope.model[folderID].needDeletes; + }; + $scope.syncPercentage = function (folder) { if (typeof $scope.model[folder] === 'undefined') { return 100;