-
+
diff --git a/gui/default/syncthing/app.js b/gui/default/syncthing/app.js
index 0c2370d1..576de8d8 100644
--- a/gui/default/syncthing/app.js
+++ b/gui/default/syncthing/app.js
@@ -12,12 +12,7 @@ var syncthing = angular.module('syncthing', [
'angularUtils.directives.dirPagination',
'pascalprecht.translate',
- 'syncthing.core',
- 'syncthing.device',
- 'syncthing.folder',
- 'syncthing.settings',
- 'syncthing.transfer',
- 'syncthing.usagereport'
+ 'syncthing.core'
]);
var urlbase = 'rest';
diff --git a/gui/default/syncthing/core/aboutModalDirective.js b/gui/default/syncthing/core/aboutModalDirective.js
deleted file mode 100644
index f20bfa34..00000000
--- a/gui/default/syncthing/core/aboutModalDirective.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('syncthing.core')
- .directive('aboutModal', function () {
- return {
- restrict: 'A',
- templateUrl: 'syncthing/core/aboutModalView.html'
- };
-});
diff --git a/gui/default/syncthing/core/aboutModalView.html b/gui/default/syncthing/core/aboutModalView.html
index 7d78ba81..5e1695d4 100644
--- a/gui/default/syncthing/core/aboutModalView.html
+++ b/gui/default/syncthing/core/aboutModalView.html
@@ -1,33 +1,40 @@
-
-
-
-
+
+
- 
-
- {{versionString()}}
-
- "{{version.codename}}"
-
- +
+
+
+
-
-
+
diff --git a/gui/default/syncthing/core/majorUpgradeModalDirective.js b/gui/default/syncthing/core/majorUpgradeModalDirective.js
deleted file mode 100644
index e6ed01db..00000000
--- a/gui/default/syncthing/core/majorUpgradeModalDirective.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('syncthing.core')
- .directive('majorUpgradeModal', function () {
- return {
- restrict: 'A',
- templateUrl: 'syncthing/core/majorUpgradeModalView.html'
- };
-});
diff --git a/gui/default/syncthing/core/majorUpgradeModalView.html b/gui/default/syncthing/core/majorUpgradeModalView.html
index 1f672e0f..8e66ec55 100644
--- a/gui/default/syncthing/core/majorUpgradeModalView.html
+++ b/gui/default/syncthing/core/majorUpgradeModalView.html
@@ -1,32 +1,20 @@
-
+
+
+ {{versionString()}}
+
+ "{{version.codename}}"
+
+ -
Copyright © 2014-2016 the following Contributors:
-
-
+
-
+
diff --git a/gui/default/syncthing/core/httpErrorDialogDirective.js b/gui/default/syncthing/core/httpErrorDialogDirective.js
deleted file mode 100644
index ec95bb50..00000000
--- a/gui/default/syncthing/core/httpErrorDialogDirective.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('syncthing.core')
- .directive('httpErrorDialog', function () {
- return {
- restrict: 'A',
- templateUrl: 'syncthing/core/httpErrorDialogView.html'
- };
-});
diff --git a/gui/default/syncthing/core/httpErrorDialogView.html b/gui/default/syncthing/core/httpErrorDialogView.html
index 0ed1a9c1..5df93f25 100644
--- a/gui/default/syncthing/core/httpErrorDialogView.html
+++ b/gui/default/syncthing/core/httpErrorDialogView.html
@@ -1,5 +1,7 @@
-
+
- Copyright © 2014-2016 the following Contributors:
+
+
-
Jakob Borg, Audrius Butkevicius, Alexander Graf, Anderson Mesquita, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Aaron Bieber, Adam Piggott, Alessandro G., Alexandre Viau, Andrew Dunham, Arthur Axel fREW Schmidt, Bart De Vries, Ben Curthoys, Ben Sidhom, Benny Ng, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Chris Howie, Chris Joel, Colin Kennedy, Daniel Bergmann, Daniel Martí, David Rimmer, Denis A., Dennis Wilson, Dominik Heidler, Elias Jarlebring, Emil Hessman, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Jaakko Hannikainen, Jacek Szafarkiewicz, Jake Peterson, James Patterson, Jaroslav Malec, Jens Diemer, Jochen Voss, Johan Vromans, Karol Różycki, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Laurent Etiemble, Lord Landon Agahnim, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Mateusz Naściszewski, Matt Burke, Max Schulze, Michael Jephcote, Michael Tilli, Nate Morrison, Pascal Jungblut, Peter Hoeg, Phill Luby, Piotr Bejda, Scott Klupfel, Stefan Kuntz, Tim Abell, Tobias Nygren, Tomas Cerveny, Tully Robinson, Tyler Brazier, Veeti Paananen, Victor Buinsky, Vil Brekin, William A. Kennington III, Wulf Weich, Yannic A.
+
+
-
Syncthing includes the following software or portions thereof:
--
-
- The Go Programming Language, Copyright © 2012 The Go Authors. -
- bkaradzic/go-lz4, Copyright © 2011-2012 Branimir Karadzic, 2013 Damian Gryski. -
- kardianos/osext, Copyright © 2012 Daniel Theophanes. -
- golang/snappy, Copyright © 2011 The Snappy-Go Authors. -
- juju/ratelimit, Copyright © 2015 Canonical Ltd. -
- thejerf/suture, Copyright © 2014-2015 Barracuda Networks, Inc. -
- syndtr/goleveldb, Copyright © 2012, Suryandaru Triandana -
- vitrun/qart, Copyright © The Go Authors. -
- AngularJS, Copyright © 2010-2015 Google, Inc. -
- Bootstrap, Copyright © 2011-2015 Twitter, Inc. -
- Font Awesome, Copyright © 2015 Dave Gandy -
Syncthing includes the following software or portions thereof:
+-
+
- The Go Programming Language, Copyright © 2012 The Go Authors. +
- bkaradzic/go-lz4, Copyright © 2011-2012 Branimir Karadzic, 2013 Damian Gryski. +
- kardianos/osext, Copyright © 2012 Daniel Theophanes. +
- golang/snappy, Copyright © 2011 The Snappy-Go Authors. +
- juju/ratelimit, Copyright © 2015 Canonical Ltd. +
- thejerf/suture, Copyright © 2014-2015 Barracuda Networks, Inc. +
- syndtr/goleveldb, Copyright © 2012, Suryandaru Triandana +
- vitrun/qart, Copyright © The Go Authors. +
- AngularJS, Copyright © 2010-2015 Google, Inc. +
- Bootstrap, Copyright © 2011-2015 Twitter, Inc. +
- Font Awesome, Copyright © 2015 Dave Gandy +
- Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists. -
+
+
+ Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists. +
+
-
-
+
diff --git a/gui/default/syncthing/core/restartingDialogDirective.js b/gui/default/syncthing/core/restartingDialogDirective.js
deleted file mode 100644
index d7d7f6d8..00000000
--- a/gui/default/syncthing/core/restartingDialogDirective.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('syncthing.core')
- .directive('restartingDialog', function () {
- return {
- restrict: 'A',
- templateUrl: 'syncthing/core/restartingDialogView.html'
- };
-});
diff --git a/gui/default/syncthing/core/restartingDialogView.html b/gui/default/syncthing/core/restartingDialogView.html
index 74c2c55a..669ce6c6 100644
--- a/gui/default/syncthing/core/restartingDialogView.html
+++ b/gui/default/syncthing/core/restartingDialogView.html
@@ -1,3 +1,8 @@
-
-
+
diff --git a/gui/default/syncthing/core/shutdownDialogDirective.js b/gui/default/syncthing/core/shutdownDialogDirective.js
deleted file mode 100644
index d293323d..00000000
--- a/gui/default/syncthing/core/shutdownDialogDirective.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('syncthing.core')
- .directive('shutdownDialog', function () {
- return {
- restrict: 'A',
- templateUrl: 'syncthing/core/shutdownDialogView.html'
- };
-});
diff --git a/gui/default/syncthing/core/shutdownDialogView.html b/gui/default/syncthing/core/shutdownDialogView.html
index d2602ee1..92efcb4b 100644
--- a/gui/default/syncthing/core/shutdownDialogView.html
+++ b/gui/default/syncthing/core/shutdownDialogView.html
@@ -1,3 +1,7 @@
-
-
+
diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index 92a88638..f9214c94 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -1028,10 +1028,6 @@ angular.module('syncthing.core')
});
};
- $scope.upgradeMajor = function () {
- $('#majorUpgrade').modal();
- };
-
$scope.shutdown = function () {
restarting = true;
$http.post(urlbase + '/system/shutdown').success(function () {
@@ -1052,12 +1048,6 @@ angular.module('syncthing.core')
$('#editDevice').modal();
};
- $scope.idDevice = function (deviceCfg) {
- $scope.currentDevice = deviceCfg;
- $('#editDevice').modal('hide');
- $('#idqr').modal('show');
- };
-
$scope.addDevice = function (deviceID, name) {
return $http.get(urlbase + '/system/discovery')
.success(function (registry) {
@@ -1229,6 +1219,18 @@ angular.module('syncthing.core')
}).error($scope.emitHTTPError);
});
+ $scope.loadFormIntoScope = function (form) {
+ console.log('loadFormIntoScope',form.$name);
+ switch (form.$name) {
+ case 'deviceEditor':
+ $scope.deviceEditor = form;
+ break;
+ case 'folderEditor':
+ $scope.folderEditor = form;
+ break;
+ }
+ }
+
$scope.editFolder = function (folderCfg) {
$scope.currentFolder = angular.copy(folderCfg);
if ($scope.currentFolder.path.slice(-1) === $scope.system.pathSeparator) {
@@ -1464,20 +1466,11 @@ angular.module('syncthing.core')
$http.get(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id))
.success(function (data) {
data.ignore = data.ignore || [];
-
- $('#editFolder').modal('hide')
- .one('hidden.bs.modal', function() {
- var textArea = $('#editIgnores textarea');
-
- textArea.val(data.ignore.join('\n'));
-
- $('#editIgnores').modal()
- .one('hidden.bs.modal', function () {
- $('#editFolder').modal();
- })
- .one('shown.bs.modal', function () {
- textArea.focus();
- });
+ var textArea = $('#editIgnores textarea');
+ textArea.val(data.ignore.join('\n'));
+ $('#editIgnores').modal()
+ .one('shown.bs.modal', function () {
+ textArea.focus();
});
})
.then(function () {
@@ -1501,16 +1494,6 @@ angular.module('syncthing.core')
});
};
- $scope.showURPreview = function () {
- $('#settings').modal('hide')
- .one('hidden.bs.modal', function() {
- $('#urPreview').modal()
- .one('hidden.bs.modal', function () {
- $('#settings').modal();
- });
- });
- };
-
$scope.acceptUR = function () {
$scope.config.options.urAccepted = 1000; // Larger than the largest existing report version
$scope.saveConfig();
@@ -1555,10 +1538,6 @@ angular.module('syncthing.core')
$http.post(urlbase + "/db/override?folder=" + encodeURIComponent(folder));
};
- $scope.about = function () {
- $('#about').modal('show');
- };
-
$scope.advanced = function () {
$scope.advancedConfig = angular.copy($scope.config);
$('#advanced').modal('show');
diff --git a/gui/default/syncthing/core/upgradingDialogDirective.js b/gui/default/syncthing/core/upgradingDialogDirective.js
deleted file mode 100644
index 5705728e..00000000
--- a/gui/default/syncthing/core/upgradingDialogDirective.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('syncthing.core')
- .directive('upgradingDialog', function () {
- return {
- restrict: 'A',
- templateUrl: 'syncthing/core/upgradingDialogView.html'
- };
-});
diff --git a/gui/default/syncthing/core/upgradingDialogView.html b/gui/default/syncthing/core/upgradingDialogView.html
index ac25f84a..066f956f 100644
--- a/gui/default/syncthing/core/upgradingDialogView.html
+++ b/gui/default/syncthing/core/upgradingDialogView.html
@@ -1,3 +1,8 @@
-
-
+
diff --git a/gui/default/syncthing/device/editDeviceModalDirective.js b/gui/default/syncthing/device/editDeviceModalDirective.js
deleted file mode 100644
index da4e0cce..00000000
--- a/gui/default/syncthing/device/editDeviceModalDirective.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('syncthing.device')
- .directive('editDeviceModal', function () {
- return {
- restrict: 'A',
- templateUrl: 'syncthing/device/editDeviceModalView.html'
- };
-});
diff --git a/gui/default/syncthing/device/editDeviceModalView.html b/gui/default/syncthing/device/editDeviceModalView.html
index e77718ef..8c692fc7 100644
--- a/gui/default/syncthing/device/editDeviceModalView.html
+++ b/gui/default/syncthing/device/editDeviceModalView.html
@@ -1,104 +1,82 @@
-
-
+
+
+
+
diff --git a/gui/default/syncthing/core/modalDirective.js b/gui/default/syncthing/core/modalDirective.js
index dcf1c701..e90f43f5 100644
--- a/gui/default/syncthing/core/modalDirective.js
+++ b/gui/default/syncthing/core/modalDirective.js
@@ -9,10 +9,10 @@ angular.module('syncthing.core')
heading: '@',
status: '@',
icon: '@',
- close: '@',
+ closeable: '@',
large: '@'
},
- link: function (scope, element, attrs, tabsCtrl) {
+ link: function (scope, element, attrs) {
// before modal show animation
$(element).on('show.bs.modal', function () {
@@ -44,7 +44,6 @@ angular.module('syncthing.core')
// find and unhide the next backdrop down in z order
var sel = false, largestZ = 0;
$('.modal-backdrop').each(function (i) {
- console.log('sel each');
var thisZ = parseInt($(this).css('zIndex'));
if (thisZ > largestZ && $(this).attr('for-modal-id') !== $(element).attr('id')) {
largestZ = thisZ;
diff --git a/gui/default/syncthing/core/networkErrorDialogDirective.js b/gui/default/syncthing/core/networkErrorDialogDirective.js
deleted file mode 100644
index bae20f6b..00000000
--- a/gui/default/syncthing/core/networkErrorDialogDirective.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('syncthing.core')
- .directive('networkErrorDialog', function () {
- return {
- restrict: 'A',
- templateUrl: 'syncthing/core/networkErrorDialogView.html'
- };
-});
diff --git a/gui/default/syncthing/core/networkErrorDialogView.html b/gui/default/syncthing/core/networkErrorDialogView.html
index 07a59139..03280764 100644
--- a/gui/default/syncthing/core/networkErrorDialogView.html
+++ b/gui/default/syncthing/core/networkErrorDialogView.html
@@ -1,5 +1,7 @@
-
+
-+ This is a major version upgrade. + A new major version may not be compatible with previous versions. + Please consult the release notes before performing a major upgrade. +
++ Release Notes +
- Syncthing seems to be down, or there is a problem with your Internet connection. Retrying… -
+
+
+ Syncthing seems to be down, or there is a problem with your Internet connection. Retrying… +
+Syncthing is restarting. Please wait...
+
+
+ Syncthing is restarting. + Please wait... +
+Syncthing has been shut down.
+
+
+ Syncthing has been shut down. +
+Syncthing is upgrading. Please wait...
+
+
+ Syncthing is upgrading. + Please wait... +
+
-
-