diff --git a/gui/assets/css/overrides.css b/gui/assets/css/overrides.css index fcafddcbf..a8cbf4ed2 100644 --- a/gui/assets/css/overrides.css +++ b/gui/assets/css/overrides.css @@ -67,7 +67,7 @@ identicon { top: 1px; } -.panel-heading .glyphicon { +.panel-heading .fa, .modal-header .fa { margin-right: 10px; } diff --git a/gui/index.html b/gui/index.html index 6bd466b31..d788eba13 100755 --- a/gui/index.html +++ b/gui/index.html @@ -19,6 +19,7 @@ + @@ -31,40 +32,38 @@ @@ -78,12 +77,14 @@
-

Restart Needed

+

Restart Needed

The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.

@@ -110,9 +111,15 @@
@@ -125,7 +132,7 @@
-

+

New Folder Share Folder

@@ -142,14 +149,14 @@
@@ -162,12 +169,14 @@
-

Notice

+

Notice

{{err.time | date:"yyyy-MM-dd HH:mm:ss"}}: {{friendlyDevices(err.error)}}

@@ -187,7 +196,7 @@

- {{folder.id}} + {{folder.id}} @@ -207,62 +216,62 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
 Folder Path Folder Path {{folder.path}}
 Error Error {{model[folder.id].invalid || model[folder.id].error}}
 Global State Global State {{model[folder.id].globalFiles | alwaysNumber}} items, ~{{model[folder.id].globalBytes | binary}}B
 Local State Local State {{model[folder.id].localFiles | alwaysNumber}} items, ~{{model[folder.id].localBytes | binary}}B
 Out of Sync Out of Sync - {{model[folder.id].needFiles | alwaysNumber}} items, ~{{model[folder.id].needBytes | binary}}B + {{model[folder.id].needFiles | alwaysNumber}} items, ~{{model[folder.id].needBytes | binary}}B
 Failed Items Failed Items - {{failed[folder.id].length | alwaysNumber}} items + {{failed[folder.id].length | alwaysNumber}} items - ... +
 Folder Master Folder Master Yes
 Ignore Patterns Ignore Patterns Yes
 Ignore Permissions Ignore Permissions Yes
 Rescan Interval Rescan Interval {{folder.rescanIntervalS}} s
 File Pull Order File Pull Order Random Alphabetic @@ -273,7 +282,7 @@
 File Versioning File Versioning Trash Can File Versioning Staggered File Versioning @@ -282,11 +291,11 @@
 Shared With Shared With {{sharesFolder(folder)}}
 Last File Received Last File Received Updated @@ -299,10 +308,16 @@

@@ -310,8 +325,12 @@
- - + +

@@ -334,27 +353,27 @@ - + - + - + - + - + - + - + - + @@ -403,53 +422,59 @@
 Download Rate Download Rate {{connectionsTotal.inbps | binary}}B/s ({{connectionsTotal.inBytesTotal | binary}}B)
 Upload Rate Upload Rate {{connectionsTotal.outbps | binary}}B/s ({{connectionsTotal.outBytesTotal | binary}}B)
 Local State (Total) Local State (Total) {{localStateTotal.files | alwaysNumber}} items, ~{{localStateTotal.bytes | binary}}B
 RAM Utilization RAM Utilization {{system.sys | binary}}B
 CPU Utilization CPU Utilization {{system.cpuPercent | alwaysNumber | natural:1}}%
 Global Discovery Global Discovery OK @@ -367,11 +386,11 @@
 Uptime Uptime {{system.uptime | duration:"m"}}
 Version Version {{versionString()}}
- + - + - + - + - + - + - + - +
 Download Rate Download Rate {{connections[deviceCfg.deviceID].inbps | binary}}B/s ({{connections[deviceCfg.deviceID].inBytesTotal | binary}}B)
 Upload Rate Upload Rate {{connections[deviceCfg.deviceID].outbps | binary}}B/s ({{connections[deviceCfg.deviceID].outBytesTotal | binary}}B)
 Address Address {{deviceAddr(deviceCfg)}}
 Compression Compression All Data Off
 Introducer Introducer Yes
 Version Version {{connections[deviceCfg.deviceID].clientVersion}}
 Last seen Last seen Never {{deviceStats[deviceCfg.deviceID].lastSeen | date:"yyyy-MM-dd HH:mm:ss"}}
 Folders Folders {{deviceFolders(deviceCfg).join(", ")}}
- +
@@ -462,16 +487,14 @@ diff --git a/gui/modal.html b/gui/modal.html index 3e403a384..f1f29dcbe 100644 --- a/gui/modal.html +++ b/gui/modal.html @@ -10,14 +10,16 @@ diff --git a/gui/syncthing/core/aboutModalView.html b/gui/syncthing/core/aboutModalView.html index a53e4ce74..7bd1ddec7 100644 --- a/gui/syncthing/core/aboutModalView.html +++ b/gui/syncthing/core/aboutModalView.html @@ -1,4 +1,4 @@ - +

Syncthing
{{versionString()}}


@@ -86,5 +86,6 @@
  • vitrun/qart, Copyright © The Go Authors.
  • AngularJS, Copyright © 2010-2015 Google, Inc.
  • Bootstrap, Copyright © 2011-2015 Twitter, Inc.
  • +
  • Font Awesome, Copyright © 2015 Dave Gandy
  • diff --git a/gui/syncthing/core/httpErrorDialogView.html b/gui/syncthing/core/httpErrorDialogView.html index 04fee56c3..3b8d36601 100644 --- a/gui/syncthing/core/httpErrorDialogView.html +++ b/gui/syncthing/core/httpErrorDialogView.html @@ -1,4 +1,4 @@ - +

    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/syncthing/core/languageSelectDirective.js b/gui/syncthing/core/languageSelectDirective.js index 84855bd21..0b678d393 100644 --- a/gui/syncthing/core/languageSelectDirective.js +++ b/gui/syncthing/core/languageSelectDirective.js @@ -4,7 +4,7 @@ angular.module('syncthing.core') return { restrict: 'EA', template: - ' {{localesNames[currentLocale] || "English"}} '+ + ' {{localesNames[currentLocale] || "English"}} '+ '
    - +
    diff --git a/gui/syncthing/usagereport/usageReportModalView.html b/gui/syncthing/usagereport/usageReportModalView.html index ed3dcd2bc..c154ad25d 100644 --- a/gui/syncthing/usagereport/usageReportModalView.html +++ b/gui/syncthing/usagereport/usageReportModalView.html @@ -1,18 +1,24 @@