diff --git a/gui/default/assets/lang/lang-en.json b/gui/default/assets/lang/lang-en.json index a8e89c238..4e1c1fe4f 100644 --- a/gui/default/assets/lang/lang-en.json +++ b/gui/default/assets/lang/lang-en.json @@ -25,6 +25,7 @@ "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.", "Anonymous Usage Reporting": "Anonymous Usage Reporting", "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymous usage report format has changed. Would you like to move to the new format?", + "Are you sure you want to continue?": "Are you sure you want to continue?", "Are you sure you want to permanently delete all these files?": "Are you sure you want to permanently delete all these files?", "Are you sure you want to remove device {%name%}?": "Are you sure you want to remove device {{name}}?", "Are you sure you want to remove folder {%label%}?": "Are you sure you want to remove folder {{label}}?", @@ -327,6 +328,8 @@ "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.", "The folder ID cannot be blank.": "The folder ID cannot be blank.", "The folder ID must be unique.": "The folder ID must be unique.", + "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.", + "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.", "The folder path cannot be blank.": "The folder path cannot be blank.", "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.", "The following items could not be synchronized.": "The following items could not be synchronized.", @@ -383,6 +386,7 @@ "Waiting to Clean": "Waiting to Clean", "Waiting to Scan": "Waiting to Scan", "Waiting to Sync": "Waiting to Sync", + "Warning": "Warning", "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a parent directory of an existing folder \"{{otherFolder}}\".", "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warning, this path is a parent directory of an existing folder \"{{otherFolderLabel}}\" ({{otherFolder}}).", "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".", diff --git a/gui/default/index.html b/gui/default/index.html index c06a3ed45..0d9926bfb 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -535,10 +535,10 @@
- - @@ -895,6 +895,7 @@ + diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 35042ec1b..ee23d4c85 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -2473,10 +2473,6 @@ angular.module('syncthing.core') return $scope.model[folder].errors !== 0; }; - $scope.override = function (folder) { - $http.post(urlbase + "/db/override?folder=" + encodeURIComponent(folder)); - }; - $scope.showLocalChanged = function (folder) { $scope.localChangedFolder = folder; $scope.localChanged = $scope.refreshLocalChanged(1, 10); @@ -2486,10 +2482,6 @@ angular.module('syncthing.core') }); }; - $scope.revert = function (folder) { - $http.post(urlbase + "/db/revert?folder=" + encodeURIComponent(folder)); - }; - $scope.canRevert = function (folder) { var f = $scope.model[folder]; if (!f) { @@ -2498,6 +2490,35 @@ angular.module('syncthing.core') return $scope.model[folder].receiveOnlyTotalItems > 0; }; + $scope.revertOverride = function () { + $http.post( + urlbase + "/db/" + $scope.revertOverrideParams.operation +"?folder=" + +encodeURIComponent($scope.revertOverrideParams.folderID)); + }; + + $scope.revertOverrideConfirmationModal = function (type, folderID) { + var params = { + type: type, + folderID: folderID, + }; + switch (type) { + case "override": + params.heading = $translate.instant("Override"); + params.operation = "override"; + break; + case "revert": + params.heading = $translate.instant("Revert"); + params.operation = "revert"; + break; + case "deleteEnc": + params.heading = $translate.instant("Delete Unexpected Items"); + params.operation = "revert"; + break; + } + $scope.revertOverrideParams = params; + $('#revert-override-confirmation').modal('show'); + }; + $scope.advanced = function () { $scope.advancedConfig = angular.copy($scope.config); $scope.advancedConfig.devices.sort(deviceCompare); diff --git a/gui/default/syncthing/folder/revertOverrideView.html b/gui/default/syncthing/folder/revertOverrideView.html new file mode 100644 index 000000000..3332f19d1 --- /dev/null +++ b/gui/default/syncthing/folder/revertOverrideView.html @@ -0,0 +1,33 @@ + +
+
+

+ Unexpected items have been found in this folder.
+ You should never add or change anything locally in a "{%receiveEncrypted%}" folder. +

+

+ Are you sure you want to permanently delete all these files? +

+
+
+

+ Warning:
+ + The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices. + The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted. + +

+

+ Are you sure you want to continue? +

+
+
+
+ + +
+ diff --git a/gui/default/untrusted/index.html b/gui/default/untrusted/index.html index 623b28b84..fc009128e 100644 --- a/gui/default/untrusted/index.html +++ b/gui/default/untrusted/index.html @@ -544,13 +544,13 @@
- - - @@ -907,7 +907,7 @@ - + diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js index fcc8b08bc..77fb19b4f 100755 --- a/gui/default/untrusted/syncthing/core/syncthingController.js +++ b/gui/default/untrusted/syncthing/core/syncthingController.js @@ -2513,10 +2513,6 @@ angular.module('syncthing.core') return $scope.model[folder].errors !== 0; }; - $scope.override = function (folder) { - $http.post(urlbase + "/db/override?folder=" + encodeURIComponent(folder)); - }; - $scope.showLocalChanged = function (folder, folderType) { $scope.localChangedFolder = folder; $scope.localChangedType = folderType; @@ -2551,15 +2547,33 @@ angular.module('syncthing.core') return counts.receiveOnlyTotalItems - counts.receiveOnlyChangedDeletes; } - $scope.revert = function (folder) { - $http.post(urlbase + "/db/revert?folder=" + encodeURIComponent(folder)); + $scope.revertOverride = function () { + $http.post( + urlbase + "/db/" + $scope.revertOverrideParams.operation +"?folder=" + +encodeURIComponent($scope.revertOverrideParams.folderID)); }; - $scope.deleteEncryptionModal = function (folderID) { - $scope.revertEncryptionFolder = folderID; - $('#delete-encryption-confirmation').modal('show').one('hidden.bs.modal', function () { - $scope.revertEncryptionFolder = undefined; - }); + $scope.revertOverrideConfirmationModal = function (type, folderID) { + var params = { + type: type, + folderID: folderID, + }; + switch (type) { + case "override": + params.heading = $translate.instant("Override"); + params.operation = "override"; + break; + case "revert": + params.heading = $translate.instant("Revert"); + params.operation = "revert"; + break; + case "deleteEnc": + params.heading = $translate.instant("Delete Unexpected Items"); + params.operation = "revert"; + break; + } + $scope.revertOverrideParams = params; + $('#revert-override-confirmation').modal('show'); }; $scope.advanced = function () { @@ -2777,7 +2791,6 @@ angular.module('syncthing.core') address.indexOf('unix://') == 0 || address.indexOf('unixs://') == 0); } - }) .directive('shareTemplate', function () { return { diff --git a/gui/default/untrusted/syncthing/folder/deleteEncryptionFolderDialogView.html b/gui/default/untrusted/syncthing/folder/deleteEncryptionFolderDialogView.html deleted file mode 100644 index 4697ff7a1..000000000 --- a/gui/default/untrusted/syncthing/folder/deleteEncryptionFolderDialogView.html +++ /dev/null @@ -1,19 +0,0 @@ - -
-

- Unexpected items have been found in this folder.
- You should never add or change anything locally in a "{%receiveEncrypted%}" folder. -

-

- Are you sure you want to permanently delete all these files? -

-
-
- - -
-