diff --git a/CHANGELOG.md b/CHANGELOG.md index ab615ab..2decfa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v1.3.0 +## 01/24/2017 + +1. [](#[](#bugfix) + * Fixed base_url variable overwriting issue causing issue with search in blog / blog posts + * Fixed link to demo page in blueprint + # v1.2.0 ## 09/09/2016 diff --git a/blueprints.yaml b/blueprints.yaml index e0d5a81..27438e1 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Gateway -version: 1.2.0 +version: 1.3.0 description: "Gateway incorporates elegant style with user friendly options making it perfectly suited for a variety of Grav users." icon: empire author: @@ -7,7 +7,7 @@ author: email: devs@getgrav.org url: http://getgrav.org homepage: https://github.com/getgrav/grav-theme-gateway -demo: http://demo.getgrav.org/blog-skeleton +demo: http://demo.getgrav.org/gateway-skeleton keywords: gateway, theme, core, modern, fast, responsive, html5, css3, blog bugs: https://github.com/getgrav/grav-theme-gateway/issues license: GPLv2 diff --git a/templates/archive.html.twig b/templates/archive.html.twig index 06ef034..6c8bd02 100644 --- a/templates/archive.html.twig +++ b/templates/archive.html.twig @@ -1,16 +1,16 @@ {% embed 'partials/base.html.twig' %} {% set collection = page.collection() %} - {% set base_url = page.url %} - {% set feed_url = base_url %} + {% set the_base_url = page.url %} + {% set feed_url = the_base_url %} - {% if base_url == '/' %} - {% set base_url = '' %} + {% if the_base_url == '/' %} + {% set the_base_url = '' %} {% endif %} - {% if base_url == base_url_relative %} - {% set feed_url = base_url~'/'~page.slug %} + {% if the_base_url == base_url_relative %} + {% set feed_url = the_base_url~'/'~page.slug %} {% endif %} - + {% block content %} {% set blog_image = page.media.images|first %} {% if blog_image %} @@ -18,7 +18,7 @@