From 12117e65cc7643e32208ea080bc4aa5e2650d0ed Mon Sep 17 00:00:00 2001
From: David Darnes <me@daviddarnes.com>
Date: Wed, 4 Jan 2017 08:54:39 +0000
Subject: [PATCH] Changing sample content and dev tweaks

---
 _config.yml                                  | 14 ++++++-------
 _includes/site-favicons.html                 |  5 +----
 _includes/site-nav.html                      |  9 +++++++--
 _posts/2016-08-27-example-post-one.md        | 11 +++++-----
 _posts/2016-08-28-example-post-two.md        | 20 +++++++++++--------
 _posts/2016-08-29-example-post-three.md      | 21 +++++++++-----------
 demo/_config.yml                             | 12 +++++------
 demo/_posts/2016-08-27-example-post-one.md   | 11 +++++-----
 demo/_posts/2016-08-28-example-post-two.md   | 20 +++++++++++--------
 demo/_posts/2016-08-29-example-post-three.md | 21 +++++++++-----------
 10 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/_config.yml b/_config.yml
index a5e5b4d..8c5a1f9 100755
--- a/_config.yml
+++ b/_config.yml
@@ -24,7 +24,7 @@ gems:
 
 # 3. Gem settings
 paginate: 2 # jekyll-paginate > items per page
-paginate_path: blog/page:num # jekyll-paginate > blog page
+paginate_path: page:num # jekyll-paginate > blog page
 
 # 4. Jekyll settings
 sass:
@@ -36,9 +36,9 @@ timezone: Europe/London # Timezone for blog posts and alike
 # 5. Collections
 collections:
   posts:
-    title: Posts # Needed for Siteleaf
+    title: Welcome # Needed for Siteleaf
     output: true
-    description: "My thoughts and ideas" # The post list page content
+    description: "Welcome to my blog!" # The post list page content
 
 # 6. Jekyll collections settings
 defaults:
@@ -57,7 +57,7 @@ defaults:
 
 # 7. Site settings
 encoding: utf-8 # Make sure the encoding is right
-title: "Garth" # Site name or title, also used in jekyll-seo-tag
-logo: "https://www.gravatar.com/avatar/6c0377abcf4da91cdd35dea4554b2a4c?s=300" # Site logo, also used in jekyll-seo-tag
-description: "A stupidly simple theme for Jekyll (3.2), using official Jekyll theme implementation" # Site description and default description, also used in jekyll-seo-tag
-url: "https://garth.darn.es" # Site url, also used in jekyll-seo-tag
+title: "Garth" # Site name or title
+logo: "https://www.gravatar.com/avatar/6c0377abcf4da91cdd35dea4554b2a4c?s=500" # Site logo
+description: "A stupidly simple theme for Jekyll (3.2), using official Jekyll theme implementation" # Site description and default description
+url: "https://garth.darn.es" # Site url
diff --git a/_includes/site-favicons.html b/_includes/site-favicons.html
index 043a2fc..e23fbda 100755
--- a/_includes/site-favicons.html
+++ b/_includes/site-favicons.html
@@ -1,4 +1 @@
-<link rel="icon" type="image/png" href="{{ site.avatarurl }}?s=16" sizes="16x16">
-<link rel="icon" type="image/png" href="{{ site.avatarurl }}?s=32" sizes="32x32">
-<link rel="icon" type="image/png" href="{{ site.avatarurl }}?s=96" sizes="96x96">
-<link rel="shortcut icon" href="{{ site.avatarurl }}">
+<link rel="shortcut icon" href="{{ site.logo }}">
diff --git a/_includes/site-nav.html b/_includes/site-nav.html
index b7bc1bd..fef707c 100755
--- a/_includes/site-nav.html
+++ b/_includes/site-nav.html
@@ -1,9 +1,14 @@
 <nav class="nav">
   <ul class="list list--nav">
     {% for item in site.pages %}
-      {% unless item.styles == true %}
+      {% unless item.styles == true or item.url contains "/page" or item.url == "/404.html" %}
         <li class="item  item--nav{% if item[1] == page.url %}  item--current{% endif %}">
-          <a href="{{ item.url }}">{{ item.title }}</a>
+          {% if item.collectionpage %}
+      			{% assign collectiondata = site.collections | where: "label", item.collectionpage | first %}
+      			<a href="{{ item.url }}">{{ collectiondata.title }}</a>
+      		{% else %}
+            <a href="{{ item.url }}">{{ item.title }}</a>
+      		{% endif %}
         </li>
       {% endunless %}
     {% endfor %}
diff --git a/_posts/2016-08-27-example-post-one.md b/_posts/2016-08-27-example-post-one.md
index 1d73de3..dd3508b 100755
--- a/_posts/2016-08-27-example-post-one.md
+++ b/_posts/2016-08-27-example-post-one.md
@@ -1,13 +1,14 @@
 ---
-title: Description of an Alembic
+title: What was Wayne's World?
 category: General
-feature_image: "https://unsplash.it/1200/400?image=200"
 ---
 
-The complete distilling apparatus consists of three parts: the "cucurbit" (Arabic ḳarʿa, Greek βίκος), the still pot containing the liquid to be distilled, which is heated by a flame; the "head" or "cap" (Arabic anbiḳ, Greek ἄμβιξ) which fits over the mouth of the cucurbit to receive the vapors, with an attached downward-sloping "tube" (Greek σωλήν), leading to the "receiver" (Arabic ḳābila, Greek ἄγγος or φιάλη) container.
+Wayne's World is a 1992 American comedy film directed by Penelope Spheeris and starring Mike Myers as Wayne Campbell and Dana Carvey as Garth Algar. The film was adapted from a sketch of the same name on NBC's Saturday Night Live.
 
 <!-- more -->
 
-Retorts have the "cap" and the "cucurbit" made into one. The anbik is also called the raʾs (head) of the cucurbit. The liquid in the cucurbit is heated or boiled; the vapour rises into the anbik, where it cools by contact with the walls and condenses, running down the spout into the receiver. A modern descendant of the alembic is the pot still, used to produce distilled beverages.
+The film grossed US$121.6 million in its theatrical run, placing it as the tenth highest-grossing film of 1992 and the highest-grossing of the 11 films based on Saturday Night Live skits. It was filmed in 34 days.
 
-_Originally from [Alembic - Wikipedia](https://en.wikipedia.org/wiki/Alembic)_
+Wayne's World was Myers' feature film debut. It also features Rob Lowe, Tia Carrere, Lara Flynn Boyle, Brian Doyle-Murray, Robert Patrick (spoofing his role in Terminator 2: Judgment Day), Chris Farley, Ed O'Neill, Ione Skye, Meat Loaf, and Alice Cooper. Wayne's World was released on February 14, 1992, and was a critical and commercial success. A sequel, Wayne's World 2, was released on December 10, 1993. In 2000, readers of Total Film magazine voted Wayne's World the 41st-greatest comedy film of all time.
+
+_Originally from [Wayne's World (film) - Wikipedia](https://en.wikipedia.org/wiki/Wayne%27s_World_(film))_
diff --git a/_posts/2016-08-28-example-post-two.md b/_posts/2016-08-28-example-post-two.md
index 252cc42..6e059f1 100755
--- a/_posts/2016-08-28-example-post-two.md
+++ b/_posts/2016-08-28-example-post-two.md
@@ -1,16 +1,20 @@
 ---
-title: History of the Alembic
-category: General
-feature_text: |
-  The History of the Alembic tool
+title: Who is Mike Myers?
+category: People
 ---
 
-Dioscorides' ambix (described in his De materia medica) is a helmet-shaped lid for gathering condensed mercury. For Athenaeus (~ 225 C.E.) it is a bottle or flask. For later chemists it denotes various parts of crude distillation devices.
+Michael John "Mike" Myers (born May 25, 1963) is a Canadian-born actor, comedian, screenwriter, and film producer, who also holds UK and US citizenship.[1] He is known for his run as a featured performer on Saturday Night Live from 1989 to 1995, and for playing the title roles in the Wayne's World, Austin Powers, and Shrek films. He also directed the documentary film Supermensch: The Legend of Shep Gordon, and had a small role in Quentin Tarantino's Inglourious Basterds in 2009.
 
 <!-- more -->
 
-Alembic drawings appear in works of Cleopatra the Alchemist, Synesius, and Zosimos of Panopolis. There were alembics with two (dibikos) and three (tribikos) receivers.[4] According to Zosimos of Panopolis, the alembic was invented by Mary the Jewess.[5]
+Myers was born on May 25, 1963 in Scarborough, Ontario, the son of English-born parents Eric Myers (1922–1991), an insurance agent, and his wife, Alice E. (née Hind; born 1926), an office supervisor and a veteran of the Royal Air Force.
 
-The anbik is described by Ibn al-Awwam in his Kitab al-Filaha (Book of Agriculture), where he explains how rose-water is distilled. Amongst others, it is mentioned in the Mafatih al-Ulum (Key of Sciences) of Khwarizmi and the Kitab al-Asrar (Book of Secrets) of Al-Razi. Some illustrations occur in the Latin translations of works which are attributed to Geber.[2]
+Both his parents were from Liverpool and he has two older brothers, Paul, an indie rock singer-songwriter, broadcaster and author, and Peter, a Sears Canada employee.
 
-_Originally from [Alembic - Wikipedia](https://en.wikipedia.org/wiki/Alembic)_
+The family is of English, Scottish and Irish ancestry. Myers was raised Protestant.
+
+Myers reportedly holds Canadian, U.S. and British citizenship.
+
+Myers grew up in North York and then Scarborough, where he attended Sir John A. MacDonald Collegiate Institute and then graduated from Stephen Leacock Collegiate Institute in 1982.
+
+_Originally from [Mike Myers - Wikipedia](https://en.wikipedia.org/wiki/Mike_Myers)_
diff --git a/_posts/2016-08-29-example-post-three.md b/_posts/2016-08-29-example-post-three.md
index 9908aaa..0aa997e 100755
--- a/_posts/2016-08-29-example-post-three.md
+++ b/_posts/2016-08-29-example-post-three.md
@@ -1,17 +1,14 @@
 ---
-title: Description of a Pot Still
-category: General
-excerpt: |
-  A pot still is a type of still used in distilling spirits such as whisky or brandy. Heat is applied directly to the pot containing the wash (for whisky) or wine (for brandy).
-feature_text: |
-  ## The Pot Still
-  The modern pot still is a descendant of the alembic, an earlier distillation device
-feature_image: "https://unsplash.it/1200/400?image=1048"
-image: "https://unsplash.it/1200/400?image=1048"
+title: Who is Dana Carvey?
+category: People
 ---
 
-A pot still is a type of still used in distilling spirits such as whisky or brandy. Heat is applied directly to the pot containing the wash (for whisky) or wine (for brandy). This is called a batch distillation (as opposed to a continuous distillation).
+Dana Thomas Carvey (born June 2, 1955) is an American actor and stand-up comedian known for his work as a cast member on Saturday Night Live and for playing the role of Garth Algar in the Wayne's World films.
 
-At standard atmospheric pressure, alcohol boils at 78 °C (172 °F), while water boils at 100 °C (212 °F). During distillation, the vapour contains more alcohol than the liquid. When the vapours are condensed, the resulting liquid contains a higher concentration of alcohol. In the pot still, the alcohol and water vapour combine with esters and flow from the still through the condensing coil. There they condense into the first distillation liquid, the so-called "low wines". The low wines have a strength of about 25–35% alcohol by volume, and flow into a second still. It is then distilled a second time to produce the colourless spirit, collected at about 70% alcohol by volume. Colour is added through maturation in an oak aging barrel, and develops over time.
+<!-- more -->
 
-The modern pot still is a descendant of the alembic, an earlier distillation device.
+Carvey was born in Missoula, Montana, the son of Billie Dahl, a schoolteacher, and Bud Carvey, a high-school business teacher. Carvey is the brother of Brad Carvey, the engineer/designer of the Video Toaster. The character Garth Algar is loosely based on Brad. Carvey has English, German, Irish, Norwegian, and Swedish ancestry, and was raised Lutheran. When he was three years old, his family moved to San Carlos, California, in the San Francisco Bay Area. He received his first drum kit at an early age. He attended Tierra Linda Junior High in San Carlos, Carlmont High School in Belmont, California (where he was a member of the Central Coast Section champion cross country team), College of San Mateo in San Mateo, California, and received his bachelor's degree in broadcast communications from San Francisco State University.
+
+He had a minor role in Halloween II, and co-starred on One of the Boys in 1982, a short-lived television sitcom that also starred Mickey Rooney, Nathan Lane, and Meg Ryan. In 1984, Carvey had a small role in Rob Reiner's film This Is Spinal Tap, in which he played a mime, with fellow comedian Billy Crystal (who tells him "Mime is money!"). He also appeared in the short-lived film-based action television series Blue Thunder.
+
+_Originally from [Dana Carvey - Wikipedia](https://en.wikipedia.org/wiki/Dana_Carvey)_
diff --git a/demo/_config.yml b/demo/_config.yml
index 0ec5386..1ad83e8 100755
--- a/demo/_config.yml
+++ b/demo/_config.yml
@@ -36,9 +36,9 @@ timezone: Europe/London # Timezone for blog posts and alike
 # 5. Collections
 collections:
   posts:
-    title: Posts # Needed for Siteleaf
+    title: Welcome # Needed for Siteleaf
     output: true
-    description: "My thoughts and ideas" # The post list page content
+    description: "Welcome to my blog!" # The post list page content
 
 # 6. Jekyll collections settings
 defaults:
@@ -57,7 +57,7 @@ defaults:
 
 # 7. Site settings
 encoding: utf-8 # Make sure the encoding is right
-title: "Garth" # Site name or title, also used in jekyll-seo-tag
-logo: "https://www.gravatar.com/avatar/6c0377abcf4da91cdd35dea4554b2a4c?s=300" # Site logo, also used in jekyll-seo-tag
-description: "A stupidly simple theme for Jekyll (3.2), using official Jekyll theme implementation" # Site description and default description, also used in jekyll-seo-tag
-url: "https://garth.darn.es" # Site url, also used in jekyll-seo-tag
+title: "Garth" # Site name or title
+logo: "https://www.gravatar.com/avatar/6c0377abcf4da91cdd35dea4554b2a4c?s=500" # Site logo
+description: "A stupidly simple theme for Jekyll (3.2), using official Jekyll theme implementation" # Site description and default description
+url: "https://garth.darn.es" # Site url
diff --git a/demo/_posts/2016-08-27-example-post-one.md b/demo/_posts/2016-08-27-example-post-one.md
index 1d73de3..dd3508b 100755
--- a/demo/_posts/2016-08-27-example-post-one.md
+++ b/demo/_posts/2016-08-27-example-post-one.md
@@ -1,13 +1,14 @@
 ---
-title: Description of an Alembic
+title: What was Wayne's World?
 category: General
-feature_image: "https://unsplash.it/1200/400?image=200"
 ---
 
-The complete distilling apparatus consists of three parts: the "cucurbit" (Arabic ḳarʿa, Greek βίκος), the still pot containing the liquid to be distilled, which is heated by a flame; the "head" or "cap" (Arabic anbiḳ, Greek ἄμβιξ) which fits over the mouth of the cucurbit to receive the vapors, with an attached downward-sloping "tube" (Greek σωλήν), leading to the "receiver" (Arabic ḳābila, Greek ἄγγος or φιάλη) container.
+Wayne's World is a 1992 American comedy film directed by Penelope Spheeris and starring Mike Myers as Wayne Campbell and Dana Carvey as Garth Algar. The film was adapted from a sketch of the same name on NBC's Saturday Night Live.
 
 <!-- more -->
 
-Retorts have the "cap" and the "cucurbit" made into one. The anbik is also called the raʾs (head) of the cucurbit. The liquid in the cucurbit is heated or boiled; the vapour rises into the anbik, where it cools by contact with the walls and condenses, running down the spout into the receiver. A modern descendant of the alembic is the pot still, used to produce distilled beverages.
+The film grossed US$121.6 million in its theatrical run, placing it as the tenth highest-grossing film of 1992 and the highest-grossing of the 11 films based on Saturday Night Live skits. It was filmed in 34 days.
 
-_Originally from [Alembic - Wikipedia](https://en.wikipedia.org/wiki/Alembic)_
+Wayne's World was Myers' feature film debut. It also features Rob Lowe, Tia Carrere, Lara Flynn Boyle, Brian Doyle-Murray, Robert Patrick (spoofing his role in Terminator 2: Judgment Day), Chris Farley, Ed O'Neill, Ione Skye, Meat Loaf, and Alice Cooper. Wayne's World was released on February 14, 1992, and was a critical and commercial success. A sequel, Wayne's World 2, was released on December 10, 1993. In 2000, readers of Total Film magazine voted Wayne's World the 41st-greatest comedy film of all time.
+
+_Originally from [Wayne's World (film) - Wikipedia](https://en.wikipedia.org/wiki/Wayne%27s_World_(film))_
diff --git a/demo/_posts/2016-08-28-example-post-two.md b/demo/_posts/2016-08-28-example-post-two.md
index 252cc42..6e059f1 100755
--- a/demo/_posts/2016-08-28-example-post-two.md
+++ b/demo/_posts/2016-08-28-example-post-two.md
@@ -1,16 +1,20 @@
 ---
-title: History of the Alembic
-category: General
-feature_text: |
-  The History of the Alembic tool
+title: Who is Mike Myers?
+category: People
 ---
 
-Dioscorides' ambix (described in his De materia medica) is a helmet-shaped lid for gathering condensed mercury. For Athenaeus (~ 225 C.E.) it is a bottle or flask. For later chemists it denotes various parts of crude distillation devices.
+Michael John "Mike" Myers (born May 25, 1963) is a Canadian-born actor, comedian, screenwriter, and film producer, who also holds UK and US citizenship.[1] He is known for his run as a featured performer on Saturday Night Live from 1989 to 1995, and for playing the title roles in the Wayne's World, Austin Powers, and Shrek films. He also directed the documentary film Supermensch: The Legend of Shep Gordon, and had a small role in Quentin Tarantino's Inglourious Basterds in 2009.
 
 <!-- more -->
 
-Alembic drawings appear in works of Cleopatra the Alchemist, Synesius, and Zosimos of Panopolis. There were alembics with two (dibikos) and three (tribikos) receivers.[4] According to Zosimos of Panopolis, the alembic was invented by Mary the Jewess.[5]
+Myers was born on May 25, 1963 in Scarborough, Ontario, the son of English-born parents Eric Myers (1922–1991), an insurance agent, and his wife, Alice E. (née Hind; born 1926), an office supervisor and a veteran of the Royal Air Force.
 
-The anbik is described by Ibn al-Awwam in his Kitab al-Filaha (Book of Agriculture), where he explains how rose-water is distilled. Amongst others, it is mentioned in the Mafatih al-Ulum (Key of Sciences) of Khwarizmi and the Kitab al-Asrar (Book of Secrets) of Al-Razi. Some illustrations occur in the Latin translations of works which are attributed to Geber.[2]
+Both his parents were from Liverpool and he has two older brothers, Paul, an indie rock singer-songwriter, broadcaster and author, and Peter, a Sears Canada employee.
 
-_Originally from [Alembic - Wikipedia](https://en.wikipedia.org/wiki/Alembic)_
+The family is of English, Scottish and Irish ancestry. Myers was raised Protestant.
+
+Myers reportedly holds Canadian, U.S. and British citizenship.
+
+Myers grew up in North York and then Scarborough, where he attended Sir John A. MacDonald Collegiate Institute and then graduated from Stephen Leacock Collegiate Institute in 1982.
+
+_Originally from [Mike Myers - Wikipedia](https://en.wikipedia.org/wiki/Mike_Myers)_
diff --git a/demo/_posts/2016-08-29-example-post-three.md b/demo/_posts/2016-08-29-example-post-three.md
index 9908aaa..0aa997e 100755
--- a/demo/_posts/2016-08-29-example-post-three.md
+++ b/demo/_posts/2016-08-29-example-post-three.md
@@ -1,17 +1,14 @@
 ---
-title: Description of a Pot Still
-category: General
-excerpt: |
-  A pot still is a type of still used in distilling spirits such as whisky or brandy. Heat is applied directly to the pot containing the wash (for whisky) or wine (for brandy).
-feature_text: |
-  ## The Pot Still
-  The modern pot still is a descendant of the alembic, an earlier distillation device
-feature_image: "https://unsplash.it/1200/400?image=1048"
-image: "https://unsplash.it/1200/400?image=1048"
+title: Who is Dana Carvey?
+category: People
 ---
 
-A pot still is a type of still used in distilling spirits such as whisky or brandy. Heat is applied directly to the pot containing the wash (for whisky) or wine (for brandy). This is called a batch distillation (as opposed to a continuous distillation).
+Dana Thomas Carvey (born June 2, 1955) is an American actor and stand-up comedian known for his work as a cast member on Saturday Night Live and for playing the role of Garth Algar in the Wayne's World films.
 
-At standard atmospheric pressure, alcohol boils at 78 °C (172 °F), while water boils at 100 °C (212 °F). During distillation, the vapour contains more alcohol than the liquid. When the vapours are condensed, the resulting liquid contains a higher concentration of alcohol. In the pot still, the alcohol and water vapour combine with esters and flow from the still through the condensing coil. There they condense into the first distillation liquid, the so-called "low wines". The low wines have a strength of about 25–35% alcohol by volume, and flow into a second still. It is then distilled a second time to produce the colourless spirit, collected at about 70% alcohol by volume. Colour is added through maturation in an oak aging barrel, and develops over time.
+<!-- more -->
 
-The modern pot still is a descendant of the alembic, an earlier distillation device.
+Carvey was born in Missoula, Montana, the son of Billie Dahl, a schoolteacher, and Bud Carvey, a high-school business teacher. Carvey is the brother of Brad Carvey, the engineer/designer of the Video Toaster. The character Garth Algar is loosely based on Brad. Carvey has English, German, Irish, Norwegian, and Swedish ancestry, and was raised Lutheran. When he was three years old, his family moved to San Carlos, California, in the San Francisco Bay Area. He received his first drum kit at an early age. He attended Tierra Linda Junior High in San Carlos, Carlmont High School in Belmont, California (where he was a member of the Central Coast Section champion cross country team), College of San Mateo in San Mateo, California, and received his bachelor's degree in broadcast communications from San Francisco State University.
+
+He had a minor role in Halloween II, and co-starred on One of the Boys in 1982, a short-lived television sitcom that also starred Mickey Rooney, Nathan Lane, and Meg Ryan. In 1984, Carvey had a small role in Rob Reiner's film This Is Spinal Tap, in which he played a mime, with fellow comedian Billy Crystal (who tells him "Mime is money!"). He also appeared in the short-lived film-based action television series Blue Thunder.
+
+_Originally from [Dana Carvey - Wikipedia](https://en.wikipedia.org/wiki/Dana_Carvey)_