more simplifying, in a template that already inherits

getnikola · Sep 5, 2015 · d1bc076 · d1bc076
1 parent 1aa8e48
commit d1bc076
Showing 1 changed file with 9 additions and 46 deletions.
diff --git a/nikola/data/themes/bootstrap3/templates/post.tmpl b/nikola/data/themes/bootstrap3/templates/post.tmpl
@@ -2,58 +2,21 @@
 <%namespace name="helper" file="post_helper.tmpl"/>
 <%namespace name="pheader" file="post_header.tmpl"/>
 <%namespace name="comments" file="comments_helper.tmpl"/>
+<%namespace name="base" file="base/templates/post.tmpl"/>
 <%inherit file="base.tmpl"/>
 
-<%block name="extra_head">
-    ${parent.extra_head()}
-    % if post.meta('keywords'):
-    <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()|h}" type="text/html">
-    %endif
-    %if post.next_post:
-        <link rel="next" href="${post.next_post.permalink()}" title="${post.next_post.title()|h}" type="text/html">
-    %endif
-    % if post.is_draft:
-        <meta name="robots" content="noindex">
-    % endif
-    ${helper.open_graph_metadata(post)}
-    ${helper.twitter_card_information(post)}
-    ${helper.meta_translations(post)}
-</%block>
-
-<%block name="content">
-<article class="post-${post.meta('type')} h-entry hentry postpage" itemscope="itemscope" itemtype="http://schema.org/Article">
-    ${pheader.html_post_header()}
-    <div class="e-content entry-content" itemprop="articleBody text">
-    ${post.text()}
-    </div>
-    <aside class="postpromonav">
-    <nav>
-    ${helper.html_tags(post)}
-    ${helper.html_pager(post)}
-    </nav>
-    </aside>
-    % if not post.meta('nocomments') and site_has_comments:
-        <section class="comments hidden-print">
-        <h2>${messages("Comments")}</h2>
-        ${comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path)}
-        </section>
-    % endif
-    ${helper.mathjax_script(post)}
-</article>
-${comments.comment_link_script()}
-</%block>
-
 <%block name="sourcelink">
 % if show_sourcelink:
     <li>
     <a href="${post.source_link()}" id="sourcelink">${messages("Source")}</a>
     </li>
 % endif
 </%block>
+
+<%block name="extra_head">
+${base.extra_head()}
+</%block>
+
+<%block name="content">
+${base.content()}
+</%block>