Renaming feed_helper.tmpl -> translation_link_helper.tmpl and moving …

…code for alternate links into there.
getnikola · Jun 8, 2017 · f2ad9b3 · f2ad9b3
1 parent 16804f0
commit f2ad9b3
Show file tree

Hide file tree

Showing 24 changed files with 72 additions and 90 deletions.
diff --git a/nikola/data/themes/base-jinja/templates/archiveindex.tmpl b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl
@@ -1,11 +1,11 @@
 {#  -*- coding: utf-8 -*- #}
 {% extends 'index.tmpl' %}
 {% import 'archive_navigation_helper.tmpl' as archive_nav with context %}
-{% import 'feed_helper.tmpl' as feed with context %}
+{% import 'translation_link_helper.tmpl' as translation_links with context %}
 
 {% block extra_head %}
     {{ super() }}
-    {{ feed.head(archive_name) }}
+    {{ translation_links.head(archive_name) }}
 {% endblock %}
 
 {% block content_header %}

diff --git a/nikola/data/themes/base-jinja/templates/author.tmpl b/nikola/data/themes/base-jinja/templates/author.tmpl
@@ -1,10 +1,10 @@
 {#  -*- coding: utf-8 -*- #}
 {% extends 'list_post.tmpl' %}
-{% import 'feed_helper.tmpl' as feed with context %}
+{% import 'translation_link_helper.tmpl' as translation_links with context %}
 
 {% block extra_head %}
     {{ super() }}
-    {{ feed.head(author) }}
+    {{ translation_links.head(author) }}
 {% endblock %}
 
 
@@ -16,7 +16,7 @@
             <p>{{ description }}</p>
         {% endif %}
         <div class="metadata">
-            {{ feed.link(author) }}
+            {{ translation_links.link(author) }}
         </div>
     </header>
     {% if posts %}

diff --git a/nikola/data/themes/base-jinja/templates/authorindex.tmpl b/nikola/data/themes/base-jinja/templates/authorindex.tmpl
@@ -1,8 +1,8 @@
 {#  -*- coding: utf-8 -*- #}
 {% extends 'index.tmpl' %}
-{% import 'feed_helper.tmpl' as feed with context %}
+{% import 'translation_link_helper.tmpl' as translation_links with context %}
 
 {% block extra_head %}
     {{ super() }}
-    {{ feed.head(author) }}
+    {{ translation_links.head(author) }}
 {% endblock %}
diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -1,5 +1,5 @@
 {#  -*- coding: utf-8 -*- #}
-{% import 'feed_helper.tmpl' as feed with context %}
+{% import 'translation_link_helper.tmpl' as translation_links with context %}
 
 {% macro html_headstart() %}
 <!DOCTYPE html>
@@ -42,7 +42,7 @@ lang="{{ lang }}">
     {% if meta_generator_tag %}
         <meta name="generator" content="Nikola (getnikola.com)">
     {% endif %}
-    {{ feed.head() }}
+    {{ translation_links.head() }}
     <link rel="canonical" href="{{ abs_link(permalink) }}">
 
     {% if favicons %}
@@ -100,7 +100,7 @@ lang="{{ lang }}">
 
 {#  This function is deprecated; use feed_helper directly. #}
 {% macro html_feedlinks() %}
-    {{ feed.head() }}
+    {{ translation_links.head() }}
 {% endmacro %}
 
 {% macro html_translations() %}

diff --git a/nikola/data/themes/base-jinja/templates/index.tmpl b/nikola/data/themes/base-jinja/templates/index.tmpl
@@ -11,11 +11,6 @@
         <link rel="prefetch" href="{{ posts[0].permalink() }}" type="text/html">
     {% endif %}
     {{ math.math_styles_ifposts(posts) }}
-    {% if has_other_languages and other_languages %}
-        {% for language, classification, _ in other_languages %}
-            <link rel="alternate" hreflang="{{ language }}" href="{{ _link(kind, classification, language) }}">
-        {% endfor %}
-    {% endif %}
 {% endblock %}
 
 {% block content %}
@@ -24,7 +19,11 @@
         <div class="translationslist translations">
             <h3 class="translationslist-intro">{{ messages("Also available in:") }}</h3>
         {% for language, classification, name in other_languages %}
-            <p><a href="{{ _link(kind, classification, language) }}" rel="alternate">{{ messages("LANGUAGE", language) }} ({{ name|e }})</a></p>
+            <p><a href="{{ _link(kind, classification, language) }}" rel="alternate">{{ messages("LANGUAGE", language) }}
+            {% if kind != 'archive' %}
+                ({{ name|e }})
+            {% endif %}
+            </a></p>
         {% endfor %}
         </div>
     {% endif %}

diff --git a/nikola/data/themes/base-jinja/templates/list.tmpl b/nikola/data/themes/base-jinja/templates/list.tmpl
@@ -2,14 +2,6 @@
 {% extends 'base.tmpl' %}
 {% import 'archive_navigation_helper.tmpl' as archive_nav with context %}
 
-{% block extra_head %}
-    {% if has_other_languages and other_languages %}
-        {% for language, classification, _ in other_languages %}
-            <link rel="alternate" hreflang="{{ language }}" href="{{ _link(kind, classification, language) }}">
-        {% endfor %}
-    {% endif %}
-{% endblock %}
-
 {% block content %}
 <article class="listpage">
     <header>
@@ -20,7 +12,11 @@
         <div class="translationslist translations">
             <h3 class="translationslist-intro">{{ messages("Also available in:") }}</h3>
         {% for language, classification, name in other_languages %}
-            <p><a href="{{ _link(kind, classification, language) }}" rel="alternate">{{ messages("LANGUAGE", language) }} ({{ name|e }})</a></p>
+            <p><a href="{{ _link(kind, classification, language) }}" rel="alternate">{{ messages("LANGUAGE", language) }}
+            {% if kind != 'archive' %}
+                ({{ name|e }})
+            {% endif %}
+            </a></p>
         {% endfor %}
         </div>
     {% endif %}

diff --git a/nikola/data/themes/base-jinja/templates/list_post.tmpl b/nikola/data/themes/base-jinja/templates/list_post.tmpl
@@ -2,14 +2,6 @@
 {% extends 'base.tmpl' %}
 {% import 'archive_navigation_helper.tmpl' as archive_nav with context %}
 
-{% block extra_head %}
-    {% if has_other_languages and other_languages %}
-        {% for language, classification, _ in other_languages %}
-            <link rel="alternate" hreflang="{{ language }}" href="{{ _link(kind, classification, language) }}">
-        {% endfor %}
-    {% endif %}
-{% endblock %}
-
 {% block content %}
 <article class="listpage">
     <header>
@@ -20,7 +12,11 @@
         <div class="translationslist translations">
             <h3 class="translationslist-intro">{{ messages("Also available in:") }}</h3>
         {% for language, classification, name in other_languages %}
-            <p><a href="{{ _link(kind, classification, language) }}" rel="alternate">{{ messages("LANGUAGE", language) }} ({{ name|e }})</a></p>
+            <p><a href="{{ _link(kind, classification, language) }}" rel="alternate">{{ messages("LANGUAGE", language) }}
+            {% if kind != 'archive' %}
+                ({{ name|e }})
+            {% endif %}
+            </a></p>
         {% endfor %}
         </div>
     {% endif %}

diff --git a/nikola/data/themes/base-jinja/templates/sectionindex.tmpl b/nikola/data/themes/base-jinja/templates/sectionindex.tmpl
@@ -1,17 +1,17 @@
 {#  -*- coding: utf-8 -*- #}
 {% extends 'index.tmpl' %}
-{% import 'feed_helper.tmpl' as feed with context %}
+{% import 'translation_link_helper.tmpl' as translation_links with context %}
 
 {% block extra_head %}
     {{ super() }}
-    {{ feed.head(section) }}
+    {{ translation_links.head(section) }}
 {% endblock %}
 
 {% block content %}
 <div class="sectionindex">
     <header>
         <h2><a href="{{ _link('section_index', section) }}">{{ title|e }}</a></h2>
-        {{ feed.link(section) }}
+        {{ translation_links.link(section) }}
     </header>
     {{ super() }}
 </div>

diff --git a/nikola/data/themes/base-jinja/templates/tag.tmpl b/nikola/data/themes/base-jinja/templates/tag.tmpl
@@ -1,10 +1,10 @@
 {#  -*- coding: utf-8 -*- #}
 {% extends 'list_post.tmpl' %}
-{% import 'feed_helper.tmpl' as feed with context %}
+{% import 'translation_link_helper.tmpl' as translation_links with context %}
 
 {% block extra_head %}
     {{ super() }}
-    {{ feed.head(tag) }}
+    {{ translation_links.head(tag) }}
 {% endblock %}
 
 
@@ -24,13 +24,17 @@
         </ul>
         {% endif %}
         <div class="metadata">
-            {{ feed.link(tag) }}
+            {{ translation_links.link(tag) }}
         </div>
         {% if has_other_languages and other_languages %}
             <div class="translationslist translations">
                 <h3 class="translationslist-intro">{{ messages("Also available in:") }}</h3>
             {% for language, classification, name in other_languages %}
-                <p><a href="{{ _link(kind, classification, language) }}" rel="alternate">{{ messages("LANGUAGE", language) }} ({{ name|e }})</a></p>
+                <p><a href="{{ _link(kind, classification, language) }}" rel="alternate">{{ messages("LANGUAGE", language) }}
+                {% if kind != 'archive' %}
+                    ({{ name|e }})
+                {% endif %}
+            </a></p>
             {% endfor %}
             </div>
         {% endif %}

diff --git a/nikola/data/themes/base-jinja/templates/tagindex.tmpl b/nikola/data/themes/base-jinja/templates/tagindex.tmpl
@@ -1,6 +1,6 @@
 {#  -*- coding: utf-8 -*- #}
 {% extends 'index.tmpl' %}
-{% import 'feed_helper.tmpl' as feed with context %}
+{% import 'translation_link_helper.tmpl' as translation_links with context %}
 
 {% block content_header %}
     {{ parent.content_header() }}
@@ -22,5 +22,5 @@
 
 {% block extra_head %}
     {{ super() }}
-    {{ feed.head(tag) }}
+    {{ translation_links.head(tag) }}
 {% endblock %}
diff --git a/...mes/base-jinja/templates/feed_helper.tmpl → ...ja/templates/translation_link_helper.tmpl b/...mes/base-jinja/templates/feed_helper.tmpl → ...ja/templates/translation_link_helper.tmpl
@@ -38,6 +38,11 @@
             {% endif %}
         {% endif %}
     {% endif %}
+    {% if has_other_languages and other_languages %}
+        {% for language, classification, _ in other_languages %}
+            <link rel="alternate" hreflang="{{ language }}" href="{{ _link(kind, classification, language) }}">
+        {% endfor %}
+    {% endif %}
 {% endmacro %}
 
 {% macro link(classification) %}

diff --git a/nikola/data/themes/base/templates/archiveindex.tmpl b/nikola/data/themes/base/templates/archiveindex.tmpl
@@ -1,11 +1,11 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="index.tmpl"/>
 <%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/>
-<%namespace name="feed" file="feed_helper.tmpl" import="*"/>
+<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
 
 <%block name="extra_head">
     ${parent.extra_head()}
-    ${feed.head(archive_name)}
+    ${translation_links.head(archive_name)}
 </%block>
 
 <%block name="content_header">

diff --git a/nikola/data/themes/base/templates/author.tmpl b/nikola/data/themes/base/templates/author.tmpl
@@ -1,10 +1,10 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="list_post.tmpl"/>
-<%namespace name="feed" file="feed_helper.tmpl" import="*"/>
+<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
 
 <%block name="extra_head">
     ${parent.extra_head()}
-    ${feed.head(author)}
+    ${translation_links.head(author)}
 </%block>
 
 
@@ -16,7 +16,7 @@
             <p>${description}</p>
         %endif
         <div class="metadata">
-            ${feed.link(author)}
+            ${translation_links.link(author)}
         </div>
     </header>
     %if posts:

diff --git a/nikola/data/themes/base/templates/authorindex.tmpl b/nikola/data/themes/base/templates/authorindex.tmpl
@@ -1,8 +1,8 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="index.tmpl"/>
-<%namespace name="feed" file="feed_helper.tmpl" import="*"/>
+<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
 
 <%block name="extra_head">
     ${parent.extra_head()}
-    ${feed.head(author)}
+    ${translation_links.head(author)}
 </%block>
diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -1,5 +1,5 @@
 ## -*- coding: utf-8 -*-
-<%namespace name="feed" file="feed_helper.tmpl" import="*"/>
+<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
 
 <%def name="html_headstart()">
 <!DOCTYPE html>
@@ -42,7 +42,7 @@ lang="${lang}">
     % if meta_generator_tag:
         <meta name="generator" content="Nikola (getnikola.com)">
     % endif
-    ${feed.head()}
+    ${translation_links.head()}
     <link rel="canonical" href="${abs_link(permalink)}">
 
     %if favicons:
@@ -100,7 +100,7 @@ lang="${lang}">
 
 ### This function is deprecated; use feed_helper directly.
 <%def name="html_feedlinks()">
-    ${feed.head()}
+    ${translation_links.head()}
 </%def>
 
 <%def name="html_translations()">

diff --git a/nikola/data/themes/base/templates/index.tmpl b/nikola/data/themes/base/templates/index.tmpl
@@ -11,11 +11,6 @@
         <link rel="prefetch" href="${posts[0].permalink()}" type="text/html">
     % endif
     ${math.math_styles_ifposts(posts)}
-    %if has_other_languages and other_languages:
-        %for language, classification, _ in other_languages:
-            <link rel="alternate" hreflang="${language}" href="${_link(kind, classification, language)}">
-        %endfor
-    %endif
 </%block>
 
 <%block name="content">

diff --git a/nikola/data/themes/base/templates/list.tmpl b/nikola/data/themes/base/templates/list.tmpl
@@ -2,14 +2,6 @@
 <%inherit file="base.tmpl"/>
 <%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/>
 
-<%block name="extra_head">
-    %if has_other_languages and other_languages:
-        %for language, classification, _ in other_languages:
-            <link rel="alternate" hreflang="${language}" href="${_link(kind, classification, language)}">
-        %endfor
-    %endif
-</%block>
-
 <%block name="content">
 <article class="listpage">
     <header>

diff --git a/nikola/data/themes/base/templates/list_post.tmpl b/nikola/data/themes/base/templates/list_post.tmpl
@@ -2,14 +2,6 @@
 <%inherit file="base.tmpl"/>
 <%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/>
 
-<%block name="extra_head">
-    %if has_other_languages and other_languages:
-        %for language, classification, _ in other_languages:
-            <link rel="alternate" hreflang="${language}" href="${_link(kind, classification, language)}">
-        %endfor
-    %endif
-</%block>
-
 <%block name="content">
 <article class="listpage">
     <header>

diff --git a/nikola/data/themes/base/templates/sectionindex.tmpl b/nikola/data/themes/base/templates/sectionindex.tmpl
@@ -1,17 +1,17 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="index.tmpl"/>
-<%namespace name="feed" file="feed_helper.tmpl" import="*"/>
+<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
 
 <%block name="extra_head">
     ${parent.extra_head()}
-    ${feed.head(section)}
+    ${translation_links.head(section)}
 </%block>
 
 <%block name="content">
 <div class="sectionindex">
     <header>
         <h2><a href="${_link('section_index', section)}">${title|h}</a></h2>
-        ${feed.link(section)}
+        ${translation_links.link(section)}
     </header>
     ${parent.content()}
 </div>

diff --git a/nikola/data/themes/base/templates/tag.tmpl b/nikola/data/themes/base/templates/tag.tmpl
@@ -1,10 +1,10 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="list_post.tmpl"/>
-<%namespace name="feed" file="feed_helper.tmpl" import="*"/>
+<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
 
 <%block name="extra_head">
     ${parent.extra_head()}
-    ${feed.head(tag)}
+    ${translation_links.head(tag)}
 </%block>
 
 
@@ -24,7 +24,7 @@
         </ul>
         %endif
         <div class="metadata">
-            ${feed.link(tag)}
+            ${translation_links.link(tag)}
         </div>
         %if has_other_languages and other_languages:
             <div class="translationslist translations">