From 49b90fcf778e2979fcb69424326e6d749bd215fc Mon Sep 17 00:00:00 2001
From: mDuo13 <mduo13@gmail.com>
Date: Fri, 13 Apr 2018 15:50:43 -0700
Subject: [PATCH] Separate expander/collapser for categories

---
 5layers.yml                    | 14 ++++++++++++++
 assets/css/devportal.css       | 27 ++++++++++++++++++---------
 tool/template-sidebar_nav.html |  7 ++++---
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/5layers.yml b/5layers.yml
index 7581127633..fbd9b8f688 100644
--- a/5layers.yml
+++ b/5layers.yml
@@ -117,6 +117,20 @@ pages:
         targets:
             - local
 
+    -   md: concept-amendments.md
+        funnel: Docs
+        doc_type: Concepts
+        category: Consensus Network
+        targets:
+            - local
+
+    -   md: concept-fee-voting.md
+        funnel: Docs
+        doc_type: Concepts
+        category: Consensus Network
+        targets:
+            - local
+
     -   name: References
         funnel: Docs
         doc_type: References
diff --git a/assets/css/devportal.css b/assets/css/devportal.css
index d885833224..55e17348fa 100644
--- a/assets/css/devportal.css
+++ b/assets/css/devportal.css
@@ -538,22 +538,31 @@ th {
   text-transform: none;
 }
 
-#sidenav_accordion .panel-heading h5 a {
+#sidenav_accordion .panel-heading h5 .sidenav_cat_title {
   display: block;
   padding: 16px 15px;
   font-family: "open_sansregular", sans-serif;
   color: #666;
 }
 
-#sidenav_accordion .panel-heading a:before {
-    content: "\f106"; /* fontawesome angle-up */
-    font-family: FontAwesome;
-    margin-left: -20px;
-    padding-right: 5px;
-    float: right;
+#sidenav_accordion .panel-heading .sidenav_cat_toggler {
+    position: absolute;
+    right: 0;
+    padding: 15px 16px 17px 16px;
+    background-color: #ccc;
+    line-height: 0;
 }
-#sidenav_accordion .panel-heading a.collapsed:before {
-    content: "\f107"; /* fontawesome angle-down */
+
+#sidenav_accordion .panel-heading .sidenav_cat_toggler:before {
+    font-family: "FontAwesome";
+    content: "\f107";
+    display: block;
+    transition: transform 0.5s;
+    line-height: 17.7px;
+}
+#sidenav_accordion .panel-heading .sidenav_cat_toggler.collapsed:before {
+  /* content: "\f106"; */
+  transform: rotate(90deg);
 }
 
 
diff --git a/tool/template-sidebar_nav.html b/tool/template-sidebar_nav.html
index b615aef408..9257769283 100644
--- a/tool/template-sidebar_nav.html
+++ b/tool/template-sidebar_nav.html
@@ -9,9 +9,8 @@
     <div class="panel panel-default{% if currentpage.category == cat %} active{% endif %}">
       <div class="panel-heading" role="tab" id="sidenav_cat_head_{{loop.index}}">
         <h5 class="panel-title">
-          <a {% if currentpage.category != cat %}class="collapsed"{% endif %} role="button" data-toggle="collapse" data-parent="#sidenav_accordion" href="#sidenav_collapse_{{loop.index}}" aria-expanded="true" aria-controls="sidenav_collapse_{{loop.index}}">
-            {{ cat }}
-          </a>
+        <a class="{% if currentpage.category != cat %}collapsed {% endif %}sidenav_cat_toggler" role="button" data-toggle="collapse" data-parent="#sidenav_accordion" href="#sidenav_collapse_{{loop.index}}" aria-expanded="true" aria-controls="sidenav_collapse_{{loop.index}}">&nbsp;</a>
+          <a class="sidenav_cat_title" href="{{ (pages|selectattr('category', 'equalto', cat)|first).html }}">{{ cat }}</a>
         </h5>
       </div><!-- /.panel-heading -->
 
@@ -20,6 +19,7 @@
           <ul class="sidebar_cat_pagelist">
           {% set printed_subcategories = [] %}
           {% for page in catpages %}
+            {% if loop.index != 1 %}{# Skip the first element since it's linked by the category header #}
             {% if page.subcategory is undefined %}
               {% if page == currentpage %}
               <li><a class="active nosubcat-page" href="{{ page.html }}">{{ page.name }}</a></li>
@@ -45,6 +45,7 @@
               {% set _ = printed_subcategories.append(page.subcategory) %}
 
             {% endif %}
+            {% endif %}
           {% endfor %}
 
           </ul>