diff options
Diffstat (limited to 'nikola/data/themes/base-jinja')
16 files changed, 159 insertions, 55 deletions
diff --git a/nikola/data/themes/base-jinja/templates/archiveindex.tmpl b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl new file mode 100644 index 0000000..565732c --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl @@ -0,0 +1,13 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'index.tmpl' %} + +{% block extra_head %} + {{ super() }} + {% if translations|length > 1 and generate_atom %} + {% for language in translations %} + <link rel="alternate" type="application/atom+xml" title="Atom for the {{ archive_name }} section ({{ language }})" href="{{ _link("archive_atom", archive_name, language) }}"> + {% endfor %} + {% elif generate_atom %} + <link rel="alternate" type="application/atom+xml" title="Atom for the {{ archive_name }} archive" href="{{ _link("archive_atom", archive_name) }}"> + {% endif %} +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/base.tmpl b/nikola/data/themes/base-jinja/templates/base.tmpl index 3768b9e..00ba9d7 100644 --- a/nikola/data/themes/base-jinja/templates/base.tmpl +++ b/nikola/data/themes/base-jinja/templates/base.tmpl @@ -14,7 +14,7 @@ <a href="#content" class="sr-only sr-only-focusable">{{ messages("Skip to main content") }}</a> <div id="container"> {{ header.html_header() }} - <main id="content"> + <main id="content" role="main"> {% block content %}{% endblock %} </main> {{ footer.html_footer() }} diff --git a/nikola/data/themes/base-jinja/templates/base_header.tmpl b/nikola/data/themes/base-jinja/templates/base_header.tmpl index 7947f68..9f79e72 100644 --- a/nikola/data/themes/base-jinja/templates/base_header.tmpl +++ b/nikola/data/themes/base-jinja/templates/base_header.tmpl @@ -16,7 +16,7 @@ {% endmacro %} {% macro html_site_title() %} - <h1 id="brand"><a href="{{ abs_link('/') }}" title="{{ blog_title }}" rel="home"> + <h1 id="brand"><a href="{{ abs_link(_link("root", None, lang)) }}" title="{{ blog_title }}" rel="home"> {% if logo_url %} <img src="{{ logo_url }}" alt="{{ blog_title }}" id="logo"> {% endif %} @@ -36,7 +36,7 @@ <ul> {% for suburl, text in url %} {% if rel_link(permalink, suburl) == "#" %} - <li class="active"><a href="{{ permalink }}">{{ text }}</a></li> + <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a></li> {% else %} <li><a href="{{ suburl }}">{{ text }}</a></li> {% endif %} @@ -44,7 +44,7 @@ </ul> {% else %} {% if rel_link(permalink, url) == "#" %} - <li class="active"><a href="{{ permalink }}">{{ text }}</a></li> + <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a></li> {% else %} <li><a href="{{ url }}">{{ text }}</a></li> {% endif %} diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl index bd5d025..baa6810 100644 --- a/nikola/data/themes/base-jinja/templates/base_helper.tmpl +++ b/nikola/data/themes/base-jinja/templates/base_helper.tmpl @@ -2,28 +2,24 @@ {% macro html_headstart() %} <!DOCTYPE html> -<html - -{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook') %} +<html \ prefix=' {% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) %} -og: http://ogp.me/ns# -{% endif %} -{% if use_open_graph %} -article: http://ogp.me/ns/article# +og: http://ogp.me/ns# article: http://ogp.me/ns/article# {% endif %} {% if comment_system == 'facebook' %} fb: http://ogp.me/ns/fb# {% endif %} -' +' \ +{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) %} +vocab="http://ogp.me/ns" \ {% endif %} - {% if is_rtl %} dir="rtl" {% endif %} lang="{{ lang }}"> - <head> +<head> <meta charset="utf-8"> {% if description %} <meta name="description" content="{{ description }}"> @@ -83,6 +79,10 @@ lang="{{ lang }}"> <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> {% endif %} {% endif %} + {% if needs_ipython_css %} + <link href="/assets/css/ipython.min.css" rel="stylesheet" type="text/css"> + <link href="/assets/css/nikola_ipython.css" rel="stylesheet" type="text/css"> + {% endif %} {% endmacro %} {% macro html_feedlinks() %} @@ -97,13 +97,22 @@ lang="{{ lang }}"> <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ _link('rss', None) }}"> {% endif %} {% endif %} + {% if generate_atom %} + {% if translations|length > 1 %} + {% for language in translations %} + <link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}"> + {% endfor %} + {% else %} + <link rel="alternate" type="application/atom+xml" title="Atom" href="{{ _link('index_atom', None) }}"> + {% endif %} + {% endif %} {% endmacro %} {% macro html_translations() %} <ul class="translations"> {% for langname in translations.keys() %} {% if langname != lang %} - <li><a href="{{ _link("index", None, langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li> + <li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li> {% endif %} {% endfor %} </ul> diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_disqus.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_disqus.tmpl index 8288bd4..0d40b0b 100644 --- a/nikola/data/themes/base-jinja/templates/comments_helper_disqus.tmpl +++ b/nikola/data/themes/base-jinja/templates/comments_helper_disqus.tmpl @@ -1,10 +1,4 @@ {# -*- coding: utf-8 -*- #} -<%! - import json - translations = { - 'es': 'es_ES', - } -%> {% macro comment_form(url, title, identifier) %} {% if comment_system_id %} @@ -17,7 +11,11 @@ disqus_title={{ title|tojson }}, disqus_identifier="{{ identifier }}", disqus_config = function () { - this.language = "{{ translations.get(lang, lang) }}"; + {% if lang == 'es' %} + this.language = "es_ES"; + {% else %} + this.language = "{{ lang }}"; + {% endif %} }; (function() { var dsq = document.createElement('script'); dsq.async = true; diff --git a/nikola/data/themes/base-jinja/templates/crumbs.tmpl b/nikola/data/themes/base-jinja/templates/crumbs.tmpl index eede9c2..970d509 100644 --- a/nikola/data/themes/base-jinja/templates/crumbs.tmpl +++ b/nikola/data/themes/base-jinja/templates/crumbs.tmpl @@ -5,7 +5,13 @@ <nav class="breadcrumbs"> <ul class="breadcrumb"> {% for link, text in crumbs %} - <li><a href="{{ link }}">{{ text }}</a></li> + {% if text != index_file %} + {% if link == '#' %} + <li>{{ text.rsplit('.html', 1)[0] }}</li> + {% else %} + <li><a href="{{ link }}">{{ text }}</a></li> + {% endif %} + {% endif %} {% endfor %} </ul> </nav> diff --git a/nikola/data/themes/base-jinja/templates/gallery.tmpl b/nikola/data/themes/base-jinja/templates/gallery.tmpl index 86eea12..0a53ebe 100644 --- a/nikola/data/themes/base-jinja/templates/gallery.tmpl +++ b/nikola/data/themes/base-jinja/templates/gallery.tmpl @@ -7,7 +7,7 @@ {% block content %} {{ ui.bar(crumbs) }} {% if title %} - <h1>{{ title }}</h1> + <h1>{{ title|e }}</h1> {% endif %} {% if post %} <p> @@ -34,3 +34,8 @@ {{ comments.comment_form(None, permalink, title) }} {% endif %} {% endblock %} + +{% block extra_head %} +{{ super() }} +<link rel="alternate" type="application/rss+xml" title="RSS" href="rss.xml"> +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/index.tmpl b/nikola/data/themes/base-jinja/templates/index.tmpl index 206fc34..fd9fcf4 100644 --- a/nikola/data/themes/base-jinja/templates/index.tmpl +++ b/nikola/data/themes/base-jinja/templates/index.tmpl @@ -3,15 +3,23 @@ {% import 'comments_helper.tmpl' as comments with context %} {% extends 'base.tmpl' %} +{% block extra_head %} + {{ super() }} + {% if posts and (permalink == '/' or permalink == '/' + index_file) %} + <link rel="prefetch" href="{{ posts[0].permalink() }}" type="text/html"> + {% endif %} +{% endblock %} + {% block content %} +{% block content_header %}{% endblock %} <div class="postindex"> {% for post in posts %} <article class="h-entry post-{{ post.meta('type') }}"> <header> - <h1 class="p-name entry-title"><a href="{{ post.permalink() }}" class="u-url">{{ post.title() }}</h1></a> + <h1 class="p-name entry-title"><a href="{{ post.permalink() }}" class="u-url">{{ post.title()|e }}</a></h1> <div class="metadata"> <p class="byline author vcard"><span class="byline-name fn">{{ post.author() }}</span></p> - <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" itemprop="datePublished" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></a></p> + <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p> {% if not post.meta('nocomments') and site_has_comments %} <p class="commentline">{{ comments.comment_link(post.permalink(), post._base_path) }} {% endif %} diff --git a/nikola/data/themes/base-jinja/templates/list_post.tmpl b/nikola/data/themes/base-jinja/templates/list_post.tmpl index b90f237..166d8c4 100644 --- a/nikola/data/themes/base-jinja/templates/list_post.tmpl +++ b/nikola/data/themes/base-jinja/templates/list_post.tmpl @@ -9,7 +9,7 @@ {% if posts %} <ul class="postlist"> {% for post in posts %} - <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title() }}</a> <time class="listdate" datetime="{{ post.date.isoformat() }}" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></li> + <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title()|e }}</a> <time class="listdate" datetime="{{ post.date.isoformat() }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></li> {% endfor %} </ul> {% else %} diff --git a/nikola/data/themes/base-jinja/templates/post.tmpl b/nikola/data/themes/base-jinja/templates/post.tmpl index e6dc97b..28da35e 100644 --- a/nikola/data/themes/base-jinja/templates/post.tmpl +++ b/nikola/data/themes/base-jinja/templates/post.tmpl @@ -10,14 +10,17 @@ <meta name="keywords" content="{{ post.meta('keywords')|e }}"> {% endif %} {% if post.description() %} - <meta name="description" itemprop="description" content="{{ post.description() }}"> + <meta name="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"> + <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() }}" type="text/html"> + <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) }} @@ -37,7 +40,7 @@ </nav> </aside> {% if not post.meta('nocomments') and site_has_comments %} - <section class="comments"> + <section class="comments hidden-print"> <h2>{{ messages("Comments") }}</h2> {{ comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path) }} </section> diff --git a/nikola/data/themes/base-jinja/templates/post_header.tmpl b/nikola/data/themes/base-jinja/templates/post_header.tmpl index 0ed40b9..00b6210 100644 --- a/nikola/data/themes/base-jinja/templates/post_header.tmpl +++ b/nikola/data/themes/base-jinja/templates/post_header.tmpl @@ -4,12 +4,12 @@ {% macro html_title() %} {% if title and not post.meta('hidetitle') %} - <h1 class="p-name entry-title" itemprop="headline name"><a href="{{ post.permalink() }}" class="u-url">{{ title|e }}</a></h1> + <h1 class="p-name entry-title" itemprop="headline name"><a href="{{ post.permalink() }}" class="u-url">{{ post.title()|e }}</a></h1> {% endif %} {% endmacro %} {% macro html_translations(post) %} - {% if translations|length > 1 %} + {% if post.translated_to|length > 1 %} <div class="metadata posttranslations translations"> <h3 class="posttranslations-intro">{{ messages("Also available in:") }}</h3> {% for langname in translations.keys() %} @@ -32,13 +32,13 @@ {{ html_title() }} <div class="metadata"> <p class="byline author vcard"><span class="byline-name fn">{{ post.author() }}</span></p> - <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" itemprop="datePublished" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></a></p> + <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" itemprop="datePublished" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p> {% if not post.meta('nocomments') and site_has_comments %} <p class="commentline">{{ comments.comment_link(post.permalink(), post._base_path) }} {% endif %} {{ html_sourcelink() }} {% if post.meta('link') %} - <p><a href='{{ post.meta('link') }}'>{{ messages("Original site") }}</a></p> + <p class="linkline"><a href='{{ post.meta('link') }}'>{{ messages("Original site") }}</a></p> {% endif %} {% if post.description() %} <meta name="description" itemprop="description" content="{{ post.description() }}"> diff --git a/nikola/data/themes/base-jinja/templates/post_helper.tmpl b/nikola/data/themes/base-jinja/templates/post_helper.tmpl index 541cd31..ae0206b 100644 --- a/nikola/data/themes/base-jinja/templates/post_helper.tmpl +++ b/nikola/data/themes/base-jinja/templates/post_helper.tmpl @@ -14,7 +14,9 @@ {% if post.tags %} <ul itemprop="keywords" class="tags"> {% for tag in post.tags %} - <li><a class="tag p-category" href="{{ _link('tag', tag) }}" rel="tag">{{ tag }}</a></li> + {% if tag not in hidden_tags %} + <li><a class="tag p-category" href="{{ _link('tag', tag) }}" rel="tag">{{ tag }}</a></li> + {% endif %} {% endfor %} </ul> {% endif %} @@ -22,15 +24,15 @@ {% macro html_pager(post) %} {% if post.prev_post or post.next_post %} - <ul class="pager"> + <ul class="pager hidden-print"> {% if post.prev_post %} <li class="previous"> - <a href="{{ post.prev_post.permalink() }}" rel="prev" title="{{ post.prev_post.title() }}">{{ messages("Previous post") }}</a> + <a href="{{ post.prev_post.permalink() }}" rel="prev" title="{{ post.prev_post.title()|e }}">{{ messages("Previous post") }}</a> </li> {% endif %} {% if post.next_post %} <li class="next"> - <a href="{{ post.next_post.permalink() }}" rel="next" title="{{ post.next_post.title() }}">{{ messages("Next post") }}</a> + <a href="{{ post.next_post.permalink() }}" rel="next" title="{{ post.next_post.title()|e }}">{{ messages("Next post") }}</a> </li> {% endif %} </ul> @@ -39,15 +41,30 @@ {% macro open_graph_metadata(post) %} {% if use_open_graph %} - <meta name="og:title" content="{{ post.title()[:70]|e }}"> - <meta name="og:url" content="{{ abs_link(permalink) }}"> + <meta property="og:site_name" content="{{ blog_title|e }}"> + <meta property="og:title" content="{{ post.title()[:70]|e }}"> + <meta property="og:url" content="{{ abs_link(permalink) }}"> {% if post.description() %} - <meta name="og:description" content="{{ post.description()[:200]|e }}"> + <meta property="og:description" content="{{ post.description()[:200]|e }}"> {% else %} - <meta name="og:description" content="{{ post.text(strip_html=True)[:200]|e }}"> + <meta property="og:description" content="{{ post.text(strip_html=True)[:200]|e }}"> + {% endif %} + {% if post.previewimage %} + <meta property="og:image" content="{{ url_replacer(permalink, post.previewimage, lang, 'absolute') }}"> + {% endif %} + <meta property="og:type" content="article"> +{# Will only work with Pintrest and breaks everywhere else who expect a [Facebook] URI. #} +{# %if post.author(): #} +{# <meta property="article:author" content="{{ post.author() }}"> #} +{# %endif #} + {% if post.date.isoformat() %} + <meta property="article:published_time" content="{{ post.date.isoformat() }}"> + {% endif %} + {% if post.tags %} + {% for tag in post.tags %} + <meta property="article:tag" content="{{ tag }}"> + {% endfor %} {% endif %} - <meta name="og:site_name" content="{{ blog_title|e }}"> - <meta name="og:type" content="article"> {% endif %} {% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/post_list_directive.tmpl b/nikola/data/themes/base-jinja/templates/post_list_directive.tmpl index ceaec3f..92c1b7d 100644 --- a/nikola/data/themes/base-jinja/templates/post_list_directive.tmpl +++ b/nikola/data/themes/base-jinja/templates/post_list_directive.tmpl @@ -8,7 +8,7 @@ <li class="post-list-item"> {{ post.formatted_date(date_format) }} - <a href="{{ post.permalink(lang) }}">{{ post.title(lang) }}</a> + <a href="{{ post.permalink(lang) }}">{{ post.title(lang)|e }}</a> </li> {% endfor %} </ul> diff --git a/nikola/data/themes/base-jinja/templates/tag.tmpl b/nikola/data/themes/base-jinja/templates/tag.tmpl index 84f9e68..765c122 100644 --- a/nikola/data/themes/base-jinja/templates/tag.tmpl +++ b/nikola/data/themes/base-jinja/templates/tag.tmpl @@ -16,7 +16,18 @@ {% block content %} <article class="tagpage"> <header> - <h1>{{ title }}</h1> + <h1>{{ title|e }}</h1> + {% if description %} + <p>{{ description }}</p> + {% endif %} + {% if subcategories %} + {{ messages('Subcategories:') }} + <ul> + {% for name, link in subcategories %} + <li><a href="{{ link }}">{{ name }}</a></li> + {% endfor %} + </ul> + {% endif %} <div class="metadata"> {% if translations|length > 1 and generate_rss %} {% for language in translations %} @@ -32,7 +43,7 @@ {% if posts %} <ul class="postlist"> {% for post in posts %} - <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title() }}</a> <time class="listdate" datetime="{{ post.date.isoformat() }}" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></li> + <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title()|e }}</a> <time class="listdate" datetime="{{ post.date.isoformat() }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></li> {% endfor %} </ul> {% endif %} diff --git a/nikola/data/themes/base-jinja/templates/tagindex.tmpl b/nikola/data/themes/base-jinja/templates/tagindex.tmpl index af0a992..ee7d8b0 100644 --- a/nikola/data/themes/base-jinja/templates/tagindex.tmpl +++ b/nikola/data/themes/base-jinja/templates/tagindex.tmpl @@ -1,2 +1,24 @@ {# -*- coding: utf-8 -*- #} {% extends 'index.tmpl' %} + +{% block content_header %} + {% if subcategories %} + {{ messages('Subcategories:') }} + <ul> + {% for name, link in subcategories %} + <li><a href="{{ link }}">{{ name }}</a></li> + {% endfor %} + </ul> + {% endif %} +{% endblock %} + +{% block extra_head %} + {{ super() }} + {% if translations|length > 1 and generate_atom %} + {% for language in translations %} + <link rel="alternate" type="application/atom+xml" title="Atom for the {{ tag }} section ({{ language }})" href="{{ _link(kind + "_atom", tag, language) }}"> + {% endfor %} + {% elif generate_atom %} + <link rel="alternate" type="application/atom+xml" title="Atom for the {{ tag }} section" href="{{ _link("tag" + "_atom", tag) }}"> + {% endif %} +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/tags.tmpl b/nikola/data/themes/base-jinja/templates/tags.tmpl index 7bcb7b2..4605fc9 100644 --- a/nikola/data/themes/base-jinja/templates/tags.tmpl +++ b/nikola/data/themes/base-jinja/templates/tags.tmpl @@ -7,14 +7,24 @@ <h1>{{ title }}</h1> </header> {% if cat_items %} - <h2>{{ messages("Categories") }}</h2> - <ul class="postlist"> - {% for text, link in cat_items %} - {% if text %} - <li><a class="reference" href="{{ link }}">{{ text }}</a></li> + {% 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="postlist"> + {% endfor %} + <li><a class="reference" href="{{ link }}">{{ text }}</a> + {% if indent_change_after <= 0 %} + </li> {% endif %} + {% for i in range(-indent_change_after) %} + </ul> + {% if i + 1 < indent_levels|length %} + </li> + {% endif %} + {% endfor %} {% endfor %} - </ul> {% if items %} <h2>{{ messages("Tags") }}</h2> {% endif %} @@ -22,7 +32,9 @@ {% if items %} <ul class="postlist"> {% for text, link in items %} - <li><a class="reference listtitle" href="{{ link }}">{{ text }}</a></li> + {% if text not in hidden_tags %} + <li><a class="reference listtitle" href="{{ link }}">{{ text }}</a></li> + {% endif %} {% endfor %} </ul> {% endif %} |