From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sat, 16 Dec 2017 16:25:06 +0000 (+0100)
Subject: theme: put the description <meta> tag before all the social stuff.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=56d6e525812aeb85a87a852e11c9d34428c3d531;p=blog.git

theme: put the description <meta> tag before all the social stuff.
---

diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html
index d9b38ae9..fe65e904 100644
--- a/pelican-theme/templates/article.html
+++ b/pelican-theme/templates/article.html
@@ -6,11 +6,15 @@
   <link rel="canonical" href="{{ article.url|format_siteurl|e }}" />
 {% endblock %}
 
-{% block social %}
-  {{- super() -}}
+{% block meta %}
   {% if article.description %}
   <meta name="description" content="{{ article.description|dehyphenate|striptags|e }}" />
   {% endif %}
+{% endblock %}
+
+{% block social %}
+  {{- super() -}}
+  {# this has to be here otherwise the spacing is all wrong #}
   <meta property="og:title" content="{{ article.title }}" />
   <meta name="twitter:title" content="{{ article.title }}" />
   <meta property="og:url" content="{{ article.url|format_siteurl|e }}" />
diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html
index c5e11841..90fa8a40 100644
--- a/pelican-theme/templates/base.html
+++ b/pelican-theme/templates/base.html
@@ -18,6 +18,8 @@
   {% if M_THEME_COLOR %}
   <meta name="theme-color" content="{{ M_THEME_COLOR }}" />
   {% endif %}
+  {% block meta %}
+  {% endblock meta %}
   {% block social %}
   {% endblock social %}
 </head>
diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html
index 6b631786..cf5c6233 100644
--- a/pelican-theme/templates/page.html
+++ b/pelican-theme/templates/page.html
@@ -23,11 +23,14 @@
   <link rel="canonical" href="{{ page.url|format_siteurl|e }}" />
 {% endblock %}
 
-{% block social %}
-  <meta property="og:site_name" content="{{ SITENAME|e }}" />
+{% block meta %}
   {% if page.description %}
   <meta name="description" content="{{ page.description|dehyphenate|striptags|e }}" />
   {% endif %}
+{% endblock %}
+
+{% block social %}
+  <meta property="og:site_name" content="{{ SITENAME|e }}" />
   <meta property="og:title" content="{{ page.title }}" />
   <meta name="twitter:title" content="{{ page.title }}" />
   <meta property="og:url" content="{{ page.url|format_siteurl|e }}" />
diff --git a/pelican-theme/test/blog/article.html b/pelican-theme/test/blog/article.html
index a7e6e13e..cb789539 100644
--- a/pelican-theme/test/blog/article.html
+++ b/pelican-theme/test/blog/article.html
@@ -7,8 +7,8 @@
   <link rel="stylesheet" href="static/m-dark.css" />
   <link rel="canonical" href="article.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta property="og:site_name" content="A Pelican Blog" />
   <meta name="description" content="Article description for the fake SEO believers." />
+  <meta property="og:site_name" content="A Pelican Blog" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />
   <meta property="og:url" content="article.html" />
diff --git a/pelican-theme/test/blog_html_escape/article-jumbo.html b/pelican-theme/test/blog_html_escape/article-jumbo.html
index 4eb2df85..bf2eff6e 100644
--- a/pelican-theme/test/blog_html_escape/article-jumbo.html
+++ b/pelican-theme/test/blog_html_escape/article-jumbo.html
@@ -7,8 +7,8 @@
   <link rel="stylesheet" href="static/m-dark.css" />
   <link rel="canonical" href="article-jumbo.html?and&amp;in&amp;url=&#34;&#34;" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta property="og:site_name" content="&lt;&amp;&gt; in blog name" />
   <meta name="description" content="And &lt;&amp;&gt; in description." />
+  <meta property="og:site_name" content="&lt;&amp;&gt; in blog name" />
   <meta property="og:title" content="Article with &lt;&amp;&gt; — a &lt;&amp;&gt; jumbo one" />
   <meta name="twitter:title" content="Article with &lt;&amp;&gt; — a &lt;&amp;&gt; jumbo one" />
   <meta property="og:url" content="article-jumbo.html?and&amp;in&amp;url=&#34;&#34;" />
diff --git a/pelican-theme/test/blog_html_escape/article.html b/pelican-theme/test/blog_html_escape/article.html
index 41a24a68..1b5ec680 100644
--- a/pelican-theme/test/blog_html_escape/article.html
+++ b/pelican-theme/test/blog_html_escape/article.html
@@ -7,8 +7,8 @@
   <link rel="stylesheet" href="static/m-dark.css" />
   <link rel="canonical" href="article.html?and&amp;in&amp;url=&#34;&#34;" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta property="og:site_name" content="&lt;&amp;&gt; in blog name" />
   <meta name="description" content="And &lt;&amp;&gt; in description." />
+  <meta property="og:site_name" content="&lt;&amp;&gt; in blog name" />
   <meta property="og:title" content="Article with &lt;&amp;&gt; in title" />
   <meta name="twitter:title" content="Article with &lt;&amp;&gt; in title" />
   <meta property="og:url" content="article.html?and&amp;in&amp;url=&#34;&#34;" />
diff --git a/pelican-theme/test/page/page.html b/pelican-theme/test/page/page.html
index 6c5157c1..6cfcd871 100644
--- a/pelican-theme/test/page/page.html
+++ b/pelican-theme/test/page/page.html
@@ -7,8 +7,8 @@
   <link rel="stylesheet" href="static/m-dark.css" />
   <link rel="canonical" href="page.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta property="og:site_name" content="A Pelican Blog" />
   <meta name="description" content="Page description for the fake SEO believers." />
+  <meta property="og:site_name" content="A Pelican Blog" />
   <meta property="og:title" content="A page" />
   <meta name="twitter:title" content="A page" />
   <meta property="og:url" content="page.html" />
diff --git a/pelican-theme/test/page_html_escape/page.html b/pelican-theme/test/page_html_escape/page.html
index b0b7dd6c..6fa1d973 100644
--- a/pelican-theme/test/page_html_escape/page.html
+++ b/pelican-theme/test/page_html_escape/page.html
@@ -7,8 +7,8 @@
   <link rel="stylesheet" href="static/m-dark.css" />
   <link rel="canonical" href="page.html?and&amp;overriden&amp;url=&#34;&#34;" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta property="og:site_name" content="&lt;&amp;&gt; in site name" />
   <meta name="description" content="And &lt;&amp;&gt; in description." />
+  <meta property="og:site_name" content="&lt;&amp;&gt; in site name" />
   <meta property="og:title" content="Page with &lt;&amp;&gt; in title" />
   <meta name="twitter:title" content="Page with &lt;&amp;&gt; in title" />
   <meta property="og:url" content="page.html?and&amp;overriden&amp;url=&#34;&#34;" />