From 9bb5248dab5fafc7e999ec92667b8dba8a5cc644 Mon Sep 17 00:00:00 2001
From: Dirk Engling <erdgeist@erdgeist.org>
Date: Thu, 2 Jan 2025 03:42:39 +0100
Subject: bring the blog up to date

---
 themes/erdgeist/templates/base.tmpl             | 21 +++++---
 themes/erdgeist/templates/base_helper.tmpl      | 66 ++++++++++++-------------
 themes/erdgeist/templates/index_helper.tmpl     | 27 ----------
 themes/erdgeist/templates/list_poetry.tmpl      |  2 +-
 themes/erdgeist/templates/list_projectnews.tmpl |  2 +-
 5 files changed, 47 insertions(+), 71 deletions(-)
 delete mode 100644 themes/erdgeist/templates/index_helper.tmpl

(limited to 'themes/erdgeist')
diff --git a/themes/erdgeist/templates/base.tmpl b/themes/erdgeist/templates/base.tmpl
index 3bdf48d..813b592 100644
--- a/themes/erdgeist/templates/base.tmpl
+++ b/themes/erdgeist/templates/base.tmpl
@@ -37,7 +37,7 @@ ${template_hooks['extra_head']()}
         </div>
         <!--End of body content-->
 
-        <footer>
+        <footer id="footer">
             ${content_footer}
             ${template_hooks['page_footer']()}
         </footer>
@@ -45,13 +45,20 @@ ${template_hooks['extra_head']()}
 </div>
 
 ${base.late_load_js()}
-    <!--script>$('a.image-reference:not(.islink)').colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script -->
+    <!-- fancy dates -->
+    <script>
+    moment.locale("${momentjs_locales[lang]}");
+    fancydates(${date_fanciness}, ${js_date_format});
+    </script>
+    <!-- end fancy dates -->
     <%block name="extra_js"></%block>
-    % if annotations and post and not post.meta('noannotations'):
-        ${notes.code()}
-    % elif not annotations and post and post.meta('annotations'):
-        ${notes.code()}
-    % endif
+    <script>
+    baguetteBox.run('div#content', {
+        ignoreClass: 'islink',
+        captions: function(element) {
+            return element.getElementsByTagName('img')[0].alt;
+    }});
+    </script>
 ${body_end}
 ${template_hooks['body_end']()}
 </body>
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()}
-    %if permalink:
-      <link rel="canonical" href="${abs_link(permalink)}">
-    %endif
+    <meta name="theme-color" content="${theme_color}">
+    % if meta_generator_tag:
+    <meta name="generator" content="Nikola (getnikola.com)">
+    % 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/fancydates.js"></script>
+            <script src="/assets/js/baguetteBox.min.js"></script>
         %endif
-        <script src="/assets/js/jquery.colorbox-min.js"></script>
-    %endif
-    %if colorbox_locales[lang]:
-        <script src="/assets/js/colorbox-i18n/jquery.colorbox-${colorbox_locales[lang]}.js"></script>
+        <script src="/assets/js/moment-with-locales.min.js"></script>
+        <script src="/assets/js/fancydates.min.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'):
-        ${notes.css()}
-    % elif not annotations and post and post.meta('annotations'):
-        ${notes.css()}
-    % 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
 </%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:
-        ${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
+    ${feeds_translations.head(classification=None, kind='index', other=False)}
 </%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
diff --git a/themes/erdgeist/templates/index_helper.tmpl b/themes/erdgeist/templates/index_helper.tmpl
deleted file mode 100644
index 9331b93..0000000
--- a/themes/erdgeist/templates/index_helper.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-## -*- coding: utf-8 -*-
-<%def name="html_pager()">
-    %if prevlink or nextlink:
-        <nav class="postindexpager">
-        <ul class="pager">
-        %if prevlink:
-            <li class="previous">
-                <a href="${prevlink}" rel="prev">${messages("Newer posts")}</a>
-            </li>
-        %endif
-        %if nextlink:
-            <li class="next">
-                <a href="${nextlink}" rel="next">${messages("Older posts")}</a>
-            </li>
-        %endif
-        </ul>
-        </nav>
-    %endif
-</%def>
-
-<%def name="mathjax_script(posts)">
-    %if any(post.is_mathjax for post in posts):
-        <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script>
-        <script src="/assets/js/mathjax.js"></script>
-    %endif
-</%def>
diff --git a/themes/erdgeist/templates/list_poetry.tmpl b/themes/erdgeist/templates/list_poetry.tmpl
index 3bde503..d05ec96 100644
--- a/themes/erdgeist/templates/list_poetry.tmpl
+++ b/themes/erdgeist/templates/list_poetry.tmpl
@@ -6,7 +6,7 @@
     <ul class="poetry-list multi-columns post-list list-unstyled">
         % for post in posts:
             <li class="post-list-item">
-                <a href="${post.permalink()}">${post.title(lang)}</a><div class="post-date">(${post.formatted_date('%b %Y')})</div>
+                <a href="${post.permalink()}">${post.title(lang)}</a><div class="post-date">(${post.formatted_date('MMM Y')})</div>
            </li>
         % endfor
     </ul>
diff --git a/themes/erdgeist/templates/list_projectnews.tmpl b/themes/erdgeist/templates/list_projectnews.tmpl
index abb515b..8c6a9eb 100644
--- a/themes/erdgeist/templates/list_projectnews.tmpl
+++ b/themes/erdgeist/templates/list_projectnews.tmpl
@@ -6,7 +6,7 @@
     <ul class="poetry-list post-list list-unstyled">
         % for post in posts:
             <li class="post-list-item">
-                <div style="float:left; margin-right: .6em"><a href="${post.permalink()}">(${post.formatted_date('%Y-%m-%d')})</a></div> ${post.text(lang)}
+                <div style="float:left; margin-right: .6em"><a href="${post.permalink()}">(${post.formatted_date('Y-m-d')})</a></div> ${post.text(lang)}
            </li>
         % endfor
     </ul>
-- 
cgit v1.2.3

