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

@@ -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 %}