Merge branch 'release/1.3.0'

getgrav · Jan 24, 2017 · ce0aece · ce0aece
2 parents 2248010 + 2ebdafe
commit ce0aece
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 23 deletions.
diff --git 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
@@ -1,13 +1,13 @@
 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:
   name: Team Grav
   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
@@ -1,32 +1,32 @@
 {% 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 %}
         <div class="flush-top blog-header blog-header-image" style="background: {{ page.header.bg_color }} url({{ blog_image.url }}) no-repeat right;">
         <h1>{{ page.title }}</h1>
         </div>
         {% endif %}
-        
+
 		<div class="content-wrapper archive-list g-grid pure-g-r">
 			<div id="listing" class="g-block pure-u-2-3">
             {{ page.content }}
 			  {% if config.plugins.taxonomylist.enabled %}
              <h4>Archives by tags</h4>
              {% include 'partials/taxonomylist.html.twig' with {'taxonomy':'tag'} %}
              {% endif  %}
-             
+
              {% if config.plugins.archives.enabled %}
              <h4>Archives by month</h4>
 	         {% include 'partials/archives.html.twig' %}

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