Merge branch 'hotfix/schema'

This commit is contained in:
Michael Rose 2014-01-15 14:56:06 -05:00
commit 6f09306ffe
8 changed files with 38 additions and 39 deletions

View File

@ -47,7 +47,7 @@ pygments: true
markdown: kramdown markdown: kramdown
# https://github.com/mojombo/jekyll/wiki/Permalinks # https://github.com/mojombo/jekyll/wiki/Permalinks
permalink: /:categories/:title permalink: /:categories/:title/
# Amount of post to show on home page # Amount of post to show on home page
paginate: 5 paginate: 5

View File

@ -1,4 +1,4 @@
<nav id="dl-menu" class="dl-menuwrapper" role="navigation" itemscope itemtype="http://schema.org/SiteNavigationElement"> <nav id="dl-menu" class="dl-menuwrapper" role="navigation">
<button class="dl-trigger">Open Menu</button> <button class="dl-trigger">Open Menu</button>
<ul class="dl-menu"> <ul class="dl-menu">
<li><a href="{{ site.url }}">Home</a></li> <li><a href="{{ site.url }}">Home</a></li>

View File

@ -7,31 +7,31 @@
{% include head.html %} {% include head.html %}
</head> </head>
<body id="page" {% if page.image.feature %}class="feature"{% endif %} itemscope itemtype="http://schema.org/WebPage"> <body id="page" {% if page.image.feature %}class="feature"{% endif %}>
{% include browser-upgrade.html %} {% include browser-upgrade.html %}
{% include navigation.html %} {% include navigation.html %}
{% if page.image.feature %} {% if page.image.feature %}
<div class="entry-header"> <div class="entry-header">
<div class="entry-image"><img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }}" itemprop="image"> <div class="entry-image"><img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }}">
{% if page.image.credit %}<div class="image-credit">Image source: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></div><!-- /.image-credit -->{% endif %} {% if page.image.credit %}<div class="image-credit">Image source: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></div><!-- /.image-credit -->{% endif %}
</div><!-- /.entry-image --> </div><!-- /.entry-image -->
</div><!-- /.entry-header --> </div><!-- /.entry-header -->
{% endif %} {% endif %}
<div id="main" role="main" itemprop="mainContentOfPage"> <div id="main" role="main">
<article class="entry"> <article class="entry">
<header class="header-title"> <header class="header-title">
<div class="header-title-wrap"> <div class="header-title-wrap">
<h1 class="entry-title" itemprop="name">{{ page.title }}</h1> <h1 class="entry-title">{{ page.title }}</h1>
</div><!-- /.header-title-wrap --> </div><!-- /.header-title-wrap -->
</header> </header>
<div class="entry-content" itemprop="description"> <div class="entry-content">
{{ content }} {{ content }}
<footer class="entry-meta"> <footer class="entry-meta">
{% if page.modified %}{{ page.title }} was last modified on <span class="entry-date date modified"><time datetime="{{ page.modified }}" itemprop="dateModified">{{ page.modified }}</time></span> {% if page.modified %}{{ page.title }} was last modified on <span class="entry-date date modified"><time datetime="{{ page.modified }}">{{ page.modified }}</time></span>
<span class="author vcard fn" itemprop="author" itemtype="http://schema.org/Person">{{ site.owner.name }}</span>{% endif %} <span class="author vcard fn">{{ site.owner.name }}</span>{% endif %}
{% if page.share %}<div class="social-share"> {% if page.share %}<div class="social-share">
<ul class="socialcount socialcount-small inline-list" data-url="{{ site.url }}{{ page.url }}" data-share-text="{{ page.title }}"> <ul class="socialcount socialcount-small inline-list" data-url="{{ site.url }}{{ page.url }}" data-share-text="{{ page.title }}">
<li class="facebook"><a href="https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ page.url }}" title="Share on Facebook"><span class="count"><i class="icon-facebook-sign"></i> Like</span></a></li> <li class="facebook"><a href="https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ page.url }}" title="Share on Facebook"><span class="count"><i class="icon-facebook-sign"></i> Like</span></a></li>

View File

@ -7,26 +7,26 @@
{% include head.html %} {% include head.html %}
</head> </head>
<body id="post-index" {% if page.image.feature %}class="feature"{% endif %} itemscope itemtype="http://schema.org/WebPage"> <body id="post-index" {% if page.image.feature %}class="feature"{% endif %}>
{% include browser-upgrade.html %} {% include browser-upgrade.html %}
{% include navigation.html %} {% include navigation.html %}
<div class="entry-header"> <div class="entry-header">
{% if page.image.feature %} {% if page.image.feature %}
<div class="entry-image"><img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }}" itemprop="image"> <div class="entry-image"><img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }}">
{% if page.image.credit %}<div class="image-credit">Image source: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></div><!-- /.image-credit -->{% endif %} {% if page.image.credit %}<div class="image-credit">Image source: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></div><!-- /.image-credit -->{% endif %}
</div><!-- /.entry-image --> </div><!-- /.entry-image -->
{% endif %} {% endif %}
<div class="header-title"> <div class="header-title">
<div class="header-title-wrap"> <div class="header-title-wrap">
<h1>{{ site.title }}</h1> <h1>{{ site.title }}</h1>
<h2 itemprop="name">{{ page.title }}</h2> <h2>{{ page.title }}</h2>
</div><!-- /.header-title-wrap --> </div><!-- /.header-title-wrap -->
</div><!-- /.header-title --> </div><!-- /.header-title -->
</div><!-- /.entry-header --> </div><!-- /.entry-header -->
<div id="main" role="main" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog"> <div id="main" role="main">
{{ content }} {{ content }}
</div><!-- /#main --> </div><!-- /#main -->

View File

@ -7,40 +7,40 @@
{% include head.html %} {% include head.html %}
</head> </head>
<body id="post" {% if page.image.feature %}class="feature"{% endif %} itemscope itemtype="http://schema.org/WebPage"> <body id="post" {% if page.image.feature %}class="feature"{% endif %}>
{% include browser-upgrade.html %} {% include browser-upgrade.html %}
{% include navigation.html %} {% include navigation.html %}
{% if page.image.feature %} {% if page.image.feature %}
<div class="entry-header"> <div class="entry-header">
<div class="entry-image"><img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }}" itemprop="image"> <div class="entry-image"><img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }}">
{% if page.image.credit %}<div class="image-credit">Image source: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></div><!-- /.image-credit -->{% endif %} {% if page.image.credit %}<div class="image-credit">Image source: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></div><!-- /.image-credit -->{% endif %}
</div><!-- /.entry-image --> </div><!-- /.entry-image -->
</div><!-- /.entry-header --> </div><!-- /.entry-header -->
{% endif %} {% endif %}
<div id="main" role="main" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog"> <div id="main" role="main">
<article class="hentry" itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting"> <article class="hentry">
<header class="header-title"> <header class="header-title">
<div class="header-title-wrap"> <div class="header-title-wrap">
{% if page.link %} {% if page.link %}
<h1 class="entry-title" itemprop="name"><a href="{{ page.link }}">{{ page.title }}</a></h1> <h1 class="entry-title"><a href="{{ page.link }}">{{ page.title }}</a></h1>
{% else %} {% else %}
<h1 class="entry-title" itemprop="name"><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}" itemprop="url">{{ page.title }}</a></h1> <h1 class="entry-title"><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}">{{ page.title }}</a></h1>
{% endif %} {% endif %}
<h2>{{ page.date | date: "%B %d, %Y" }}</h2> <h2>{{ page.date | date: "%B %d, %Y" }}</h2>
</div><!-- /.header-title-wrap --> </div><!-- /.header-title-wrap -->
</header> </header>
<div class="entry-content" itemprop="description"> <div class="entry-content">
{{ content }} {{ content }}
<footer class="entry-meta"> <footer class="entry-meta">
<span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.url }}/tags/index.html#{{ tag | cgi_encode }}" title="Pages tagged {{ tag }}" rel="tag" class="tag">{{ tag }}</a>{% unless forloop.last %}{% endunless %}{% endfor %}</span> <span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.url }}/tags/#{{ tag | cgi_encode }}" title="Pages tagged {{ tag }}" class="tag">{{ tag }}</a>{% unless forloop.last %}{% endunless %}{% endfor %}</span>
<span><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}" itemprop="url">{{ page.title }}</a> was published on <span class="entry-date date published updated"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%B %d, %Y" }}</time></span></span> <span><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}">{{ page.title }}</a> was published on <span class="entry-date date published updated"><time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time></span></span>
{% if page.modified %}(revised: <span class="entry-date date modified"><time datetime="{{ page.modified }}" itemprop="dateModified">{{ page.modified | date: "%m/%d/%Y" }}</time></span>){% endif %} {% if page.modified %}(revised: <span class="entry-date date modified"><time datetime="{{ page.modified }}">{{ page.modified | date: "%m/%d/%Y" }}</time></span>){% endif %}
<span class="author vcard" itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name" class="fn"><a href="{{ site.url }}/about" title="About {{ site.owner.name }}" itemprop="url">{{ site.owner.name }}</a></span></span> <span class="author vcard"><span class="fn"><a href="{{ site.url }}/about/" title="About {{ site.owner.name }}">{{ site.owner.name }}</a></span></span>
{% if page.share %}<div class="social-share"> {% if page.share %}<div class="social-share">
<ul class="socialcount socialcount-small inline-list" data-url="{{ site.url }}{{ page.url }}" data-share-text="{{ page.title }}"> <ul class="socialcount socialcount-small inline-list">
<li class="facebook"><a href="https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ page.url }}" title="Share on Facebook"><span class="count"><i class="icon-facebook-sign"></i> Like</span></a></li> <li class="facebook"><a href="https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ page.url }}" title="Share on Facebook"><span class="count"><i class="icon-facebook-sign"></i> Like</span></a></li>
<li class="twitter"><a href="https://twitter.com/intent/tweet?text={{ site.url }}{{ page.url }}" title="Share on Twitter"><span class="count"><i class="icon-twitter-sign"></i> Tweet</span></a></li> <li class="twitter"><a href="https://twitter.com/intent/tweet?text={{ site.url }}{{ page.url }}" title="Share on Twitter"><span class="count"><i class="icon-twitter-sign"></i> Tweet</span></a></li>
<li class="googleplus"><a href="https://plus.google.com/share?url={{ site.url }}{{ page.url }}" title="Share on Google Plus"><span class="count"><i class="icon-google-plus-sign"></i> +1</span></a></li> <li class="googleplus"><a href="https://plus.google.com/share?url={{ site.url }}{{ page.url }}" title="Share on Google Plus"><span class="count"><i class="icon-google-plus-sign"></i> +1</span></a></li>

View File

@ -7,16 +7,16 @@ description: "An archive of posts."
--- ---
{% for post in site.posts %} {% for post in site.posts %}
<article class="hentry" itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting"> <article class="hentry">
<header> <header>
<div class="entry-meta"><span class="entry-date date published"><time datetime="{{ post.date | date_to_xmlschema }}" itemprop="datePublished"><a href="{{ site.url }}{{ post.url }}">{{ post.date | date: "%B %d, %Y" }}</a></time></span><span class="author vcard fn" itemprop="author" itemtype="http://schema.org/Person"><a class="url fn" href="{{ site.url }}">{{ site.owner.name }}</a></span>{% if site.disqus_shortname and post.comments %}&nbsp; &bull; &nbsp;<span class="entry-comments"><a href="{{ site.url }}{{ post.url }}#disqus_thread">Comment</a></span>{% endif %}</div><!-- /.entry-meta --> <div class="entry-meta"><span class="entry-date date published"><time datetime="{{ post.date | date_to_xmlschema }}"><a href="{{ site.url }}{{ post.url }}">{{ post.date | date: "%B %d, %Y" }}</a></time></span><span class="author vcard fn"><a class="url fn" href="{{ site.url }}">{{ site.owner.name }}</a></span>{% if site.disqus_shortname and post.comments %}&nbsp; &bull; &nbsp;<span class="entry-comments"><a href="{{ site.url }}{{ post.url }}#disqus_thread">Comment</a></span>{% endif %}</div><!-- /.entry-meta -->
{% if post.link %} {% if post.link %}
<h1 class="entry-title" itemprop="name"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" itemprop="url" title="{{ post.title }}"><i class="icon-double-angle-right"></i></a> <a href="{{ post.link }}">{{ post.title }}</a></h1> <h1 class="entry-title"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}"><i class="icon-double-angle-right"></i></a> <a href="{{ post.link }}">{{ post.title }}</a></h1>
{% else %} {% else %}
<h1 class="entry-title" itemprop="name"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}" itemprop="url">{{ post.title }}</a></h1> <h1 class="entry-title"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h1>
{% endif %} {% endif %}
</header> </header>
<div class="entry-content" itemprop="description"> <div class="entry-content">
<p>{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 120 }}{% endif %} <a href="{{ site.url }}{{ post.url }}">Continue reading</a></p> <p>{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 120 }}{% endif %} <a href="{{ site.url }}{{ post.url }}">Continue reading</a></p>
</div><!-- /.entry-content --> </div><!-- /.entry-content -->
</article><!-- /.hentry --> </article><!-- /.hentry -->

View File

@ -10,16 +10,16 @@ image:
--- ---
{% for post in paginator.posts %} {% for post in paginator.posts %}
<article class="hentry" itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting"> <article class="hentry">
<header> <header>
<div class="entry-meta"><span class="entry-date date published updated"><time datetime="{{ post.date | date_to_xmlschema }}" itemprop="datePublished"><a href="{{ site.url }}{{ post.url }}">{{ post.date | date: "%B %d, %Y" }}</a></time></span><span class="author vcard" itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name" class="fn"><a href="{{ site.url }}/about" title="About {{ site.owner.name }}" itemprop="url">{{ site.owner.name }}</a></span></span>{% if site.disqus_shortname and post.comments %}&nbsp; &bull; &nbsp;<span class="entry-comments"><a href="{{ site.url }}{{ post.url }}#disqus_thread">Comment</a></span>{% endif %}</div><!-- /.entry-meta --> <div class="entry-meta"><span class="entry-date date published updated"><time datetime="{{ post.date | date_to_xmlschema }}"><a href="{{ site.url }}{{ post.url }}">{{ post.date | date: "%B %d, %Y" }}</a></time></span><span class="author vcard"><span class="fn"><a href="{{ site.url }}/about/" title="About {{ site.owner.name }}">{{ site.owner.name }}</a></span></span>{% if site.disqus_shortname and post.comments %}&nbsp; &bull; &nbsp;<span class="entry-comments"><a href="{{ site.url }}{{ post.url }}#disqus_thread">Comment</a></span>{% endif %}</div><!-- /.entry-meta -->
{% if post.link %} {% if post.link %}
<h1 class="entry-title" itemprop="name"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" itemprop="url" title="{{ post.title }}"><i class="icon-double-angle-right"></i></a> <a href="{{ post.link }}">{{ post.title }}</a></h1> <h1 class="entry-title"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}"><i class="icon-double-angle-right"></i></a> <a href="{{ post.link }}">{{ post.title }}</a></h1>
{% else %} {% else %}
<h1 class="entry-title" itemprop="name"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}" itemprop="url">{{ post.title }}</a></h1> <h1 class="entry-title"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}" itemprop="url">{{ post.title }}</a></h1>
{% endif %} {% endif %}
</header> </header>
<div class="entry-content" itemprop="description"> <div class="entry-content">
{{ post.content }} {{ post.content }}
</div><!-- /.entry-content --> </div><!-- /.entry-content -->
</article><!-- /.hentry --> </article><!-- /.hentry -->
@ -58,5 +58,4 @@ image:
{% else %} {% else %}
Next Next
{% endif %} {% endif %}
</div><!-- /.pagination -->
</div>

View File

@ -20,14 +20,14 @@ description: "An archive of posts sorted by tag."
</ul> </ul>
{% for tag in site.tags %} {% for tag in site.tags %}
<article class="hentry" itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting"> <article class="hentry">
<h2 id="{{ tag[0] }}">{{ tag[0] }}</h2> <h2 id="{{ tag[0] }}">{{ tag[0] }}</h2>
<ul> <ul>
{% assign pages_list = tag[1] %} {% assign pages_list = tag[1] %}
{% for post in pages_list %} {% for post in pages_list %}
{% if post.title != null %} {% if post.title != null %}
{% if group == null or group == post.group %} {% if group == null or group == post.group %}
<li class="entry-title" itemprop="name"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}" itemprop="url">{{ post.title }}</a></li> <li class="entry-title"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}