1 files changed, 31 insertions, 35 deletions
diff --git a/themes/erdgeist/templates/base_helper.tmpl b/themes/erdgeist/templates/base_helper.tmpl
index bec4b78..7b44a95 100644
--- a/themes/erdgeist/templates/base_helper.tmpl
+++ b/themes/erdgeist/templates/base_helper.tmpl
@@ -1,6 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%namespace name="notes" file="annotation_helper.tmpl" import="*" />
+<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/>
 <%def name="html_headstart()">
 <!DOCTYPE html>
 <html
@@ -26,17 +27,26 @@ 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}">
+    <meta name="description" content="${description|h}">
    %endif
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>${title|striphtml} | ${blog_title|striphtml}</title>
+    %if title == blog_title:
+        <title>${blog_title|h}</title>
+    %else:
+        <title>${title|h} | ${blog_title|h}</title>
+    %endif
    ${html_stylesheets()}
-    ${html_feedlinks()}
+    <meta name="theme-color" content="${theme_color}">
-    %if permalink:
+    % if meta_generator_tag:
-      <link rel="canonical" href="${abs_link(permalink)}">
+    <meta name="generator" content="Nikola (getnikola.com)">
-    %endif
+    % endif
+    ${feeds_translations.head(classification=None, kind='index', other=False)}
+    <link rel="canonical" href="${abs_link(permalink)}">
    %if favicons:
        %for name, file, size in favicons:
@@ -55,11 +65,10 @@ lang="${lang}">
        <link rel="next" href="${nextlink}" type="text/html">
    %endif
-    ${mathjax_config}
    %if use_cdn:
        <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
    %else:
-        <!--[if lt IE 9]><script src="${url_replacer(permalink, '/assets/js/html5.js', lang)}"></script><![endif]-->
+        <!--[if lt IE 9]><script src="${url_replacer(permalink, '/assets/js/html5.js', lang, url_type)}"></script><![endif]-->
    %endif
    ${extra_head_data}
@@ -81,13 +90,10 @@ lang="${lang}">
        %else:
            <script src="/assets/js/jquery.min.js"></script>
            <script src="/assets/js/bootstrap.min.js"></script>
-            <script src="/assets/js/moment-with-locales.min.js"></script>
+            <script src="/assets/js/baguetteBox.min.js"></script>
-            <script src="/assets/js/fancydates.js"></script>
        %endif
-        <script src="/assets/js/jquery.colorbox-min.js"></script>
+        <script src="/assets/js/moment-with-locales.min.js"></script>
-    %endif
+        <script src="/assets/js/fancydates.min.js"></script>
-    %if colorbox_locales[lang]:
-        <script src="/assets/js/colorbox-i18n/jquery.colorbox-${colorbox_locales[lang]}.js"></script>
    %endif
    ${social_buttons_code}
 </%def>
@@ -106,30 +112,30 @@ lang="${lang}">
            <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
        %else:
            <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
+            <link href="/assets/css/baguetteBox.min.css" rel="stylesheet" type="text/css">
        %endif
-        <link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/rst_base.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/nikola_rst.css" rel="stylesheet" type="text/css">
        <link href="/assets/css/code.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/colorbox.css" rel="stylesheet" type="text/css">
        <link href="/assets/css/theme.css" rel="stylesheet" type="text/css">
        %if has_custom_css:
            <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
        %endif
    %endif
-    % if annotations and post and not post.meta('noannotations'):
+    %if needs_ipython_css:
-        ${notes.css()}
+        <link href="/assets/css/ipython.min.css" rel="stylesheet" type="text/css">
-    % elif not annotations and post and post.meta('annotations'):
+        <link href="/assets/css/nikola_ipython.css" rel="stylesheet" type="text/css">
-        ${notes.css()}
+    %endif
-    % endif
 </%def>
 <%def name="html_navigation_links()">
    %for url, text, icon in navigation_links[lang]:
        % if isinstance(url, tuple):
-            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">${text}<b class="caret"></b></a>
+            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">${text} <b class="caret"></b></a>
            <ul class="dropdown-menu">
            %for suburl, text in url:
                % if rel_link(permalink, suburl) == "#":
-                    <li class="active"><a href="${permalink}" title="${text}"><i class="${icon}"></i></a>
+                    <li class="active"><a href="${permalink}">${text} <i class="${icon}"></i></a>
                %else:
                    <li><a href="${suburl}" title="${text}"><i class="${icon}"></i></a>
                %endif
@@ -146,21 +152,11 @@ lang="${lang}">
 </%def>
 <%def name="html_feedlinks()">
-    %if rss_link:
+    ${feeds_translations.head(classification=None, kind='index', other=False)}
-        ${rss_link}
-    %elif generate_rss:
-        %if len(translations) > 1:
-            %for language in translations:
-                <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
-            %endfor
-        %else:
-            <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}">
-        %endif
-    %endif
 </%def>
 <%def name="html_translations()">
-    %for langname in translations.keys():
+    %for langname in sorted(translations):
        %if langname != lang:
            <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
        %endif