Skip to content

Commit

Permalink
Rename translation_link_helper.tmpl → feeds_translations_helper.tmpl
Browse files Browse the repository at this point in the history 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
@Kwpolska
Kwpolska committed Jun 10, 2017
1 parent 7439dab commit e1d0235
Show file tree
Hide file tree
Showing 22 changed files with 55 additions and 51 deletions.
4 changes: 2 additions & 2 deletions nikola/data/themes/base-jinja/templates/archiveindex.tmpl
View file
@@ -1,11 +1,11 @@
{# -*- coding: utf-8 -*- #}
{% extends 'index.tmpl' %}
{% import 'archive_navigation_helper.tmpl' as archive_nav with context %}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}

{% block extra_head %}
{{ super() }}
{{ translation_links.head(archive_name) }}
{{ feeds_translations.head(archive_name) }}
{% endblock %}

{% block content_header %}
Expand Down
6 changes: 3 additions & 3 deletions nikola/data/themes/base-jinja/templates/author.tmpl
View file
@@ -1,10 +1,10 @@
{# -*- coding: utf-8 -*- #}
{% extends 'list_post.tmpl' %}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}

{% block extra_head %}
{{ super() }}
{{ translation_links.head(author) }}
{{ feeds_translations.head(author) }}
{% endblock %}


Expand All @@ -16,7 +16,7 @@
<p>{{ description }}</p>
{% endif %}
<div class="metadata">
{{ translation_links.feed_link(author) }}
{{ feeds_translations.feed_link(author) }}
</div>
</header>
{% if posts %}
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base-jinja/templates/authorindex.tmpl
View file
@@ -1,8 +1,8 @@
{# -*- coding: utf-8 -*- #}
{% extends 'index.tmpl' %}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}

{% block extra_head %}
{{ super() }}
{{ translation_links.head(author) }}
{{ feeds_translations.head(author) }}
{% endblock %}
6 changes: 3 additions & 3 deletions nikola/data/themes/base-jinja/templates/base_helper.tmpl
View file
@@ -1,5 +1,5 @@
{# -*- coding: utf-8 -*- #}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}

{% macro html_headstart() %}
<!DOCTYPE html>
Expand Down Expand Up @@ -42,7 +42,7 @@ lang="{{ lang }}">
{% if meta_generator_tag %}
<meta name="generator" content="Nikola (getnikola.com)">
{% endif %}
{{ translation_links.head() }}
{{ feeds_translations.head() }}
<link rel="canonical" href="{{ abs_link(permalink) }}">

{% if favicons %}
Expand Down Expand Up @@ -100,7 +100,7 @@ lang="{{ lang }}">

{# This function is deprecated; use feed_helper directly. #}
{% macro html_feedlinks() %}
{{ translation_links.head() }}
{{ feeds_translations.head() }}
{% endmacro %}

{% macro html_translations() %}
Expand Down
2 changes: 2 additions & 0 deletions ...ja/templates/translation_link_helper.tmpl → .../templates/feeds_translations_helper.tmpl
View file
@@ -1,4 +1,6 @@
{# -*- coding: utf-8 -*- #}

{# Handles both feeds and translations #}
{% macro head(classification=None) %}
{% if rss_link %}
{{ rss_link }}
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base-jinja/templates/index.tmpl
View file
Expand Up @@ -3,7 +3,7 @@
{% import 'math_helper.tmpl' as math with context %}
{% import 'comments_helper.tmpl' as comments with context %}
{% import 'pagination_helper.tmpl' as pagination with context %}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
{% extends 'base.tmpl' %}

{% block extra_head %}
Expand All @@ -16,7 +16,7 @@

{% block content %}
{% block content_header %}
{{ translation_links.translation_link() }}
{{ feeds_translations.translation_link() }}
{% endblock %}
{% if 'main_index' in pagekind %}
{{ front_index_header }}
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base-jinja/templates/list.tmpl
View file
@@ -1,15 +1,15 @@
{# -*- coding: utf-8 -*- #}
{% extends 'base.tmpl' %}
{% import 'archive_navigation_helper.tmpl' as archive_nav with context %}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}

{% block content %}
<article class="listpage">
<header>
<h1>{{ title|e }}</h1>
</header>
{{ archive_nav.archive_navigation() }}
{{ translation_links.translation_link() }}
{{ feeds_translations.translation_link() }}
{% if items %}
<ul class="postlist">
{% for text, link, count in items %}
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base-jinja/templates/list_post.tmpl
View file
@@ -1,15 +1,15 @@
{# -*- coding: utf-8 -*- #}
{% extends 'base.tmpl' %}
{% import 'archive_navigation_helper.tmpl' as archive_nav with context %}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}

{% block content %}
<article class="listpage">
<header>
<h1>{{ title|e }}</h1>
</header>
{{ archive_nav.archive_navigation() }}
{{ translation_links.translation_link() }}
{{ feeds_translations.translation_link() }}
{% if posts %}
<ul class="postlist">
{% for post in posts %}
Expand Down
6 changes: 3 additions & 3 deletions nikola/data/themes/base-jinja/templates/sectionindex.tmpl
View file
@@ -1,17 +1,17 @@
{# -*- coding: utf-8 -*- #}
{% extends 'index.tmpl' %}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}

{% block extra_head %}
{{ super() }}
{{ translation_links.head(section) }}
{{ feeds_translations.head(section) }}
{% endblock %}

{% block content %}
<div class="sectionindex">
<header>
<h2><a href="{{ _link('section_index', section) }}">{{ title|e }}</a></h2>
{{ translation_links.feed_link(section) }}
{{ feeds_translations.feed_link(section) }}
</header>
{{ super() }}
</div>
Expand Down
8 changes: 4 additions & 4 deletions nikola/data/themes/base-jinja/templates/tag.tmpl
View file
@@ -1,10 +1,10 @@
{# -*- coding: utf-8 -*- #}
{% extends 'list_post.tmpl' %}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}

{% block extra_head %}
{{ super() }}
{{ translation_links.head(tag) }}
{{ feeds_translations.head(tag) }}
{% endblock %}


Expand All @@ -24,9 +24,9 @@
</ul>
{% endif %}
<div class="metadata">
{{ translation_links.feed_link(tag) }}
{{ feeds_translations.feed_link(tag) }}
</div>
{{ translation_links.translation_link() }}
{{ feeds_translations.translation_link() }}
</header>
{% if posts %}
<ul class="postlist">
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base-jinja/templates/tagindex.tmpl
View file
@@ -1,6 +1,6 @@
{# -*- coding: utf-8 -*- #}
{% extends 'index.tmpl' %}
{% import 'translation_link_helper.tmpl' as translation_links with context %}
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}

{% block content_header %}
{{ parent.content_header() }}
Expand All @@ -22,5 +22,5 @@

{% block extra_head %}
{{ super() }}
{{ translation_links.head(tag) }}
{{ feeds_translations.head(tag) }}
{% endblock %}
4 changes: 2 additions & 2 deletions nikola/data/themes/base/templates/archiveindex.tmpl
View file
@@ -1,11 +1,11 @@
## -*- coding: utf-8 -*-
<%inherit file="index.tmpl"/>
<%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/>
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>

<%block name="extra_head">
${parent.extra_head()}
${translation_links.head(archive_name)}
${feeds_translations.head(archive_name)}
</%block>

<%block name="content_header">
Expand Down
6 changes: 3 additions & 3 deletions nikola/data/themes/base/templates/author.tmpl
View file
@@ -1,10 +1,10 @@
## -*- coding: utf-8 -*-
<%inherit file="list_post.tmpl"/>
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>

<%block name="extra_head">
${parent.extra_head()}
${translation_links.head(author)}
${feeds_translations.head(author)}
</%block>


Expand All @@ -16,7 +16,7 @@
<p>${description}</p>
%endif
<div class="metadata">
${translation_links.feed_link(author)}
${feeds_translations.feed_link(author)}
</div>
</header>
%if posts:
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base/templates/authorindex.tmpl
View file
@@ -1,8 +1,8 @@
## -*- coding: utf-8 -*-
<%inherit file="index.tmpl"/>
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>

<%block name="extra_head">
${parent.extra_head()}
${translation_links.head(author)}
${feeds_translations.head(author)}
</%block>
6 changes: 3 additions & 3 deletions nikola/data/themes/base/templates/base_helper.tmpl
View file
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>

<%def name="html_headstart()">
<!DOCTYPE html>
Expand Down Expand Up @@ -42,7 +42,7 @@ lang="${lang}">
% if meta_generator_tag:
<meta name="generator" content="Nikola (getnikola.com)">
% endif
${translation_links.head()}
${feeds_translations.head()}
<link rel="canonical" href="${abs_link(permalink)}">

%if favicons:
Expand Down Expand Up @@ -100,7 +100,7 @@ lang="${lang}">

### This function is deprecated; use feed_helper directly.
<%def name="html_feedlinks()">
${translation_links.head()}
${feeds_translations.head()}
</%def>

<%def name="html_translations()">
Expand Down
4 changes: 3 additions & 1 deletion ...se/templates/translation_link_helper.tmpl → .../templates/feeds_translations_helper.tmpl
View file
@@ -1,4 +1,6 @@
## -*- coding: utf-8 -*-

## Handles both feeds and translations
<%def name="head(classification=None)">
% if rss_link:
${rss_link}
Expand Down Expand Up @@ -86,4 +88,4 @@
%endfor
</div>
%endif
</%def>
</%def>
4 changes: 2 additions & 2 deletions nikola/data/themes/base/templates/index.tmpl
View file
Expand Up @@ -3,7 +3,7 @@
<%namespace name="math" file="math_helper.tmpl"/>
<%namespace name="comments" file="comments_helper.tmpl"/>
<%namespace name="pagination" file="pagination_helper.tmpl"/>
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
<%inherit file="base.tmpl"/>

<%block name="extra_head">
Expand All @@ -16,7 +16,7 @@

<%block name="content">
<%block name="content_header">
${translation_links.translation_link()}
${feeds_translations.translation_link()}
</%block>
% if 'main_index' in pagekind:
${front_index_header}
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base/templates/list.tmpl
View file
@@ -1,15 +1,15 @@
## -*- coding: utf-8 -*-
<%inherit file="base.tmpl"/>
<%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/>
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>

<%block name="content">
<article class="listpage">
<header>
<h1>${title|h}</h1>
</header>
${archive_nav.archive_navigation()}
${translation_links.translation_link()}
${feeds_translations.translation_link()}
%if items:
<ul class="postlist">
% for text, link, count in items:
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base/templates/list_post.tmpl
View file
@@ -1,15 +1,15 @@
## -*- coding: utf-8 -*-
<%inherit file="base.tmpl"/>
<%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/>
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>

<%block name="content">
<article class="listpage">
<header>
<h1>${title|h}</h1>
</header>
${archive_nav.archive_navigation()}
${translation_links.translation_link()}
${feeds_translations.translation_link()}
%if posts:
<ul class="postlist">
% for post in posts:
Expand Down
6 changes: 3 additions & 3 deletions nikola/data/themes/base/templates/sectionindex.tmpl
View file
@@ -1,17 +1,17 @@
## -*- coding: utf-8 -*-
<%inherit file="index.tmpl"/>
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>

<%block name="extra_head">
${parent.extra_head()}
${translation_links.head(section)}
${feeds_translations.head(section)}
</%block>

<%block name="content">
<div class="sectionindex">
<header>
<h2><a href="${_link('section_index', section)}">${title|h}</a></h2>
${translation_links.feed_link(section)}
${feeds_translations.feed_link(section)}
</header>
${parent.content()}
</div>
Expand Down
8 changes: 4 additions & 4 deletions nikola/data/themes/base/templates/tag.tmpl
View file
@@ -1,10 +1,10 @@
## -*- coding: utf-8 -*-
<%inherit file="list_post.tmpl"/>
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>

<%block name="extra_head">
${parent.extra_head()}
${translation_links.head(tag)}
${feeds_translations.head(tag)}
</%block>


Expand All @@ -24,9 +24,9 @@
</ul>
%endif
<div class="metadata">
${translation_links.feed_link(tag)}
${feeds_translations.feed_link(tag)}
</div>
${translation_links.translation_link()}
${feeds_translations.translation_link()}
</header>
%if posts:
<ul class="postlist">
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base/templates/tagindex.tmpl
View file
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="index.tmpl"/>
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>

<%block name="content_header">
${parent.content_header()}
Expand All @@ -22,5 +22,5 @@

<%block name="extra_head">
${parent.extra_head()}
${translation_links.head(tag)}
${feeds_translations.head(tag)}
</%block>

0 comments on commit e1d0235

Please sign in to comment.