From e06440090062db09dda951dfab3f27fc6f82b089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <gina@octoprint.org>
Date: Fri, 1 Dec 2017 17:47:16 +0100
Subject: [PATCH] Link to blacklist in wizard & settings

As suggested by @Kunsi in #2256
---
 .../templates/corewizard_pluginblacklist_wizard.jinja2       | 5 +++++
 .../settings/server/serverPluginBlacklistDescription.jinja2  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2
index f046ac2f..5c6eebbe 100644
--- a/src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2
+++ b/src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2
@@ -6,6 +6,11 @@
     normal operation, allowing you to uninstall or update them to a newer version.
 {% endtrans %}</p>
 
+<p>{% trans url="http://plugins.octoprint.org/blacklist/" %}
+    By default, OctoPrint will use the blacklist hosted at <code>plugins.octoprint.org/blacklist.json</code> which you
+    can also take a look at in a more human readable format <a href="{{ url }}" target="_blank">here</a>.
+{% endtrans %}</p>
+
 <p>{% trans %}
     Please decide whether to allow fetch and use of this centralized blacklist starting with the next server start.
     You may also change your decision at any time through Settings > Server right from within OctoPrint.
diff --git a/src/octoprint/templates/snippets/settings/server/serverPluginBlacklistDescription.jinja2 b/src/octoprint/templates/snippets/settings/server/serverPluginBlacklistDescription.jinja2
index d4b12013..74880eb6 100644
--- a/src/octoprint/templates/snippets/settings/server/serverPluginBlacklistDescription.jinja2
+++ b/src/octoprint/templates/snippets/settings/server/serverPluginBlacklistDescription.jinja2
@@ -3,3 +3,8 @@
     the use of a centralized plugin version blacklist to automatically disable such plugins before they can interfere
     with normal operation.
 {% endtrans %}</p>
+
+<p>{% trans url="http://plugins.octoprint.org/blacklist/" %}
+    By default, OctoPrint will use the blacklist hosted at <code>plugins.octoprint.org/blacklist.json</code> which you
+    can also take a look at in a more human readable format <a href="{{ url }}" target="_blank">here</a>.
+{% endtrans %}</p>