Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5ae69264bed3
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59d3e1571a14
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 7, 2015

  1. undo post.tmpl changes :-(

    @ralsina
    ralsina committed Sep 7, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4d0d189 View commit details

  2. undo post.tmpl changes :-(

    @ralsina
    ralsina committed Sep 7, 2015
    Copy the full SHA
    59d3e15 View commit details
Showing with 92 additions and 18 deletions.
  1. +46 −9 nikola/data/themes/bootstrap3-jinja/templates/post.tmpl
  2. +46 −9 nikola/data/themes/bootstrap3/templates/post.tmpl
55 changes: 46 additions & 9 deletions nikola/data/themes/bootstrap3-jinja/templates/post.tmpl
View file
Original file line number Diff line number Diff line change
@@ -2,21 +2,58 @@
{% import 'post_helper.tmpl' as helper with context %}
{% import 'post_header.tmpl' as pheader with context %}
{% import 'comments_helper.tmpl' as comments with context %}
{% import 'base/templates/post.tmpl' as base with context %}
{% extends 'base.tmpl' %}

{% block extra_head %}
{{ super() }}
{% if post.meta('keywords') %}
<meta name="keywords" content="{{ post.meta('keywords')|e }}">
{% 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()|e }}" type="text/html">
{% endif %}
{% if post.next_post %}
<link rel="next" href="{{ post.next_post.permalink() }}" title="{{ post.next_post.title()|e }}" 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) }}
{% endblock %}

{% block 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() }}
{% endblock %}

{% block sourcelink %}
{% if show_sourcelink %}
<li>
<a href="{{ post.source_link() }}" id="sourcelink">{{ messages("Source") }}</a>
</li>
{% endif %}
{% endblock %}

{% block extra_head %}
{{ base.extra_head() }}
{% endblock %}

{% block content %}
{{ base.content() }}
{% endblock %}
55 changes: 46 additions & 9 deletions nikola/data/themes/bootstrap3/templates/post.tmpl
View file
Original file line number Diff line number Diff line change
@@ -2,21 +2,58 @@
<%namespace name="helper" file="post_helper.tmpl"/>
<%namespace name="pheader" file="post_header.tmpl"/>
<%namespace name="comments" file="comments_helper.tmpl"/>
<%namespace name="basepost" 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">
${basepost.extra_head()}
</%block>

<%block name="content">
${basepost.content()}
</%block>