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

@@ -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")

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.",

gui/index.html

@@ -492,6 +492,7 @@
   <div usage-report-preview-modal></div>
   <div needed-files-modal></div>
   <div failed-files-modal></div>
+  <div about-modal></div>
 
   <!-- vendor scripts -->
   <script src="vendor/jquery/jquery-2.0.3.min.js"></script>
@@ -503,57 +504,57 @@
   <!-- / vendor scripts -->
 
   <!-- gui application code -->
-  <script src="scripts/syncthing/core/module.js"></script>
-  <script src="scripts/syncthing/core/services/events.js"></script>
-  <script src="scripts/syncthing/core/controllers/syncthingController.js"></script>
-  <script src="scripts/syncthing/core/directives/aboutModalDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/identiconDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/languageSelectDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/majorUpgradeModalDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/modalDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/uniqueFolderDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/validDeviceidDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/popoverDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/selectOnClickDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/messageDialogs/httpErrorDialogDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/messageDialogs/networkErrorDialogDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/messageDialogs/restartingDialogDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/messageDialogs/shutdownDialogDirective.js"></script>
-  <script src="scripts/syncthing/core/directives/messageDialogs/upgradingDialogDirective.js"></script>
-  <script src="scripts/syncthing/core/filters/alwaysNumberFilter.js"></script>
-  <script src="scripts/syncthing/core/filters/basenameFilter.js"></script>
-  <script src="scripts/syncthing/core/filters/binaryFilter.js"></script>
-  <script src="scripts/syncthing/core/filters/durationFilter.js"></script>
-  <script src="scripts/syncthing/core/filters/groupFilter.js"></script>
-  <script src="scripts/syncthing/core/filters/naturalFilter.js"></script>
-  <script src="scripts/syncthing/core/filters/lastErrorComponentFilter.js"></script>
-  <script src="scripts/syncthing/core/services/filterStabilize.js"></script>
-  <script src="scripts/syncthing/core/services/localeService.js"></script>
-  <script src="scripts/syncthing/core/services/memoize.js"></script>
-
-  <script src="scripts/syncthing/device/module.js"></script>
-  <script src="scripts/syncthing/device/directives/editDeviceModalDirective.js"></script>
-  <script src="scripts/syncthing/device/directives/idqrModalDirective.js"></script>
-
-  <script src="scripts/syncthing/folder/module.js"></script>
-  <script src="scripts/syncthing/folder/directives/editFolderModalDirective.js"></script>
-  <script src="scripts/syncthing/folder/directives/editIgnoresModalDirective.js"></script>
-
-  <script src="scripts/syncthing/settings/module.js"></script>
-  <script src="scripts/syncthing/settings/directives/settingsModalDirective.js"></script>
-  <script src="scripts/syncthing/settings/directives/advancedSettingsModalDirective.js"></script>
-
-  <script src="scripts/syncthing/transfer/module.js"></script>
-  <script src="scripts/syncthing/transfer/directives/failedFilesModalDirective.js"></script>
-  <script src="scripts/syncthing/transfer/directives/neededFilesModalDirective.js"></script>
-
-  <script src="scripts/syncthing/usagereport/module.js"></script>
-  <script src="scripts/syncthing/usagereport/directives/usageReportModalDirective.js"></script>
-  <script src="scripts/syncthing/usagereport/directives/usageReportPreviewModalDirective.js"></script>
+  <script src="syncthing/core/module.js"></script>
+  <script src="syncthing/core/aboutModalDirective.js"></script>
+  <script src="syncthing/core/alwaysNumberFilter.js"></script>
+  <script src="syncthing/core/basenameFilter.js"></script>
+  <script src="syncthing/core/binaryFilter.js"></script>
+  <script src="syncthing/core/durationFilter.js"></script>
+  <script src="syncthing/core/eventService.js"></script>
+  <script src="syncthing/core/filterStabilize.js"></script>
+  <script src="syncthing/core/groupFilter.js"></script>
+  <script src="syncthing/core/httpErrorDialogDirective.js"></script>
+  <script src="syncthing/core/identiconDirective.js"></script>
+  <script src="syncthing/core/languageSelectDirective.js"></script>
+  <script src="syncthing/core/lastErrorComponentFilter.js"></script>
+  <script src="syncthing/core/localeService.js"></script>
+  <script src="syncthing/core/majorUpgradeModalDirective.js"></script>
+  <script src="syncthing/core/memoize.js"></script>
+  <script src="syncthing/core/modalDirective.js"></script>
+  <script src="syncthing/core/naturalFilter.js"></script>
+  <script src="syncthing/core/networkErrorDialogDirective.js"></script>
+  <script src="syncthing/core/popoverDirective.js"></script>
+  <script src="syncthing/core/restartingDialogDirective.js"></script>
+  <script src="syncthing/core/selectOnClickDirective.js"></script>
+  <script src="syncthing/core/shutdownDialogDirective.js"></script>
+  <script src="syncthing/core/syncthingController.js"></script>
+  <script src="syncthing/core/uniqueFolderDirective.js"></script>
+  <script src="syncthing/core/upgradingDialogDirective.js"></script>
+  <script src="syncthing/core/validDeviceidDirective.js"></script>
+
+  <script src="syncthing/device/module.js"></script>
+  <script src="syncthing/device/editDeviceModalDirective.js"></script>
+  <script src="syncthing/device/idqrModalDirective.js"></script>
+
+  <script src="syncthing/folder/module.js"></script>
+  <script src="syncthing/folder/editFolderModalDirective.js"></script>
+  <script src="syncthing/folder/editIgnoresModalDirective.js"></script>
+
+  <script src="syncthing/settings/module.js"></script>
+  <script src="syncthing/settings/settingsModalDirective.js"></script>
+  <script src="syncthing/settings/advancedSettingsModalDirective.js"></script>
+
+  <script src="syncthing/transfer/module.js"></script>
+  <script src="syncthing/transfer/failedFilesModalDirective.js"></script>
+  <script src="syncthing/transfer/neededFilesModalDirective.js"></script>
+
+  <script src="syncthing/usagereport/module.js"></script>
+  <script src="syncthing/usagereport/usageReportModalDirective.js"></script>
+  <script src="syncthing/usagereport/usageReportPreviewModalDirective.js"></script>
 
   <script src="assets/lang/valid-langs.js"></script>
   <script src="assets/lang/prettyprint.js"></script>
-  <script src="scripts/syncthing/app.js"></script>
+  <script src="syncthing/app.js"></script>
   <!-- / gui application code -->
 
 </body>

gui/scripts/syncthing/app.js → 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;
     };
 }
-

gui/scripts/syncthing/core/directives/aboutModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/core/views/directives/aboutModalView.html → gui/syncthing/core/aboutModalView.html

@@ -9,6 +9,7 @@
         <li class="auto-generated">Aaron Bieber</li>
         <li class="auto-generated">Alexander Graf</li>
         <li class="auto-generated">Andrew Dunham</li>
+        <li class="auto-generated">Antony Male</li>
         <li class="auto-generated">Arthur Axel fREW Schmidt</li>
         <li class="auto-generated">Audrius Butkevicius</li>
         <li class="auto-generated">Bart De Vries</li>
@@ -17,22 +18,28 @@
         <li class="auto-generated">Ben Sidhom</li>
         <li class="auto-generated">Brandon Philips</li>
         <li class="auto-generated">Brendan Long</li>
+        <li class="auto-generated">Brian R. Becker</li>
         <li class="auto-generated">Caleb Callaway</li>
         <li class="auto-generated">Carsten Hagemann</li>
         <li class="auto-generated">Cathryne Linenweaver</li>
         <li class="auto-generated">Chris Howie</li>
         <li class="auto-generated">Chris Joel</li>
         <li class="auto-generated">Colin Kennedy</li>
+        <li class="auto-generated">Daniel Bergmann</li>
         <li class="auto-generated">Daniel Martí</li>
+        <li class="auto-generated">Denis A.</li>
         <li class="auto-generated">Dennis Wilson</li>
         <li class="auto-generated">Dominik Heidler</li>
         <li class="auto-generated">Elias Jarlebring</li>
         <li class="auto-generated">Emil Hessman</li>
+        <li class="auto-generated">Erik Meitner</li>
         <li class="auto-generated">Federico Castagnini</li>
         <li class="auto-generated">Felix Ableitner</li>
         <li class="auto-generated">Felix Unterpaintner</li>
         <li class="auto-generated">Francois-Xavier Gsell</li>
+        <li class="auto-generated">Frank Isemann</li>
         <li class="auto-generated">Gilli Sigurdsson</li>
+        <li class="auto-generated">Jacek Szafarkiewicz</li>
         <li class="auto-generated">Jakob Borg</li>
         <li class="auto-generated">James Patterson</li>
         <li class="auto-generated">Jaroslav Malec</li>

gui/scripts/syncthing/core/filters/durationFilter.js → 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];
                 }

gui/scripts/syncthing/core/services/filterStabilize.js → 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')

gui/scripts/syncthing/core/filters/groupFilter.js → 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 = [];

gui/scripts/syncthing/core/directives/messageDialogs/httpErrorDialogDirective.js → 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'
         };
 });

gui/scripts/syncthing/core/directives/majorUpgradeModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/core/services/memoize.js → 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')

gui/scripts/syncthing/core/directives/messageDialogs/networkErrorDialogDirective.js → 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'
         };
 });

gui/scripts/syncthing/core/directives/messageDialogs/restartingDialogDirective.js → 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'
         };
 });

gui/scripts/syncthing/core/directives/messageDialogs/shutdownDialogDirective.js → 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'
         };
 });

gui/scripts/syncthing/core/directives/messageDialogs/upgradingDialogDirective.js → 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'
         };
 });

gui/scripts/syncthing/device/directives/editDeviceModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/device/directives/idqrModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/folder/directives/editFolderModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/folder/directives/editIgnoresModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/settings/directives/advancedSettingsModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/settings/directives/settingsModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/transfer/directives/failedFilesModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/transfer/directives/neededFilesModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/usagereport/directives/usageReportModalDirective.js → 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'
         };
 });

gui/scripts/syncthing/usagereport/directives/usageReportPreviewModalDirective.js → 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'
         };
 });