blacklist -> blocklist

Server redirects will be put in place to make this transparent.

Author: foosel

_data/blacklist.yaml _data/blocklist.yaml_data/blacklist.yaml renamed to _data/blocklist.yaml

@@ -3,7 +3,7 @@
 #  pythonversions: affected Python versions (e.g. [">=3"], all versions if left out)
 #  octoversions: affected OctoPrint versions (e.g. [">=1.2.9,<1.3.0",">=1.3.2"], all versions if left out)
 #  versions: list of affected versions (e.g. ["0.1.0"]), optional (all versions if left out), deprecated starting with release of OctoPrint 1.7.0
-#  reason: Human readble reason for blacklisting, may contain Markdown
+#  reason: Human readble reason for blocklisting, may contain Markdown
 - plugin: tplinksmartplug
   versions:
     - 0.7.0

_data/notices.yaml

@@ -111,7 +111,7 @@
               >Lists <b class="caret"></b
             ></a>
             <ul class="dropdown-menu">
-              <li><a href="{{ '/blacklist/' | prepend: site.baseurl }}">Blacklist</a></li>
+              <li><a href="{{ '/blocklist/' | prepend: site.baseurl }}">Blocklist</a></li>
               <li><a href="{{ '/notices/' | prepend: site.baseurl }}">Notices</a></li>
               <li><a href="{{ '/overlays/' | prepend: site.baseurl }}">Overlays</a></li>
               <li>

_includes/navigation.html

@@ -2,12 +2,12 @@
 
 // fix for less v2 vs bootstrap v2, see http://stackoverflow.com/a/28182792/2028598
 #grid {
-    .core  {
-        .span(@gridColumns) {
-            width: (@gridColumnWidth * @gridColumns) + (@gridGutterWidth * (@gridColumns - 1));
-        }
+  .core {
+    .span(@gridColumns) {
+      width: (@gridColumnWidth * @gridColumns) + (@gridGutterWidth * (@gridColumns - 1));
     }
-};
+  }
+}
 
 @import "webfonts.less";
 
@@ -35,12 +35,17 @@
 @footerpaddingtop_phone: 20px;
 @footerpaddingbottom: 15px;
 
-body, html {
+body,
+html {
   height: 100%;
 }
 
-.text-align-right  { text-align: right; }
-.text-align-center { text-align: center; }
+.text-align-right {
+  text-align: right;
+}
+.text-align-center {
+  text-align: center;
+}
 
 .navbar {
   .brand {
@@ -61,7 +66,9 @@ body, html {
   }
 }
 
-.navbar .nav > li > a { padding: 12px 10px 9px; }
+.navbar .nav > li > a {
+  padding: 12px 10px 9px;
+}
 
 .octo-heart {
   color: red;
@@ -71,13 +78,19 @@ h1 {
   font-family: @serifFontFamily;
 }
 
-h1, h2 {
+h1,
+h2 {
   margin: 20px 0 30px;
   padding-bottom: 9px;
   border-bottom: 1px solid @grayLighter;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   a {
     color: @textColor;
   }
@@ -99,7 +112,10 @@ h1, h2, h3, h4, h5, h6 {
 
   #gradient > .radial( @octoLight, @octoDark);
 
-  &, h1 { color: @white; }
+  &,
+  h1 {
+    color: @white;
+  }
 
   h1 {
     font-size: 60px;
@@ -124,12 +140,15 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 #main {
-  padding-bottom: @footerinnerheight_desktop + @footerpaddingtop_desktop + @footerpaddingbottom;
+  padding-bottom: @footerinnerheight_desktop + @footerpaddingtop_desktop +
+    @footerpaddingbottom;
   @media (max-width: 979px) and (min-width: 768px) {
-    padding-bottom: @footerinnerheight_tablet + @footerpaddingtop_tablet + @footerpaddingbottom;
+    padding-bottom: @footerinnerheight_tablet + @footerpaddingtop_tablet +
+      @footerpaddingbottom;
   }
   @media (max-width: 767px) {
-    padding-bottom: @footerinnerheight_phone + @footerpaddingtop_phone + @footerpaddingbottom;
+    padding-bottom: @footerinnerheight_phone + @footerpaddingtop_phone +
+      @footerpaddingbottom;
   }
 
   .content {
@@ -151,13 +170,13 @@ h1, h2, h3, h4, h5, h6 {
     margin-top: -1em;
 
     .prop {
-      padding-right: .5em;
+      padding-right: 0.5em;
     }
   }
 
   .plugin-attributes {
     display: inline-block;
-  
+
     .label {
       vertical-align: middle;
     }
@@ -214,25 +233,29 @@ footer {
   height: @footerinnerheight_desktop;
   padding-top: @footerpaddingtop_desktop;
   padding-bottom: @footerpaddingbottom;
-  margin-top: -(@footerinnerheight_desktop + @footerpaddingtop_desktop + @footerpaddingbottom);
+  margin-top: -(@footerinnerheight_desktop + @footerpaddingtop_desktop +
+        @footerpaddingbottom);
   @media (max-width: 979px) and (min-width: 768px) {
     height: @footerinnerheight_tablet;
     padding-top: @footerpaddingtop_tablet;
     padding-bottom: @footerpaddingbottom;
-    margin-top: -(@footerinnerheight_tablet + @footerpaddingtop_tablet + @footerpaddingbottom);
+    margin-top: -(@footerinnerheight_tablet + @footerpaddingtop_tablet +
+          @footerpaddingbottom);
   }
   @media (max-width: 767px) {
     height: auto;
     padding-top: @footerpaddingtop_phone;
     padding-bottom: @footerpaddingbottom;
-    margin-top: -(@footerinnerheight_phone + @footerpaddingtop_phone + @footerpaddingbottom);
+    margin-top: -(@footerinnerheight_phone + @footerpaddingtop_phone +
+          @footerpaddingbottom);
   }
 
-  #gradient > .vertical(lighten(@octoLight, 3%), @octoDark);
+  #gradient > .vertical(lighten(@octoLight, 3%), @octoDark);;
   background-color: @octoDark;
   border-top: 1px solid mix(@octoLight, @octoDark, 50%);
 
-  h1, h2 {
+  h1,
+  h2 {
     border: none;
     padding: 0;
     margin: 0 0 10px;
@@ -241,15 +264,14 @@ footer {
 
   a {
     color: @white;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
     &:hover {
       color: @white;
     }
-
   }
 
   color: mix(@octoLight, @white, 35%);
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   *zoom: 1; // ie7 hack
 
   ul {
@@ -262,30 +284,32 @@ footer {
   }
 }
 
-.navbar-search .search-query { line-height: inherit; }
+.navbar-search .search-query {
+  line-height: inherit;
+}
 
-.blacklist-table,
+.blocklist-table,
 .notice-table,
 .overlay-table,
 .abandoned-table {
-  .blacklist-plugin,
+  .blocklist-plugin,
   .notice-plugin,
   .overlay-plugin,
   .abandoned-plugin {
     width: 50%;
   }
-  .blacklist-versions,
-  .blacklist-octoversions,
+  .blocklist-versions,
+  .blocklist-octoversions,
   .notice-versions,
   .notice-octoversions {
     width: 25%;
     text-align: center;
   }
 
-  .blacklist-reason,
+  .blocklist-reason,
   .notice-text {
     p:first-child::before {
-      content: 'Reason: ';
+      content: "Reason: ";
       font-weight: bold;
     }
   }
@@ -320,7 +344,7 @@ footer {
     float: left;
     max-width: @adcolumn;
     text-align: left;
-    font-size: .8em;
+    font-size: 0.8em;
     color: #333;
   }
 
@@ -329,7 +353,7 @@ footer {
     position: absolute;
     right: 0;
     bottom: 0;
-    font-size: .5em;
+    font-size: 0.5em;
     text-transform: uppercase;
     line-height: 1;
     letter-spacing: 1px;

assets/css/site.css

@@ -2,5 +2,5 @@
 layout: null
 ---
 [
-{% for item in site.data.blacklist %}{% unless forloop.first %},{% endunless %}{{ item | jsonify }}{% endfor %}
+{% for item in site.data.blocklist %}{% unless forloop.first %},{% endunless %}{{ item | jsonify }}{% endfor %}
 ]

assets/less/site.less

@@ -0,0 +1,54 @@
+---
+layout: page
+title: Plugin blocklist
+---
+
+<p>
+  Starting with version 1.3.6 OctoPrint now supports the use of a centralized plugin
+  blocklist, to prevent loading of specific plugin versions that are known to cause
+  serious issues with specific OctoPrint versions that interfere severly with normal
+  operation.
+</p>
+<p>
+  If configured as such, OctoPrint will not load any plugins that are listed on this
+  blocklist and match the provided versions. Deinstallation or manual upgrade of such
+  plugins will however still be possible.
+</p>
+<p>
+  The blocklist is hosted here on <code>plugins.octoprint.org</code> as a
+  <a href="/blocklist.json">JSON file</a>
+  and currently contains the following entries:
+</p>
+<table class="table blocklist-table">
+  <thead>
+    <tr>
+      <th class="blocklist-plugin">Plugin</th>
+      <th class="blocklist-versions">Affected Plugin Versions</th>
+      <th class="blocklist-octoversions">Affected OctoPrint Versions</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for item in site.data.blocklist %}
+    <tr>
+      <td class="blocklist-plugin">
+        {% assign id = item.plugin | prepend: "/plugins/" %} {% assign p = site.plugins |
+        where: "id", id | first %} {% if p %}
+        <a href="{{ p.url }}">{{ p.title }}</a>
+        {% else %}
+        <code>{{ item.plugin | xml_escape }}</code>
+        {% endif %} {% if item.reason %}
+        <div class="blocklist-reason">{{ item.reason | markdownify }}</div>
+        {% endif %}
+      </td>
+      <td class="blocklist-versions">
+        {% if item.pluginversions %}{{ item.pluginversions | join: ", " | xml_escape }}{%
+        else %}all{% endif %}
+      </td>
+      <td class="blocklist-octoversions">
+        {% if item.octoversions %}{{ item.octoversions | join: ", " | xml_escape }}{% else
+        %}all{% endif %}
+      </td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>