jinjified

ralsina · ralsina · commit a53db5edcedb · 2015-05-04T23:18:19.000-03:00
diff --git a/nikola/data/themes/base-jinja/templates/archiveindex.tmpl b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl
@@ -1,2 +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_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -93,6 +93,15 @@ 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() %}
diff --git a/nikola/data/themes/base-jinja/templates/tagindex.tmpl b/nikola/data/themes/base-jinja/templates/tagindex.tmpl
@@ -1,2 +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 {{ 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/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
@@ -68,14 +68,14 @@ lang="{{ lang }}">
 {% macro late_load_js() %}
     {% if use_bundles %}
         {% if use_cdn %}
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-            <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-            <script src="/assets/js/all.js"></script>
-        {% else %}
-            <script src="/assets/js/all-nocdn.js"></script>
+            {% for url in cdn_js_urls %}
+                <script src="{{ url }}"></script>
+            {% endfor %}
         {% endif %}
+        <script src="/assets/js/all.js"></script>
     {% else %}
         {% if use_cdn %}
+            FOO
             <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
             <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
         {% else %}
@@ -96,14 +96,14 @@ lang="{{ lang }}">
 {% macro html_stylesheets() %}
     {% if use_bundles %}
         {% if use_cdn %}
-            <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
-            <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
-        {% else %}
-            <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
+            {% for url in cdn_css_urls %}
+                <link href="{{ url }}" rel="stylesheet">
+            {% endfor %}
         {% endif %}
+        <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
     {% else %}
         {% if use_cdn %}
-            <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
+-            <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
         {% else %}
             <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
         {% endif %}
