Merge branch 'master' of https://github.com/roryg/ghostwriter into update-normalize

9 files changed, 36 insertions, 10 deletions

diff --git a/README.md b/README.md
index 737c807..9bacecc 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Ghostwriter is a simple AJAX driven theme for the [Ghost](http://github.com/tryg
 
 ### Features
 
-* Supports Ghost 0.5
+* Supports Ghost 0.5.x
 * Clean typography focused design.
 * Fully responsive (includes fitvid.js for responsive video embeds).
 * AJAX loading for fast, smooth transitions between posts and pages.
@@ -19,10 +19,6 @@ Ghostwriter is a simple AJAX driven theme for the [Ghost](http://github.com/tryg
 * Featured post support.
 * A bunch of other bits and bobs.
 
-### Static Pages and Navigation
-
-Ghost 0.4 introduced static pages which you can use for making pages separate from your list of blog posts. There isn't however a way to output a list of static pages for navigation yet so you'll need to edit the navigation menu in the default.hbs file yourself. The HTML for the menu starts on `line 37` of the default.hbs file and contains an example `About` menu item on `line 40`.
-
 ### Troubleshooting
 
 ###### The Browse Posts link isn't working
diff --git a/assets/js/scripts.js b/assets/js/scripts.js
index a0430b1..ee47bc6 100644
--- a/assets/js/scripts.js
+++ b/assets/js/scripts.js
@@ -79,6 +79,10 @@ jQuery(function($) {
                 loading = false;
                 showIndex = false;
             });
+        }).fail(function() {
+            // Request fail
+            NProgress.done();
+            location.reload();
         });
     });
 
diff --git a/changelog.txt b/changelog.txt
index 6d282c4..ac4fe55 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,22 @@
 ------------------------------
+Ghostwriter Version 1.9.1
+------------------------------
+
+- Fixed navigation bug
+
+------------------------------
+Ghostwriter Version 1.9.0
+------------------------------
+
+- Added support for Ghost 0.5.9 navigation feature
+
+------------------------------
+Ghostwriter Version 1.8.2
+------------------------------
+
+- Fixed multiline code block indention
+
+------------------------------
 Ghostwriter Version 1.8.1
 ------------------------------
 
diff --git a/default.hbs b/default.hbs
index c4464fd..63af9b1 100644
--- a/default.hbs
+++ b/default.hbs
@@ -41,7 +41,8 @@
                 <ul class="site-nav">
                     <li class="site-nav-item"><a class="js-ajax-link" title="{{@blog.title}}" href="{{@blog.url}}">Latest Post</a></li>
                     <li class="site-nav-item"><a class="js-ajax-link js-show-index" title="{{@blog.title}}" href="{{@blog.url}}">Browse Posts</a></li>
-                    <li class="site-nav-item"><a class="js-ajax-link" title="About | {{@blog.title}}" href="{{@blog.url}}/about">About</a></li>
+
+                    {{navigation}}
 
                     {{#if @blog.logo}}
                         <li class="site-nav-item"><a href="{{@blog.url}}/rss">RSS</a></li>
diff --git a/index.hbs b/index.hbs
index 8daaab1..51ac862 100644
--- a/index.hbs
+++ b/index.hbs
@@ -3,7 +3,8 @@
 <div id="latest-post" class="container">
     {{#foreach posts}}
         {{#if @first}}
-            {{> post-content}}
+{{! No indention to prevent handlebars indenting <pre> tag content}}   
+{{> post-content}}
         {{/if}}
     {{/foreach}}
 </div>
diff --git a/package.json b/package.json
index 8453327..26dd6d9 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,4 @@
 {
 	"name": "Ghostwriter",
-	"version": "1.8.1"
+	"version": "1.9.1"
 }
\ No newline at end of file
diff --git a/page.hbs b/page.hbs
index 5f694b7..7c30ba8 100644
--- a/page.hbs
+++ b/page.hbs
@@ -13,7 +13,9 @@
                 {{#if image}}
                     <img class="post-featured-image" src="{{image}}">
                 {{/if}}
-                {{{content}}}
+
+{{! No indention to prevent handlebars indenting <pre> tag content}}               
+{{{content}}}
 
                 {{#if tags}}
                     <p class="post-tags"><span>Tagged:</span> {{tags}}</p>
diff --git a/partials/navigation.hbs b/partials/navigation.hbs
new file mode 100644
index 0000000..ac8464d
--- /dev/null
+++ b/partials/navigation.hbs
@@ -0,0 +1,3 @@
+{{#foreach navigation}}
+    <li class="site-nav-item"><a class="js-ajax-link" title="{{label}} | {{@blog.title}}" href="{{url absolute="true"}}">{{label}}</a></li>
+{{/foreach}}
\ No newline at end of file
diff --git a/post.hbs b/post.hbs
index 4331107..b31b8c3 100644
--- a/post.hbs
+++ b/post.hbs
@@ -2,6 +2,7 @@
 
 <div class="container">
     {{#post}}
-        {{> post-content}}
+{{! No indention to prevent handlebars indenting <pre> tag content}}   
+{{> post-content}}
     {{/post}}
 </div>
\ No newline at end of file