From 9513e91d66c2b882536841984b50c295a84d8dac Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 2 Aug 2015 09:05:19 +0200 Subject: [PATCH] Flatten GUI tree somewhat The very deep tree structure didn't really aggree with me, sorry. This makes the core module rather large, but on the other hand that just highlights that it is rather large. --- authors.go | 2 +- gui/assets/lang/lang-en.json | 2 - gui/index.html | 87 ++++++++++--------- gui/{scripts => }/syncthing/app.js | 13 ++- .../core}/aboutModalDirective.js | 2 +- .../core}/aboutModalView.html | 7 ++ .../core}/alwaysNumberFilter.js | 0 .../core}/basenameFilter.js | 0 .../core}/binaryFilter.js | 0 .../core}/durationFilter.js | 4 +- .../core/eventService.js} | 0 .../core}/filterStabilize.js | 2 +- .../filters => syncthing/core}/groupFilter.js | 2 +- .../core}/httpErrorDialogDirective.js | 2 +- .../core}/httpErrorDialogView.html | 0 .../core}/identiconDirective.js | 0 .../core}/languageSelectDirective.js | 0 .../core}/lastErrorComponentFilter.js | 0 .../core}/localeService.js | 0 .../core}/majorUpgradeModalDirective.js | 2 +- .../core}/majorUpgradeModalView.html | 0 .../services => syncthing/core}/memoize.js | 4 +- .../core}/modalDirective.js | 0 gui/{scripts => }/syncthing/core/module.js | 0 .../core}/naturalFilter.js | 0 .../core}/networkErrorDialogDirective.js | 2 +- .../core}/networkErrorDialogView.html | 0 .../core}/popoverDirective.js | 0 .../core}/restartingDialogDirective.js | 2 +- .../core}/restartingDialogView.html | 0 .../core}/selectOnClickDirective.js | 0 .../core}/shutdownDialogDirective.js | 2 +- .../core}/shutdownDialogView.html | 0 .../core}/syncthingController.js | 0 .../core}/uniqueFolderDirective.js | 0 .../core}/upgradingDialogDirective.js | 2 +- .../core}/upgradingDialogView.html | 0 .../core}/validDeviceidDirective.js | 0 .../device}/editDeviceModalDirective.js | 2 +- .../device}/editDeviceModalView.html | 0 .../device}/idqrModalDirective.js | 2 +- .../device}/idqrModalView.html | 0 gui/{scripts => }/syncthing/device/module.js | 0 .../folder}/editFolderModalDirective.js | 2 +- .../folder}/editFolderModalView.html | 0 .../folder}/editIgnoresModalDirective.js | 2 +- .../folder}/editIgnoresModalView.html | 0 gui/{scripts => }/syncthing/folder/module.js | 0 .../advancedSettingsModalDirective.js | 2 +- .../settings}/advancedSettingsModalView.html | 0 .../syncthing/settings/module.js | 0 .../settings}/settingsModalDirective.js | 2 +- .../settings}/settingsModalView.html | 0 .../transfer}/failedFilesModalDirective.js | 2 +- .../transfer}/failedFilesModalView.html | 0 .../syncthing/transfer/module.js | 0 .../transfer}/neededFilesModalDirective.js | 2 +- .../transfer}/neededFilesModalView.html | 0 .../syncthing/usagereport/module.js | 0 .../usagereport}/usageReportModalDirective.js | 2 +- .../usagereport}/usageReportModalView.html | 0 .../usageReportPreviewModalDirective.js | 2 +- .../usageReportPreviewModalView.html | 0 63 files changed, 81 insertions(+), 76 deletions(-) rename gui/{scripts => }/syncthing/app.js (97%) rename gui/{scripts/syncthing/core/directives => syncthing/core}/aboutModalDirective.js (60%) rename gui/{scripts/syncthing/core/views/directives => syncthing/core}/aboutModalView.html (92%) rename gui/{scripts/syncthing/core/filters => syncthing/core}/alwaysNumberFilter.js (100%) rename gui/{scripts/syncthing/core/filters => syncthing/core}/basenameFilter.js (100%) rename gui/{scripts/syncthing/core/filters => syncthing/core}/binaryFilter.js (100%) rename gui/{scripts/syncthing/core/filters => syncthing/core}/durationFilter.js (91%) rename gui/{scripts/syncthing/core/services/events.js => syncthing/core/eventService.js} (100%) rename gui/{scripts/syncthing/core/services => syncthing/core}/filterStabilize.js (95%) rename gui/{scripts/syncthing/core/filters => syncthing/core}/groupFilter.js (96%) rename gui/{scripts/syncthing/core/directives/messageDialogs => syncthing/core}/httpErrorDialogDirective.js (56%) rename gui/{scripts/syncthing/core/views/directives/messageDialogs => syncthing/core}/httpErrorDialogView.html (100%) rename gui/{scripts/syncthing/core/directives => syncthing/core}/identiconDirective.js (100%) rename gui/{scripts/syncthing/core/directives => syncthing/core}/languageSelectDirective.js (100%) rename gui/{scripts/syncthing/core/filters => syncthing/core}/lastErrorComponentFilter.js (100%) rename gui/{scripts/syncthing/core/services => syncthing/core}/localeService.js (100%) rename gui/{scripts/syncthing/core/directives => syncthing/core}/majorUpgradeModalDirective.js (60%) rename gui/{scripts/syncthing/core/views/directives => syncthing/core}/majorUpgradeModalView.html (100%) rename gui/{scripts/syncthing/core/services => syncthing/core}/memoize.js (95%) rename gui/{scripts/syncthing/core/directives => syncthing/core}/modalDirective.js (100%) rename gui/{scripts => }/syncthing/core/module.js (100%) rename gui/{scripts/syncthing/core/filters => syncthing/core}/naturalFilter.js (100%) rename gui/{scripts/syncthing/core/directives/messageDialogs => syncthing/core}/networkErrorDialogDirective.js (56%) rename gui/{scripts/syncthing/core/views/directives/messageDialogs => syncthing/core}/networkErrorDialogView.html (100%) rename gui/{scripts/syncthing/core/directives => syncthing/core}/popoverDirective.js (100%) rename gui/{scripts/syncthing/core/directives/messageDialogs => syncthing/core}/restartingDialogDirective.js (56%) rename gui/{scripts/syncthing/core/views/directives/messageDialogs => syncthing/core}/restartingDialogView.html (100%) rename gui/{scripts/syncthing/core/directives => syncthing/core}/selectOnClickDirective.js (100%) rename gui/{scripts/syncthing/core/directives/messageDialogs => syncthing/core}/shutdownDialogDirective.js (56%) rename gui/{scripts/syncthing/core/views/directives/messageDialogs => syncthing/core}/shutdownDialogView.html (100%) rename gui/{scripts/syncthing/core/controllers => syncthing/core}/syncthingController.js (100%) rename gui/{scripts/syncthing/core/directives => syncthing/core}/uniqueFolderDirective.js (100%) rename gui/{scripts/syncthing/core/directives/messageDialogs => syncthing/core}/upgradingDialogDirective.js (56%) rename gui/{scripts/syncthing/core/views/directives/messageDialogs => syncthing/core}/upgradingDialogView.html (100%) rename gui/{scripts/syncthing/core/directives => syncthing/core}/validDeviceidDirective.js (100%) rename gui/{scripts/syncthing/device/directives => syncthing/device}/editDeviceModalDirective.js (60%) rename gui/{scripts/syncthing/device/views/directives => syncthing/device}/editDeviceModalView.html (100%) rename gui/{scripts/syncthing/device/directives => syncthing/device}/idqrModalDirective.js (60%) rename gui/{scripts/syncthing/device/views/directives => syncthing/device}/idqrModalView.html (100%) rename gui/{scripts => }/syncthing/device/module.js (100%) rename gui/{scripts/syncthing/folder/directives => syncthing/folder}/editFolderModalDirective.js (60%) rename gui/{scripts/syncthing/folder/views/directives => syncthing/folder}/editFolderModalView.html (100%) rename gui/{scripts/syncthing/folder/directives => syncthing/folder}/editIgnoresModalDirective.js (60%) rename gui/{scripts/syncthing/folder/views/directives => syncthing/folder}/editIgnoresModalView.html (100%) rename gui/{scripts => }/syncthing/folder/module.js (100%) rename gui/{scripts/syncthing/settings/directives => syncthing/settings}/advancedSettingsModalDirective.js (59%) rename gui/{scripts/syncthing/settings/views/directives => syncthing/settings}/advancedSettingsModalView.html (100%) rename gui/{scripts => }/syncthing/settings/module.js (100%) rename gui/{scripts/syncthing/settings/directives => syncthing/settings}/settingsModalDirective.js (60%) rename gui/{scripts/syncthing/settings/views/directives => syncthing/settings}/settingsModalView.html (100%) rename gui/{scripts/syncthing/transfer/directives => syncthing/transfer}/failedFilesModalDirective.js (59%) rename gui/{scripts/syncthing/transfer/views/directives => syncthing/transfer}/failedFilesModalView.html (100%) rename gui/{scripts => }/syncthing/transfer/module.js (100%) rename gui/{scripts/syncthing/transfer/directives => syncthing/transfer}/neededFilesModalDirective.js (59%) rename gui/{scripts/syncthing/transfer/views/directives => syncthing/transfer}/neededFilesModalView.html (100%) rename gui/{scripts => }/syncthing/usagereport/module.js (100%) rename gui/{scripts/syncthing/usagereport/directives => syncthing/usagereport}/usageReportModalDirective.js (59%) rename gui/{scripts/syncthing/usagereport/views/directives => syncthing/usagereport}/usageReportModalView.html (100%) rename gui/{scripts/syncthing/usagereport/directives => syncthing/usagereport}/usageReportPreviewModalDirective.js (59%) rename gui/{scripts/syncthing/usagereport/views/directives => syncthing/usagereport}/usageReportPreviewModalView.html (100%) diff --git a/authors.go b/authors.go index 4c8170eac..13b7f8778 100644 --- a/authors.go +++ b/authors.go @@ -20,7 +20,7 @@ import ( "strings" ) -const htmlFile = "gui/scripts/syncthing/core/views/directives/aboutModalView.html" +const htmlFile = "gui/syncthing/core/aboutModalView.html" func main() { bs := readAll("AUTHORS") diff --git a/gui/assets/lang/lang-en.json b/gui/assets/lang/lang-en.json index 14fd5dd56..3a9f0ee4c 100644 --- a/gui/assets/lang/lang-en.json +++ b/gui/assets/lang/lang-en.json @@ -50,7 +50,6 @@ "Editing": "Editing", "Enable UPnP": "Enable UPnP", "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.", - "Enter comma separated addresses (\"ip:port\", \"host:port\") or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated addresses (\"ip:port\", \"host:port\") or \"dynamic\" to perform automatic discovery of the address.", "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.", "Error": "Error", "External File Versioning": "External File Versioning", @@ -171,7 +170,6 @@ "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "The first command line parameter is the folder path and the second parameter is the relative path in the folder.", "The folder ID cannot be blank.": "The folder ID cannot be blank.", "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.", - "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscore (_) characters only.": "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscore (_) characters only.", "The folder ID must be unique.": "The folder ID must be unique.", "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.", diff --git a/gui/index.html b/gui/index.html index 0d67980d3..54a5db3f4 100755 --- a/gui/index.html +++ b/gui/index.html @@ -492,6 +492,7 @@
+
@@ -503,57 +504,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + diff --git a/gui/scripts/syncthing/app.js b/gui/syncthing/app.js similarity index 97% rename from gui/scripts/syncthing/app.js rename to gui/syncthing/app.js index 483ff9e7e..1acbab47c 100644 --- a/gui/scripts/syncthing/app.js +++ b/gui/syncthing/app.js @@ -26,26 +26,26 @@ syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvi $httpProvider.interceptors.push(function xHeadersResponseInterceptor() { var guiVersion = null; var deviceId = null; - + return { response: function onResponse(response) { var headers = response.headers(); var responseVersion; var deviceIdShort; - + // angular template cache sends no headers if(Object.keys(headers).length === 0) { return response; } - + responseVersion = headers['x-syncthing-version']; - + if (!guiVersion) { guiVersion = responseVersion; } else if (guiVersion != responseVersion) { document.location.reload(true); } - + if (!deviceId) { deviceId = headers['x-syncthing-id']; if (deviceId) { @@ -54,7 +54,7 @@ syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvi $httpProvider.defaults.xsrfCookieName = 'CSRF-Token-' + deviceIdShort; } } - + return response; } }; @@ -171,4 +171,3 @@ function debounce(func, wait) { return result; }; } - diff --git a/gui/scripts/syncthing/core/directives/aboutModalDirective.js b/gui/syncthing/core/aboutModalDirective.js similarity index 60% rename from gui/scripts/syncthing/core/directives/aboutModalDirective.js rename to gui/syncthing/core/aboutModalDirective.js index 633fe2f6c..f20bfa34e 100644 --- a/gui/scripts/syncthing/core/directives/aboutModalDirective.js +++ b/gui/syncthing/core/aboutModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.core') .directive('aboutModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/core/views/directives/aboutModalView.html' + templateUrl: 'syncthing/core/aboutModalView.html' }; }); diff --git a/gui/scripts/syncthing/core/views/directives/aboutModalView.html b/gui/syncthing/core/aboutModalView.html similarity index 92% rename from gui/scripts/syncthing/core/views/directives/aboutModalView.html rename to gui/syncthing/core/aboutModalView.html index 6c28c40a5..a53e4ce74 100644 --- a/gui/scripts/syncthing/core/views/directives/aboutModalView.html +++ b/gui/syncthing/core/aboutModalView.html @@ -9,6 +9,7 @@
  • Aaron Bieber
  • Alexander Graf
  • Andrew Dunham
    • +
  • Antony Male
  • Arthur Axel fREW Schmidt
  • Audrius Butkevicius
  • Bart De Vries
    • @@ -17,22 +18,28 @@
  • Ben Sidhom
  • Brandon Philips
  • Brendan Long
    • +
  • Brian R. Becker
  • Caleb Callaway
  • Carsten Hagemann
  • Cathryne Linenweaver
  • Chris Howie
  • Chris Joel
  • Colin Kennedy
    • +
  • Daniel Bergmann
  • Daniel Martí
    • +
  • 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
    • +
  • Jacek Szafarkiewicz
  • Jakob Borg
  • James Patterson
  • Jaroslav Malec
    • diff --git a/gui/scripts/syncthing/core/filters/alwaysNumberFilter.js b/gui/syncthing/core/alwaysNumberFilter.js similarity index 100% rename from gui/scripts/syncthing/core/filters/alwaysNumberFilter.js rename to gui/syncthing/core/alwaysNumberFilter.js diff --git a/gui/scripts/syncthing/core/filters/basenameFilter.js b/gui/syncthing/core/basenameFilter.js similarity index 100% rename from gui/scripts/syncthing/core/filters/basenameFilter.js rename to gui/syncthing/core/basenameFilter.js diff --git a/gui/scripts/syncthing/core/filters/binaryFilter.js b/gui/syncthing/core/binaryFilter.js similarity index 100% rename from gui/scripts/syncthing/core/filters/binaryFilter.js rename to gui/syncthing/core/binaryFilter.js diff --git a/gui/scripts/syncthing/core/filters/durationFilter.js b/gui/syncthing/core/durationFilter.js similarity index 91% rename from gui/scripts/syncthing/core/filters/durationFilter.js rename to gui/syncthing/core/durationFilter.js index ea54402eb..96e0be22f 100644 --- a/gui/scripts/syncthing/core/filters/durationFilter.js +++ b/gui/syncthing/core/durationFilter.js @@ -21,11 +21,11 @@ angular.module('syncthing.core') var t = (input/SECONDS_IN[k] | 0); // Math.floor if (t > 0) { - result += " " + t + k; + result += " " + t + k; } if (precision == k) { - return result ? result : "<1" + k; + return result ? result : "<1" + k; } else { input %= SECONDS_IN[k]; } diff --git a/gui/scripts/syncthing/core/services/events.js b/gui/syncthing/core/eventService.js similarity index 100% rename from gui/scripts/syncthing/core/services/events.js rename to gui/syncthing/core/eventService.js diff --git a/gui/scripts/syncthing/core/services/filterStabilize.js b/gui/syncthing/core/filterStabilize.js similarity index 95% rename from gui/scripts/syncthing/core/services/filterStabilize.js rename to gui/syncthing/core/filterStabilize.js index 7eb31f75e..7d63279ef 100644 --- a/gui/scripts/syncthing/core/services/filterStabilize.js +++ b/gui/syncthing/core/filterStabilize.js @@ -1,7 +1,7 @@ /** * m59peacemaker's filterStabilize * - * See https://github.com/m59peacemaker/angular-pmkr-components/tree/master/src/services/filterStabilize + * See https://github.com/m59peacemaker/angular-pmkr-components/tree/master/src/filterStabilize * Released under the MIT license */ angular.module('syncthing.core') diff --git a/gui/scripts/syncthing/core/filters/groupFilter.js b/gui/syncthing/core/groupFilter.js similarity index 96% rename from gui/scripts/syncthing/core/filters/groupFilter.js rename to gui/syncthing/core/groupFilter.js index d960651df..fdbc7cc8a 100644 --- a/gui/scripts/syncthing/core/filters/groupFilter.js +++ b/gui/syncthing/core/groupFilter.js @@ -7,7 +7,7 @@ */ angular.module('syncthing.core') .filter('group', [ - 'pmkr.filterStabilize', + 'pmkr.filterStabilize', function (stabilize) { return stabilize(function(items, groupSize) { var groups = []; diff --git a/gui/scripts/syncthing/core/directives/messageDialogs/httpErrorDialogDirective.js b/gui/syncthing/core/httpErrorDialogDirective.js similarity index 56% rename from gui/scripts/syncthing/core/directives/messageDialogs/httpErrorDialogDirective.js rename to gui/syncthing/core/httpErrorDialogDirective.js index 87894b285..a2881b814 100644 --- a/gui/scripts/syncthing/core/directives/messageDialogs/httpErrorDialogDirective.js +++ b/gui/syncthing/core/httpErrorDialogDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.core') .directive('httpErrorDialog', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/core/views/directives/messageDialogs/httpErrorDialogView.html' + templateUrl: 'syncthing/core//httpErrorDialogView.html' }; }); diff --git a/gui/scripts/syncthing/core/views/directives/messageDialogs/httpErrorDialogView.html b/gui/syncthing/core/httpErrorDialogView.html similarity index 100% rename from gui/scripts/syncthing/core/views/directives/messageDialogs/httpErrorDialogView.html rename to gui/syncthing/core/httpErrorDialogView.html diff --git a/gui/scripts/syncthing/core/directives/identiconDirective.js b/gui/syncthing/core/identiconDirective.js similarity index 100% rename from gui/scripts/syncthing/core/directives/identiconDirective.js rename to gui/syncthing/core/identiconDirective.js diff --git a/gui/scripts/syncthing/core/directives/languageSelectDirective.js b/gui/syncthing/core/languageSelectDirective.js similarity index 100% rename from gui/scripts/syncthing/core/directives/languageSelectDirective.js rename to gui/syncthing/core/languageSelectDirective.js diff --git a/gui/scripts/syncthing/core/filters/lastErrorComponentFilter.js b/gui/syncthing/core/lastErrorComponentFilter.js similarity index 100% rename from gui/scripts/syncthing/core/filters/lastErrorComponentFilter.js rename to gui/syncthing/core/lastErrorComponentFilter.js diff --git a/gui/scripts/syncthing/core/services/localeService.js b/gui/syncthing/core/localeService.js similarity index 100% rename from gui/scripts/syncthing/core/services/localeService.js rename to gui/syncthing/core/localeService.js diff --git a/gui/scripts/syncthing/core/directives/majorUpgradeModalDirective.js b/gui/syncthing/core/majorUpgradeModalDirective.js similarity index 60% rename from gui/scripts/syncthing/core/directives/majorUpgradeModalDirective.js rename to gui/syncthing/core/majorUpgradeModalDirective.js index 1bddfea58..d3d618ffb 100644 --- a/gui/scripts/syncthing/core/directives/majorUpgradeModalDirective.js +++ b/gui/syncthing/core/majorUpgradeModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.core') .directive('majorUpgradeModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/core/views/directives/majorUpgradeModalView.html' + templateUrl: 'syncthing/core//majorUpgradeModalView.html' }; }); diff --git a/gui/scripts/syncthing/core/views/directives/majorUpgradeModalView.html b/gui/syncthing/core/majorUpgradeModalView.html similarity index 100% rename from gui/scripts/syncthing/core/views/directives/majorUpgradeModalView.html rename to gui/syncthing/core/majorUpgradeModalView.html diff --git a/gui/scripts/syncthing/core/services/memoize.js b/gui/syncthing/core/memoize.js similarity index 95% rename from gui/scripts/syncthing/core/services/memoize.js rename to gui/syncthing/core/memoize.js index db72e5c0a..1e16289fe 100644 --- a/gui/scripts/syncthing/core/services/memoize.js +++ b/gui/syncthing/core/memoize.js @@ -1,7 +1,7 @@ /** * m59peacemaker's memoize - * - * See https://github.com/m59peacemaker/angular-pmkr-components/tree/master/src/services/memoize + * + * See https://github.com/m59peacemaker/angular-pmkr-components/tree/master/src/memoize * Released under the MIT license */ angular.module('syncthing.core') diff --git a/gui/scripts/syncthing/core/directives/modalDirective.js b/gui/syncthing/core/modalDirective.js similarity index 100% rename from gui/scripts/syncthing/core/directives/modalDirective.js rename to gui/syncthing/core/modalDirective.js diff --git a/gui/scripts/syncthing/core/module.js b/gui/syncthing/core/module.js similarity index 100% rename from gui/scripts/syncthing/core/module.js rename to gui/syncthing/core/module.js diff --git a/gui/scripts/syncthing/core/filters/naturalFilter.js b/gui/syncthing/core/naturalFilter.js similarity index 100% rename from gui/scripts/syncthing/core/filters/naturalFilter.js rename to gui/syncthing/core/naturalFilter.js diff --git a/gui/scripts/syncthing/core/directives/messageDialogs/networkErrorDialogDirective.js b/gui/syncthing/core/networkErrorDialogDirective.js similarity index 56% rename from gui/scripts/syncthing/core/directives/messageDialogs/networkErrorDialogDirective.js rename to gui/syncthing/core/networkErrorDialogDirective.js index 048e93b0b..dc6389b87 100644 --- a/gui/scripts/syncthing/core/directives/messageDialogs/networkErrorDialogDirective.js +++ b/gui/syncthing/core/networkErrorDialogDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.core') .directive('networkErrorDialog', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/core/views/directives/messageDialogs/networkErrorDialogView.html' + templateUrl: 'syncthing/core//networkErrorDialogView.html' }; }); diff --git a/gui/scripts/syncthing/core/views/directives/messageDialogs/networkErrorDialogView.html b/gui/syncthing/core/networkErrorDialogView.html similarity index 100% rename from gui/scripts/syncthing/core/views/directives/messageDialogs/networkErrorDialogView.html rename to gui/syncthing/core/networkErrorDialogView.html diff --git a/gui/scripts/syncthing/core/directives/popoverDirective.js b/gui/syncthing/core/popoverDirective.js similarity index 100% rename from gui/scripts/syncthing/core/directives/popoverDirective.js rename to gui/syncthing/core/popoverDirective.js diff --git a/gui/scripts/syncthing/core/directives/messageDialogs/restartingDialogDirective.js b/gui/syncthing/core/restartingDialogDirective.js similarity index 56% rename from gui/scripts/syncthing/core/directives/messageDialogs/restartingDialogDirective.js rename to gui/syncthing/core/restartingDialogDirective.js index 0ebe5c43c..28d974d46 100644 --- a/gui/scripts/syncthing/core/directives/messageDialogs/restartingDialogDirective.js +++ b/gui/syncthing/core/restartingDialogDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.core') .directive('restartingDialog', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/core/views/directives/messageDialogs/restartingDialogView.html' + templateUrl: 'syncthing/core//restartingDialogView.html' }; }); diff --git a/gui/scripts/syncthing/core/views/directives/messageDialogs/restartingDialogView.html b/gui/syncthing/core/restartingDialogView.html similarity index 100% rename from gui/scripts/syncthing/core/views/directives/messageDialogs/restartingDialogView.html rename to gui/syncthing/core/restartingDialogView.html diff --git a/gui/scripts/syncthing/core/directives/selectOnClickDirective.js b/gui/syncthing/core/selectOnClickDirective.js similarity index 100% rename from gui/scripts/syncthing/core/directives/selectOnClickDirective.js rename to gui/syncthing/core/selectOnClickDirective.js diff --git a/gui/scripts/syncthing/core/directives/messageDialogs/shutdownDialogDirective.js b/gui/syncthing/core/shutdownDialogDirective.js similarity index 56% rename from gui/scripts/syncthing/core/directives/messageDialogs/shutdownDialogDirective.js rename to gui/syncthing/core/shutdownDialogDirective.js index 8f98bbe75..3e7eaa259 100644 --- a/gui/scripts/syncthing/core/directives/messageDialogs/shutdownDialogDirective.js +++ b/gui/syncthing/core/shutdownDialogDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.core') .directive('shutdownDialog', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/core/views/directives/messageDialogs/shutdownDialogView.html' + templateUrl: 'syncthing/core//shutdownDialogView.html' }; }); diff --git a/gui/scripts/syncthing/core/views/directives/messageDialogs/shutdownDialogView.html b/gui/syncthing/core/shutdownDialogView.html similarity index 100% rename from gui/scripts/syncthing/core/views/directives/messageDialogs/shutdownDialogView.html rename to gui/syncthing/core/shutdownDialogView.html diff --git a/gui/scripts/syncthing/core/controllers/syncthingController.js b/gui/syncthing/core/syncthingController.js similarity index 100% rename from gui/scripts/syncthing/core/controllers/syncthingController.js rename to gui/syncthing/core/syncthingController.js diff --git a/gui/scripts/syncthing/core/directives/uniqueFolderDirective.js b/gui/syncthing/core/uniqueFolderDirective.js similarity index 100% rename from gui/scripts/syncthing/core/directives/uniqueFolderDirective.js rename to gui/syncthing/core/uniqueFolderDirective.js diff --git a/gui/scripts/syncthing/core/directives/messageDialogs/upgradingDialogDirective.js b/gui/syncthing/core/upgradingDialogDirective.js similarity index 56% rename from gui/scripts/syncthing/core/directives/messageDialogs/upgradingDialogDirective.js rename to gui/syncthing/core/upgradingDialogDirective.js index fa69fa4c4..6f4bfeda8 100644 --- a/gui/scripts/syncthing/core/directives/messageDialogs/upgradingDialogDirective.js +++ b/gui/syncthing/core/upgradingDialogDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.core') .directive('upgradingDialog', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/core/views/directives/messageDialogs/upgradingDialogView.html' + templateUrl: 'syncthing/core//upgradingDialogView.html' }; }); diff --git a/gui/scripts/syncthing/core/views/directives/messageDialogs/upgradingDialogView.html b/gui/syncthing/core/upgradingDialogView.html similarity index 100% rename from gui/scripts/syncthing/core/views/directives/messageDialogs/upgradingDialogView.html rename to gui/syncthing/core/upgradingDialogView.html diff --git a/gui/scripts/syncthing/core/directives/validDeviceidDirective.js b/gui/syncthing/core/validDeviceidDirective.js similarity index 100% rename from gui/scripts/syncthing/core/directives/validDeviceidDirective.js rename to gui/syncthing/core/validDeviceidDirective.js diff --git a/gui/scripts/syncthing/device/directives/editDeviceModalDirective.js b/gui/syncthing/device/editDeviceModalDirective.js similarity index 60% rename from gui/scripts/syncthing/device/directives/editDeviceModalDirective.js rename to gui/syncthing/device/editDeviceModalDirective.js index 0da0a27ae..cb94ef907 100644 --- a/gui/scripts/syncthing/device/directives/editDeviceModalDirective.js +++ b/gui/syncthing/device/editDeviceModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.device') .directive('editDeviceModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/device/views/directives/editDeviceModalView.html' + templateUrl: 'syncthing/device//editDeviceModalView.html' }; }); diff --git a/gui/scripts/syncthing/device/views/directives/editDeviceModalView.html b/gui/syncthing/device/editDeviceModalView.html similarity index 100% rename from gui/scripts/syncthing/device/views/directives/editDeviceModalView.html rename to gui/syncthing/device/editDeviceModalView.html diff --git a/gui/scripts/syncthing/device/directives/idqrModalDirective.js b/gui/syncthing/device/idqrModalDirective.js similarity index 60% rename from gui/scripts/syncthing/device/directives/idqrModalDirective.js rename to gui/syncthing/device/idqrModalDirective.js index 0fe58c577..5024d8c85 100644 --- a/gui/scripts/syncthing/device/directives/idqrModalDirective.js +++ b/gui/syncthing/device/idqrModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.device') .directive('idqrModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/device/views/directives/idqrModalView.html' + templateUrl: 'syncthing/device//idqrModalView.html' }; }); diff --git a/gui/scripts/syncthing/device/views/directives/idqrModalView.html b/gui/syncthing/device/idqrModalView.html similarity index 100% rename from gui/scripts/syncthing/device/views/directives/idqrModalView.html rename to gui/syncthing/device/idqrModalView.html diff --git a/gui/scripts/syncthing/device/module.js b/gui/syncthing/device/module.js similarity index 100% rename from gui/scripts/syncthing/device/module.js rename to gui/syncthing/device/module.js diff --git a/gui/scripts/syncthing/folder/directives/editFolderModalDirective.js b/gui/syncthing/folder/editFolderModalDirective.js similarity index 60% rename from gui/scripts/syncthing/folder/directives/editFolderModalDirective.js rename to gui/syncthing/folder/editFolderModalDirective.js index 1e9a6692e..a2eb3c156 100644 --- a/gui/scripts/syncthing/folder/directives/editFolderModalDirective.js +++ b/gui/syncthing/folder/editFolderModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.folder') .directive('editFolderModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/folder/views/directives/editFolderModalView.html' + templateUrl: 'syncthing/folder//editFolderModalView.html' }; }); diff --git a/gui/scripts/syncthing/folder/views/directives/editFolderModalView.html b/gui/syncthing/folder/editFolderModalView.html similarity index 100% rename from gui/scripts/syncthing/folder/views/directives/editFolderModalView.html rename to gui/syncthing/folder/editFolderModalView.html diff --git a/gui/scripts/syncthing/folder/directives/editIgnoresModalDirective.js b/gui/syncthing/folder/editIgnoresModalDirective.js similarity index 60% rename from gui/scripts/syncthing/folder/directives/editIgnoresModalDirective.js rename to gui/syncthing/folder/editIgnoresModalDirective.js index 1550314bf..fd7ee4612 100644 --- a/gui/scripts/syncthing/folder/directives/editIgnoresModalDirective.js +++ b/gui/syncthing/folder/editIgnoresModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.folder') .directive('editIgnoresModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/folder/views/directives/editIgnoresModalView.html' + templateUrl: 'syncthing/folder//editIgnoresModalView.html' }; }); diff --git a/gui/scripts/syncthing/folder/views/directives/editIgnoresModalView.html b/gui/syncthing/folder/editIgnoresModalView.html similarity index 100% rename from gui/scripts/syncthing/folder/views/directives/editIgnoresModalView.html rename to gui/syncthing/folder/editIgnoresModalView.html diff --git a/gui/scripts/syncthing/folder/module.js b/gui/syncthing/folder/module.js similarity index 100% rename from gui/scripts/syncthing/folder/module.js rename to gui/syncthing/folder/module.js diff --git a/gui/scripts/syncthing/settings/directives/advancedSettingsModalDirective.js b/gui/syncthing/settings/advancedSettingsModalDirective.js similarity index 59% rename from gui/scripts/syncthing/settings/directives/advancedSettingsModalDirective.js rename to gui/syncthing/settings/advancedSettingsModalDirective.js index 60bbae91f..3eb1cda63 100644 --- a/gui/scripts/syncthing/settings/directives/advancedSettingsModalDirective.js +++ b/gui/syncthing/settings/advancedSettingsModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.settings') .directive('advancedSettingsModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/settings/views/directives/advancedSettingsModalView.html' + templateUrl: 'syncthing/settings//advancedSettingsModalView.html' }; }); diff --git a/gui/scripts/syncthing/settings/views/directives/advancedSettingsModalView.html b/gui/syncthing/settings/advancedSettingsModalView.html similarity index 100% rename from gui/scripts/syncthing/settings/views/directives/advancedSettingsModalView.html rename to gui/syncthing/settings/advancedSettingsModalView.html diff --git a/gui/scripts/syncthing/settings/module.js b/gui/syncthing/settings/module.js similarity index 100% rename from gui/scripts/syncthing/settings/module.js rename to gui/syncthing/settings/module.js diff --git a/gui/scripts/syncthing/settings/directives/settingsModalDirective.js b/gui/syncthing/settings/settingsModalDirective.js similarity index 60% rename from gui/scripts/syncthing/settings/directives/settingsModalDirective.js rename to gui/syncthing/settings/settingsModalDirective.js index 37654d303..d11d6f7b8 100644 --- a/gui/scripts/syncthing/settings/directives/settingsModalDirective.js +++ b/gui/syncthing/settings/settingsModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.settings') .directive('settingsModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/settings/views/directives/settingsModalView.html' + templateUrl: 'syncthing/settings//settingsModalView.html' }; }); diff --git a/gui/scripts/syncthing/settings/views/directives/settingsModalView.html b/gui/syncthing/settings/settingsModalView.html similarity index 100% rename from gui/scripts/syncthing/settings/views/directives/settingsModalView.html rename to gui/syncthing/settings/settingsModalView.html diff --git a/gui/scripts/syncthing/transfer/directives/failedFilesModalDirective.js b/gui/syncthing/transfer/failedFilesModalDirective.js similarity index 59% rename from gui/scripts/syncthing/transfer/directives/failedFilesModalDirective.js rename to gui/syncthing/transfer/failedFilesModalDirective.js index 26b3a5e59..238c28e33 100644 --- a/gui/scripts/syncthing/transfer/directives/failedFilesModalDirective.js +++ b/gui/syncthing/transfer/failedFilesModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.transfer') .directive('failedFilesModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/transfer/views/directives/failedFilesModalView.html' + templateUrl: 'syncthing/transfer//failedFilesModalView.html' }; }); diff --git a/gui/scripts/syncthing/transfer/views/directives/failedFilesModalView.html b/gui/syncthing/transfer/failedFilesModalView.html similarity index 100% rename from gui/scripts/syncthing/transfer/views/directives/failedFilesModalView.html rename to gui/syncthing/transfer/failedFilesModalView.html diff --git a/gui/scripts/syncthing/transfer/module.js b/gui/syncthing/transfer/module.js similarity index 100% rename from gui/scripts/syncthing/transfer/module.js rename to gui/syncthing/transfer/module.js diff --git a/gui/scripts/syncthing/transfer/directives/neededFilesModalDirective.js b/gui/syncthing/transfer/neededFilesModalDirective.js similarity index 59% rename from gui/scripts/syncthing/transfer/directives/neededFilesModalDirective.js rename to gui/syncthing/transfer/neededFilesModalDirective.js index 5bcace9ba..d1f1a87e6 100644 --- a/gui/scripts/syncthing/transfer/directives/neededFilesModalDirective.js +++ b/gui/syncthing/transfer/neededFilesModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.transfer') .directive('neededFilesModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/transfer/views/directives/neededFilesModalView.html' + templateUrl: 'syncthing/transfer//neededFilesModalView.html' }; }); diff --git a/gui/scripts/syncthing/transfer/views/directives/neededFilesModalView.html b/gui/syncthing/transfer/neededFilesModalView.html similarity index 100% rename from gui/scripts/syncthing/transfer/views/directives/neededFilesModalView.html rename to gui/syncthing/transfer/neededFilesModalView.html diff --git a/gui/scripts/syncthing/usagereport/module.js b/gui/syncthing/usagereport/module.js similarity index 100% rename from gui/scripts/syncthing/usagereport/module.js rename to gui/syncthing/usagereport/module.js diff --git a/gui/scripts/syncthing/usagereport/directives/usageReportModalDirective.js b/gui/syncthing/usagereport/usageReportModalDirective.js similarity index 59% rename from gui/scripts/syncthing/usagereport/directives/usageReportModalDirective.js rename to gui/syncthing/usagereport/usageReportModalDirective.js index 000a51a46..6c733ae63 100644 --- a/gui/scripts/syncthing/usagereport/directives/usageReportModalDirective.js +++ b/gui/syncthing/usagereport/usageReportModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.usagereport') .directive('usageReportModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/usagereport/views/directives/usageReportModalView.html' + templateUrl: 'syncthing/usagereport//usageReportModalView.html' }; }); diff --git a/gui/scripts/syncthing/usagereport/views/directives/usageReportModalView.html b/gui/syncthing/usagereport/usageReportModalView.html similarity index 100% rename from gui/scripts/syncthing/usagereport/views/directives/usageReportModalView.html rename to gui/syncthing/usagereport/usageReportModalView.html diff --git a/gui/scripts/syncthing/usagereport/directives/usageReportPreviewModalDirective.js b/gui/syncthing/usagereport/usageReportPreviewModalDirective.js similarity index 59% rename from gui/scripts/syncthing/usagereport/directives/usageReportPreviewModalDirective.js rename to gui/syncthing/usagereport/usageReportPreviewModalDirective.js index 675a8f8bb..b64e39668 100644 --- a/gui/scripts/syncthing/usagereport/directives/usageReportPreviewModalDirective.js +++ b/gui/syncthing/usagereport/usageReportPreviewModalDirective.js @@ -2,6 +2,6 @@ angular.module('syncthing.usagereport') .directive('usageReportPreviewModal', function () { return { restrict: 'A', - templateUrl: 'scripts/syncthing/usagereport/views/directives/usageReportPreviewModalView.html' + templateUrl: 'syncthing/usagereport//usageReportPreviewModalView.html' }; }); diff --git a/gui/scripts/syncthing/usagereport/views/directives/usageReportPreviewModalView.html b/gui/syncthing/usagereport/usageReportPreviewModalView.html similarity index 100% rename from gui/scripts/syncthing/usagereport/views/directives/usageReportPreviewModalView.html rename to gui/syncthing/usagereport/usageReportPreviewModalView.html