5 files changed, 43 insertions, 39 deletions
diff --git a/nikola/data/themes/base/templates/base.tmpl b/nikola/data/themes/base/templates/base.tmpl
index f587593..21f5ad5 100644
--- a/nikola/data/themes/base/templates/base.tmpl
+++ b/nikola/data/themes/base/templates/base.tmpl
@@ -11,6 +11,7 @@ ${base.html_headstart()}
 ${template_hooks['extra_head']()}
 </head>
 <body>
+<a href="#content" class="sr-only sr-only-focusable">${messages("Skip to main content")}</a>
     <div id="container">
          ${header.html_header()}
          <main id="content">
diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
index beeff99..491b6da 100644
--- a/nikola/data/themes/base/templates/base_helper.tmpl
+++ b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -47,11 +47,18 @@ lang="${lang}">
         <meta property="fb:app_id" content="${comment_system_id}">
     % endif
 
+    %if prevlink:
+        <link rel="prev" href="${prevlink}" type="text/html">
+    %endif
+    %if nextlink:
+        <link rel="next" href="${nextlink}" type="text/html">
+    %endif
+
     ${mathjax_config}
     %if use_cdn:
         <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
     %else:
-        <!--[if lt IE 9]><script src="/assets/js/html5.js"></script><![endif]-->
+        <!--[if lt IE 9]><script src="${url_replacer(permalink, '/assets/js/html5.js', lang)}"></script><![endif]-->
     %endif
 
     ${extra_head_data}
diff --git a/nikola/data/themes/base/templates/post.tmpl b/nikola/data/themes/base/templates/post.tmpl
index 0babb2b..fc0afba 100644
--- a/nikola/data/themes/base/templates/post.tmpl
+++ b/nikola/data/themes/base/templates/post.tmpl
@@ -7,9 +7,18 @@
 <%block name="extra_head">
     ${parent.extra_head()}
     % if post.meta('keywords'):
-        <meta name="keywords" content="${post.meta('keywords')|h}">
+    <meta name="keywords" content="${post.meta('keywords')|h}">
     % endif
+    %if post.description():
+    <meta name="description" itemprop="description" content="${post.description()}">
+    %endif
     <meta name="author" content="${post.author()}">
+    %if post.prev_post:
+        <link rel="prev" href="${post.prev_post.permalink()}" title="${post.prev_post.title()}" type="text/html">
+    %endif
+    %if post.next_post:
+        <link rel="next" href="${post.next_post.permalink()}" title="${post.next_post.title()}" type="text/html">
+    %endif
     ${helper.open_graph_metadata(post)}
     ${helper.twitter_card_information(post)}
     ${helper.meta_translations(post)}
diff --git a/nikola/data/themes/base/templates/post_helper.tmpl b/nikola/data/themes/base/templates/post_helper.tmpl
index 85ba378..c4e0ed1 100644
--- a/nikola/data/themes/base/templates/post_helper.tmpl
+++ b/nikola/data/themes/base/templates/post_helper.tmpl
@@ -38,33 +38,33 @@
 </%def>
 
 <%def name="open_graph_metadata(post)">
-     %if use_open_graph:
-        <meta name="og:title" content="${post.title()[:70]|h}">
-        <meta name="og:url" content="${abs_link(permalink)}">
-        %if post.description():
-            <meta name="og:description" content="${post.description()[:200]|h}">
-        %else:
-            <meta name="og:description" content="${post.text(strip_html=True)[:200]|h}">
-        %endif
-        <meta name="og:site_name" content="${blog_title|striphtml}">
-        <meta name="og:type" content="article">
+%if use_open_graph:
+    <meta name="og:title" content="${post.title()[:70]|h}">
+    <meta name="og:url" content="${abs_link(permalink)}">
+    %if post.description():
+    <meta name="og:description" content="${post.description()[:200]|h}">
+    %else:
+    <meta name="og:description" content="${post.text(strip_html=True)[:200]|h}">
     %endif
+    <meta name="og:site_name" content="${blog_title|striphtml}">
+    <meta name="og:type" content="article">
+%endif
 </%def>
 
 <%def name="twitter_card_information(post)">
-    %if twitter_card and twitter_card['use_twitter_cards']:
-        <meta name="twitter:card" content="${twitter_card.get('card', 'summary')|h}">
-        %if 'site:id' in twitter_card:
-            <meta name="twitter:site:id" content="${twitter_card['site:id']}">
-        %elif 'site' in twitter_card:
-            <meta name="twitter:site" content="${twitter_card['site']}">
-        %endif
-        %if 'creator:id' in twitter_card:
-            <meta name="twitter:creator:id" content="${twitter_card['creator:id']}">
-        %elif 'creator' in twitter_card:
-            <meta name="twitter:creator" content="${twitter_card['creator']}">
-        %endif
+%if twitter_card and twitter_card['use_twitter_cards']:
+    <meta name="twitter:card" content="${twitter_card.get('card', 'summary')|h}">
+    %if 'site:id' in twitter_card:
+    <meta name="twitter:site:id" content="${twitter_card['site:id']}">
+    %elif 'site' in twitter_card:
+    <meta name="twitter:site" content="${twitter_card['site']}">
+    %endif
+    %if 'creator:id' in twitter_card:
+    <meta name="twitter:creator:id" content="${twitter_card['creator:id']}">
+    %elif 'creator' in twitter_card:
+    <meta name="twitter:creator" content="${twitter_card['creator']}">
     %endif
+%endif
 </%def>
 
 <%def name="mathjax_script(post)">
diff --git a/nikola/data/themes/base/templates/story.tmpl b/nikola/data/themes/base/templates/story.tmpl
index e3e3054..2737c4d 100644
--- a/nikola/data/themes/base/templates/story.tmpl
+++ b/nikola/data/themes/base/templates/story.tmpl
@@ -4,27 +4,13 @@
 <%namespace name="comments" file="comments_helper.tmpl"/>
 <%inherit file="post.tmpl"/>
 
-<%block name="extra_head">
-    ${parent.extra_head()}
-    % if post.meta('keywords'):
-        <meta name="keywords" content="${post.meta('keywords')|h}">
-    % endif
-    <meta name="author" content="${post.author()}">
-    ${helper.open_graph_metadata(post)}
-    ${helper.twitter_card_information(post)}
-    ${helper.meta_translations(post)}
-    %if post.description():
-        <meta name="description" itemprop="description" content="${post.description()}">
-    %endif
-</%block>
-
 <%block name="content">
 <article class="storypage" itemscope="itemscope" itemtype="http://schema.org/Article">
     <header>
         ${pheader.html_title()}
         ${pheader.html_translations(post)}
     </header>
-    <div itemprop="articleBody text">
+    <div class="e-content entry-content" itemprop="articleBody text">
     ${post.text()}
     </div>
     %if site_has_comments and enable_comments and not post.meta('nocomments'):
@@ -33,5 +19,6 @@
         ${comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path)}
         </section>
     %endif
+    ${helper.mathjax_script(post)}
 </article>
 </%block>