Blurbs in children template (experimental) and back angles on sidebar parent link

This commit is contained in:
mDuo13
2018-05-03 18:04:03 -07:00
parent 7849a66914
commit b606735efd
5 changed files with 37 additions and 18 deletions

View File

@@ -55,13 +55,13 @@ th {
}
.navbar .navbar-nav .active a {
font-weight: bold;
font-weight: 700;
color: #333;
background-color: #eee;
}
.navbar .active-parent a {
font-weight: bold;
font-weight: 700;
background-color: #eee;
}
@@ -157,12 +157,12 @@ th {
.content h5 {
margin-top: 16px;
line-height: 1.2;
font-weight: bold;
font-weight: 700;
}
.content h6 {
margin-top: 12px
line-height: 1.2;
font-weight: bold;
font-weight: 700;
}
.content p,
@@ -191,7 +191,7 @@ th {
top: 25px;
left: 150px;
font-size: 12px;
font-weight: bold;
font-weight: 700;
}
/* Footer ------------------------------------------------------------------- */
@@ -441,10 +441,14 @@ a.current {
}
.level-1,
.curated-links li {
font-weight: bold;
margin-top: 15px;
margin-left: 15px;
}
.level-1 a,
.curated-links li a {
font-weight: 700;
}
.landing .level-1,
.landing .curated-links li {
font-weight: 400;
@@ -482,7 +486,7 @@ a.current {
bottom: 15px;
right: 30px;
background-color: #333;
font-weight: bolder;
font-weight: 700;
z-index: 1000;
color: white;
}
@@ -573,7 +577,7 @@ a.current {
}
#sidenav .card-header h5 .sidenav_cat_title.active {
color: #333;
font-weight: bold;
font-weight: 700;
cursor: default;
}
#sidenav .card-header h5 .sidenav_cat_title.active-parent {
@@ -649,7 +653,7 @@ a.current {
.card .sidebar_pagelist a.active {
color: black;
font-weight: bold;
font-weight: 700;
}
.card .sidebar_pagelist a:hover {
@@ -657,7 +661,7 @@ a.current {
}
.subcat-title.active-parent {
font-weight: bold;
font-weight: 700;
}
.card .sidebar_pagelist li .subpage {
@@ -668,7 +672,7 @@ a.current {
display: block;
text-decoration: none;
font-size: 18px;
font-weight: bold;
font-weight: 700;
padding: 15px 16px 15px 10px;
}

View File

@@ -86,6 +86,7 @@ pages:
funnel: Docs
doc_type: Concepts
category: Introduction
blurb: Get a quick and concise introduction to key features of the XRP Ledger.
targets:
- local
@@ -95,6 +96,7 @@ pages:
funnel: Docs
doc_type: Concepts
category: Introduction
blurb: Understand the role of consensus in the XRP Ledger.
targets:
- local
@@ -103,6 +105,7 @@ pages:
funnel: Docs
doc_type: Concepts
category: Introduction
blurb: Learn about the uses and properties of XRP, the digital asset for payments.
targets:
- local
@@ -121,6 +124,7 @@ pages:
doc_type: Concepts
category: Payment System Basics
subcategory: Accounts
blurb: Learn about accounts in the XRP Ledger. Accounts can send transactions and hold XRP.
targets:
- local
@@ -130,6 +134,7 @@ pages:
doc_type: Concepts
category: Payment System Basics
subcategory: Accounts
blurb: Use cryptographic keys to approve transactions so the XRP Ledger can execute them.
targets:
- local
@@ -140,6 +145,7 @@ pages:
funnel: Docs
doc_type: Concepts
category: Payment System Basics
blurb: Learn about the types of fees allowed by the XRP Ledger, including neutral fees (payable to no one) that protect the ledger against abuse, as well as fees that users can collect from each other.
targets:
- local

View File

@@ -14,6 +14,7 @@
<section class="p-3 bg-light">
<h2>Children of this page:</h2>
{% set show_blurbs = True %}
{% include 'template-page-children.html' %}
</section>
{% endblock %}

View File

@@ -5,6 +5,10 @@
{% set depth = 5 %}
{% endif %}
{% if show_blurbs is undefined %}
{% set show_blurbs = False %}
{% endif %}
{% if parent_page.funnel is undefined %}
{% set parent_level = "home" %}
{% set level_2 = "funnel" %}
@@ -37,7 +41,7 @@
{% if onepage == parent %}{# pass #}
{% elif next_level_field == None or (onepage[next_level_field] is undefined and next_level_field != "supercategory") %}
{# direct child, print it! #}
<li class="level-{{indent_level}}"><a href="{{onepage.html}}">{{onepage.name}}</a></li>
<li class="level-{{indent_level}}"><a href="{{onepage.html}}">{{onepage.name}}</a>{% if show_blurbs and onepage.blurb is defined %}<p class="blurb child-blurb">{{onepage.blurb}}</p>{% endif %}</li>
{% elif onepage[next_level_field] is undefined and next_level_field == "supercategory" %}
{# special case, might need to skip "supercategory" #}
@@ -49,7 +53,7 @@
{% set next_level_children = thosepages|selectattr("category",
"equalto", onepage.category)|list %}
{% set next_level_parent = next_level_children|first %}
<li class="level-{{indent_level}}"><a href="{{next_level_parent.html}}">{{next_level_parent.name}}</a></li>
<li class="level-{{indent_level}}"><a href="{{next_level_parent.html}}">{{next_level_parent.name}}</a>{% if show_blurbs and next_level_parent.blurb is defined %}<p class="blurb child-blurb">{{next_level_parent.blurb}}</p>{% endif %}</li>
{% if indent_level+1 <= depth_limit and next_level_field != None %}
{# Recurse! #}
{% set field_after = "subcategory" %}
@@ -60,7 +64,7 @@
{% else %}
<!-- Template WARNING: no category for page '{{onepage.name}}'? -->
<li class="level-{{indent_level}}"><a href="{{onepage.html}}">{{onepage.html}}</a></li>
<li class="level-{{indent_level}}"><a href="{{onepage.html}}">{{onepage.html}}</a>{% if show_blurbs and onepage.blurb is defined %}<p class="blurb child-blurb">{{onepage.blurb}}</p>{% endif %}</li>
{% endif %}
{% elif onepage[next_level_field] is defined %}
@@ -69,7 +73,7 @@
{% set next_level_children = thosepages|selectattr(next_level_field,
"equalto", onepage[next_level_field])|list %}
{% set next_level_parent = next_level_children|first %}
<li class="level-{{indent_level}}"><a href="{{next_level_parent.html}}">{{next_level_parent.name}}</a></li>
<li class="level-{{indent_level}}"><a href="{{next_level_parent.html}}">{{next_level_parent.name}}</a>{% if show_blurbs and next_level_parent.blurb is defined %}<p class="blurb child-blurb">{{next_level_parent.blurb}}</p>{% endif %}</li>
{% if (indent_level+1 <= depth_limit and next_level_field != None)
or (next_level_field == "supercategory" and depth_limit == 1.5) %}
{# Recurse! #}

View File

@@ -6,19 +6,23 @@
{% if currentpage == (pages|selectattr('supercategory', 'equalto', currentpage.supercategory)|first) %}
<a class="active" href="{{ currentpage.html }}">{{ currentpage.supercategory }}</a>
{% else %}
<a href="{{ (pages|selectattr('supercategory', 'equalto', currentpage.supercategory)|first).html }}">{{ currentpage.supercategory }}</a>
<a href="{{ (pages|selectattr('supercategory', 'equalto', currentpage.supercategory)|first).html }}"><i class="fa fa-angle-double-left" aria-hidden="true"></i> {{ currentpage.supercategory }}</a>
{% endif %}
</div>
{% elif currentpage.doc_type is defined %}
<div class="sidenav_parent">
<a href="{{ (pages|selectattr('doc_type', 'equalto', currentpage.doc_type)|first).html }}">{{ currentpage.doc_type }}</a>
{% if currentpage == (pages|selectattr('doc_type', 'equalto', currentpage.doc_type)|first) %}
<a class="active" href="{{ currentpage.html }}">{{ currentpage.doc_type }}</a>
{% else %}
<a href="{{ (pages|selectattr('doc_type', 'equalto', currentpage.doc_type)|first).html }}"><i class="fa fa-angle-double-left" aria-hidden="true"></i> {{ currentpage.doc_type }}</a>
{% endif %}
</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>
<a href="{{ (pages|selectattr('funnel', 'equalto', currentpage.funnel)|first).html }}"><i class="fa fa-angle-double-left" aria-hidden="true"></i> {{ currentpage.funnel }}</a>
{% endif %}
</div>
{% endif %}