jinjify

getnikola · Sep 3, 2015 · 0398dab · 0398dab
1 parent 7be07e8
commit 0398dab
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/nikola/data/themes/base-jinja/templates/author.tmpl b/nikola/data/themes/base-jinja/templates/author.tmpl
@@ -5,10 +5,10 @@
     {{ super() }}
     {% if translations|length > 1 and generate_rss %}
         {% for language in translations|sort %}
-            <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ author }} ({{ language }})" href="{{ _link(kind + "_rss", author, language) }}">
+            <link rel="alternate" type="application/rss+xml" title="RSS for {{ kind }} {{ author }} ({{ language }})" href="{{ _link(kind + "_rss", author, language) }}">
         {% endfor %}
     {% elif generate_rss %}
-        <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ author }}" href="{{ _link(kind + "_rss", author) }}">
+        <link rel="alternate" type="application/rss+xml" title="RSS for {{ kind }} {{ author }}" href="{{ _link(kind + "_rss", author) }}">
     {% endif %}
 {% endblock %}
 

diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -21,7 +21,9 @@ dir="rtl"
 lang="{{ lang }}">
 <head>
     <meta charset="utf-8">
+    {% if use_base_tag %}
     <base href="{{ abs_link(permalink) }}">
+    {% endif %}
     {% if description %}
     <meta name="description" content="{{ description }}">
     {% endif %}

diff --git a/nikola/data/themes/base-jinja/templates/post_header.tmpl b/nikola/data/themes/base-jinja/templates/post_header.tmpl
@@ -44,7 +44,7 @@
             {% endif %}
             {{ html_sourcelink() }}
             {% if post.meta('link') %}
-                    <p class="linkline"><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/tag.tmpl b/nikola/data/themes/base-jinja/templates/tag.tmpl
@@ -5,10 +5,10 @@
     {{ super() }}
     {% if translations|length > 1 and generate_rss %}
         {% 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) }}">
+            <link rel="alternate" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }} ({{ language }})" href="{{ _link(kind + "_rss", tag, language) }}">
         {% endfor %}
     {% elif generate_rss %}
-        <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }}" href="{{ _link(kind + "_rss", tag) }}">
+        <link rel="alternate" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }}" href="{{ _link(kind + "_rss", tag) }}">
     {% endif %}
 {% endblock %}
 

diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
@@ -26,7 +26,9 @@ dir="rtl"
 lang="{{ lang }}">
     <head>
     <meta charset="utf-8">
+    {% if use_base_tag %}
     <base href="{{ abs_link(permalink) }}">
+    {% endif %}
     {% if description %}
     <meta name="description" content="{{ description }}">
     {% endif %}

diff --git a/nikola/data/themes/bootstrap3-jinja/templates/tags.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/tags.tmpl
@@ -9,7 +9,7 @@
     {% 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">
+            <ul class="list-inline">
         {% endfor %}
         <li><a class="reference badge" href="{{ link }}">{{ text }}</a>
         {% if indent_change_after <= 0 %}