diff options
Diffstat (limited to 'nikola/data/themes/bootstrap3/templates')
4 files changed, 111 insertions, 11 deletions
diff --git a/nikola/data/themes/bootstrap3/templates/base.tmpl b/nikola/data/themes/bootstrap3/templates/base.tmpl index 16aebce..5f90733 100644 --- a/nikola/data/themes/bootstrap3/templates/base.tmpl +++ b/nikola/data/themes/bootstrap3/templates/base.tmpl @@ -13,10 +13,10 @@ ${template_hooks['extra_head']()} <!-- Menubar --> -<nav class="navbar navbar-inverse navbar-static-top" role="navigation"> +<nav class="navbar navbar-inverse navbar-static-top"> <div class="container"><!-- This keeps the margins nice --> <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> @@ -32,7 +32,7 @@ ${template_hooks['extra_head']()} % endif </a> </div><!-- /.navbar-header --> - <div class="collapse navbar-collapse navbar-ex1-collapse"> + <div class="collapse navbar-collapse" id="bs-navbar" aria-expanded="false"> <ul class="nav navbar-nav"> ${base.html_navigation_links()} ${template_hooks['menu']()} diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl index 8ea843a..a1e7508 100644 --- a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl +++ b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl @@ -26,17 +26,20 @@ dir="rtl" \ lang="${lang}"> <head> <meta charset="utf-8"> + <base href="${abs_link(permalink)}"> %if description: <meta name="description" content="${description}"> %endif <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>${title|striphtml} | ${blog_title|striphtml}</title> + %if title == blog_title: + <title>${blog_title|h}</title> + %else: + <title>${title|h} | ${blog_title|h}</title> + %endif ${html_stylesheets()} ${html_feedlinks()} - %if permalink: - <link rel="canonical" href="${abs_link(permalink)}"> - %endif + <link rel="canonical" href="${abs_link(permalink)}"> %if favicons: %for name, file, size in favicons: @@ -129,7 +132,7 @@ lang="${lang}"> <%def name="html_navigation_links()"> %for url, text in navigation_links[lang]: % if isinstance(url, tuple): - <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">${text} <b class="caret"></b></a> + <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">${text} <b class="caret"></b></a> <ul class="dropdown-menu"> %for suburl, text in url: % if rel_link(permalink, suburl) == "#": @@ -154,7 +157,7 @@ lang="${lang}"> ${rss_link} %elif generate_rss: %if len(translations) > 1: - %for language in translations: + %for language in sorted(translations): <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}"> %endfor %else: @@ -163,7 +166,7 @@ lang="${lang}"> %endif %if generate_atom: %if len(translations) > 1: - %for language in translations: + %for language in sorted(translations): <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}"> %endfor %else: @@ -173,7 +176,7 @@ lang="${lang}"> </%def> <%def name="html_translations()"> - %for langname in translations.keys(): + %for langname in sorted(translations): %if langname != lang: <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li> %endif diff --git a/nikola/data/themes/bootstrap3/templates/post.tmpl b/nikola/data/themes/bootstrap3/templates/post.tmpl new file mode 100644 index 0000000..8d9f88a --- /dev/null +++ b/nikola/data/themes/bootstrap3/templates/post.tmpl @@ -0,0 +1,59 @@ +## -*- coding: utf-8 -*- +<%namespace name="helper" file="post_helper.tmpl"/> +<%namespace name="pheader" file="post_header.tmpl"/> +<%namespace name="comments" file="comments_helper.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> diff --git a/nikola/data/themes/bootstrap3/templates/tags.tmpl b/nikola/data/themes/bootstrap3/templates/tags.tmpl new file mode 100644 index 0000000..ead3b0a --- /dev/null +++ b/nikola/data/themes/bootstrap3/templates/tags.tmpl @@ -0,0 +1,38 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> + +<%block name="content"> +<h1>${title}</h1> +% if cat_items: + % if items: + <h2>${messages("Categories")}</h2> + % endif + % for text, full_name, path, link, indent_levels, indent_change_before, indent_change_after in cat_hierarchy: + % for i in range(indent_change_before): + <ul class="unstyled"> + % endfor + <li><a class="reference badge" href="${link}">${text}</a> + % if indent_change_after <= 0: + </li> + % endif + % for i in range(-indent_change_after): + </ul> + % if i + 1 < len(indent_levels): + </li> + % endif + % endfor + % endfor + % if items: + <h2>${messages("Tags")}</h2> + % endif +%endif +% if items: + <ul class="list-inline"> + % for text, link in items: + % if text not in hidden_tags: + <li><a class="reference badge" href="${link}">${text}</a></li> + % endif + % endfor + </ul> +% endif +</%block> |