diff options
Diffstat (limited to 'nikola/data/themes/base-jinja')
11 files changed, 27 insertions, 23 deletions
diff --git a/nikola/data/themes/base-jinja/templates/archiveindex.tmpl b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl index 565732c..8b9286e 100644 --- a/nikola/data/themes/base-jinja/templates/archiveindex.tmpl +++ b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl @@ -4,7 +4,7 @@ {% block extra_head %} {{ super() }} {% if translations|length > 1 and generate_atom %} - {% for language in translations %} + {% for language in translations|sort %} <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 %} diff --git a/nikola/data/themes/base-jinja/templates/base.tmpl b/nikola/data/themes/base-jinja/templates/base.tmpl index 00ba9d7..5412326 100644 --- a/nikola/data/themes/base-jinja/templates/base.tmpl +++ b/nikola/data/themes/base-jinja/templates/base.tmpl @@ -14,13 +14,14 @@ <a href="#content" class="sr-only sr-only-focusable">{{ messages("Skip to main content") }}</a> <div id="container"> {{ header.html_header() }} - <main id="content" role="main"> + <main id="content"> {% block content %}{% endblock %} </main> {{ footer.html_footer() }} </div> + {{ base.late_load_js() }} + {% block extra_js %}{% endblock %} {{ body_end }} {{ template_hooks['body_end']() }} - {{ base.late_load_js() }} </body> </html> diff --git a/nikola/data/themes/base-jinja/templates/base_footer.tmpl b/nikola/data/themes/base-jinja/templates/base_footer.tmpl index 7fcf616..2e541a6 100644 --- a/nikola/data/themes/base-jinja/templates/base_footer.tmpl +++ b/nikola/data/themes/base-jinja/templates/base_footer.tmpl @@ -3,7 +3,7 @@ {% macro html_footer() %} {% if content_footer %} - <footer id="footer" role="contentinfo"> + <footer id="footer"> <p>{{ content_footer }}</p> {{ template_hooks['page_footer']() }} </footer> diff --git a/nikola/data/themes/base-jinja/templates/base_header.tmpl b/nikola/data/themes/base-jinja/templates/base_header.tmpl index 9f79e72..092abd8 100644 --- a/nikola/data/themes/base-jinja/templates/base_header.tmpl +++ b/nikola/data/themes/base-jinja/templates/base_header.tmpl @@ -2,7 +2,7 @@ {% import 'base_helper.tmpl' as base with context %} {% macro html_header() %} - <header id="header" role="banner"> + <header id="header"> {{ html_site_title() }} {{ html_translation_header() }} {{ html_navigation_links() }} @@ -28,7 +28,7 @@ {% endmacro %} {% macro html_navigation_links() %} - <nav id="menu" role="navigation"> + <nav id="menu"> <ul> {% for url, text in navigation_links[lang] %} {% if isinstance(url, tuple) %} diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl index baa6810..8b4ed97 100644 --- a/nikola/data/themes/base-jinja/templates/base_helper.tmpl +++ b/nikola/data/themes/base-jinja/templates/base_helper.tmpl @@ -21,17 +21,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"> - <title>{{ title|e }} | {{ blog_title|e }}</title> + {% if title == blog_title %} + <title>{{ blog_title|e }}</title> + {% else %} + <title>{{ title|e }} | {{ blog_title|e }}</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 %} @@ -90,7 +93,7 @@ lang="{{ lang }}"> {{ rss_link }} {% elif generate_rss %} {% if translations|length > 1 %} - {% for language in translations %} + {% for language in translations|sort %} <link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}"> {% endfor %} {% else %} @@ -99,7 +102,7 @@ lang="{{ lang }}"> {% endif %} {% if generate_atom %} {% if translations|length > 1 %} - {% for language in translations %} + {% for language in translations|sort %} <link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}"> {% endfor %} {% else %} @@ -110,7 +113,7 @@ lang="{{ lang }}"> {% macro html_translations() %} <ul class="translations"> - {% for langname in translations.keys() %} + {% for langname in translations|sort %} {% 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/base-jinja/templates/index.tmpl b/nikola/data/themes/base-jinja/templates/index.tmpl index fd9fcf4..222da43 100644 --- a/nikola/data/themes/base-jinja/templates/index.tmpl +++ b/nikola/data/themes/base-jinja/templates/index.tmpl @@ -19,7 +19,7 @@ <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() }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p> + <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.formatted_date('webiso') }}" 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 166d8c4..919d6f0 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()|e }}</a> <time class="listdate" datetime="{{ post.date.isoformat() }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></li> + <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title()|e }}</a> <time class="listdate" datetime="{{ post.formatted_date('webiso') }}" 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_header.tmpl b/nikola/data/themes/base-jinja/templates/post_header.tmpl index 00b6210..dc844e3 100644 --- a/nikola/data/themes/base-jinja/templates/post_header.tmpl +++ b/nikola/data/themes/base-jinja/templates/post_header.tmpl @@ -12,7 +12,7 @@ {% 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() %} + {% for langname in translations|sort %} {% if langname != lang and post.is_translation_available(langname) %} <p><a href="{{ post.permalink(langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></p> {% endif %} @@ -32,7 +32,7 @@ {{ 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="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p> + <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.formatted_date('webiso') }}" 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 %} diff --git a/nikola/data/themes/base-jinja/templates/post_helper.tmpl b/nikola/data/themes/base-jinja/templates/post_helper.tmpl index ae0206b..b4826eb 100644 --- a/nikola/data/themes/base-jinja/templates/post_helper.tmpl +++ b/nikola/data/themes/base-jinja/templates/post_helper.tmpl @@ -2,7 +2,7 @@ {% macro meta_translations(post) %} {% if translations|length > 1 %} - {% for langname in translations.keys() %} + {% for langname in translations|sort %} {% if langname != lang and post.is_translation_available(langname) %} <link rel="alternate" hreflang="{{ langname }}" href="{{ post.permalink(langname) }}"> {% endif %} @@ -58,7 +58,7 @@ {# <meta property="article:author" content="{{ post.author() }}"> #} {# %endif #} {% if post.date.isoformat() %} - <meta property="article:published_time" content="{{ post.date.isoformat() }}"> + <meta property="article:published_time" content="{{ post.formatted_date('webiso') }}"> {% endif %} {% if post.tags %} {% for tag in post.tags %} diff --git a/nikola/data/themes/base-jinja/templates/tag.tmpl b/nikola/data/themes/base-jinja/templates/tag.tmpl index 765c122..0928a5f 100644 --- a/nikola/data/themes/base-jinja/templates/tag.tmpl +++ b/nikola/data/themes/base-jinja/templates/tag.tmpl @@ -4,7 +4,7 @@ {% block extra_head %} {{ super() }} {% if translations|length > 1 and generate_rss %} - {% for language in translations %} + {% for language in translations|sort %} <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }} ({{ language }})" href="{{ _link(kind + "_rss", tag, language) }}"> {% endfor %} {% elif generate_rss %} @@ -30,7 +30,7 @@ {% endif %} <div class="metadata"> {% if translations|length > 1 and generate_rss %} - {% for language in translations %} + {% for language in translations|sort %} <p class="feedlink"> <a href="{{ _link(kind + "_rss", tag, language) }}" hreflang="{{ language }}" type="application/rss+xml">{{ messages('RSS feed', language) }} ({{ language }})</a> </p> @@ -43,7 +43,7 @@ {% if posts %} <ul class="postlist"> {% for post in posts %} - <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> + <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title()|e }}</a> <time class="listdate" datetime="{{ post.formatted_date('webiso') }}" 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 ee7d8b0..f2d2d7a 100644 --- a/nikola/data/themes/base-jinja/templates/tagindex.tmpl +++ b/nikola/data/themes/base-jinja/templates/tagindex.tmpl @@ -15,7 +15,7 @@ {% block extra_head %} {{ super() }} {% if translations|length > 1 and generate_atom %} - {% for language in translations %} + {% for language in translations|sort %} <link rel="alternate" type="application/atom+xml" title="Atom for the {{ tag }} section ({{ language }})" href="{{ _link(kind + "_atom", tag, language) }}"> {% endfor %} {% elif generate_atom %} |