Moved to jekyll-sitemaps and tweaks to the theme

Removed the sitemap.xml file and moved to the jekyll-sitemap gem, added the gems to the Gemfile and _config.yml file and tweaked the theme.
sondr3 · Feb 10, 2015 · f69533d · f69533d
1 parent 67eaa12
commit f69533d
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,8 @@ as it was.
   some minor tweaks to suit this project better.
 * **Archives:** Added yearly and monthly archives and archives for tags and
   categories.
+* **Sitemap:** Removed the `sitemap.xml` file and now use the `jekyll-sitemap`
+  gem instead.
 * **Jekyll directory:** Everything is now output to a `dist` folder instead of a
   `site` folder to be more in line with most other tools.
 * **Asset directories:** Moved most of the assets to live in a .tmp while working on

diff --git a/app/templates/Gemfile b/app/templates/Gemfile
@@ -2,4 +2,7 @@ source "http://rubygems.org"
 
 gem 'jekyll'
 gem 'redcarpet'
-gem 'jekyll-archives'
+
+# jekyll plugins
+gem 'jekyll-archives', :git => 'https://github.com/jekyll/jekyll-archives'
+gem 'jekyll-sitemap'
diff --git a/app/templates/_config.yml b/app/templates/_config.yml
@@ -40,6 +40,7 @@ excerpt_separator: '<!--more-->'
 # Extras for Jekyll
 gems:
   - jekyll-archives
+  - jekyll-sitemap
 
 # Markdown library
 markdown: redcarpet
@@ -62,7 +63,7 @@ jekyll-archives:
     category: 'category-archive'
     tag: 'tag-archive'
   permalinks:
-    year: '/:year/'
-    month: '/:year/:month/'
+    year: '/archive/:year/'
+    month: '/archive/:year/:month/'
     category: '/category/:name/'
     tags: '/tag/:name/'
diff --git a/app/templates/app/_drafts/2014-03-01-example-content.md b/app/templates/app/_drafts/2014-03-01-example-content.md
@@ -5,74 +5,99 @@ title: Example content
 categories: jekyll example
 ---
 
+<div class="message"> Howdy! This is an example blog post that shows several
+types of HTML content supported in this theme. </div>
 
-<div class="message">
-  Howdy! This is an example blog post that shows several types of HTML content supported in this theme.
-</div>
+Cum sociis natoque penatibus et magnis <a href="#">dis parturient montes</a>,
+nascetur ridiculus mus. *Aenean eu leo quam.* Pellentesque ornare sem lacinia
+quam venenatis vestibulum. Sed posuere consectetur est at lobortis. Cras mattis
+consectetur purus sit amet fermentum.
 
-Cum sociis natoque penatibus et magnis <a href="#">dis parturient montes</a>, nascetur ridiculus mus. *Aenean eu leo quam.* Pellentesque ornare sem lacinia quam venenatis vestibulum. Sed posuere consectetur est at lobortis. Cras mattis consectetur purus sit amet fermentum.
+> Curabitur blandit tempus porttitor. Nullam quis risus eget urna mollis ornare
+> vel eu leo. Nullam id dolor id nibh ultricies vehicula ut id elit.
 
-> Curabitur blandit tempus porttitor. Nullam quis risus eget urna mollis ornare vel eu leo. Nullam id dolor id nibh ultricies vehicula ut id elit.
+Etiam porta **sem malesuada magna** mollis euismod. Cras mattis consectetur
+purus sit amet fermentum. Aenean lacinia bibendum nulla sed consectetur.
 
-Etiam porta **sem malesuada magna** mollis euismod. Cras mattis consectetur purus sit amet fermentum. Aenean lacinia bibendum nulla sed consectetur.
+<!--more-->
 
 ## Inline HTML elements
 
-HTML defines a long list of available inline tags, a complete list of which can be found on the [Mozilla Developer Network](https://developer.mozilla.org/en-US/docs/Web/HTML/Element).
+HTML defines a long list of available inline tags, a complete list of which can
+be found on the [Mozilla Developer
+Network](https://developer.mozilla.org/en-US/docs/Web/HTML/Element).
 
 - **To bold text**, use `<strong>`.
 - *To italicize text*, use `<em>`.
-- Abbreviations, like <abbr title="HyperText Markup Langage">HTML</abbr> should use `<abbr>`, with an optional `title` attribute for the full phrase.
+- Abbreviations, like <abbr title="HyperText Markup Langage">HTML</abbr> should
+  use `<abbr>`, with an optional `title` attribute for the full phrase.
 - Citations, like <cite>&mdash; Mark otto</cite>, should use `<cite>`.
-- <del>Deleted</del> text should use `<del>` and <ins>inserted</ins> text should use `<ins>`.
-- Superscript <sup>text</sup> uses `<sup>` and subscript <sub>text</sub> uses `<sub>`.
+- <del>Deleted</del> text should use `<del>` and <ins>inserted</ins> text should
+  use `<ins>`.
+- Superscript <sup>text</sup> uses `<sup>` and subscript <sub>text</sub> uses
+  `<sub>`.
 
 Most of these elements are styled by browsers with few modifications on our part.
 
 ## Heading
 
-Vivamus sagittis lacus vel augue rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.
+Vivamus sagittis lacus vel augue rutrum faucibus dolor auctor. Duis mollis, est
+non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
+Morbi leo risus, porta ac consectetur ac, vestibulum at eros.
 
 ### Code
 
-Cum sociis natoque penatibus et magnis dis `code element` montes, nascetur ridiculus mus.
+Cum sociis natoque penatibus et magnis dis `code element` montes, nascetur
+ridiculus mus.
 
 {% highlight js %}
 // Example can be run directly in your JavaScript console
 
-// Create a function that takes two arguments and returns the sum of those arguments
-var adder = new Function("a", "b", "return a + b");
+// Create a function that takes two arguments and returns the sum of those
+arguments var adder = new Function("a", "b", "return a + b");
 
 // Call the function
 adder(2, 6);
 // > 8
 {% endhighlight %}
 
-Aenean lacinia bibendum nulla sed consectetur. Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.
+Aenean lacinia bibendum nulla sed consectetur. Etiam porta sem malesuada magna
+mollis euismod. Fusce dapibus, tellus ac cursus commodo, tortor mauris
+condimentum nibh, ut fermentum massa.
 
 ### Gists via GitHub Pages
 
-Vestibulum id ligula porta felis euismod semper. Nullam quis risus eget urna mollis ornare vel eu leo. Donec sed odio dui.
+Vestibulum id ligula porta felis euismod semper. Nullam quis risus eget urna
+mollis ornare vel eu leo. Donec sed odio dui.
 
 {% gist 5555251 gist.md %}
 
-Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed odio dui. Vestibulum id ligula porta felis euismod semper.
+Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
+Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque
+penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed
+odio dui. Vestibulum id ligula porta felis euismod semper.
 
 ### Lists
 
-Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean lacinia bibendum nulla sed consectetur. Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
+Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus
+mus. Aenean lacinia bibendum nulla sed consectetur. Etiam porta sem malesuada
+magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, tortor mauris
+condimentum nibh, ut fermentum massa justo sit amet risus.
 
 * Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
 * Donec id elit non mi porta gravida at eget metus.
 * Nulla vitae elit libero, a pharetra augue.
 
-Donec ullamcorper nulla non metus auctor fringilla. Nulla vitae elit libero, a pharetra augue.
+Donec ullamcorper nulla non metus auctor fringilla. Nulla vitae elit libero, a
+pharetra augue.
 
 1. Vestibulum id ligula porta felis euismod semper.
-2. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
+2. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur
+   ridiculus mus.
 3. Maecenas sed diam eget risus varius blandit sit amet non magna.
 
-Cras mattis consectetur purus sit amet fermentum. Sed posuere consectetur est at lobortis.
+Cras mattis consectetur purus sit amet fermentum. Sed posuere consectetur est at
+lobortis.
 
 <dl>
   <dt>HyperText Markup Language (HTML)</dt>
@@ -85,11 +110,14 @@ Cras mattis consectetur purus sit amet fermentum. Sed posuere consectetur est at
   <dd>The programming language used to build advanced Web sites and applications</dd>
 </dl>
 
-Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Nullam quis risus eget urna mollis ornare vel eu leo.
+Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Morbi leo
+risus, porta ac consectetur ac, vestibulum at eros. Nullam quis risus eget urna
+mollis ornare vel eu leo.
 
 ### Tables
 
-Aenean lacinia bibendum nulla sed consectetur. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Aenean lacinia bibendum nulla sed consectetur. Lorem ipsum dolor sit amet,
+consectetur adipiscing elit.
 
 <table>
   <thead>
@@ -125,8 +153,5 @@ Aenean lacinia bibendum nulla sed consectetur. Lorem ipsum dolor sit amet, conse
   </tbody>
 </table>
 
-Nullam id dolor id nibh ultricies vehicula ut id elit. Sed posuere consectetur est at lobortis. Nullam quis risus eget urna mollis ornare vel eu leo.
-
------
-
-Want to see something else added? <a href="https://github.com/poole/poole/issues/new">Open an issue.</a>
+Nullam id dolor id nibh ultricies vehicula ut id elit. Sed posuere consectetur
+est at lobortis. Nullam quis risus eget urna mollis ornare vel eu leo.
diff --git a/app/templates/app/_includes/head.html b/app/templates/app/_includes/head.html
@@ -17,5 +17,5 @@
   <link rel="shortcut icon" href="/assets/favicon.ico">
 
   <!-- RSS -->
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title }} RSS" href="/feed/">
 </head>
diff --git a/app/templates/app/_includes/header.html b/app/templates/app/_includes/header.html
@@ -2,7 +2,7 @@
 
   <div class="wrapper">
 
-    <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
+    <a class="site-title" href="/">{{ site.title }}</a>
 
     <nav class="site-nav">
       <a href="#" class="menu-icon">

diff --git a/app/templates/app/atom.xml b/app/templates/app/atom.xml
@@ -1,5 +1,7 @@
 ---
 layout: null
+regenerate: true
+permalink: /feed/
 ---
 
 <?xml version="1.0" encoding="utf-8"?>

diff --git a/app/templates/app/index.html b/app/templates/app/index.html
@@ -17,5 +17,5 @@ <h2>
     {% endfor %}
   </ul>
 
-  <p class="rss-subscribe">subscribe <a href="{{ "/atom.xml" }}">via RSS</a></p>
+  <p class="rss-subscribe">subscribe <a href="{{ "/feed/" }}">via RSS</a></p>
 </div>
diff --git a/app/templates/app/sitemap.xml b/app/templates/app/sitemap.xml