Merge branch 'release/1.3.0'

getgrav · Jul 14, 2016 · 4205148 · 4205148
2 parents 722cb52 + d955964
commit 4205148
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v1.3.0
+## 07/14/2016
+
+1. [](#improved)
+    * Remove unneeded streams from Theme YAML
+1. [](#bugfix)
+    * Fix setting the page language in the html tag
+    * Fixed pagination 
+    * Updated the logo link url
+
 # v1.2.0
 ## 09/04/2015
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Notepad
-version: 1.2.0
+version: 1.3.0
 description: "Notepad theme by HOSSAIN MOHD FAYSAL ported to **Grav**"
 icon: pencil-square
 author:

diff --git a/notepad.yaml b/notepad.yaml
@@ -1,8 +1 @@
 enabled: true
-
-streams:
-  scheme:
-    theme:
-      type: ReadOnlyStream
-      paths:
-        - user/themes/notepad
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="{{ grav.language.getLanguage ?: 'en' }}">
 <head>
     <meta charset="utf-8">
     <!-- (1) Optimize for mobile versions: http://goo.gl/EOpFl -->
@@ -54,7 +54,7 @@
         {% block header %}
             <header class="summer-site-head">
                 <div class="summer-site-head-menu">
-                    <a class="summer-blog-logo" href="{{ base_url_absolute }}"><img src="{{ base_url_relative }}{{ site.logo }}" alt="Blog Logo" /></a>
+                    <a class="summer-blog-logo" href="{{ base_url == '' ? '/' : base_url }}"><img src="{{ base_url_relative }}{{ site.logo }}" alt="Blog Logo" /></a>
                     {% include 'partials/navigation.html.twig' %}
                     <div class="clearfix"></div>
                 </div>

diff --git a/templates/partials/pagination.html.twig b/templates/partials/pagination.html.twig
@@ -1,9 +1,14 @@
+{% if base_url == '' %}
+    {% set base_url = '/' %}
+{% endif %}
 <nav class="pagination" role="navigation">
     {% if pagination.hasNext %}
-        <a class="older-posts" href="{{ base_url }}{{ pagination.params }}{{ pagination.nextUrl }}">&larr; Older posts</a>
+        {% set url = (base_url ~ pagination.params ~ pagination.nextUrl)|replace({'//':'/'}) %}
+        <a class="older-posts" href="{{ url }}">&larr; Older posts</a>
     {% endif %}
     <span class="page-number">Page {{ uri.currentPage }} of {{ pagination|length }}</span>
     {% if pagination.hasPrev %}
-        <a class="newer-posts" href="{{ base_url }}{{ pagination.params }}{{ pagination.prevUrl }}">Newer posts &rarr;</a>
+            {% set url = (base_url ~ pagination.params ~ pagination.prevUrl)|replace({'//':'/'}) %}
+        <a class="newer-posts" href="{{ url }}">Newer posts &rarr;</a>
     {% endif %}
 </nav>