New upstream version 7.8.1upstream/7.8.1

16 files changed, 82 insertions, 42 deletions

diff --git a/nikola/data/themes/base/templates/author.tmpl b/nikola/data/themes/base/templates/author.tmpl
index 3ad5140..21d8d64 100644
--- a/nikola/data/themes/base/templates/author.tmpl
+++ b/nikola/data/themes/base/templates/author.tmpl
@@ -35,7 +35,7 @@
     %if posts:
     <ul class="postlist">
     % for post in posts:
-        <li><a href="${post.permalink()}" class="listtitle">${post.title()|h}</a><time class="listdate" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)|h}">${post.formatted_date(date_format)|h}</time></li>
+        <li><time class="listdate" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)|h}">${post.formatted_date(date_format)|h}</time> <a href="${post.permalink()}" class="listtitle">${post.title()|h}</a></li>
     % endfor
     </ul>
     %endif
diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
index 35ed983..e2ffab2 100644
--- a/nikola/data/themes/base/templates/base_helper.tmpl
+++ b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -58,7 +58,7 @@ lang="${lang}">
 
     ${mathjax_config}
     %if use_cdn:
-        <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+        <!--[if lt IE 9]><script src="https://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]-->
     %endif
diff --git a/nikola/data/themes/base/templates/comments_helper_disqus.tmpl b/nikola/data/themes/base/templates/comments_helper_disqus.tmpl
index 6dd423c..b842871 100644
--- a/nikola/data/themes/base/templates/comments_helper_disqus.tmpl
+++ b/nikola/data/themes/base/templates/comments_helper_disqus.tmpl
@@ -21,12 +21,12 @@
         };
         (function() {
             var dsq = document.createElement('script'); dsq.async = true;
-            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+            dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
             (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
     </script>
-    <noscript>Please enable JavaScript to view the <a href="//disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
-    <a href="//disqus.com" class="dsq-brlink" rel="nofollow">Comments powered by <span class="logo-disqus">Disqus</span></a>
+    <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
+    <a href="https://disqus.com" class="dsq-brlink" rel="nofollow">Comments powered by <span class="logo-disqus">Disqus</span></a>
     %endif
 </%def>
 
@@ -39,6 +39,6 @@
 
 <%def name="comment_link_script()">
     %if comment_system_id:
-       <script>var disqus_shortname="${comment_system_id}";(function(){var a=document.createElement("script");a.async=true;a.src="//"+disqus_shortname+".disqus.com/count.js";(document.getElementsByTagName("head")[0]||document.getElementsByTagName("body")[0]).appendChild(a)}());</script>
+       <script>var disqus_shortname="${comment_system_id}";(function(){var a=document.createElement("script");a.async=true;a.src="https://"+disqus_shortname+".disqus.com/count.js";(document.getElementsByTagName("head")[0]||document.getElementsByTagName("body")[0]).appendChild(a)}());</script>
     %endif
 </%def>
diff --git a/nikola/data/themes/base/templates/comments_helper_facebook.tmpl b/nikola/data/themes/base/templates/comments_helper_facebook.tmpl
index d6059a1..815f489 100644
--- a/nikola/data/themes/base/templates/comments_helper_facebook.tmpl
+++ b/nikola/data/themes/base/templates/comments_helper_facebook.tmpl
@@ -17,7 +17,7 @@
      var js, fjs = d.getElementsByTagName(s)[0];
      if (d.getElementById(id)) {return;}
      js = d.createElement(s); js.id = id;
-     js.src = "//connect.facebook.net/en_US/all.js";
+     js.src = "https://connect.facebook.net/en_US/all.js";
      fjs.parentNode.insertBefore(js, fjs);
    }(document, 'script', 'facebook-jssdk'));
 </script>
@@ -55,7 +55,7 @@
      var js, fjs = d.getElementsByTagName(s)[0];
      if (d.getElementById(id)) {return;}
      js = d.createElement(s); js.id = id;
-     js.src = "//connect.facebook.net/en_US/all.js";
+     js.src = "https://connect.facebook.net/en_US/all.js";
      fjs.parentNode.insertBefore(js, fjs);
    }(document, 'script', 'facebook-jssdk'));
 </script>
diff --git a/nikola/data/themes/base/templates/comments_helper_isso.tmpl b/nikola/data/themes/base/templates/comments_helper_isso.tmpl
index 8dc95f5..95f93ae 100644
--- a/nikola/data/themes/base/templates/comments_helper_isso.tmpl
+++ b/nikola/data/themes/base/templates/comments_helper_isso.tmpl
@@ -14,7 +14,7 @@
 
 
 <%def name="comment_link_script()">
-    %if comment_system_id:
+    %if comment_system_id and 'index' in pagekind:
         <script src="${comment_system_id}js/count.min.js" data-isso="${comment_system_id}"></script>
     %endif
 </%def>
diff --git a/nikola/data/themes/base/templates/comments_helper_muut.tmpl b/nikola/data/themes/base/templates/comments_helper_muut.tmpl
index 94532d9..e5e7c05 100644
--- a/nikola/data/themes/base/templates/comments_helper_muut.tmpl
+++ b/nikola/data/themes/base/templates/comments_helper_muut.tmpl
@@ -9,5 +9,5 @@
 
 
 <%def name="comment_link_script()">
-<script src="//cdn.muut.com/1/moot.min.js"></script>
+<script src="https://cdn.muut.com/1/moot.min.js"></script>
 </%def>
diff --git a/nikola/data/themes/base/templates/gallery.tmpl b/nikola/data/themes/base/templates/gallery.tmpl
index 126d51c..f9bbd1b 100644
--- a/nikola/data/themes/base/templates/gallery.tmpl
+++ b/nikola/data/themes/base/templates/gallery.tmpl
@@ -17,7 +17,7 @@
     %if folders:
     <ul>
     % for folder, ftitle in folders:
-        <li><a href="${folder|u}"><i
+        <li><a href="${folder}"><i
         class="icon-folder-open"></i>&nbsp;${ftitle|h}</a></li>
     % endfor
     </ul>
diff --git a/nikola/data/themes/base/templates/index.tmpl b/nikola/data/themes/base/templates/index.tmpl
index 294bdaf..f74d2e4 100644
--- a/nikola/data/themes/base/templates/index.tmpl
+++ b/nikola/data/themes/base/templates/index.tmpl
@@ -12,6 +12,9 @@
 
 <%block name="content">
 <%block name="content_header"></%block>
+% if 'main_index' in pagekind:
+    ${front_index_header}
+% endif
 <div class="postindex">
 % for post in posts:
     <article class="h-entry post-${post.meta('type')}">
diff --git a/nikola/data/themes/base/templates/index_helper.tmpl b/nikola/data/themes/base/templates/index_helper.tmpl
index fae046d..0e98016 100644
--- a/nikola/data/themes/base/templates/index_helper.tmpl
+++ b/nikola/data/themes/base/templates/index_helper.tmpl
@@ -21,16 +21,30 @@
 <%def name="mathjax_script(posts)">
     %if any(post.is_mathjax for post in posts):
         %if use_katex:
-            <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/katex.min.js"></script>
-            <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/contrib/auto-render.min.js"></script>
-            <script>
-                renderMathInElement(document.body);
-            </script>
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.js"></script>
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/contrib/auto-render.min.js"></script>
+            % if katex_auto_render:
+                <script>
+                    renderMathInElement(document.body,
+                        {
+                            ${katex_auto_render}
+                        }
+                    );
+                </script>
+            % else:
+                <script>
+                    renderMathInElement(document.body);
+                </script>
+            % endif
         %else:
-            <script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> </script>
+            <script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> </script>
+            % if mathjax_config:
+            ${mathjax_config}
+            % else:
             <script type="text/x-mathjax-config">
             MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});
             </script>
+            % endif
         %endif
     %endif
 </%def>
diff --git a/nikola/data/themes/base/templates/list_post.tmpl b/nikola/data/themes/base/templates/list_post.tmpl
index 5fd4df1..bc52385 100644
--- a/nikola/data/themes/base/templates/list_post.tmpl
+++ b/nikola/data/themes/base/templates/list_post.tmpl
@@ -9,7 +9,7 @@
     %if posts:
     <ul class="postlist">
     % for post in posts:
-        <li><a href="${post.permalink()}" class="listtitle">${post.title()|h}</a> <time class="listdate" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)|h}">${post.formatted_date(date_format)|h}</time></li>
+        <li><time class="listdate" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)|h}">${post.formatted_date(date_format)|h}</time> <a href="${post.permalink()}" class="listtitle">${post.title()|h}</a></li>
     % endfor
     </ul>
     %else:
diff --git a/nikola/data/themes/base/templates/listing.tmpl b/nikola/data/themes/base/templates/listing.tmpl
index 1800bd9..fae7607 100644
--- a/nikola/data/themes/base/templates/listing.tmpl
+++ b/nikola/data/themes/base/templates/listing.tmpl
@@ -14,10 +14,13 @@ ${ui.bar(crumbs)}
 </ul>
 %endif
 % if code:
+    <h1>${title}
+        % if source_link:
+            <small><a href="${source_link}">(${messages("Source")})</a></small>
+        % endif
+        </h1>
     ${code}
 % endif
-% if source_link:
-    <p class="sourceline"><a href="${source_link}" id="sourcelink">${messages("Source")}</a></p>
-% endif
 </%block>
 
+
diff --git a/nikola/data/themes/base/templates/post_helper.tmpl b/nikola/data/themes/base/templates/post_helper.tmpl
index f8572ec..47bf9b3 100644
--- a/nikola/data/themes/base/templates/post_helper.tmpl
+++ b/nikola/data/themes/base/templates/post_helper.tmpl
@@ -3,7 +3,7 @@
 <%def name="meta_translations(post)">
     %if len(translations) > 1:
         %for langname in sorted(translations):
-            %if langname != lang and post.is_translation_available(langname):
+            %if langname != lang and ((not post.skip_untranslated) or post.is_translation_available(langname)):
                 <link rel="alternate" hreflang="${langname}" href="${post.permalink(langname)}">
             %endif
         %endfor
@@ -87,16 +87,30 @@
 <%def name="mathjax_script(post)">
     %if post.is_mathjax:
         %if use_katex:
-            <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/katex.min.js"></script>
-            <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/contrib/auto-render.min.js"></script>
-            <script>
-                renderMathInElement(document.body);
-            </script>
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.js"></script>
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/contrib/auto-render.min.js"></script>
+            % if katex_auto_render:
+                <script>
+                    renderMathInElement(document.body,
+                        {
+                            ${katex_auto_render}
+                        }
+                    );
+                </script>
+            % else:
+                <script>
+                    renderMathInElement(document.body);
+                </script>
+            % endif
         %else:
-            <script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> </script>
+            <script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> </script>
+            % if mathjax_config:
+            ${mathjax_config}
+            % else:
             <script type="text/x-mathjax-config">
             MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});
             </script>
+            % endif
         %endif
     %endif
 </%def>
diff --git a/nikola/data/themes/base/templates/post_list_directive.tmpl b/nikola/data/themes/base/templates/post_list_directive.tmpl
index 4a136a1..4a1cf69 100644
--- a/nikola/data/themes/base/templates/post_list_directive.tmpl
+++ b/nikola/data/themes/base/templates/post_list_directive.tmpl
@@ -6,10 +6,10 @@
     <ul class="post-list">
         % for post in posts:
             <li class="post-list-item">
-	        ${post.formatted_date(date_format)|h}
-		&nbsp;
-		<a href="${post.permalink(lang)}">${post.title(lang)|h}</a>
-	    </li>
+            ${post.formatted_date(date_format)|h}
+            &nbsp;
+            <a href="${post.permalink(lang)}">${post.title(lang)|h}</a>
+            </li>
         % endfor
     </ul>
     %endif
diff --git a/nikola/data/themes/base/templates/story.tmpl b/nikola/data/themes/base/templates/story.tmpl
index 2737c4d..b8fb7ed 100644
--- a/nikola/data/themes/base/templates/story.tmpl
+++ b/nikola/data/themes/base/templates/story.tmpl
@@ -5,7 +5,7 @@
 <%inherit file="post.tmpl"/>
 
 <%block name="content">
-<article class="storypage" itemscope="itemscope" itemtype="http://schema.org/Article">
+<article class="post-${post.meta('type')} storypage" itemscope="itemscope" itemtype="http://schema.org/Article">
     <header>
         ${pheader.html_title()}
         ${pheader.html_translations(post)}
diff --git a/nikola/data/themes/base/templates/tag.tmpl b/nikola/data/themes/base/templates/tag.tmpl
index d07c434..50c5bf2 100644
--- a/nikola/data/themes/base/templates/tag.tmpl
+++ b/nikola/data/themes/base/templates/tag.tmpl
@@ -43,7 +43,7 @@
     %if posts:
     <ul class="postlist">
     % for post in posts:
-        <li><time class="listdate" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)|h}">${post.formatted_date(date_format)|h}</time><a href="${post.permalink()}" class="listtitle">${post.title()|h}<a></li>
+        <li><time class="listdate" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)|h}">${post.formatted_date(date_format)|h}</time> <a href="${post.permalink()}" class="listtitle">${post.title()|h}<a></li>
     % endfor
     </ul>
     %endif
diff --git a/nikola/data/themes/base/templates/tagindex.tmpl b/nikola/data/themes/base/templates/tagindex.tmpl
index 047d638..c3c51b0 100644
--- a/nikola/data/themes/base/templates/tagindex.tmpl
+++ b/nikola/data/themes/base/templates/tagindex.tmpl
@@ -2,14 +2,20 @@
 <%inherit file="index.tmpl"/>
 
 <%block name="content_header">
-    %if subcategories:
-    ${messages('Subcategories:')}
-    <ul>
-        %for name, link in subcategories:
-        <li><a href="${link}">${name|h}</a></li>
-        %endfor
-    </ul>
-    %endif
+    <header>
+        <h1>${title|h}</h1>
+        %if description:
+        <p>${description}</p>
+        %endif
+        %if subcategories:
+        ${messages('Subcategories:')}
+        <ul>
+            %for name, link in subcategories:
+            <li><a href="${link}">${name|h}</a></li>
+            %endfor
+        </ul>
+        %endif
+    </header>
 </%block>
 
 <%block name="extra_head">