diff --git a/CHANGELOG.md b/CHANGELOG.md index 5592aff..9f43489 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v1.3.3 +## 06/22/2017 + +1. [](#bugfix) + * The "Popular Articles" sidebar now actually ignores deleted pages. + * The "Latest Articles" sidebar fixed to respect `articles.root`. + # v1.3.2 ## 05/17/2017 diff --git a/blueprints.yaml b/blueprints.yaml index e4cfdd1..5d267ea 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Knowledge Base -version: 1.3.2 +version: 1.3.3 description: A theme for a knowledge base or FAQ icon: database author: diff --git a/templates/partials/sidebar.html.twig b/templates/partials/sidebar.html.twig index f06c7b7..21a934c 100644 --- a/templates/partials/sidebar.html.twig +++ b/templates/partials/sidebar.html.twig @@ -11,6 +11,14 @@ {% set catlist = tmplst %} {% endif %} +{% set homeroute = '/home' %} +{% if config.themes['knowledge-base'].params.articleroot is defined %} + {% set homeroute = config.themes['knowledge-base'].params.articleroot %} +{% endif %} +{% if config.themes['knowledge-base'].params.articles.root is defined %} + {% set homeroute = config.themes['knowledge-base'].params.articles.root %} +{% endif %} + {% if config.themes['knowledge-base'].params.sidebar.show.categories %}

{{ 'CATEGORIES'|t }}

@@ -31,16 +39,12 @@
{% set counts = config.plugins['count-views'].counts|sort|reverse %} {% set popular = [] %} - {% set homeroute = '/home' %} - {% if config.themes['knowledge-base'].params.articleroot is defined %} - {% set homeroute = config.themes['knowledge-base'].params.articleroot %} - {% endif %} - {% if config.themes['knowledge-base'].params.articles.root is defined %} - {% set homeroute = config.themes['knowledge-base'].params.articles.root %} - {% endif %} {% for route,views in counts %} {% if route starts with homeroute %} - {% set popular = popular|merge([page.find(route)]) %} + {% set thispage = page.find(route) %} + {% if thispage is not null %} + {% set popular = popular|merge([thispage]) %} + {% endif %} {% endif %} {% endfor %} {% set tmplst = [] %} @@ -64,7 +68,7 @@ {% if config.themes['knowledge-base'].params.sidebar.show.latest %}

{{ 'LATEST_ARTICLES'|t }}

- {% set articles = page.find('/home').children.order('date', 'desc') %} + {% set articles = page.find(homeroute).children.order('date', 'desc') %} {% set tmplst = [] %} {% for page in articles %} {% set blisted = false %}