diff options
Diffstat (limited to '')
| -rw-r--r-- | source/_includes/article.html | 35 | ||||
| -rw-r--r-- | source/_includes/footer.html | 6 | ||||
| -rw-r--r-- | source/_includes/head.html | 23 | ||||
| -rw-r--r-- | source/_includes/sidebar.html | 4 |
4 files changed, 45 insertions, 23 deletions
diff --git a/source/_includes/article.html b/source/_includes/article.html index 92f06720..3481cf21 100644 --- a/source/_includes/article.html +++ b/source/_includes/article.html @@ -1,18 +1,27 @@ <header> - <h1><a href="{{ page.url }}">{{ page.title }}</a></h1> - <p> - {% if site.author or site.author == page.author %} - <span class="byline author vcard">By <span class="fn">{{ site.author }}</span></span> - {% elsif page.author %} - <span class="byline author vcard">By <span class="fn">{{ page.author }}</span></span> + {% if index %} + <h1><a href="{{ page.url }}">{{ page.title }}</a></h1> + {% else %} + <h1>{{ page.title }}</h1> + {% endif %} + {% unless page.nometa %} + {% if page.author %} + {% assign author = page.author %} + {% else %} + {% assign author = site.author %} {% endif %} - {% if page.date %} - <time datetime="{{ page.date | datetime }}" pubdate>{{ page.date | ordinalize }}</time> - {% endif %} - {% if page.updated %} - <time class="updated" datetime="{{ page.updated | datetime }}" pubdate>Updated {{ page.updated | ordinalize }}</time> - {% endif %} - </p> + <p> + {% if author %} + <span class="byline author vcard">By <span class="fn">{{ author }}</span></span> + {% endif %} + {% if page.date %} + <time datetime="{{ page.date | datetime }}" pubdate>{{ page.date | ordinalize }}</time> + {% endif %} + {% if page.updated %} + <time class="updated" datetime="{{ page.updated | datetime }}" pubdate>Updated {{ page.updated | ordinalize }}</time> + {% endif %} + </p> + {% endunless %} </header> {% if index %} <div class="entry">{{ content | exerpt(content, page.url, 'Continue reading »') | smart_quotes }}</div> diff --git a/source/_includes/footer.html b/source/_includes/footer.html index de560edc..5b40083e 100644 --- a/source/_includes/footer.html +++ b/source/_includes/footer.html @@ -3,9 +3,9 @@ <span class="credit">Powered by <a href="http://octopress.org">Octopress</a></span> </p> {% if site.pinboard_user %} + <script language="javascript" src="/javascripts/pinboard.js"></script> <script language="javascript"> - var pinboard_user = "{{ site.pinboard_user }}"; - var pinboard_count = "{{ site.pinboard_count }}"; + var linkroll = 'pinboard_linkroll'; //id target for pinboard list + pinboardNS_fetch_script("http://feeds.pinboard.in/json/v1/u:{{ site.pinboard_user }}/?cb=pinboardNS_show_bmarks\&count={{ site.pinboard_count }}"); </script> - <script language="javascript" src="/javascripts/pinboard.js"></script> {% endif %} diff --git a/source/_includes/head.html b/source/_includes/head.html index 1d3329ba..b311ca69 100644 --- a/source/_includes/head.html +++ b/source/_includes/head.html @@ -1,7 +1,16 @@ +<!DOCTYPE html> +<!--[if IEMobile 7 ]><html class="no-js iem7" manifest="default.appcache?v=1"><![endif]--> +<!--[if lt IE 7 ]><html class="no-js ie6" lang="en"><![endif]--> +<!--[if IE 7 ]><html class="no-js ie7" lang="en"><![endif]--> +<!--[if IE 8 ]><html class="no-js ie8" lang="en"><![endif]--> +<!--[if (gte IE 9)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" manifest="default.appcache?v=1" lang="en"><!--<![endif]--> <head> <meta charset="utf-8"> - - <title>{{page.title}} - {{site.title}}</title> + {% if page.title %} + <title>{{site.title}}: {{page.title}}{% if site.author %} - {{ site.author }}{% endif %}</title> + {% else %} + <title>{{site.title}}{% if site.author %} - {{ site.author }}{% endif %}</title> + {% endif %} <meta name="author" content="{{site.author}}"> {% if page.description %} <meta name="description" content="{{page.description}}"/> @@ -10,7 +19,7 @@ <!-- http://t.co/dKP3o1e --> <meta name="HandheldFriendly" content="True"> <meta name="MobileOptimized" content="320"> - <meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1"> {% if page.keywords %} <meta name="keywords" content="{{page.keywords}}"/> @@ -18,8 +27,12 @@ <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css"> <!--<script src="/javascripts/octopress.js" type="text/javascript"></script>--> - <script src="javascripts/libs/modernizr-1.7.min.js"></script> - <script src="javascripts/libs/ios-viewport-scaling-bug-fix.js"></script> + <script src="/javascripts/libs/modernizr-1.7.js"></script> + <script src="/javascripts/libs/ios-viewport-scaling-bug-fix.js"></script> + <script src="/javascripts/libs/json2.js"></script> + <script src="/javascripts/libs/jXHR.js"></script> + <script src="/javascripts/libs/ender.js"></script> + <script src="/javascripts/syntax-helper.js"></script> {% if site.google_analytics_tracking_id %} {% include google_analytics.html %} {% endif %} diff --git a/source/_includes/sidebar.html b/source/_includes/sidebar.html index c5e3bd01..03890462 100644 --- a/source/_includes/sidebar.html +++ b/source/_includes/sidebar.html @@ -2,14 +2,13 @@ <h1>About Me</h1> <p>Hi, I'm Octopress!</p> </section> -{% if site.recent_posts %} +{% if page.single and site.recent_posts %} <section> <h1>Recent Posts</h1> <ul id="recent_posts"> {% for post in site.posts limit: site.recent_posts %} <li class="post"> <a href="{{ post.url }}">{{ post.title }}</a> - <time>{{ post.date | date: "%B %d, %Y" }}</time> </li> {% endfor %} </ul> @@ -24,3 +23,4 @@ {% if site.pinboard_user %} <section>{% include pinboard.html %}</section> {% endif %} + |