From 77157f16a10929aded4a82a97f7f56676786b22c Mon Sep 17 00:00:00 2001 From: Ben Schulz Date: Mon, 10 Aug 2015 11:22:37 +0200 Subject: [PATCH] Change to Font Awesome icon font (fixes #2138) - remove Glyphicon assets and customize bootstrap CSS - add Font Awesome v4.4.0 assets - replace Glyphicons with Font Awesome icons in HTML - add icons to modal headers - add attribution for Font Awesome - format HTML source code for buttons --- gui/assets/css/overrides.css | 2 +- gui/index.html | 185 ++-- gui/modal.html | 6 +- gui/syncthing/core/aboutModalView.html | 3 +- gui/syncthing/core/httpErrorDialogView.html | 2 +- gui/syncthing/core/languageSelectDirective.js | 2 +- gui/syncthing/core/majorUpgradeModalView.html | 11 +- .../core/networkErrorDialogView.html | 2 +- gui/syncthing/core/restartingDialogView.html | 2 +- gui/syncthing/core/shutdownDialogView.html | 2 +- gui/syncthing/core/syncthingController.js | 6 +- gui/syncthing/core/upgradingDialogView.html | 2 +- gui/syncthing/device/editDeviceModalView.html | 18 +- gui/syncthing/device/idqrModalView.html | 2 +- gui/syncthing/folder/editFolderModalView.html | 26 +- .../folder/editIgnoresModalView.html | 52 +- .../settings/advancedSettingsModalView.html | 10 +- gui/syncthing/settings/settingsModalView.html | 16 +- .../transfer/failedFilesModalView.html | 2 +- .../transfer/neededFilesModalView.html | 8 +- .../usagereport/usageReportModalView.html | 16 +- .../usageReportPreviewModalView.html | 22 +- gui/vendor/bootstrap/config.json | 6 +- gui/vendor/bootstrap/css/bootstrap-theme.css | 4 +- .../bootstrap/css/bootstrap-theme.min.css | 4 +- gui/vendor/bootstrap/css/bootstrap.css | 807 +----------------- gui/vendor/bootstrap/css/bootstrap.min.css | 6 +- .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | Bin 108738 -> 0 bytes .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes gui/vendor/bootstrap/js/bootstrap.js | 4 +- gui/vendor/bootstrap/js/bootstrap.min.js | 4 +- .../font-awesome/css/font-awesome.min.css | 4 + gui/vendor/font-awesome/fonts/FontAwesome.otf | Bin 0 -> 106260 bytes .../fonts/fontawesome-webfont.eot | Bin 0 -> 68875 bytes .../fonts/fontawesome-webfont.svg | Bin 0 -> 355981 bytes .../fonts/fontawesome-webfont.ttf | Bin 0 -> 138204 bytes .../fonts/fontawesome-webfont.woff | Bin 0 -> 81284 bytes .../fonts/fontawesome-webfont.woff2 | Bin 0 -> 64464 bytes 41 files changed, 244 insertions(+), 992 deletions(-) delete mode 100644 gui/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot delete mode 100644 gui/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg delete mode 100644 gui/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf delete mode 100644 gui/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff delete mode 100644 gui/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2 create mode 100644 gui/vendor/font-awesome/css/font-awesome.min.css create mode 100644 gui/vendor/font-awesome/fonts/FontAwesome.otf create mode 100644 gui/vendor/font-awesome/fonts/fontawesome-webfont.eot create mode 100644 gui/vendor/font-awesome/fonts/fontawesome-webfont.svg create mode 100644 gui/vendor/font-awesome/fonts/fontawesome-webfont.ttf create mode 100644 gui/vendor/font-awesome/fonts/fontawesome-webfont.woff create mode 100644 gui/vendor/font-awesome/fonts/fontawesome-webfont.woff2 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(", ")}}
-  Edit + + +
- +
@@ -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 @@

- + {{title}}

- +
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"}} '+ '
      '+ '
    • '+ '{{name}}'+ diff --git a/gui/syncthing/core/majorUpgradeModalView.html b/gui/syncthing/core/majorUpgradeModalView.html index 1fb063362..206b24ffc 100644 --- a/gui/syncthing/core/majorUpgradeModalView.html +++ b/gui/syncthing/core/majorUpgradeModalView.html @@ -3,8 +3,7 @@

      - - Major Upgrade + Major Upgrade

      @@ -18,8 +17,12 @@

      - - + +
      diff --git a/gui/syncthing/core/networkErrorDialogView.html b/gui/syncthing/core/networkErrorDialogView.html index 95441b549..7f243590e 100644 --- a/gui/syncthing/core/networkErrorDialogView.html +++ b/gui/syncthing/core/networkErrorDialogView.html @@ -1,4 +1,4 @@ - +

      Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…

      diff --git a/gui/syncthing/core/restartingDialogView.html b/gui/syncthing/core/restartingDialogView.html index 3fcccebc5..48fe3891b 100644 --- a/gui/syncthing/core/restartingDialogView.html +++ b/gui/syncthing/core/restartingDialogView.html @@ -1,3 +1,3 @@ - +

      Syncthing is restarting. Please wait...

       diff --git a/gui/syncthing/core/shutdownDialogView.html b/gui/syncthing/core/shutdownDialogView.html index 51c4b3772..a57ea800c 100644 --- a/gui/syncthing/core/shutdownDialogView.html +++ b/gui/syncthing/core/shutdownDialogView.html @@ -1,3 +1,3 @@ - +

      Syncthing has been shut down.

       diff --git a/gui/syncthing/core/syncthingController.js b/gui/syncthing/core/syncthingController.js index a104e881a..dd590fd33 100755 --- a/gui/syncthing/core/syncthingController.js +++ b/gui/syncthing/core/syncthingController.js @@ -69,9 +69,9 @@ angular.module('syncthing.core') 'touch': 'Update' }; $scope.needIcons = { - 'rm': 'remove', - 'rmdir': 'remove', - 'sync': 'download', + 'rm': 'trash-o', + 'rmdir': 'trash-o', + 'sync': 'arrow-circle-o-down', 'touch': 'asterisk' }; diff --git a/gui/syncthing/core/upgradingDialogView.html b/gui/syncthing/core/upgradingDialogView.html index 86280046b..270e66c56 100644 --- a/gui/syncthing/core/upgradingDialogView.html +++ b/gui/syncthing/core/upgradingDialogView.html @@ -1,3 +1,3 @@ - +

      Syncthing is upgrading. Please wait...

       diff --git a/gui/syncthing/device/editDeviceModalView.html b/gui/syncthing/device/editDeviceModalView.html index bb1ea986a..85cab08c1 100644 --- a/gui/syncthing/device/editDeviceModalView.html +++ b/gui/syncthing/device/editDeviceModalView.html @@ -2,8 +2,10 @@
      -

      Add Device

      -

      Edit Device

      +

      + Add Device + Edit Device +

      @@ -70,9 +72,15 @@
      - - - + + +
      diff --git a/gui/syncthing/device/idqrModalView.html b/gui/syncthing/device/idqrModalView.html index 6b5578a1a..5117591d4 100644 --- a/gui/syncthing/device/idqrModalView.html +++ b/gui/syncthing/device/idqrModalView.html @@ -1,4 +1,4 @@ - +
      {{myID}}
       diff --git a/gui/syncthing/folder/editFolderModalView.html b/gui/syncthing/folder/editFolderModalView.html index 130cac380..4197e23a8 100644 --- a/gui/syncthing/folder/editFolderModalView.html +++ b/gui/syncthing/folder/editFolderModalView.html @@ -2,8 +2,10 @@
      -

      Add Folder

      -

      Edit Folder

      +

      + Add Folder + Edit Folder +

      @@ -54,7 +56,7 @@ -   Help +   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.

      @@ -82,7 +84,7 @@
      -   Help +   Help +
      +
      +
      +

      Ignore Patterns

      +
      +
      +

      Enter ignore patterns, one per line.

      + -
      +
      -

      Quick guide to supported patterns (full documentation):

      -
      -
      !
      Inversion of the given condition (i.e. do not exclude)
      -
      *
      Single level wildcard (matches within a directory only)
      -
      **
      Multi level wildcard (matches multiple directory levels)
      -
      //
      Comment, when used at the start of a line
      -
      -
      -
      -
      Editing {{currentFolder.path}}{{system.pathSeparator}}.stignore
      - - -
      -
      -
      +

      Quick guide to supported patterns (full documentation):

      +
      +
      !
      Inversion of the given condition (i.e. do not exclude)
      +
      *
      Single level wildcard (matches within a directory only)
      +
      **
      Multi level wildcard (matches multiple directory levels)
      +
      //
      Comment, when used at the start of a line
      +
      +
      +
      +
      Editing {{currentFolder.path}}{{system.pathSeparator}}.stignore
      + + +
      + + diff --git a/gui/syncthing/settings/advancedSettingsModalView.html b/gui/syncthing/settings/advancedSettingsModalView.html index 0017cf20b..7ec89d299 100644 --- a/gui/syncthing/settings/advancedSettingsModalView.html +++ b/gui/syncthing/settings/advancedSettingsModalView.html @@ -2,7 +2,7 @@
      -

      Advanced Configuration

      +

      Advanced Configuration

      @@ -71,8 +71,12 @@
      - - + +
      diff --git a/gui/syncthing/settings/settingsModalView.html b/gui/syncthing/settings/settingsModalView.html index 6fff99423..428bf87aa 100644 --- a/gui/syncthing/settings/settingsModalView.html +++ b/gui/syncthing/settings/settingsModalView.html @@ -2,7 +2,7 @@
      -

      Settings

      +

      Settings

      @@ -101,9 +101,11 @@
      - +
      {{tmpGUI.apiKey || "-"}}
      - +
      @@ -111,8 +113,12 @@
      - - + +
      diff --git a/gui/syncthing/transfer/failedFilesModalView.html b/gui/syncthing/transfer/failedFilesModalView.html index 4c3841dbf..e5150b791 100644 --- a/gui/syncthing/transfer/failedFilesModalView.html +++ b/gui/syncthing/transfer/failedFilesModalView.html @@ -1,4 +1,4 @@ - +

      The following items could not be synchronized. They are retried automatically and will be synced when the error is resolved. diff --git a/gui/syncthing/transfer/neededFilesModalView.html b/gui/syncthing/transfer/neededFilesModalView.html index b4076d140..eac38802c 100644 --- a/gui/syncthing/transfer/neededFilesModalView.html +++ b/gui/syncthing/transfer/neededFilesModalView.html @@ -1,4 +1,4 @@ -

    - +     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 @@