New upstream version 8.3.0.upstream/8.3.0upstream

4 files changed, 30 insertions, 3 deletions

diff --git a/nikola/data/themes/base/templates/base.tmpl b/nikola/data/themes/base/templates/base.tmpl
index f071c95..ae9570a 100644
--- a/nikola/data/themes/base/templates/base.tmpl
+++ b/nikola/data/themes/base/templates/base.tmpl
@@ -30,7 +30,7 @@ ${template_hooks['extra_head']()}
     % endif
     <%block name="extra_js"></%block>
     <script>
-    baguetteBox.run('div#content', {
+    baguetteBox.run('main#content', {
         ignoreClass: 'islink',
         captions: function(element){var i=element.getElementsByTagName('img')[0];return i===undefined?'':i.alt;}});
     </script>
diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
index 684165d..a03ae50 100644
--- a/nikola/data/themes/base/templates/base_helper.tmpl
+++ b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -82,7 +82,7 @@ lang="${lang}">
             <script src="https://polyfill.io/v3/polyfill.js?features=Intl.RelativeTimeFormat.%7Elocale.${luxon_locales[lang]}"></script>
         % endif
         % if use_cdn:
-            <script src="https://cdn.jsdelivr.net/npm/luxon@1.28.0/build/global/luxon.min.js" integrity="sha256-l1u7Y5ze+ENf/T9ORPa3E642/uMgHUFa1KnqzFCcWEY=" crossorigin="anonymous"></script>
+            <script src="https://cdn.jsdelivr.net/npm/luxon@3.3.0/build/global/luxon.min.js" integrity="sha256-Nn+JGDrq3PuTxcDfJmmI0Srj5LpfOFlKqEiPwQK7y40=" crossorigin="anonymous"></script>
         % else:
             <script src="/assets/js/luxon.min.js"></script>
         % endif
diff --git a/nikola/data/themes/base/templates/comments_helper_discourse.tmpl b/nikola/data/themes/base/templates/comments_helper_discourse.tmpl
new file mode 100644
index 0000000..0f92ea2
--- /dev/null
+++ b/nikola/data/themes/base/templates/comments_helper_discourse.tmpl
@@ -0,0 +1,27 @@
+## -*- coding: utf-8 -*-
+
+<%def name="comment_form(url, title, identifier)">
+    %if comment_system_id:
+        <div id="discourse-comments"></div>
+        <script type="text/javascript">
+            DiscourseEmbed = { discourseUrl: '${comment_system_id}',
+            discourseEmbedUrl: '${url}' };
+
+            (function() {
+                var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+                d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+            })();
+        </script>
+    %endif
+</%def>
+
+<%def name="comment_link(link, identifier)">
+    %if comment_system_id:
+    <a href="${link}#discourse-comments">${messages("Comments")}</a>
+    %endif
+</%def>
+
+
+<%def name="comment_link_script()">
+</%def>
diff --git a/nikola/data/themes/base/templates/gallery.tmpl b/nikola/data/themes/base/templates/gallery.tmpl
index fef3a86..a32f234 100644
--- a/nikola/data/themes/base/templates/gallery.tmpl
+++ b/nikola/data/themes/base/templates/gallery.tmpl
@@ -32,7 +32,7 @@
         % else:
             <ul>
             % for folder, ftitle in folders:
-                <li><a href="${folder}">📂&nbsp;${ftitle|h}</a></li>
+                <li><a href="${folder}">&#x1f4c2;&nbsp;${ftitle|h}</a></li>
             % endfor
             </ul>
         % endif