From 3abb80885e5664d5d08687321590867926afeda8 Mon Sep 17 00:00:00 2001 From: "Lars K.W. Gohlke" Date: Thu, 10 Mar 2016 15:54:33 +0000 Subject: [PATCH] Collapse advanced settings in folder editor modal --- gui/default/assets/css/overrides.css | 21 ++ .../syncthing/folder/editFolderModalView.html | 239 +++++++++--------- lib/auto/gui.files.go | 10 +- 3 files changed, 152 insertions(+), 118 deletions(-) diff --git a/gui/default/assets/css/overrides.css b/gui/default/assets/css/overrides.css index 9d0caadca..7dca8a172 100644 --- a/gui/default/assets/css/overrides.css +++ b/gui/default/assets/css/overrides.css @@ -140,6 +140,27 @@ table.table-condensed td { text-overflow: ellipsis; white-space: nowrap; } + +.folder-advanced{ + background-color: hsla(0,0%,99%,1); + border: 1px solid hsla(0, 0%, 95%, 1); + padding: 1rem; + margin-bottom: 15px; +} + +.folder-advanced-toggle{ + cursor: pointer; +} +.folder-advanced-toggle .collapse, +.folder-advanced-toggle.collapsed .expand{ + display: inline-block; +} + +.folder-advanced-toggle.collapsed .collapse, +.folder-advanced-toggle .expand{ + display: none; +} + @media (max-width:767px) { table.table-condensed td { /* for mobile phones to allow linebreaks in long repro folder/shared with diff --git a/gui/default/syncthing/folder/editFolderModalView.html b/gui/default/syncthing/folder/editFolderModalView.html index 5a39e75ad..8e23a0c10 100644 --- a/gui/default/syncthing/folder/editFolderModalView.html +++ b/gui/default/syncthing/folder/editFolderModalView.html @@ -13,7 +13,7 @@
- +

Short identifier for the folder. Must be the same on all cluster devices. The folder ID must be unique. @@ -22,7 +22,7 @@

- + @@ -31,118 +31,8 @@ The folder path cannot be blank.

-
- - -

- The rescan interval must be a non-negative number of seconds. -

-
-
- - -

- The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive). -

-
-
- -
-
-
- -   Help -
-

Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.

-
-
-
- -
-

File permission bits are ignored when looking for changes. Use on FAT file systems.

-
-
- - -
-
- - -
-
-   Help - -
-
-

Files are moved to .stversions folder when replaced or deleted by Syncthing.

- -
- -
days
-
-

- The number of days to keep files in the trash can. Zero means forever. - The number of days must be a number and cannot be blank. - A negative number of days doesn't make sense. -

-
-
-

Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.

- - -

- The number of old versions to keep, per file. - The number of versions must be a number and cannot be blank. - You must keep at least one version. -

-
-
-

Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing. Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.

-

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 maximum time to keep a version (in days, set to 0 to keep versions forever). - The maximum age must be a number and cannot be blank. - A negative number of days doesn't make sense. -

-
-
- - -

Path where versions should be stored (leave empty for the default .stversions folder in the folder).

-
-
-

An external command handles the versioning. It has to remove the file from the synced folder.

- - -

- The first command line parameter is the folder path and the second parameter is the relative path in the folder. - The path cannot be blank. -

-
-
-
-
@@ -160,9 +50,132 @@
+
When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.
+
+
+ +
+
+
+
+
+
+ + +

+ The rescan interval must be a non-negative number of seconds. +

+
+
+ + +

+ The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive). +

+
+
+
+
+ +
+
+
+ +   Help +
+

Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.

+
+
+
+ +
+

File permission bits are ignored when looking for changes. Use on FAT file systems.

+
+
+ +
+
+ + +
+
+   Help + +
+
+

Files are moved to .stversions folder when replaced or deleted by Syncthing.

+ +
+ +
days
+
+

+ The number of days to keep files in the trash can. Zero means forever. + The number of days must be a number and cannot be blank. + A negative number of days doesn't make sense. +

+
+
+

Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.

+ + +

+ The number of old versions to keep, per file. + The number of versions must be a number and cannot be blank. + You must keep at least one version. +

+
+
+

Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing. Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.

+

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 maximum time to keep a version (in days, set to 0 to keep versions forever). + The maximum age must be a number and cannot be blank. + A negative number of days doesn't make sense. +

+
+
+ + +

Path where versions should be stored (leave empty for the default .stversions folder in the folder).

+
+
+

An external command handles the versioning. It has to remove the file from the synced folder.

+ + +

+ The first command line parameter is the folder path and the second parameter is the relative path in the folder. + The path cannot be blank. +

+
+
+
+
-
When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.