Tweaks to tags

MarlinFirmware · May 25, 2018 · fbd7468 · fbd7468
1 parent 0a92e62
commit fbd7468
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 46 deletions.
diff --git a/_config.yml b/_config.yml
@@ -61,11 +61,6 @@ collections:
     title: Features
     permalink: /docs/:collection/:path:output_ext
 
-  hardware:
-    output: true
-    title: Hardware
-    permalink: /docs/:collection/:path:output_ext
-
   gcode:
     output: true
     title: G-code
@@ -153,10 +148,3 @@ defaults:
       type: 'meta'
     values:
       category: [ 'meta' ]
-
-  - # Tools collection settings
-    scope:
-      type: 'gcode'
-    values:
-      layout: 'gcode'
-      category: [ 'gcode' ]
diff --git a/_features/auto_bed_leveling.md b/_features/auto_bed_leveling.md
@@ -1,6 +1,7 @@
 ---
 title:        'Automatic Bed Leveling'
 description:  'Automated procedures to probe the bed and compensate for an irregular or tilted bed'
+tag: leveling
 
 author: thinkyhead
 category: [ features, leveling ]

diff --git a/_features/lcd_menu.md b/_features/lcd_menu.md
@@ -1,7 +1,7 @@
 ---
-tag: lcd-menu
 title:       LCD Menu Tree
 description: A synopsis of the LCD menu tree
+tag: lcd-menu
 
 author: thinkyhead
 category: [ features, lcd ]

diff --git a/_features/unified_bed_leveling.md b/_features/unified_bed_leveling.md
@@ -1,7 +1,7 @@
 ---
 title:        'Unified Bed Leveling'
 description:  'The Unified Auto Bed Leveling system (UBL) provides automated procedures to probe the bed and compensate for an irregular or tilted bed'
-tag:
+tag: leveling
 
 author: Bob-the-Kuhn, thinkyhead, Roxy-3D, bjarchi
 category: [ features, leveling ]

diff --git a/_includes/license.html b/_includes/license.html
@@ -1,6 +1,6 @@
 <!--
   Marlin Firmware Documentation
-  Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+  Copyright (C) 2018 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -47,16 +47,31 @@
               {% assign list = (list | sort: 'title') %}
               {% for col in list %}
                 {% if col.title %}
-                    <li class="dropdown-submenu {{ col.label }}">
-                      <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ col.title }}</a>
-                      <ul class="dropdown-menu">
-                        <li><a href="{{ '/meta/' | append: col.label | append: '/' }}">
-                          All documents
-                        </a></li>
-                        {% if col.label == 'gcode' %}
+                  <li class="dropdown-submenu {{ col.label }}">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ col.title }}</a>
+                    <ul class="dropdown-menu">
+                      <li><a href="{{ '/meta/' | append: col.label | append: '/' }}">
+                        All documents
+                      </a></li>
+                      {% if col.label == 'gcode' %}
+                        <li class="divider"></li>
+                        {% assign docs = (col.docs | sort: 'tag') %}
+                        {% for doc in docs %}
+                          {% if doc.title %}
+                            <li><a href="{{ doc.url }}">
+                              {% if col.label == 'gcode' %}
+                                {{ doc.codes[0] }}{% if doc.codes[1] %}-{{ doc.codes[1] }}{% endif %}: {{ doc.title }}
+                              {% else %}
+                                {{ doc.title }}
+                              {% endif %}
+                            </a></li>
+                          {% endif %}
+                        {% endfor %}
+                      {% else %}
+                        {% assign docs = (col.docs | group_by: 'tag' | sort: 'title') %}
+                        {% for tag in docs %}
                           <li class="divider"></li>
-                          {% assign docs = (col.docs | sort: 'tag') %}
-                          {% for doc in docs %}
+                          {% for doc in tag.items %}
                             {% if doc.title %}
                               <li><a href="{{ doc.url }}">
                                 {% if col.label == 'gcode' %}
@@ -67,28 +82,13 @@
                               </a></li>
                             {% endif %}
                           {% endfor %}
-                        {% else %}
-                          {% assign docs = (col.docs | group_by: 'tag' | sort: 'title') %}
-                          {% for tag in docs %}
-                            <li class="divider"></li>
-                            {% for doc in tag.items %}
-                              {% if doc.title %}
-                                <li><a href="{{ doc.url }}">
-                                  {% if col.label == 'gcode' %}
-                                    {{ doc.codes[0] }}{% if doc.codes[1] %}-{{ doc.codes[1] }}{% endif %}: {{ doc.title }}
-                                  {% else %}
-                                    {{ doc.title }}
-                                  {% endif %}
-                                </a></li>
-                              {% endif %}
-                            {% endfor %}
-                          {% endfor %}
-                        {% endif %}
-                      </ul>
-                    </li>
-                  {% endif %}
-                {% endfor %}
-              {% endif %}
+                        {% endfor %}
+                      {% endif %}
+                    </ul>
+                  </li>
+                {% endif %}
+              {% endfor %}
+            {% endif %}
 
             <li class="divider"></li>