From f69533d3f2520795b5aa5d8c6f4d4e524ef90682 Mon Sep 17 00:00:00 2001 From: Sondre Nilsen Date: Tue, 10 Feb 2015 19:22:28 +0100 Subject: [PATCH] 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. --- CHANGELOG.md | 2 + app/templates/Gemfile | 5 +- app/templates/_config.yml | 5 +- .../app/_drafts/2014-03-01-example-content.md | 81 ++++++++++++------- app/templates/app/_includes/head.html | 2 +- app/templates/app/_includes/header.html | 2 +- app/templates/app/atom.xml | 2 + app/templates/app/index.html | 2 +- app/templates/app/sitemap.xml | 56 ------------- 9 files changed, 67 insertions(+), 90 deletions(-) delete mode 100644 app/templates/app/sitemap.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index baa2747..7abb7ba 100755 --- 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 index 0cba631..91437eb 100755 --- 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 index 3f0d6e4..bc4e4ff 100755 --- a/app/templates/_config.yml +++ b/app/templates/_config.yml @@ -40,6 +40,7 @@ excerpt_separator: '' # 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 index e6e5462..fb41e06 100644 --- 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 --- +
Howdy! This is an example blog post that shows several +types of HTML content supported in this theme.
-
- Howdy! This is an example blog post that shows several types of HTML content supported in this theme. -
+Cum sociis natoque penatibus et magnis dis parturient montes, +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 dis parturient montes, 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. + ## 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 ``. - *To italicize text*, use ``. -- Abbreviations, like HTML should use ``, with an optional `title` attribute for the full phrase. +- Abbreviations, like HTML should + use ``, with an optional `title` attribute for the full phrase. - Citations, like — Mark otto, should use ``. -- Deleted text should use `` and inserted text should use ``. -- Superscript text uses `` and subscript text uses ``. +- Deleted text should use `` and inserted text should + use ``. +- Superscript text uses `` and subscript text uses + ``. 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.
HyperText Markup Language (HTML)
@@ -85,11 +110,14 @@ Cras mattis consectetur purus sit amet fermentum. Sed posuere consectetur est at
The programming language used to build advanced Web sites and applications
-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. @@ -125,8 +153,5 @@ Aenean lacinia bibendum nulla sed consectetur. Lorem ipsum dolor sit amet, conse
-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? Open an issue. +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 index 6cf97ca..e51f1a0 100644 --- a/app/templates/app/_includes/head.html +++ b/app/templates/app/_includes/head.html @@ -17,5 +17,5 @@ - + diff --git a/app/templates/app/_includes/header.html b/app/templates/app/_includes/header.html index e2395a1..cedae2c 100644 --- a/app/templates/app/_includes/header.html +++ b/app/templates/app/_includes/header.html @@ -2,7 +2,7 @@
- {{ site.title }} + {{ site.title }}
diff --git a/app/templates/app/sitemap.xml b/app/templates/app/sitemap.xml deleted file mode 100644 index 72f9372..0000000 --- a/app/templates/app/sitemap.xml +++ /dev/null @@ -1,56 +0,0 @@ ---- -layout: null ---- - - - - {{ site.url }}/ - {{ site.time | date_to_xmlschema }} - weekly - 1.0 - - {% for post in site.posts %} - - {{ site.url }}{{ post.url }} - {% if post.sitemap.lastmod %} - {{ post.sitemap.lastmod | date: "%Y-%m-%d" }} - {% elsif post.date %} - {{ post.date | date_to_xmlschema }} - {% else %} - {{ site.time | date_to_xmlschema }} - {% endif %} - {% if post.sitemap.changefreq %} - {{ post.sitemap.changefreq }} - {% else %} - monthly - {% endif %} - {% if post.sitemap.priority %} - {{ post.sitemap.priority }} - {% else %} - 0.5 - {% endif %} - - {% endfor %} - {% for page in site.pages %} - - {{ site.url }}{{ page.url }} - {% if page.sitemap.lastmod %} - {{ page.sitemap.lastmod | date: "%Y-%m-%d" }} - {% elsif page.date %} - {{ page.date | date_to_xmlschema }} - {% else %} - {{ site.time | date_to_xmlschema }} - {% endif %} - {% if page.sitemap.changefreq %} - {{ page.sitemap.changefreq }} - {% else %} - monthly - {% endif %} - {% if page.sitemap.priority %} - {{ page.sitemap.priority }} - {% else %} - 0.3 - {% endif %} - - {% endfor %} -