diff --git a/authors.go b/authors.go
index 4c8170ea..13b7f877 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 14fd5dd5..3a9f0ee4 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 0d67980d..54a5db3f 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 483ff9e7..1acbab47 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 633fe2f6..f20bfa34 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 6c28c40a..a53e4ce7 100644
--- a/gui/scripts/syncthing/core/views/directives/aboutModalView.html
+++ b/gui/syncthing/core/aboutModalView.html
@@ -9,6 +9,7 @@