Fixed disqusipfs

9 files changed, 310 insertions, 52 deletions

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 0c46eb2..5aad884 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -12,8 +12,12 @@ relativeurls = true
 	another = "/:section/:slug/"
 [params]
 	subtitle = "An elegant, responsive theme for Hugo"
+	[params.author]
+		name = "Hugo"
+		avatar = "avatar.jpg"
+		bio = "A static site generator written in Go"
+		github = "spf13/hugo"
 	[params.image]
 	  feature = "abstract-1.jpg"
 	  credit = "dargadgetz"
 	  creditlink = "http://www.dargadgetz.com/ios-7-abstract-wallpaper-pack-for-iphone-5-and-ipod-touch-retina/"
-
diff --git a/exampleSite/content/about.md b/exampleSite/content/about.md
index 977b4b5..002e49a 100644
--- a/exampleSite/content/about.md
+++ b/exampleSite/content/about.md
@@ -1,31 +1,32 @@
-+++
-title = "About"
-date = "2014-04-09"
-sidemenu = "true"
-description = "About me and this site"
-+++
-
-Hugo is a static site engine written in Go.
-
-
-It makes use of a variety of open source projects including:
-
-* [Cobra](https://github.com/spf13/cobra)
-* [Viper](https://github.com/spf13/viper)
-* [J Walter Weatherman](https://github.com/spf13/jWalterWeatherman)
-* [Cast](https://github.com/spf13/cast)
-
-Learn more and contribute on [GitHub](https://github.com/spf13).
-
-## Setup
-
-Some fun facts about [Hugo](http://gohugo.io/):
-
-* Built in [Go](http://golang.org/)
-* Loosely inspired by [Jekyll](http://jekyllrb.com/)
-* Primarily developed by [spf13](http://spf13.com/) on the train while commuting to and from Manhattan.
-* Coded in [Vim](http://vim.org) using [spf13-vim](http://vim.spf13.com/)
-
-Have questions or suggestions? Feel free to [open an issue on GitHub](https://github.com/spf13/hugo/issues/new) or [ask me on Twitter](https://twitter.com/spf13).
-
-Thanks for reading!
+---
+layout: page
+title: About the Jekyll Theme
+image:
+  feature: abstract-5.jpg
+  credit: dargadgetz
+  creditlink: http://www.dargadgetz.com/ios-7-abstract-wallpaper-pack-for-iphone-5-and-ipod-touch-retina/
+comments: false
+modified: 2016-02-01
+---
+
+They say three times the charm, so here is another free responsive Jekyll blog theme for you. I've learned a ton since open sourcing my first two themes [on Github](http://github.com/mmistakes), and wanted to try a few new things this time around. 
+
+If you've used any of [my other themes](http://mademistakes.com/work/jekyll-themes/) most of this should be familiar territory...
+
+## HPSTR Features:
+
+* Compatible with Jekyll 3 and GitHub Pages.
+* Responsive templates for post, page, and post index `_layouts`. Looks great on mobile, tablet, and desktop devices.
+* Gracefully degrades in older browsers. Compatible with Internet Explorer 8+ and all modern browsers.  
+* Sweet animated menu.
+* Background image support.
+* Support for large images to call out your favorite posts.
+* Optional [Disqus](http://disqus.com) comments.
+* Simple and clear permalink structure[^1].
+* [Open Graph](https://developers.facebook.com/docs/opengraph/) and [Twitter Cards](https://dev.twitter.com/docs/cards) support for a better social sharing experience.
+* [Custom 404 page]({{ site.url }}/404.html) to get you started.
+* [Syntax highlighting]({{ site.url }}/code-highlighting-post/) stylesheets to make your code examples look snazzy.
+
+<div markdown="0"><a href="{{ site.url }}/theme-setup/" class="btn btn-info">Theme Setup</a> <a href="https://github.com/mmistakes/hpstr-jekyll-theme" class="btn btn-success">Download HPSTR</a></div>
+
+[^1]: Example: *domain.com/category-name/post-title*
\ No newline at end of file
diff --git a/exampleSite/content/posts/2013-05-22-sample-post-images.md b/exampleSite/content/posts/2013-05-22-sample-post-images.md
index 7c41120..415542b 100644
--- a/exampleSite/content/posts/2013-05-22-sample-post-images.md
+++ b/exampleSite/content/posts/2013-05-22-sample-post-images.md
@@ -12,8 +12,8 @@ Here are some examples of what a post with images might look like. If you want t
 ### One Up
 
 <figure>
-	<a href="http://farm9.staticflickr.com/8426/7758832526_cc8f681e48_b.jpg"><img src="http://farm9.staticflickr.com/8426/7758832526_cc8f681e48_c.jpg" alt=""></a>
-	<figcaption><a href="http://www.flickr.com/photos/80901381@N04/7758832526/" title="Morning Fog Emerging From Trees by A Guy Taking Pictures, on Flickr">Morning Fog Emerging From Trees by A Guy Taking Pictures, on Flickr</a>.</figcaption>
+	<a href="//farm9.staticflickr.com/8426/7758832526_cc8f681e48_b.jpg"><img src="//farm9.staticflickr.com/8426/7758832526_cc8f681e48_c.jpg" alt=""></a>
+	<figcaption><a href="//www.flickr.com/photos/80901381@N04/7758832526/" title="Morning Fog Emerging From Trees by A Guy Taking Pictures, on Flickr">Morning Fog Emerging From Trees by A Guy Taking Pictures, on Flickr</a>.</figcaption>
 </figure>
 
 ### Two Up
@@ -31,10 +31,10 @@ Apply the `half` class like so to display two images side by side that share the
 And you'll get something that looks like this:
 
 <figure class="half">
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
-	<img src="http://placehold.it/600x300.jpg" alt="">
-	<img src="http://placehold.it/600x300.jpg" alt="">
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
+	<img src="//placehold.it/600x300.jpg" alt="">
+	<img src="//placehold.it/600x300.jpg" alt="">
 	<figcaption>Two images.</figcaption>
 </figure>
 
@@ -44,9 +44,9 @@ Apply the `third` class like so to display three images side by side that share
 
 ```html
 <figure class="third">
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
 	<figcaption>Caption describing these three images.</figcaption>
 </figure>
 ```
@@ -54,12 +54,12 @@ Apply the `third` class like so to display three images side by side that share
 And you'll get something that looks like this:
 
 <figure class="third">
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
-	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
+	<a href="//placehold.it/1200x600.jpg"><img src="//placehold.it/600x300.jpg" alt=""></a>
 	<figcaption>Three images.</figcaption>
 </figure>
 
@@ -75,7 +75,7 @@ Here is the block you might want to use:
 {% raw %}{% capture images %}
 	/images/abstract-10.jpg
 	/images/abstract-11.jpg
-	http://upload.wikimedia.org/wikipedia/en/2/24/Lenna.png
+	//upload.wikimedia.org/wikipedia/en/2/24/Lenna.png
 {% endcapture %}
 {% include gallery images=images caption="Test images" cols=3 %}{% endraw %}
 ```
@@ -91,6 +91,6 @@ It will look something like this:
 {% capture images %}
 	/images/abstract-10.jpg
 	/images/abstract-11.jpg
-	http://upload.wikimedia.org/wikipedia/en/2/24/Lenna.png
+	//upload.wikimedia.org/wikipedia/en/2/24/Lenna.png
 {% endcapture %}
 {% include gallery images=images caption="Test images" cols=3 %}
diff --git a/exampleSite/content/theme-setup.md b/exampleSite/content/theme-setup.md
new file mode 100644
index 0000000..597767b
--- /dev/null
+++ b/exampleSite/content/theme-setup.md
@@ -0,0 +1,230 @@
+---
+type: page
+title: Theme Setup
+description: "Instructions on how to install and customize the modern Jekyll theme HPSTR."
+image:
+  feature: abstract-11.jpg
+  credit: dargadgetz
+  creditlink: http://www.dargadgetz.com/ios-7-abstract-wallpaper-pack-for-iphone-5-and-ipod-touch-retina/
+share: true
+modified: 2016-06-01T15:14:43-04:00
+---
+
+General notes and suggestions for customizing **HPSTR**.
+
+HPSTR now requires [Jekyll](http://jekyllrb.com/) 3.0. Make sure to run `bundle update` if you aren't on the latest version to update all gem dependencies.
+
+## Basic Setup for a new Jekyll site
+
+1. [Install Bundler](http://bundler.io) `gem install bundler` and then install [Jekyll](http://jekyllrb.com) and all dependencies `bundle install`.
+2. Fork the [HPSTR Jekyll Theme repo](https://github.com/mmistakes/hpstr-jekyll-theme/fork).
+3. Clone the repo you just forked and rename it.
+4. Edit `_config.yml` to personalize your site.
+5. Check out the sample posts in `_posts` to see examples for pulling in large feature images, assigning categories and tags, and other YAML data.
+6. Read the documentation below for further customization pointers and documentation.
+
+<div markdown="0"><a href="https://github.com/mmistakes/hpstr-jekyll-theme/archive/master.zip" class="btn">Download the Theme</a></div>
+
+**Pro-tip:** Delete the `gh-pages` branch after cloning and start fresh by branching off `master`. There is a bunch of garbage in `gh-pages` used for the theme's demo site that I'm guessing you don't want on your site.
+{: .notice}
+
+---
+
+## Setup for an Existing Jekyll site
+
+1. Clone the following folders: `_includes`, `_layouts`, `_sass`, `assets`, and `images`.
+2. Clone the following folders/files and personalize content as need: `about/`, `posts/`, `tags/`, `feed.xml` and `index.html`.
+3. Edit `_config.yml` to personalize your site.
+
+---
+
+## Running Jekyll
+
+The preferred method for running Jekyll is with `bundle exec`, but if you're willing to deal gem conflicts feel free to go cowboy with a `jekyll build` or `jekyll serve`.
+
+> In some cases, running executables without bundle exec may work, if the executable happens to be installed in your system and does not pull in any gems that conflict with your bundle.
+>
+>However, this is unreliable and is the source of considerable pain. Even if it looks like it works, it may not work in the future or on another machine.
+
+```bash
+bundle exec jekyll build
+
+bundle exec jekyll serve
+```
+
+---
+
+## Folder Structure
+
+```bash
+hpstr-jekyll-theme/
+├── _includes
+|    ├── browser-upgrade.html       # prompt to upgrade browser on < IE8
+|    ├── footer.html                # site footer
+|    ├── head.html                  # site head
+|    ├── navigation.html            # site navigation
+|    └── scripts.html               # jQuery, plugins, GA, etc
+├── _layouts
+|    ├── page.html                  # page layout
+|    ├── page.html                  # post-index layout used on home page
+|    └── post.html                  # post layout
+├── _posts
+├── _sass                           # Sass partials
+├── assets
+|    ├── css                        # compiled stylesheets
+|    ├── js
+|    |   ├── _main.js               # plugin options
+|    |   ├── scripts.min.js         # concatenated and minifed site scripts
+|    |   ├── plugins                # plugin scripts
+|    └── └── vendor                 # jQuery and Modernizr scripts
+├── images                          # images for posts and pages
+├── _config.yml                     # Jekyll options
+├── about/                          # about page
+├── posts/                          # all posts
+├── tags/                           # all posts grouped by tag
+└── index.html                      # home page with pagination
+```
+
+---
+
+## Customization
+
+Most of the variables found here are used in the .html files found in `_includes` if you need to add or remove anything. A good place to start would be to add the `title`, `description`, and `url` for your site. Links are absolute and prefixed with `{{ "{{ site.url " }}}}` in the various `_includes` and `_layouts`, so remember to properly set `url`[^1] to `http://localhost:4000` when developing locally.
+
+### Disqus Comments
+
+Create a [Disqus](http://disqus.com) account and change `disqus_shortname` in `_config.yml` to the Disqus *shortname* you just setup. By default comments appear on all post and pages if you assigned a shortname. To disable commenting on a post or page, add the following to its YAML Front Matter:
+
+```yaml
+comments: false
+```
+
+### Social Share Links
+
+To disable Facebook, Twitter, and Google+ share links on a post or page, add the following to its front matter:
+
+```yaml
+share: false
+```
+
+### Owner/Author Information
+
+Change your name, and avatar photo (200x200 pixels or larger), email, and social networking URLs. If you want to link to an external image on Gravatar or something similar you'll need to edit the path in `navigation.html` since it assumes it is located in `/images`.
+
+### Google Analytics and Webmaster Tools
+
+Your Google Analytics ID goes here along with meta tags for [Google Webmaster Tools](http://support.google.com/webmasters/bin/answer.py?hl=en&answer=35179) and [Bing Webmaster Tools](https://ssl.bing.com/webmaster/configure/verify/ownershi) site verification.
+
+### Navigation Links
+
+To add additional links in the drop down menu edit `_data/navigation.yml`. Use the following format to set the URL and title for as many links as you'd like. *External links will open in a new window.*
+
+```yaml
+- title: Portfolio
+  url: /portfolio/
+
+- title: Made Mistakes
+  url: http://mademistakes.com  
+```
+
+---
+
+## Adding New Content
+
+Posts are stored in the `_posts` directory and named according to the `YEAR-MONTH-DAY-title.MARKUP` format as per [the usual](https://jekyllrb.com/docs/posts/).
+
+To streamline the creation of posts and pages, [Jekyll::Compose](https://github.com/jekyll/jekyll-compose) and [Octopress](https://github.com/octopress/octopress) are great plugins you can install to automate this process.
+
+---
+
+### Jekyll _includes
+
+For the most part you can leave these as is since the author/owner details are pulled from `_config.yml`. That said you'll probably want to customize the copyright stuff in `footer.html` to your liking.
+
+### Reading Time
+
+On by default. To turn off remove `reading_time` from `_config.yml`. Default words per minute is set at 200 and can changed by updating `words_per_minute` in `_config.yml`.
+
+### Feature Images
+
+A good rule of thumb is to keep feature images nice and wide so you don't push the body text too far down. An image cropped around around 1024 x 256 pixels will keep file size down with an acceptable resolution for most devices. If you want to serve these images responsively I'd suggest looking at the [Jekyll Picture Tag](https://github.com/scottjehl/picturefill)[^2] plugin.
+
+The two layouts make the assumption that the feature images live in the *images* folder. To add a feature image to a post or page just include the filename in the front matter like so.
+
+```yaml
+image:
+  feature: feature-image-filename.jpg
+  thumb: thumbnail-image.jpg #keep it square 200x200 px is good
+```
+
+If you want to apply attribution to a feature image use the following YAML front matter on posts or pages. Image credits appear directly below the feature image with a link back to the original source.
+
+```yaml
+image:
+  feature: feature-image-filename.jpg
+  credit: Michael Rose #name of the person or site you want to credit
+  creditlink: http://mademistakes.com #url to their site or licensing
+```
+
+By default the `<div>` containing feature images is set to have a minimum height of 400px with CSS. Anything taller is hidden with an `overflow: hidden` declaration. You can customize the height of the homepage feature image and those appearing on posts/pages by modifying the following variables in `/_sass/_variables.scss`.
+
+```scss
+$feature-image-height: 400px; // min 150px recommended
+$front-page-feature-image-height: 400px; // min 150px recommended
+```
+
+#### Post/Page Thumbnails for OG and Twitter Cards
+
+Post and page thumbnails work the same way. These are used by [Open Graph](https://developers.facebook.com/docs/opengraph/) and [Twitter Cards](https://dev.twitter.com/docs/cards) meta tags found in `head.html`. If you don't assign a thumbnail the image you assigned to `site.owner.avatar` in `_config.yml` will be used.
+
+Here's an example of what a tweet to your site could look like if you activate Twitter Cards and include all the metas in your post's YAML.
+
+![Twitter Card summary large image screenshot]({{ site.url }}/images/twitter-card-summary-large-image.jpg)
+
+### Videos
+
+Video embeds are responsive and scale with the width of the main content block with the help of [FitVids](http://fitvidsjs.com/).
+
+### Twitter Cards
+
+Twitter cards make it possible to attach images and post summaries to Tweets that link to your content. Summary Card meta tags have been added to `head.html` to support this, you just need to [validate and apply your domain](https://dev.twitter.com/docs/cards) to turn it on.
+
+### Link Post Type
+
+Link blog like a champ by adding `link: http://url-you-want-linked` to a post's YAML front matter. Arrow glyph links to the post's permalink and the the `post-title` links to the source URL. Here's an [example of a link post]({{ site.url }}/sample-link-post/) if you need a visual.
+
+---
+
+## Further Customization
+
+Jekyll 2.x added support for Sass files making it much easier to modify a theme's fonts and colors. By editing values found in `_sass/variables.scss` you can fine tune the site's colors and typography.
+
+For example if you wanted a red background instead of white you'd change `$bodycolor: #fff;` to `$bodycolor: $cc0033;`.
+
+To modify the site's JavaScript files I setup a Grunt build script to lint/concatenate/minify all scripts into `scripts.min.js`. [Install Node.js](http://nodejs.org/), then [install Grunt](http://gruntjs.com/getting-started), and then finally install the dependencies for the theme contained in `package.json`:
+
+```bash
+npm install
+```
+
+From the theme's root, use `grunt` to concatenate JavaScript files and optimize `.jpg`, `.png` and `.svg` files in the `images/` folder.
+
+You can also use `grunt dev` in combination with `bundle exec jekyll serve` to watch for updates in JS files that Grunt will then automatically re-build as you write your code, which will in turn auto-generate your Jekyll site when developing locally.
+
+---
+
+## Questions?
+
+Having a problem getting something to work or want to know why I setup something in a certain way? Ping me on Twitter [@mmistakes](http://twitter.com/mmistakes) or [file a GitHub Issue](https://github.com/mmistakes/hpstr-jekyll-theme/issues/new). And if you make something cool with this theme feel free to let me know.
+
+---
+
+## License
+
+This theme is free and open source software, distributed under the [MIT License]({{ site.url }}/LICENSE) version 2 or later. So feel free to to modify this theme to suit your needs.
+
+---
+
+[^1]: Used to generate absolute URLs in `feed.xml`, and for canonical URLs in `head.html`. Don't include a trailing `/` in your base url ie: http://mademistakes.com. When developing locally I suggest using http://localhost:4000 or whatever localhost you're using to properly load all theme stylesheets, scripts, and image assets. If you leave this variable blank all links will resolve correctly except those pointing to home.
+
+[^2]: If you're using GitHub Pages to host your site be aware that plugins are disabled. So you'll need to build your site locally and then manually deploy if you want to use this sweet plugin.
diff --git a/exampleSite/data/navigation.toml b/exampleSite/data/navigation.toml
new file mode 100644
index 0000000..5dab9be
--- /dev/null
+++ b/exampleSite/data/navigation.toml
@@ -0,0 +1,8 @@
+
+[[links]]
+title = "Theme Setup"
+url = "/theme-setup/"
+
+[[links]]
+title = "External Link"
+url = "http://mademistakes.com"
diff --git a/exampleSite/data/sections.toml b/exampleSite/data/sections.toml
index dbdd117..3fc0e4c 100644
--- a/exampleSite/data/sections.toml
+++ b/exampleSite/data/sections.toml
@@ -4,4 +4,3 @@
           feature = "abstract-2.jpg"
           credit = "dargadgetz"
           creditlink = "http://www.dargadgetz.com/ios-7-abstract-wallpaper-pack-for-iphone-5-and-ipod-touch-retina/"
-
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 0118e58..2a11c88 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,4 @@
 {{ partial "head.html" . }}
-{{ printf "%#v" $.Scratch}}
 <body id="post-index" {{ if isset ($.Scratch.Get "Params") "image" }}class="feature"{{ end }}>
 {{ partial "navigation.html" . }}
 <div class="entry-header">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 272a24d..45eee5d 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -41,7 +41,7 @@
       </footer>
     </div><!-- /.entry-content -->
     {{ if ne .Params.comments false }}
-    <section id="disqus_thread">{{ template "_internal/disqus.html" . }}</section><!-- /#disqus_thread -->
+    <section id="disqus_thread">{{ partial "disqus.html" . }}</section><!-- /#disqus_thread -->
     {{ end }}
     <!--{{ if ne .Type "page" }}{% if site.related_posts.size > 0 %}{% include read-more.html %}{% endif %}{{ end }} -->
   </article>
diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html
new file mode 100644
index 0000000..52e39f8
--- /dev/null
+++ b/layouts/partials/disqus.html
@@ -0,0 +1,17 @@
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+
+(function() {
+    // Don't ever inject Disqus on localhost--it creates unwanted
+    // discussions from 'localhost:1313' on your Disqus account...
+    if (window.location.hostname == "localhost")
+        return;
+
+    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+    var disqus_shortname = '{{ .Site.DisqusShortname }}';
+    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+})();
+</script>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="http://disqus.com/" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>