1 files changed, 20 insertions, 11 deletions
diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
index bd5d025..baa6810 100644
--- a/nikola/data/themes/base-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -2,28 +2,24 @@
 
 {% macro html_headstart() %}
 <!DOCTYPE html>
-<html
-
-{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook') %}
+<html \
 prefix='
 {% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) %}
-og: http://ogp.me/ns#
-{% endif %}
-{% if use_open_graph %}
-article: http://ogp.me/ns/article#
+og: http://ogp.me/ns# article: http://ogp.me/ns/article#
 {% endif %}
 {% if comment_system == 'facebook' %}
 fb: http://ogp.me/ns/fb#
 {% endif %}
-'
+' \
+{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) %}
+vocab="http://ogp.me/ns" \
 {% endif %}
-
 {% if is_rtl %}
 dir="rtl"
 {% endif %}
 
 lang="{{ lang }}">
-    <head>
+<head>
     <meta charset="utf-8">
     {% if description %}
     <meta name="description" content="{{ description }}">
@@ -83,6 +79,10 @@ lang="{{ lang }}">
             <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
         {% endif %}
     {% endif %}
+    {% if needs_ipython_css %}
+        <link href="/assets/css/ipython.min.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/nikola_ipython.css" rel="stylesheet" type="text/css">
+    {% endif %}
 {% endmacro %}
 
 {% macro html_feedlinks() %}
@@ -97,13 +97,22 @@ 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() %}
     <ul class="translations">
     {% for langname in translations.keys() %}
         {% if langname != lang %}
-            <li><a href="{{ _link("index", None, langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
+            <li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
         {% endif %}
     {% endfor %}
     </ul>