From 480987203a19ecbf1bc8fe8f66a3606786f50b7c Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 20 Oct 2016 05:39:28 -0400 Subject: [PATCH 1/4] Fixed link to Demo page (#8) --- blueprints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints.yaml b/blueprints.yaml index e0d5a81..bf76150 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -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 From 6981178eb81bdd1612fa0ecb745292d5280e55ed Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Fri, 30 Dec 2016 16:44:51 +0100 Subject: [PATCH 2/4] Fix base_url variable overwriting issue causing issue with search in blog / blog posts --- templates/archive.html.twig | 18 +++++++++--------- templates/blog.html.twig | 12 ++++++------ templates/item.html.twig | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) 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 @@

{{ page.title }}

{% endif %} - +
{{ page.content }} @@ -26,7 +26,7 @@

Archives by tags

{% include 'partials/taxonomylist.html.twig' with {'taxonomy':'tag'} %} {% endif %} - + {% if config.plugins.archives.enabled %}

Archives by month

{% include 'partials/archives.html.twig' %} diff --git a/templates/blog.html.twig b/templates/blog.html.twig index d092c2a..1b2ef32 100644 --- a/templates/blog.html.twig +++ b/templates/blog.html.twig @@ -1,15 +1,15 @@ {% 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 %} diff --git a/templates/item.html.twig b/templates/item.html.twig index cc99030..faa8ca0 100644 --- a/templates/item.html.twig +++ b/templates/item.html.twig @@ -1,14 +1,14 @@ {% embed 'partials/base.html.twig' %} -{% set base_url = page.parent.url %} -{% set feed_url = base_url %} +{% set the_base_url = page.parent.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.parent.slug %} +{% if the_base_url == base_url_relative %} +{% set feed_url = the_base_url~'/'~page.parent.slug %} {% endif %} {% block content %} From 47c67a6d4d90b2446791a38ba04de3e17466291e Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 24 Jan 2017 19:04:42 +0100 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab615ab..dcd1845 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v1.3.0 +## xx/xx/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 From 2ebdafe1e760805eb7a6f279b2318a5a38a6adb2 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 24 Jan 2017 19:05:23 +0100 Subject: [PATCH 4/4] Prepare release --- CHANGELOG.md | 2 +- blueprints.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcd1845..2decfa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v1.3.0 -## xx/xx/2017 +## 01/24/2017 1. [](#[](#bugfix) * Fixed base_url variable overwriting issue causing issue with search in blog / blog posts diff --git a/blueprints.yaml b/blueprints.yaml index bf76150..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: