From d274a9c73d995f553b8928f9607a5c8caef5a5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 29 May 2017 12:37:50 +0200 Subject: [PATCH] Fixed a couple of FontAwesome issues * fa-circle-blank does not exist, replaced with fa-circle-o (see also report in #1928) * fa-trash-o instead of fa-trash (same look and feel) * fa-check instead of fa-check-circle (same look and feel) * fixed toggleContent binding to also be able to toggle fa icons * fix deletion spinner in file list (was still using old icon- classes which of course weren't there anymore and hence not toggleable) * icons-ul => fa-ul * remove superfluous fa class from some places Follow-up to #1915. --- .../announcements/static/js/announcements.js | 2 +- .../snippets/settings/cura/profiles.jinja2 | 2 +- .../pluginmanager/static/js/pluginmanager.js | 2 +- .../templates/pluginmanager_settings.jinja2 | 16 ++++++------- .../static/js/softwareupdate.js | 6 ++--- .../templates/softwareupdate_settings.jinja2 | 2 +- .../static/js/app/bindings/togglecontent.js | 1 + .../static/js/app/viewmodels/files.js | 6 ++--- .../dialogs/settings/accesscontrol.jinja2 | 4 ++-- .../dialogs/settings/appearance.jinja2 | 2 +- .../templates/dialogs/settings/logs.jinja2 | 2 +- .../dialogs/settings/serialconnection.jinja2 | 2 +- .../dialogs/settings/temperatures.jinja2 | 2 +- .../dialogs/settings/terminalfilters.jinja2 | 2 +- .../templates/dialogs/settings/webcam.jinja2 | 2 +- .../dialogs/usersettings/access.jinja2 | 2 +- src/octoprint/templates/sidebar/files.jinja2 | 6 ++--- .../templates/sidebar/files_header.jinja2 | 24 +++++++++---------- .../settings/printerprofiles/profiles.jinja2 | 2 +- src/octoprint/templates/tabs/terminal.jinja2 | 2 +- src/octoprint/templates/tabs/timelapse.jinja2 | 10 ++++---- 21 files changed, 50 insertions(+), 49 deletions(-) diff --git a/src/octoprint/plugins/announcements/static/js/announcements.js b/src/octoprint/plugins/announcements/static/js/announcements.js index 497828e8..a5af767d 100644 --- a/src/octoprint/plugins/announcements/static/js/announcements.js +++ b/src/octoprint/plugins/announcements/static/js/announcements.js @@ -40,7 +40,7 @@ $(function() { }; self.toggleButtonCss = function(data) { - var icon = data.enabled ? "fa fa-circle" : "fa fa-circle-blank"; + var icon = data.enabled ? "fa fa-circle" : "fa fa-circle-o"; var disabled = (self.enableToggle(data)) ? "" : " disabled"; return icon + disabled; diff --git a/src/octoprint/plugins/cura/templates/snippets/settings/cura/profiles.jinja2 b/src/octoprint/plugins/cura/templates/snippets/settings/cura/profiles.jinja2 index f15ea42d..f5d85ea3 100644 --- a/src/octoprint/plugins/cura/templates/snippets/settings/cura/profiles.jinja2 +++ b/src/octoprint/plugins/cura/templates/snippets/settings/cura/profiles.jinja2 @@ -15,7 +15,7 @@ -  |  +  |  diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js index 3aef0338..d234e2ad 100644 --- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js +++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js @@ -805,7 +805,7 @@ $(function() { }; self.toggleButtonCss = function(data) { - var icon = self._getToggleCommand(data) == "enable" ? "fa fa-circle-blank" : "fa fa-circle"; + var icon = self._getToggleCommand(data) == "enable" ? "fa fa-circle-o" : "fa fa-circle"; var disabled = (self.enableToggle(data)) ? "" : " disabled"; return icon + disabled; diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 index 754ce2d2..61323dde 100644 --- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 +++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 @@ -51,7 +51,7 @@ -  |  +  |  @@ -73,7 +73,7 @@
- + Using pip of "", Version @@ -90,7 +90,7 @@
- + @@ -131,11 +131,11 @@ @@ -209,7 +209,7 @@
- +
diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index 30c5585a..6d857aac 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -315,11 +315,11 @@ $(function() { if (data.status == "updateAvailable" || data.status == "updatePossible") { var text = "
" + gettext("There are updates available for the following components:"); - text += "
    "; + text += "
      "; _.each(self.versions.items(), function(update_info) { if (update_info.updateAvailable) { text += "
    • " - + "" + + "" + "" + update_info.fullNameRemote + "" + (update_info.releaseNotes ? "" + gettext("Release Notes") + "" : "") + "
    • "; @@ -327,7 +327,7 @@ $(function() { }); text += "
    "; - text += "

    " + gettext("Those components marked with can be updated directly.") + "

    "; + text += "

    " + gettext("Those components marked with can be updated directly.") + "

    "; if (!self.loginState.isAdmin()) { text += "

    " + gettext("To have updates applied, get in touch with an administrator of this OctoPrint instance.") + "

    "; diff --git a/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 b/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 index 87b43308..d6ab7289 100644 --- a/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 +++ b/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 @@ -60,7 +60,7 @@
    - +
    {{ _('Last cache refresh:') }} diff --git a/src/octoprint/static/js/app/bindings/togglecontent.js b/src/octoprint/static/js/app/bindings/togglecontent.js index db5ce578..939a68be 100644 --- a/src/octoprint/static/js/app/bindings/togglecontent.js +++ b/src/octoprint/static/js/app/bindings/togglecontent.js @@ -14,6 +14,7 @@ ko.bindingHandlers.toggleContent = { e.preventDefault(); if(options.class) { $elm.children('[class^="icon-"]').toggleClass(options.class); + $elm.children('[class^="fa"]').toggleClass(options.class); } if(options.container) { if(options.parent) { diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js index 6b94f997..8f363497 100644 --- a/src/octoprint/static/js/app/viewmodels/files.js +++ b/src/octoprint/static/js/app/viewmodels/files.js @@ -466,13 +466,13 @@ $(function() { if (event) { var element = $(event.currentTarget); if (element.length) { - var icon = $("i.icon-trash", element); + var icon = $("i.fa-trash-o", element); if (icon.length) { activateSpinner = function() { - icon.removeClass("icon-trash").addClass("icon-spinner icon-spin"); + icon.removeClass("fa-trash-o").addClass("fa-spinner fa-spin"); }; finishSpinner = function() { - icon.removeClass("icon-spinner icon-spin").addClass("icon-trash"); + icon.removeClass("fa-spinner fa-spin").addClass("fa-trash-o"); }; } } diff --git a/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2 b/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2 index c40df579..735f0f2f 100644 --- a/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2 +++ b/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2 @@ -13,7 +13,7 @@ -  |  |  +  |  |  @@ -139,7 +139,7 @@
    - +
    diff --git a/src/octoprint/templates/dialogs/settings/appearance.jinja2 b/src/octoprint/templates/dialogs/settings/appearance.jinja2 index eb0876b8..e15db660 100644 --- a/src/octoprint/templates/dialogs/settings/appearance.jinja2 +++ b/src/octoprint/templates/dialogs/settings/appearance.jinja2 @@ -72,7 +72,7 @@ {{ _('Last update:') }}
    - +
diff --git a/src/octoprint/templates/dialogs/settings/logs.jinja2 b/src/octoprint/templates/dialogs/settings/logs.jinja2 index c4e5202f..22fbec75 100644 --- a/src/octoprint/templates/dialogs/settings/logs.jinja2 +++ b/src/octoprint/templates/dialogs/settings/logs.jinja2 @@ -21,7 +21,7 @@ -  |  +  |  diff --git a/src/octoprint/templates/dialogs/settings/serialconnection.jinja2 b/src/octoprint/templates/dialogs/settings/serialconnection.jinja2 index cd1906aa..0beeae73 100644 --- a/src/octoprint/templates/dialogs/settings/serialconnection.jinja2 +++ b/src/octoprint/templates/dialogs/settings/serialconnection.jinja2 @@ -108,7 +108,7 @@
- +
diff --git a/src/octoprint/templates/dialogs/settings/temperatures.jinja2 b/src/octoprint/templates/dialogs/settings/temperatures.jinja2 index 24c217e1..5f4411a6 100644 --- a/src/octoprint/templates/dialogs/settings/temperatures.jinja2 +++ b/src/octoprint/templates/dialogs/settings/temperatures.jinja2 @@ -29,7 +29,7 @@ °C
- +
diff --git a/src/octoprint/templates/dialogs/settings/terminalfilters.jinja2 b/src/octoprint/templates/dialogs/settings/terminalfilters.jinja2 index 7fc9d6cc..87fc103b 100644 --- a/src/octoprint/templates/dialogs/settings/terminalfilters.jinja2 +++ b/src/octoprint/templates/dialogs/settings/terminalfilters.jinja2 @@ -12,7 +12,7 @@
- +
diff --git a/src/octoprint/templates/dialogs/settings/webcam.jinja2 b/src/octoprint/templates/dialogs/settings/webcam.jinja2 index 3ace8d22..a1db65ab 100644 --- a/src/octoprint/templates/dialogs/settings/webcam.jinja2 +++ b/src/octoprint/templates/dialogs/settings/webcam.jinja2 @@ -13,7 +13,7 @@ {% include "snippets/settings/webcam/ffmpegPath.jinja2" %} {% include "snippets/settings/webcam/watermark.jinja2" %}
- +
{% include "snippets/settings/webcam/ffmpegBitrate.jinja2" %} {% include "snippets/settings/webcam/ffmpegThreads.jinja2" %} diff --git a/src/octoprint/templates/dialogs/usersettings/access.jinja2 b/src/octoprint/templates/dialogs/usersettings/access.jinja2 index 86cdf776..2fa52053 100644 --- a/src/octoprint/templates/dialogs/usersettings/access.jinja2 +++ b/src/octoprint/templates/dialogs/usersettings/access.jinja2 @@ -26,7 +26,7 @@
- +
{{ _('Please note that changes to the API key are applied immediately, without having to "Confirm" first.') }}
diff --git a/src/octoprint/templates/sidebar/files.jinja2 b/src/octoprint/templates/sidebar/files.jinja2 index e7b9eec4..80a8e46b 100644 --- a/src/octoprint/templates/sidebar/files.jinja2 +++ b/src/octoprint/templates/sidebar/files.jinja2 @@ -19,7 +19,7 @@
-
+
@@ -31,7 +31,7 @@
{{ _('Size') }}:
-
+
@@ -40,7 +40,7 @@
{{ _('Size') }}:
-
+
diff --git a/src/octoprint/templates/sidebar/files_header.jinja2 b/src/octoprint/templates/sidebar/files_header.jinja2 index b9f6ef52..10af216a 100644 --- a/src/octoprint/templates/sidebar/files_header.jinja2 +++ b/src/octoprint/templates/sidebar/files_header.jinja2 @@ -3,27 +3,27 @@
diff --git a/src/octoprint/templates/snippets/settings/printerprofiles/profiles.jinja2 b/src/octoprint/templates/snippets/settings/printerprofiles/profiles.jinja2 index ea7225fb..8d943775 100644 --- a/src/octoprint/templates/snippets/settings/printerprofiles/profiles.jinja2 +++ b/src/octoprint/templates/snippets/settings/printerprofiles/profiles.jinja2 @@ -11,7 +11,7 @@ -  |  |  +  |  |  diff --git a/src/octoprint/templates/tabs/terminal.jinja2 b/src/octoprint/templates/tabs/terminal.jinja2 index ef05fcb1..4200d5cf 100644 --- a/src/octoprint/templates/tabs/terminal.jinja2 +++ b/src/octoprint/templates/tabs/terminal.jinja2 @@ -24,7 +24,7 @@
-
{{ _('Advanced options') }}
+
{{ _('Advanced options') }}

diff --git a/src/octoprint/templates/tabs/timelapse.jinja2 b/src/octoprint/templates/tabs/timelapse.jinja2 index 06724625..24cebc01 100644 --- a/src/octoprint/templates/tabs/timelapse.jinja2 +++ b/src/octoprint/templates/tabs/timelapse.jinja2 @@ -67,9 +67,9 @@

@@ -99,7 +99,7 @@ -  |  +  |  @@ -148,7 +148,7 @@ -  |  +  |