From 3efde330dca999cb0fe38b3c819d3675cc6b4a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20=C2=BBmo=2E=C2=AB=20Sauer?= <mo@phlow.de>
Date: Wed, 25 Feb 2015 13:54:46 +0100
Subject: [PATCH] added google analytics and next previous in category include

---
 _config.yml                                   | 23 +++++++++--
 _data/language.yml                            |  4 +-
 _includes/breadcrumb.html                     |  8 ++--
 _includes/footer.html                         |  2 +-
 _includes/footer_scripte.html                 |  9 ----
 _includes/footer_scripts.html                 | 24 +++++++++++
 _includes/list-posts.html                     | 38 ++++++++---------
 _includes/next-previous-post-in-category.html | 41 +++++++++++++++++++
 _includes/pagination.html                     | 11 +++--
 _includes/sidebar.html                        |  2 +-
 _layouts/default.html                         |  2 +-
 _posts/design/2014-09-13-grid.md              | 22 +++++-----
 .../design/2014-10-08-header-image-pattern.md |  1 +
 .../2014-10-09-header-full-width-image.md     |  1 +
 .../design/2014-10-09-header-image-color.md   |  1 +
 _posts/design/2014-10-09-header-logo-only.md  |  1 +
 _posts/design/2015-02-10-header-with-text.md  |  1 +
 _posts/design/2015-10-11-no-header.md         |  3 +-
 _sass/_06_typography.scss                     |  4 +-
 _sass/_07_layout.scss                         |  6 ++-
 pages/changelog.md                            |  3 ++
 pages/roadmap.md                              |  7 ++--
 22 files changed, 151 insertions(+), 63 deletions(-)
 delete mode 100755 _includes/footer_scripte.html
 create mode 100755 _includes/footer_scripts.html
 create mode 100644 _includes/next-previous-post-in-category.html

diff --git a/_config.yml b/_config.yml
index 52e70f8..c5689d2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -110,7 +110,7 @@ defaults:
 google_author:             "https://plus.google.com/u/0/118311555303973066167"
 google_site_verification:  "Vk0IOJ2jwG_qEoG7fuEXYqv0m2rLa8P778Fi_GrsgEQ"
 bing_webmastertools_id:    "0FB4C028ABCF07C908C54386ABD2D97F"
-# alexa_verify_id:         ""
+alexa_verify_id:         "m1VxsMv1gIN-up4Sw0PGQIvyCRw"
 
 
 
@@ -162,6 +162,8 @@ og_description:                     "Feeling Responsive is built on the fabulous
 #     / /_/ / (__  ) /_/ / /_/ (__  ) 
 #    /_____/_/____/\__, /\__,_/____/  
 #                    /_/              
+#
+# used in _includes/comments.html
 
 disqus_shortname: feelingresponsive
 
@@ -169,10 +171,23 @@ disqus_shortname: feelingresponsive
 #      _____                
 #     / ___/____ ___________
 #     \__ \/ __ `/ ___/ ___/
-#    ___/ / /_/ (__  |__  ) 
-#   /____/\__,_/____/____/  
+#    ___/ / /_/ (__  |__  )     More › http://sass-lang.com/ 
+#   /____/\__,_/____/____/      More › http://jekyllrb.com/docs/assets/#sassscss
 #                           
 
 sass:
     sass_dir: _sass
-    style: :compressed
\ No newline at end of file
+    style: :compressed
+
+
+#       ___                __      __  _          
+#      /   |  ____  ____ _/ /_  __/ /_(_)_________
+#     / /| | / __ \/ __ `/ / / / / __/ / ___/ ___/
+#    / ___ |/ / / / /_/ / / /_/ / /_/ / /__(__  ) 
+#   /_/  |_/_/ /_/\__,_/_/\__, /\__/_/\___/____/      https://www.google.com/analytics/
+#                        /____/                   
+#
+# used in _includes/footer_scripts.html
+
+google_analytics_tracking_id: UA-60112281-1
+
diff --git a/_data/language.yml b/_data/language.yml
index bc1e06b..9cded77 100644
--- a/_data/language.yml
+++ b/_data/language.yml
@@ -14,4 +14,6 @@ previous_posts: "Previous Posts"
 read: "Read"
 read_more: "Read More&nbsp;›"
 if_you_are_not_redirected_automatically: "If you are not redirected automatically,"
-click_here: "click here"
\ No newline at end of file
+click_here: "click here"
+next_post_in: "Next Post in"
+previous_post_in: "Previous Post in"
\ No newline at end of file
diff --git a/_includes/breadcrumb.html b/_includes/breadcrumb.html
index 7c68337..10cca14 100644
--- a/_includes/breadcrumb.html
+++ b/_includes/breadcrumb.html
@@ -1,8 +1,8 @@
 {% comment %}
-
-http://stackoverflow.com/questions/9612235/what-are-some-good-ways-to-implement-breadcrumbs-on-a-jekyll-site
-https://github.com/huonw/huonw.github.io/blob/master/_layouts/default.html#L17
-
+*  
+*  http://stackoverflow.com/questions/9612235/what-are-some-good-ways-to-implement-breadcrumbs-on-a-jekyll-site
+*  https://github.com/huonw/huonw.github.io/blob/master/_layouts/default.html#L17
+*  
 {% endcomment %}
 
 
diff --git a/_includes/footer.html b/_includes/footer.html
index 28cfab9..be979c0 100755
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -69,7 +69,7 @@
         <nav class="row">
           <section id="subfooter-left" class="b30 small-12 medium-6 columns">
             <ul class="inline-list">
-              <li>We &hearts; <a style="display:inline;" href="http://jekyllrb.com/" target="_blank">Jekyll</a> &amp; <a style="display:inline;" href="http://phlow.github.io/feeling-responsive/">Feeling Responsive</a> </li>
+              <li>Created with &hearts; by <a style="display:inline;" href="http://phlow.de/">Phlow</a> with <a style="display:inline;" href="http://jekyllrb.com/" target="_blank">Jekyll</a> using <a style="display:inline;" href="http://phlow.github.io/feeling-responsive/">Feeling Responsive</a> </li>
             </ul>
           </section>
 
diff --git a/_includes/footer_scripte.html b/_includes/footer_scripte.html
deleted file mode 100755
index 057dad3..0000000
--- a/_includes/footer_scripte.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script src="{{ site.url }}/assets/js/javascript.min.js"></script>
-
-{% if page.header.image_fullwidth %}
-<script>
-    $("#masthead").backstretch("{{ site.url }}/images/{{ page.header.image_fullwidth }}", {fade: 700});
-    $("#masthead-with-text").backstretch("{{ site.url }}/images/{{ page.header.image_fullwidth }}", {fade: 700});
-</script>
-{% endif %}
-
diff --git a/_includes/footer_scripts.html b/_includes/footer_scripts.html
new file mode 100755
index 0000000..d3141ac
--- /dev/null
+++ b/_includes/footer_scripts.html
@@ -0,0 +1,24 @@
+<script src="{{ site.url }}/assets/js/javascript.min.js"></script>
+
+{% if page.header.image_fullwidth %}
+<script>
+    $("#masthead").backstretch("{{ site.url }}/images/{{ page.header.image_fullwidth }}", {fade: 700});
+    $("#masthead-with-text").backstretch("{{ site.url }}/images/{{ page.header.image_fullwidth }}", {fade: 700});
+</script>
+{% endif %}
+
+
+
+{% if site.google_analytics_tracking_id %}
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '{{ if site.google_analytics_tracking_id }}', 'auto');
+  ga('set', 'anonymizeIp', true);
+  ga('send', 'pageview');
+
+</script>
+{% endif %}
\ No newline at end of file
diff --git a/_includes/list-posts.html b/_includes/list-posts.html
index 497df11..a9e06b7 100644
--- a/_includes/list-posts.html
+++ b/_includes/list-posts.html
@@ -1,23 +1,23 @@
 {% comment %}
-
-Possible parameter for this loop:
-
- › entries
- › offset
- › category
- › tag
-
-Example for Category: {% include list-posts.html entries='3' offset='1' category='design' %}
-
-Example for Tag: {% include list-posts.html entries='5' tag='terminal' %}
-
-
-This loop works like this:
-
-1. First we check if there was given a category for filtering › if include.categories == NULL 
-2. If no category is given for filtering do a general loop.
-3. If a category/tag was given, assign category/tag to the variable category/tag › assign category = include.categories 
-
+*   
+*   Possible parameter for this loop:
+*   
+*    › entries
+*    › offset
+*    › category
+*    › tag
+*   
+*   Example for Category: {% include list-posts.html entries='3' offset='1' category='design' %}
+*   
+*   Example for Tag: {% include list-posts.html entries='5' tag='terminal' %}
+*   
+*   
+*   This loop works like this:
+*   
+*   1. First we check if there was given a category for filtering › if include.categories == NULL 
+*   2. If no category is given for filtering do a general loop.
+*   3. If a category/tag was given, assign category/tag to the variable category/tag › assign category = include.categories 
+*   
 {% endcomment %}
 
 
diff --git a/_includes/next-previous-post-in-category.html b/_includes/next-previous-post-in-category.html
new file mode 100644
index 0000000..a851c06
--- /dev/null
+++ b/_includes/next-previous-post-in-category.html
@@ -0,0 +1,41 @@
+{% comment %}
+*
+* This include creates a next/previous link to a post of the same category
+* using a the categories-variable in front matter.
+*
+* Source: https://github.com/jekyll/jekyll/issues/260a#issue-495435
+*
+* Use › {% include next-previous-post-in-category.html %}
+* 
+{% endcomment %}
+
+
+{% comment %}
+*
+* assign FIRST category from categories variable from front matter to cat
+* and make a string from the array by using › join: ''
+*
+{% endcomment %}
+
+{% assign cat = page.categories | first | join: '' %}
+{% for post in site.categories.[cat] %}
+{% if post.url == page.url %}
+{% assign post_index0 = forloop.index0 %}
+{% assign post_index1 = forloop.index %}
+{% endif %}
+{% endfor %}
+{% for post in site.categories.[cat] %}
+{% if post_index0 == forloop.index %}
+{% assign next_post = post.url %}
+{% endif %}
+{% if post_index1 == forloop.index0 %}
+{% assign prev_post = post.url %}
+{% endif %}
+{% endfor %}
+{% if next_post %}
+<a class="left button tiny radius icon-chevron-left r15" href="{{ next_post }}">{{ site.data.language.next_post_in }} {{ cat | upcase }}</a>
+{% endif %}
+{% if prev_post %}
+<a class="button tiny radius" href="{{ prev_post }}">{{ site.data.language.previous_post_in }} {{ cat | upcase }}<span class="icon-chevron-right"></span></a>
+{% endif %}
+
diff --git a/_includes/pagination.html b/_includes/pagination.html
index 8b96eee..bb43c7d 100644
--- a/_includes/pagination.html
+++ b/_includes/pagination.html
@@ -1,9 +1,12 @@
-<!-- This loops through the paginated posts 
+{% comment %}
+*  This loops through the paginated posts 
+*
+*  Total posts: {{ paginator.total_posts }}
+*  Total paginate-pages: {{ paginator.total_pages }}
+*  
+{% endcomment %}
 
-Total posts: {{ paginator.total_posts }}
-Total paginate-pages: {{ paginator.total_pages }}
 
--->
 {% for post in paginator.posts %}
   <div class="row">
     <div class="small-12 columns b60">
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index fbcef6e..e3ceae1 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -14,7 +14,7 @@
 	<div class="border-dotted radius b30">
 		<img src="http://placekitten.com/271/270" alt="uh, Placekitten">
 		<p class="text-left">
-			This is an advertisment with crazy cats! <a href="http://placekitten.com/">Check'em out.</a>
+			This is an advertisment with a crazy cat! <a href="http://placekitten.com/">More cats, please!</a>
 		</p>
 	</div>
 </aside>
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index 92eef1a..b158d12 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -15,6 +15,6 @@ layout: compress
 
 	{% include footer.html %}
 	
-	{% include footer_scripte.html %}
+	{% include footer_scripts.html %}
 </body>
 </html>
\ No newline at end of file
diff --git a/_posts/design/2014-09-13-grid.md b/_posts/design/2014-09-13-grid.md
index cca07e8..7069aa8 100755
--- a/_posts/design/2014-09-13-grid.md
+++ b/_posts/design/2014-09-13-grid.md
@@ -6,10 +6,11 @@ teaser: "Create powerful multi-device layouts quickly and easily with the 12-col
 breadcrumb: true
 categories:
     - design
+permalink: /design/grid/
 header:
-   image_fullwidth: "unsplash_brooklyn-bridge_header.jpg"
+    image_fullwidth: "unsplash_brooklyn-bridge_header.jpg"
 image:
-   thumb: "unsplash_brooklyn-bridge_thumb.jpg"
+    thumb: "unsplash_brooklyn-bridge_thumb.jpg"
 ---
 *Feeling Responsive* is built on Foundation. And of course, we make use of the wonderful grid system and so can you. Find out more about [constructing  beautiful layouts][1] in the foundation documentation.
 
@@ -136,13 +137,12 @@ image:
 </div>
 
 
+<div id="bottom" class="row t30">
+    <div class="small-12 columns">
+      {% include next-previous-post-in-category.html %}
+    </div><!-- /.small-12.columns -->
+</div>
+
+
+
  [1]: http://foundation.zurb.com/docs/components/grid.html
- [2]: #
- [3]: #
- [4]: #
- [5]: #
- [6]: #
- [7]: #
- [8]: #
- [9]: #
- [10]: #
\ No newline at end of file
diff --git a/_posts/design/2014-10-08-header-image-pattern.md b/_posts/design/2014-10-08-header-image-pattern.md
index 6b3b9a2..2c9b107 100755
--- a/_posts/design/2014-10-08-header-image-pattern.md
+++ b/_posts/design/2014-10-08-header-image-pattern.md
@@ -27,5 +27,6 @@ header:
 
 
 ### All Header-Styles 
+{: .t60 }
 
 {% include list-posts.html tag='header' %}
\ No newline at end of file
diff --git a/_posts/design/2014-10-09-header-full-width-image.md b/_posts/design/2014-10-09-header-full-width-image.md
index 4b6fe4f..351031c 100755
--- a/_posts/design/2014-10-09-header-full-width-image.md
+++ b/_posts/design/2014-10-09-header-full-width-image.md
@@ -26,5 +26,6 @@ header:
 
 
 ### All Header-Styles 
+{: .t60 }
 
 {% include list-posts.html tag='header' %}
\ No newline at end of file
diff --git a/_posts/design/2014-10-09-header-image-color.md b/_posts/design/2014-10-09-header-image-color.md
index a111cbe..fbe7ca9 100755
--- a/_posts/design/2014-10-09-header-image-color.md
+++ b/_posts/design/2014-10-09-header-image-color.md
@@ -28,5 +28,6 @@ header:
 
 
 ### All Header-Styles 
+{: .t60 }
 
 {% include list-posts.html tag='header' %}
\ No newline at end of file
diff --git a/_posts/design/2014-10-09-header-logo-only.md b/_posts/design/2014-10-09-header-logo-only.md
index 91c1dd9..7630734 100755
--- a/_posts/design/2014-10-09-header-logo-only.md
+++ b/_posts/design/2014-10-09-header-logo-only.md
@@ -14,5 +14,6 @@ No front matter code needed.
 
 
 ### All Header-Styles 
+{: .t60 }
 
 {% include list-posts.html tag='header' %}
\ No newline at end of file
diff --git a/_posts/design/2015-02-10-header-with-text.md b/_posts/design/2015-02-10-header-with-text.md
index de3a289..24fde00 100644
--- a/_posts/design/2015-02-10-header-with-text.md
+++ b/_posts/design/2015-02-10-header-with-text.md
@@ -19,5 +19,6 @@ header:
 
 
 ### All Header-Styles 
+{: .t60 }
 
 {% include list-posts.html tag='header' %}
\ No newline at end of file
diff --git a/_posts/design/2015-10-11-no-header.md b/_posts/design/2015-10-11-no-header.md
index ecd5ef8..7ffa554 100755
--- a/_posts/design/2015-10-11-no-header.md
+++ b/_posts/design/2015-10-11-no-header.md
@@ -18,6 +18,7 @@ header: no
 ~~~
 
 
-### All Header-Styles 
+### All Header-Styles
+{: .t60 }
 
 {% include list-posts.html tag='header' %}
\ No newline at end of file
diff --git a/_sass/_06_typography.scss b/_sass/_06_typography.scss
index f8907dd..5f418d3 100644
--- a/_sass/_06_typography.scss
+++ b/_sass/_06_typography.scss
@@ -18,7 +18,6 @@ a:visited {
 
 a:hover {
         color: darken( $ci-1, 10% ) ;
-        // border-bottom: 3px solid $ci-1;
 }
 
 a:focus {
@@ -49,7 +48,8 @@ p a:hover,
 article a:hover {
     border-bottom: 2px solid;
 }
-p a.button {
+p a.button,
+.button:hover {
     border: 0;
 }
 p.button a {
diff --git a/_sass/_07_layout.scss b/_sass/_07_layout.scss
index 8f9db5c..f52814c 100644
--- a/_sass/_07_layout.scss
+++ b/_sass/_07_layout.scss
@@ -304,8 +304,10 @@ body.video cite { color: #fff; }
 .b30 { margin-bottom: 30px !important; }
 .b60 { margin-bottom: 60px !important; }
 
-.pl20 { padding-left: 20px !important; }
+.l15 { margin-left: 15px !important; }
+.r15 { margin-right: 15px !important; }
 
-.pr5 { padding-right: 5px !important; }
+.pl20 { padding-left: 20px !important; }
+.pr5  { padding-right: 5px !important; }
 .pr10 { padding-right: 10px !important; }
 .pr20 { padding-right: 20px !important; }
\ No newline at end of file
diff --git a/pages/changelog.md b/pages/changelog.md
index 52930db..7194f9c 100644
--- a/pages/changelog.md
+++ b/pages/changelog.md
@@ -7,6 +7,9 @@ header:
    image_fullwidth: "header_unsplash_9.jpg"
 permalink: "/changelog/"
 ---
+2015-02-25 // Version 0.99.1
+:   Added support for Google Analtics. Added `_include/next-previous-post-in-category.html` to generate links from one post in a category to another post in that same category. Example at the bottom of [Grid & Colors]({{ site.url }}/design/grid/#bottom).
+
 2015-02-19 // Version 0.99
 :   Yes! Now *Feeling Responsive* uses the built-in sass-support by Jekyll. Open `_sass` and dig deeper into customizing this theme using your colors, typography and so on...
 
diff --git a/pages/roadmap.md b/pages/roadmap.md
index 9c71d60..86259ee 100644
--- a/pages/roadmap.md
+++ b/pages/roadmap.md
@@ -9,11 +9,10 @@ permalink: "/roadmap/"
 ---
 
 ## Ideas and possible new features
+{: .t30 }
 
-* Additional [header]({{ site.url }}/headers/) with text
-github-pages/#comment-1870475246)
 * Produce an introduction video to showcase *Feeling Responsive*
-* Better responsive typography
+* Even better responsive typography
 * Google AdSense ads
 * [Submit *Feeling Responsive* to jekyllthemes.org](http://jekyllthemes.org/)
 * More post-formats for blogging like special post formats for links, audio, tweets,...
@@ -22,6 +21,8 @@ github-pages/#comment-1870475246)
 
 ## Done
 
+* [<s>Additional header with text</s>]({{ site.url }}/headers/)
+* <s>Added Google Analtics support</s>
 * [<s>Add redirection layout by KanishkKanishk</s>](http://codingtips.kanishkkunal.in/redirects-jekyll-github-pages/)
 * <s>Convert Foundation Sass to use native Jekyll Sass support</s>
 * <s>Optimize HTML and use Schema.org-Attributes › http://schema.org/Article</s>