From eeb8b248cacf610086d542bb1331379c7f1b43b7 Mon Sep 17 00:00:00 2001
From: John O'Nolan <john@onolan.org>
Date: Tue, 13 Jun 2017 19:02:22 +0100
Subject: [PATCH] Refactor site navigation

---
 author.hbs              | 27 +--------------------------
 index.hbs               | 24 +-----------------------
 page.hbs                | 27 +--------------------------
 partials/navigation.hbs |  7 -------
 partials/site-nav.hbs   | 38 ++++++++++++++++++++++++++++++++++++++
 post.hbs                | 29 +----------------------------
 tag.hbs                 | 27 +--------------------------
 7 files changed, 43 insertions(+), 136 deletions(-)
 delete mode 100644 partials/navigation.hbs
 create mode 100644 partials/site-nav.hbs

diff --git a/author.hbs b/author.hbs
index 7340698..ed53609 100644
--- a/author.hbs
+++ b/author.hbs
@@ -7,32 +7,7 @@
 {{#author}}
 <header class="site-header outer {{#if cover_image}}" style="background-image: url({{cover_image}}){{else}}no-cover{{/if}}">
     <div class="inner">
-        <nav class="site-nav">
-            <div class="site-nav-left">
-                {{#if @blog.logo}}
-                    <a class="site-nav-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{@blog.title}}" /></a>
-                {{/if}}
-                {{#if @blog.navigation}}
-                    {{!-- The blog navigation links from /ghost/settings/design --}}
-                    {{navigation}}
-                {{/if}}
-            </div>
-            <div class="site-nav-right">
-                <div class="social-links">
-                    {{#if @blog.facebook}}
-                        <a class="social-link social-link-fb" href="{{facebook_url @blog.facebook}}" target="_blank">{{> "icons/facebook"}}</a>
-                    {{/if}}
-                    {{#if @blog.twitter}}
-                        <a class="social-link social-link-tw" href="{{twitter_url @blog.twitter}}" target="_blank">{{> "icons/twitter"}}</a>
-                    {{/if}}
-                </div>
-                {{#if @labs.subscribers}}
-                    <a class="subscribe-button" href="{{@blog.url}}/subscribe/">Subscribe</a>
-                {{else}}
-                    <a class="rss-button" href="http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/" target="_blank">{{> "icons/rss"}}</a>
-                {{/if}}
-            </div>
-        </nav>
+        {{> "site-nav"}}
         <div class="site-header-content">
             {{#if profile_image}}
                 <img class="author-profile-image" src="{{profile_image}}" alt="{{name}}" />
diff --git a/index.hbs b/index.hbs
index a64a4ff..658da44 100644
--- a/index.hbs
+++ b/index.hbs
@@ -15,29 +15,7 @@ into the {body} of the default.hbs template --}}
             </h1>
             <h2 class="site-description">{{@blog.description}}</h2>
         </div>
-        <nav class="site-nav">
-            <div class="site-nav-left">
-                {{#if @blog.navigation}}
-                    {{!-- The blog navigation links from /ghost/settings/design --}}
-                    {{navigation}}
-                {{/if}}
-            </div>
-            <div class="site-nav-right">
-                <div class="social-links">
-                    {{#if @blog.facebook}}
-                        <a class="social-link social-link-fb" href="{{facebook_url @blog.facebook}}" target="_blank">{{> "icons/facebook"}}</a>
-                    {{/if}}
-                    {{#if @blog.twitter}}
-                        <a class="social-link social-link-tw" href="{{twitter_url @blog.twitter}}" target="_blank">{{> "icons/twitter"}}</a>
-                    {{/if}}
-                </div>
-                {{#if @labs.subscribers}}
-                    <a class="subscribe-button" href="{{@blog.url}}/subscribe/">Subscribe</a>
-                {{else}}
-                    <a class="rss-button" href="http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/" target="_blank">{{> "icons/rss"}}</a>
-                {{/if}}
-            </div>
-        </nav>
+        {{> "site-nav"}}
     </div>
 </header>
 
diff --git a/page.hbs b/page.hbs
index 7cbdb1e..9333963 100644
--- a/page.hbs
+++ b/page.hbs
@@ -5,32 +5,7 @@ into the {body} of the default.hbs template --}}
 {{!-- The big featured header, it uses blog cover image as a BG if available --}}
 <header class="site-header outer">
     <div class="inner">
-        <nav class="site-nav">
-            <div class="site-nav-left">
-                {{#if @blog.logo}}
-                    <a class="site-nav-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{@blog.title}}" /></a>
-                {{/if}}
-                {{#if @blog.navigation}}
-                    {{!-- The blog navigation links from /ghost/settings/design --}}
-                    {{navigation}}
-                {{/if}}
-            </div>
-            <div class="site-nav-right">
-                <div class="social-links">
-                    {{#if @blog.facebook}}
-                        <a class="social-link social-link-fb" href="{{facebook_url @blog.facebook}}">{{> "icons/facebook"}}</a>
-                    {{/if}}
-                    {{#if @blog.twitter}}
-                        <a class="social-link social-link-tw" href="{{twitter_url @blog.twitter}}">{{> "icons/twitter"}}</a>
-                    {{/if}}
-                </div>
-                {{#if @labs.subscribers}}
-                    <a class="subscribe-button" href="{{@blog.url}}/subscribe/">Subscribe</a>
-                {{else}}
-                    <a class="rss-button" href="http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/" target="_blank">{{> "icons/rss"}}</a>
-                {{/if}}
-            </div>
-        </nav>
+        {{> "site-nav"}}
     </div>
 </header>
 
diff --git a/partials/navigation.hbs b/partials/navigation.hbs
deleted file mode 100644
index 7367950..0000000
--- a/partials/navigation.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="nav-menu">
-    <ul>
-        {{#foreach navigation}}
-            <li class="nav-item nav-item-{{slug}}{{#if current}} nav-item-current{{/if}}"><a href="{{url absolute="true"}}">{{label}}</a></li>
-        {{/foreach}}
-    </ul>
-</div>
diff --git a/partials/site-nav.hbs b/partials/site-nav.hbs
new file mode 100644
index 0000000..fb65fe7
--- /dev/null
+++ b/partials/site-nav.hbs
@@ -0,0 +1,38 @@
+<nav class="site-nav">
+    <div class="site-nav-left">
+        {{^is "home"}}
+            {{#if @blog.logo}}
+                <a class="site-nav-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{@blog.title}}" /></a>
+            {{else}}
+                <a class="site-nav-logo" href="{{@blog.url}}">{{@blog.title}}</a>
+            {{/if}}
+        {{/is}}
+        {{#if @blog.navigation}}
+            {{#navigation}}
+            {{!-- Outputting nav links from Ghost admin settings/design --}}
+            <div class="nav-menu">
+                <ul>
+                    {{#foreach navigation}}
+                        <li class="nav-item nav-item-{{slug}}{{#if current}} nav-item-current{{/if}}"><a href="{{url absolute="true"}}">{{label}}</a></li>
+                    {{/foreach}}
+                </ul>
+            </div>
+            {{/navigation}}
+        {{/if}}
+    </div>
+    <div class="site-nav-right">
+        <div class="social-links">
+            {{#if @blog.facebook}}
+                <a class="social-link social-link-fb" href="{{facebook_url @blog.facebook}}" target="_blank">{{> "icons/facebook"}}</a>
+            {{/if}}
+            {{#if @blog.twitter}}
+                <a class="social-link social-link-tw" href="{{twitter_url @blog.twitter}}" target="_blank">{{> "icons/twitter"}}</a>
+            {{/if}}
+        </div>
+        {{#if @labs.subscribers}}
+            <a class="subscribe-button" href="{{@blog.url}}/subscribe/">Subscribe</a>
+        {{else}}
+            <a class="rss-button" href="http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/" target="_blank">{{> "icons/rss"}}</a>
+        {{/if}}
+    </div>
+</nav>
diff --git a/post.hbs b/post.hbs
index 525df12..f36ed5f 100644
--- a/post.hbs
+++ b/post.hbs
@@ -5,34 +5,7 @@ into the {body} of the default.hbs template --}}
 {{!-- The big featured header, it uses blog cover image as a BG if available --}}
 <header class="site-header outer">
     <div class="inner">
-        <nav class="site-nav">
-            <div class="site-nav-left">
-                {{#if @blog.logo}}
-                    <a class="site-nav-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{@blog.title}}" /></a>
-                {{else}}
-                    <a class="site-nav-logo" href="{{@blog.url}}">{{@blog.title}}</a>
-                {{/if}}
-                {{#if @blog.navigation}}
-                    {{!-- The blog navigation links from /ghost/settings/design --}}
-                    {{navigation}}
-                {{/if}}
-            </div>
-            <div class="site-nav-right">
-                <div class="social-links">
-                    {{#if @blog.facebook}}
-                        <a class="social-link social-link-fb" href="{{facebook_url @blog.facebook}}">{{> "icons/facebook"}}</a>
-                    {{/if}}
-                    {{#if @blog.twitter}}
-                        <a class="social-link social-link-tw" href="{{twitter_url @blog.twitter}}">{{> "icons/twitter"}}</a>
-                    {{/if}}
-                </div>
-                {{#if @labs.subscribers}}
-                    <a class="subscribe-button" href="{{@blog.url}}/subscribe/">Subscribe</a>
-                {{else}}
-                    <a class="rss-button" href="http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/" target="_blank">{{> "icons/rss"}}</a>
-                {{/if}}
-            </div>
-        </nav>
+        {{> "site-nav"}}
     </div>
 </header>
 
diff --git a/tag.hbs b/tag.hbs
index e129877..0dd1ca6 100644
--- a/tag.hbs
+++ b/tag.hbs
@@ -5,32 +5,7 @@
 {{#tag}}
 <header class="site-header outer {{#if feature_image}}" style="background-image: url({{feature_image}}){{else}}no-cover{{/if}}">
     <div class="inner">
-        <nav class="site-nav">
-            <div class="site-nav-left">
-                {{#if @blog.logo}}
-                    <a class="site-nav-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{@blog.title}}" /></a>
-                {{/if}}
-                {{#if @blog.navigation}}
-                    {{!-- The blog navigation links from /ghost/settings/design --}}
-                    {{navigation}}
-                {{/if}}
-            </div>
-            <div class="site-nav-right">
-                <div class="social-links">
-                    {{#if @blog.facebook}}
-                        <a class="social-link social-link-fb" href="{{facebook_url @blog.facebook}}" target="_blank">{{> "icons/facebook"}}</a>
-                    {{/if}}
-                    {{#if @blog.twitter}}
-                        <a class="social-link social-link-tw" href="{{twitter_url @blog.twitter}}" target="_blank">{{> "icons/twitter"}}</a>
-                    {{/if}}
-                </div>
-                {{#if @labs.subscribers}}
-                    <a class="subscribe-button" href="{{@blog.url}}/subscribe/">Subscribe</a>
-                {{else}}
-                    <a class="rss-button" href="http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/" target="_blank">{{> "icons/rss"}}</a>
-                {{/if}}
-            </div>
-        </nav>
+        {{> "site-nav"}}
         <div class="site-header-content">
             <h1 class="site-title">{{name}}</h1>
             <h2 class="site-description">