From 654986e154c13d4a58c276552f3fad70f8c76a1d Mon Sep 17 00:00:00 2001
From: mDuo13 <mduo13@gmail.com>
Date: Tue, 17 Apr 2018 16:12:02 -0700
Subject: [PATCH] New footer, children includes, sidebars for non-Doc pages

---
 5layers.yml                      | 45 +++++++++++++++
 assets/css/devportal.css         | 94 ++++++++++++++++++++++----------
 assets/css/ripple.css            |  9 +--
 tool/template-base.html          |  1 -
 tool/template-cat-landing.html   |  6 +-
 tool/template-footer.html        | 22 ++++++++
 tool/template-page-children.html | 60 ++++++++++++++++++++
 tool/template-sidebar_nav.html   | 39 ++++++++++++-
 8 files changed, 237 insertions(+), 39 deletions(-)
 create mode 100644 tool/template-page-children.html

diff --git a/5layers.yml b/5layers.yml
index fe3f7a5e41..d40edff68c 100644
--- a/5layers.yml
+++ b/5layers.yml
@@ -258,6 +258,46 @@ pages:
         targets:
             - local
 
+    -   name: RPC Tool
+        funnel: Dev Tools
+        html: xrp-ledger-rpc-tool.html
+        targets:
+            - local
+        template: template-xrp-ledger-rpc-tool.html
+
+    -   name: WebSocket API Tool
+        funnel: Dev Tools
+        html: ripple-api-tool.html
+        sidebar: custom
+        targets:
+            - local
+        template: template-ripple-api-tool.html
+
+    -   name: Data API v2 Tool
+        funnel: Dev Tools
+        html: data-api-v2-tool.html
+        methods_js: js/apitool-methods-data_v2.js
+        rest_host: https://data.ripple.com
+        doc_page: reference-data-api.html
+        sidebar: custom
+        targets:
+            - local
+        template: template-rest-api-tool.html
+
+    -   name: ripple.txt Validator
+        funnel: Dev Tools
+        html: ripple-txt-validator.html
+        targets:
+            - local
+        template: template-ripple-txt-validator.html
+
+    -   name: XRP Test Net Faucet
+        funnel: Dev Tools
+        html: xrp-test-net-faucet.html
+        targets:
+            - local
+        template: template-test-net.html
+
     -   name: News
         funnel: News
         html: news.html
@@ -265,6 +305,11 @@ pages:
         targets:
             - local
 
+    -   md: reference-amendments.md
+        funnel: News
+        targets:
+            - local
+
 
 ignore_anchors_in:
     - data-api-v2-tool.html
diff --git a/assets/css/devportal.css b/assets/css/devportal.css
index bd0f7542ae..b80f2e6096 100644
--- a/assets/css/devportal.css
+++ b/assets/css/devportal.css
@@ -287,7 +287,8 @@ pre code {
   list-style-type: none;
   margin-bottom: 0;
 }
-.dev_nav_sidebar li:before {
+.dev_nav_sidebar li:before,
+.children-display li:before {
   content: "\f111"; /* fontawesome circle */
   font-family: FontAwesome;
   font-size: 8px;
@@ -296,16 +297,18 @@ pre code {
   top: -2px;
   margin-right: -5px;
 }
-.dev_nav_sidebar .level-3:before {
+.dev_nav_sidebar .level-2:before,
+.children-display .level-2:before {
+  content: "\f1db"; /* fontawesome circle-thin */
+}
+.dev_nav_sidebar .level-3:before,
+.children-display .level-3:before {
   content: "\f0c8"; /* fontawesome square */
   font-size: 6px;
   top: -2px;
   left: -14px;
   color: #888;
 }
-.dev_nav_sidebar .level-2:before {
-  content: "\f1db"; /* fontawesome circle-thin */
-}
 
 .dev_nav_wrapper {
   position: fixed;
@@ -509,77 +512,77 @@ th {
 }
 
 /* Accordion styling for sidebar navigation */
-.sidebar_cat_pagelist {
+.sidebar_pagelist {
   margin-left: 0;
   padding-left: 0;
   list-style-type: none;
 }
 
-#sidenav_accordion a {
+#sidenav a {
   text-decoration: none;
 }
-#sidenav_accordion .panel-body a:hover {
+#sidenav .panel-body a:hover {
   text-decoration: underline;
 }
 
-#sidenav_accordion .panel + .panel {
+#sidenav .panel + .panel {
   margin: 0;
 }
 
-#sidenav_accordion .panel-default {
+#sidenav .panel-default {
   border-width: 0;
   border-color: #eee;
 }
 
-#sidenav_accordion .panel-body {
+#sidenav .panel-body {
   padding: 0;
 }
 
-#sidenav_accordion .collapse {
+#sidenav .collapse {
   padding-bottom: 0;
 }
 
-#sidenav_accordion .panel.active {
+#sidenav .panel.active {
   background-color: #f8f8f8;
 }
-#sidenav_accordion .panel:hover {
+#sidenav .panel:hover {
   background-color: #f6f6f6;
 }
 
-#sidenav_accordion .panel-heading {
+#sidenav .panel-heading {
   padding: 0;
   background-color: transparent;
 }
 
-#sidenav_accordion .panel {
+#sidenav .panel {
   padding: 0;
   border-radius: 0;
   border-top: 1px solid #cccccc;
 }
 
-#sidenav_accordion .panel-heading h5 {
+#sidenav .panel-heading h5 {
   margin-bottom: 0;
   text-transform: none;
 }
 
-#sidenav_accordion .panel-heading h5 .sidenav_cat_title {
+#sidenav .panel-heading h5 .sidenav_cat_title {
   display: block;
   padding: 16px 15px 16px 55px;
   font-family: "open_sansregular", sans-serif;
 }
-#sidenav_accordion .panel-heading h5 a.sidenav_cat_title {
+#sidenav .panel-heading h5 a.sidenav_cat_title {
   color: #27a2db;
 }
-#sidenav_accordion .panel-heading h5 .sidenav_cat_title.active {
+#sidenav .panel-heading h5 .sidenav_cat_title.active {
   color: #333;
   font-weight: bold;
   cursor: default;
 }
-#sidenav_accordion .panel-heading h5 .sidenav_cat_title.active-parent {
+#sidenav .panel-heading h5 .sidenav_cat_title.active-parent {
   color: #333;
 }
 
-#sidenav_accordion .panel-heading .sidenav_cat_toggler {
+#sidenav .panel-heading .sidenav_cat_toggler {
     position: absolute;
     left: 0;
     padding: 15px 16px 17px 16px;
@@ -587,23 +590,23 @@ th {
     line-height: 0;
     transition: background-color 0.5s;
 }
-#sidenav_accordion .panel-heading .sidenav_cat_toggler.collapsed {
+#sidenav .panel-heading .sidenav_cat_toggler.collapsed {
   background-color: #ccc;
 }
 
-#sidenav_accordion .panel-heading .sidenav_cat_toggler:before {
+#sidenav .panel-heading .sidenav_cat_toggler:before {
     content: "-";
     width: 0.8em;
     text-align: center;
     display: block;
     line-height: 17.7px;
 }
-#sidenav_accordion .panel-heading .sidenav_cat_toggler.collapsed:before {
+#sidenav .panel-heading .sidenav_cat_toggler.collapsed:before {
     content: "+";
 }
 
 
-#sidenav_accordion .panel .sidebar_cat_pagelist li a {
+.panel .sidebar_pagelist li a {
   display: block;
   margin-top: 5px;
   padding: 4px 15px 4px 75px;
@@ -612,12 +615,12 @@ th {
   color: #27a2db;
 }
 
-#sidenav_accordion .panel .sidebar_cat_pagelist a.active {
+.panel .sidebar_pagelist a.active {
   color: black;
   font-weight: bold;
 }
 
-#sidenav_accordion .panel .sidebar_cat_pagelist a:hover {
+.panel .sidebar_pagelist a:hover {
   color: #333;
 }
 
@@ -918,7 +921,7 @@ th {
   font-weight: bold;
 }
 
-#sidenav_accordion .panel .sidebar_cat_pagelist li .subpage {
+.panel .sidebar_pagelist li .subpage {
   padding-left: 105px;
 }
 
@@ -929,3 +932,36 @@ th {
   font-weight: bold;
   padding: 15px 16px 15px 10px;
 }
+
+.sidenav_parent a.active {
+  color: #333;
+  cursor: default;
+}
+
+.funnel-sidebar a {
+
+}
+
+.funnel-sidebar a.active {
+  color: #333;
+  cursor: default;
+}
+
+.children-display ul {
+  list-style-type: none;
+}
+
+.foot-nav-col h5 {
+  font-size:
+}
+
+.foot-nav-col .children-display ul {
+  padding-left: 20px;
+}
+.foot-nav-col .children-display li {
+  padding-left: 0;
+  margin-left: 0;
+}
+.foot-nav-col .children-display li:before {
+  content: "";
+}
diff --git a/assets/css/ripple.css b/assets/css/ripple.css
index 44f90705ab..9fcbd34834 100755
--- a/assets/css/ripple.css
+++ b/assets/css/ripple.css
@@ -6778,11 +6778,11 @@ figure.alignnone {
 .content-info section {
   margin-bottom: 70px;
 }
-.content-info section a {
-  color: #999999;
+.content-info a {
+  text-decoration: none;
   transition: .5s;
 }
-.content-info section a:hover {
+.content-info a:hover {
   color: #ffffff;
   transition: .5s;
 }
@@ -6804,7 +6804,7 @@ figure.alignnone {
 }
 .content-info h5 a {
   color: #ffffff;
-  font-size: 12px;
+  font-size: 16px;
   font-family: 'open_sansbold', sans-serif;
   -o-transition: .5s;
   -ms-transition: .5s;
@@ -6812,6 +6812,7 @@ figure.alignnone {
   -webkit-transition: .5s;
   transition: .5s;
   letter-spacing: .04em;
+  text-decoration: none;
 }
 .content-info h5 a:hover,
 .content-info h5 a:focus {
diff --git a/tool/template-base.html b/tool/template-base.html
index 627fd36149..0d9d8da199 100644
--- a/tool/template-base.html
+++ b/tool/template-base.html
@@ -52,7 +52,6 @@
               <a class="nav-link" href="{{ thisfunneltop.html }}">{{ thisfunneltop.name }}</a>
             </li>
             {% set _ = funnels.append(page.funnel) %}
-            <!-- funnels is: {{ funnels }} -->
           {% endif %}
         {% endfor %}
       </ul><!-- /.navbar-nav -->
diff --git a/tool/template-cat-landing.html b/tool/template-cat-landing.html
index 269e9486bb..4d6dfc2062 100644
--- a/tool/template-cat-landing.html
+++ b/tool/template-cat-landing.html
@@ -13,13 +13,15 @@
 
     <div class='content'>
       <h2>Pages in this category:</h2>
-      <ul class="cat_pagelist">
+      {% include 'template-page-children.html' %}
+
+      <!--{# <ul class="cat_pagelist">
         {% for page in pages %}
           {% if page.category == currentpage.category and
               page.name != currentpage.name %}
             <li><a href="{{page.html}}">{{page.name}}</a></li>
           {% endif %}
         {% endfor %}
-      </ul>
+      </ul> #}-->
     </div>
 {% endblock %}
diff --git a/tool/template-footer.html b/tool/template-footer.html
index 17361bd7f1..7e162fee70 100644
--- a/tool/template-footer.html
+++ b/tool/template-footer.html
@@ -1,4 +1,26 @@
 <footer class="content-info" role="contentinfo">
+    <div class="container">
+        <div class="row">
+          {% set funnels = [] %}
+          {% for page in pages %}
+            {% if page.funnel is defined and page.funnel not in funnels %}
+              {% set parent_page = pages|selectattr('funnel', 'equalto', page.funnel)|first %}
+
+              <!--{#<li class="nav-item{% if currentpage == thisfunneltop %} active{% elif currentpage.funnel == thisfunneltop.name %} active-parent{% endif %}">
+                <a class="nav-link" href="{{ thisfunneltop.html }}">{{ thisfunneltop.name }}</a>
+              </li>#}-->
+
+          <div class="col-sm-3 foot-nav-col">
+            <h5><a class="foot-nav-link" href="{{ parent_page.html }}">{{ parent_page.name }}</a></h5>
+            {% set depth=1 %}
+            {% include 'template-page-children.html' %}
+          </div><!--/.foot-nav-col -->
+            {% set _ = funnels.append(page.funnel) %}
+          {% endif %}
+        {% endfor %}
+        </div><!--/.row-->
+    </div>
+
     <div class="container">
         <div class="row">
        		<div class="col-sm-12 absolute_bottom_footer">
diff --git a/tool/template-page-children.html b/tool/template-page-children.html
new file mode 100644
index 0000000000..a10724fd26
--- /dev/null
+++ b/tool/template-page-children.html
@@ -0,0 +1,60 @@
+{% if parent_page is undefined %}
+  {% set parent_page = currentpage %}
+{% endif %}
+
+{% if parent_level is undefined %}
+  {% if parent_page.funnel is undefined %}
+    <!-- TEMPLATE ERROR: need funnel for children-display -->
+  {% elif parent_page == pages|selectattr("funnel", "equalto", parent_page.funnel)|first %}
+    {% set parent_level = "funnel" %}
+  {% elif parent_page == pages|selectattr("doc_type", "equalto", parent_page.doc_type)|first %}
+    {% set parent_level = "doc_type" %}
+  {% elif parent_page == pages|selectattr("category", "equalto", parent_page.category)|first %}
+    {% set parent_level = "category" %}
+  {% elif parent_page == pages|selectattr("subcategory", "equalto", parent_page.subcategory)|first %}
+    {% set parent_level = "subcategory" %}
+  {% else %}
+    <!-- TEMPLATE ERROR: page {{parent_page.name}} is not the parent of anything? -->
+  {% endif %}
+  <!-- parent_level is {{parent_level}} -->
+  {% set childpages = pages|selectattr(parent_level, "equalto", parent_page[parent_level])|list %}
+{% endif %}
+<div class="children-display">
+  <ul>
+    {% set printed_subcategories = [] %}
+    {% for page in childpages %}
+      {% if page == parent_page %}{# skip parent #}
+
+      {% elif parent_level == "funnel" %}
+        {% if page.doc_type is defined and page in childpages|selectattr("category", "undefined") %}
+          <li class="level-1"><a href="{{page.html}}">{{page.name}}</a></li>
+        {% elif not childpages|selectattr("category", "defined")|list %}
+          {# no categories in this funnel #}
+          <li class="level-1"><a href="{{page.html}}">{{page.name}}</a></li>
+        {% endif %}
+
+      {% elif parent_level == "category" %}
+        {% if page.subcategory is defined and (depth is undefined or depth > 1) %}
+          {% if page.subcategory not in printed_subcategories %}
+            {% for subpage in childpages|selectattr("subcategory",  "equalto", page.subcategory) %}
+              {% if loop.index == 1 %}
+                <li class="level-1"><a href="{{subpage.html}}">{{subpage.name}}</a></li>
+              {% else %}
+              <li class="level-2"><a href="{{subpage.html}}">{{subpage.name}}</a></li>
+              {% endif %}
+            {% endfor %}
+            {% set _ = printed_subcategories.append(page.subcategory) %}
+          {% endif %}
+        {% else %}
+          {# non-subcategory page #}
+          <li class="level-1"><a href="{{page.html}}">{{page.name}}</a></li>
+        {% endif %}
+
+      {% else %}
+        <!-- TEMPLATE WARNING: unhandled case -->
+        <li class="level-1"><a href="{{page.html}}">{{page.name}}</a></li>
+      {% endif %}
+
+    {% endfor %}
+  </ul>
+</div>
diff --git a/tool/template-sidebar_nav.html b/tool/template-sidebar_nav.html
index 4b61104d8c..3599e5c47f 100644
--- a/tool/template-sidebar_nav.html
+++ b/tool/template-sidebar_nav.html
@@ -3,10 +3,23 @@
   <div class="sidenav_parent">
     <a href="{{ (pages|selectattr('doc_type', 'equalto', currentpage.doc_type)|first).html }}">{{ currentpage.doc_type }}</a>
   </div>
+  {% elif currentpage.funnel is defined %}
+  <div class="sidenav_parent">
+    {% if currentpage == (pages|selectattr('funnel', 'equalto', currentpage.funnel)|first) %}
+    <a class="active" href="{{ currentpage.html }}">{{ currentpage.funnel }}</a>
+    {% else %}
+    <a href="{{ (pages|selectattr('funnel', 'equalto', currentpage.funnel)|first).html }}">{{ currentpage.funnel }}</a>
+    {% endif %}
+  </div>
   {% endif %}
-  <div id="sidenav_accordion" class="panel-group" role="tablist" aria-multiselectable="true">
+
+  {% if pages|selectattr("funnel", "equalto", currentpage.funnel)|selectattr("category", "defined")|list|length %}
+  <div id="sidenav" class="panel-group" role="tablist" aria-multiselectable="true">
     {% for cat in categories %}
       {% set catpages = pages|selectattr("category", "equalto", cat)|list %}
+      {% if currentpage.funnel is defined %}
+        {% set catpages = catpages|selectattr("funnel", "equalto", currentpage.funnel)|list %}
+      {% endif %}
       {% if currentpage.doc_type is defined %}
         {% set catpages = catpages|selectattr("doc_type", "equalto", currentpage.doc_type)|list %}
       {% endif %}
@@ -23,7 +36,7 @@
 
       <div id="sidenav_collapse_{{loop.index}}" class="collapse{% if currentpage.category == cat %} in{% endif %}" role="tabpanel" aria-labelledby="sidenav_cat_head_{{loop.index}}">
         <div class="panel-body">
-          <ul class="sidebar_cat_pagelist">
+          <ul class="sidebar_pagelist">
           {% set printed_subcategories = [] %}
           {% for page in catpages %}
             {% if loop.index != 1 %}{# Skip the first element since it's linked by the category header #}
@@ -64,6 +77,26 @@
     </div><!-- /.panel -->
     {% endif %}
     {% endfor %}
+  </div><!-- /#sidenav -->
 
-  </div><!-- /#sidenav_accordion -->
+  {% else %}
+  {#--- No categories in this funnel --#}
+  {% set funnelpages = pages|selectattr("funnel", "equalto", currentpage.funnel)|list %}
+  <div id="sidenav" class="panel-group" aria-multiselectable="true">
+    <div class="panel panel-default active">
+      <div class="panel-body">
+        <ul class="sidebar_pagelist">
+        {% for page in funnelpages %}
+          {% if loop.index == 1 %}{# Skip the first element since it's linked by the funnel header #}
+          {% elif page == currentpage %}
+          <li><a class="active nosubcat-page" href="{{ page.html }}">{{ page.name }}</a></li>
+          {% else %}
+          <li><a class="nosubcat-page" href="{{ page.html }}">{{ page.name }}</a></li>
+          {% endif %}
+        {% endfor %}
+        </ul>
+      </div><!-- /.panel-body -->
+    </div><!-- /.panel -->
+  </div><!-- /#sidenav -->
+  {% endif %}
 </div><!-- /.guide_toc -->