From 5c0a56459232e67aca3f7e14ec492e7fd320c567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 31 Mar 2017 17:53:49 +0200 Subject: [PATCH] PMGR: Better handling of plugins disabled on the repo Switched button from "Incompatible" to "Disabled", added link to plugin page on repo with the prominent alert box explaining the reason for disabling. --- src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js | 2 +- .../pluginmanager/templates/pluginmanager_settings.jinja2 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js index 8475bbaa..7c3b6ac0 100644 --- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js +++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js @@ -653,7 +653,7 @@ $(function() { }; self.installButtonText = function(data) { - return self.isCompatible(data) ? (self.installed(data) ? gettext("Reinstall") : gettext("Install")) : gettext("Incompatible"); + return self.isCompatible(data) ? (self.installed(data) ? gettext("Reinstall") : gettext("Install")) : (data.disabled ? gettext("Disabled") : gettext("Incompatible")); }; self._displayNotification = function(response, titleSuccess, textSuccess, textRestart, textReload, titleError, textError) { diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 index d29d33a1..3f0b7124 100644 --- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 +++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 @@ -163,6 +163,7 @@
+
{{ _('"Why?"') }}