Merge tag 'upstream/7.6.0'

Upstream version 7.6.0

1 files changed, 27 insertions, 10 deletions

diff --git a/nikola/data/themes/base/templates/post_helper.tmpl b/nikola/data/themes/base/templates/post_helper.tmpl
index c4e0ed1..e091447 100644
--- a/nikola/data/themes/base/templates/post_helper.tmpl
+++ b/nikola/data/themes/base/templates/post_helper.tmpl
@@ -14,7 +14,9 @@
     %if post.tags:
         <ul itemprop="keywords" class="tags">
         %for tag in post.tags:
-           <li><a class="tag p-category" href="${_link('tag', tag)}" rel="tag">${tag}</a></li>
+          % if tag not in hidden_tags:
+            <li><a class="tag p-category" href="${_link('tag', tag)}" rel="tag">${tag}</a></li>
+          % endif
         %endfor
         </ul>
     %endif
@@ -22,15 +24,15 @@
 
 <%def name="html_pager(post)">
     %if post.prev_post or post.next_post:
-        <ul class="pager">
+        <ul class="pager hidden-print">
         %if post.prev_post:
             <li class="previous">
-                <a href="${post.prev_post.permalink()}" rel="prev" title="${post.prev_post.title()}">${messages("Previous post")}</a>
+                <a href="${post.prev_post.permalink()}" rel="prev" title="${post.prev_post.title()|h}">${messages("Previous post")}</a>
             </li>
         %endif
         %if post.next_post:
             <li class="next">
-                <a href="${post.next_post.permalink()}" rel="next" title="${post.next_post.title()}">${messages("Next post")}</a>
+                <a href="${post.next_post.permalink()}" rel="next" title="${post.next_post.title()|h}">${messages("Next post")}</a>
             </li>
         %endif
         </ul>
@@ -39,15 +41,30 @@
 
 <%def name="open_graph_metadata(post)">
 %if use_open_graph:
-    <meta name="og:title" content="${post.title()[:70]|h}">
-    <meta name="og:url" content="${abs_link(permalink)}">
+    <meta property="og:site_name" content="${blog_title|striphtml}">
+    <meta property="og:title" content="${post.title()[:70]|h}">
+    <meta property="og:url" content="${abs_link(permalink)}">
     %if post.description():
-    <meta name="og:description" content="${post.description()[:200]|h}">
+    <meta property="og:description" content="${post.description()[:200]|h}">
     %else:
-    <meta name="og:description" content="${post.text(strip_html=True)[:200]|h}">
+    <meta property="og:description" content="${post.text(strip_html=True)[:200]|h}">
+    %endif
+    %if post.previewimage:
+    <meta property="og:image" content="${url_replacer(permalink, post.previewimage, lang, 'absolute')}">
+    %endif
+    <meta property="og:type" content="article">
+### Will only work with Pintrest and breaks everywhere else who expect a [Facebook] URI.
+###    %if post.author():
+###    <meta property="article:author" content="${post.author()}">
+###    %endif
+    %if post.date.isoformat():
+    <meta property="article:published_time" content="${post.date.isoformat()}">
+    %endif
+    %if post.tags:
+        %for tag in post.tags:
+           <meta property="article:tag" content="${tag}">
+        %endfor
     %endif
-    <meta name="og:site_name" content="${blog_title|striphtml}">
-    <meta name="og:type" content="article">
 %endif
 </%def>