theme: don't include the keywords meta tag if there are no tags.

diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html
index 7fb459df268f42a8d6a395b785d416b7ac957584..7703a671de86011de9806a246e55de225b4bf092 100644 (file)
--- a/pelican-theme/templates/article.html
+++ b/pelican-theme/templates/article.html
@@ -7,7 +7,9 @@
   {% if article.description %}
   <meta name="description" content="{{ article.description|dehyphenate|striptags|e }}" />
   {% endif %}
+  {% if article.tags %}
   <meta name="keywords" content="{{ article.tags|join(', ')|e }}" />
+  {% endif %}
   <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/test/blog_author_list/article-jumbo.html b/pelican-theme/test/blog_author_list/article-jumbo.html
index 225aa4b603dc3f91e4c565eeb10ed6807bd32a2f..92287d3b839db745ec03cb7d18e023374e722342 100644 (file)
--- a/pelican-theme/test/blog_author_list/article-jumbo.html
+++ b/pelican-theme/test/blog_author_list/article-jumbo.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />
   <meta property="og:url" content="article-jumbo.html" />

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html
index b9bbb8881413dd0c4c03d4c2e6f787f3819533d0..42e89965daa73ad7d9137384c5199fbea6276219 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html
+++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />
   <meta property="og:url" content="article-jumbo.html" />
@@ -80,4 +79,4 @@
   </nav>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html
index 9eb362d07199de44a7ba630eba0c58d41bf1b79f..fdc38f13c28c37ce91fe61be566680be7d961a2d 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html
+++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />
   <meta property="og:url" content="article.html" />
@@ -55,4 +54,4 @@
 </div>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html
index 4ed06c53168aeae1dc9b245782a4666626e424e2..a663b8c428aa6d3173d6d66e648a7578f9c0b79d 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html
+++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />
   <meta property="og:url" content="article-jumbo.html" />
@@ -73,4 +72,4 @@
   </nav>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html
index 78959a54b5a401d8e1888aa3e6b0041c043ce2a4..a7df3b3229758fe3951c11271b5de724afea5fd0 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html
+++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />
   <meta property="og:url" content="article.html" />
@@ -54,4 +53,4 @@
 </div>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html
index 317a79f95c0b2ea522956371d04f49159979ad26..a5c98e1f9755c786da8c65b8b858a1a8d7652a91 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html
+++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />
   <meta property="og:url" content="article-jumbo.html" />
@@ -80,4 +79,4 @@
   </nav>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html
index 215efd9360d21909fa4d54fd54f2bcf788d611a3..7349599fe0c519a5c1e54fc5789f215b670f6848 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html
+++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />
   <meta property="og:url" content="article.html" />
@@ -55,4 +54,4 @@
 </div>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html
index bcea5bf6a9d384b6e30319da10d1dd479cfae588..a663b8c428aa6d3173d6d66e648a7578f9c0b79d 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html
+++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />
   <meta property="og:url" content="article-jumbo.html" />

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html
index e9b2e7e7c0a4ff01357b21a0791faf430edab27b..6f0d3896cb89518fea71f3912df13e4dab0ebb02 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html
+++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <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_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_hide_summary_both/article-jumbo.html
index 9ab7c70d50fa78e250f227d8ef398c79627683d4..fa8e5771bee8cd91bb60e7c5c4343849d88c01f9 100644 (file)
--- a/pelican-theme/test/blog_hide_summary_both/article-jumbo.html
+++ b/pelican-theme/test/blog_hide_summary_both/article-jumbo.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />
   <meta property="og:url" content="article-jumbo.html" />
@@ -80,4 +79,4 @@
   </nav>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_hide_summary_both/article.html b/pelican-theme/test/blog_hide_summary_both/article.html
index 40a871b9301847e8b8e5506e0240f8c004f34787..0c41e043e47572336d99ee96d009428eb133ac99 100644 (file)
--- a/pelican-theme/test/blog_hide_summary_both/article.html
+++ b/pelican-theme/test/blog_hide_summary_both/article.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />
   <meta property="og:url" content="article.html" />
@@ -55,4 +54,4 @@
 </div>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_hide_summary_global/article-jumbo.html
index 094f8804c672a5783fed7f9c50cc354ddab2a2fa..d1edbff1676ff8a499a7852899e103d771caf6a6 100644 (file)
--- a/pelican-theme/test/blog_hide_summary_global/article-jumbo.html
+++ b/pelican-theme/test/blog_hide_summary_global/article-jumbo.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />
   <meta property="og:url" content="article-jumbo.html" />

diff --git a/pelican-theme/test/blog_hide_summary_global/article.html b/pelican-theme/test/blog_hide_summary_global/article.html
index 3f20aba741464e1c476cdcc0b1bd8cb2aa172581..e7b653df58f1dbbb3274ade5e8d4af8cb2281985 100644 (file)
--- a/pelican-theme/test/blog_hide_summary_global/article.html
+++ b/pelican-theme/test/blog_hide_summary_global/article.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />
   <meta property="og:url" content="article.html" />
@@ -54,4 +53,4 @@
 </div>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html
index ab42d552592cc9389938281e17368248bbcaca39..55610b8c42d57f2439a2084b843d0ce4b7edb826 100644 (file)
--- a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html
+++ b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />
   <meta property="og:url" content="article-jumbo.html" />
@@ -62,4 +61,4 @@
   </nav>
 </main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/pelican-theme/test/blog_minimal/article-jumbo.html b/pelican-theme/test/blog_minimal/article-jumbo.html
index 4f78f88ae9060a3ab8e0123942895675f3bd7340..c06f5a179b0e41caf9f8eac4969848ffe1eb9340 100644 (file)
--- a/pelican-theme/test/blog_minimal/article-jumbo.html
+++ b/pelican-theme/test/blog_minimal/article-jumbo.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />
   <meta property="og:url" content="article-jumbo.html" />

diff --git a/pelican-theme/test/blog_minimal/article.html b/pelican-theme/test/blog_minimal/article.html
index e467254f5ae26375986365ec7352d09ecaefac0e..011063b175a76eb9bee2d6f35ec111f8265e4506 100644 (file)
--- a/pelican-theme/test/blog_minimal/article.html
+++ b/pelican-theme/test/blog_minimal/article.html
@@ -6,7 +6,6 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="keywords" content="" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />
   <meta property="og:url" content="article.html" />