From bd147ee284a2a2b052c626a709be05d250fab69d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 11 Dec 2017 12:46:16 +0100
Subject: [PATCH] theme: don't include the keywords meta tag if there are no
 tags.

---
 pelican-theme/templates/article.html                           | 2 ++
 pelican-theme/test/blog_author_list/article-jumbo.html         | 1 -
 .../article-jumbo.html                                         | 3 +--
 .../blog_collapse_first_both_hide_summary_both/article.html    | 3 +--
 .../article-jumbo.html                                         | 3 +--
 .../blog_collapse_first_both_hide_summary_global/article.html  | 3 +--
 .../article-jumbo.html                                         | 3 +--
 .../blog_collapse_first_global_hide_summary_both/article.html  | 3 +--
 .../article-jumbo.html                                         | 1 -
 .../article.html                                               | 1 -
 pelican-theme/test/blog_hide_summary_both/article-jumbo.html   | 3 +--
 pelican-theme/test/blog_hide_summary_both/article.html         | 3 +--
 pelican-theme/test/blog_hide_summary_global/article-jumbo.html | 1 -
 pelican-theme/test/blog_hide_summary_global/article.html       | 3 +--
 pelican-theme/test/blog_jumbo_inverted/article-jumbo.html      | 3 +--
 pelican-theme/test/blog_minimal/article-jumbo.html             | 1 -
 pelican-theme/test/blog_minimal/article.html                   | 1 -
 17 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html
index 7fb459df..7703a671 100644
--- 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 225aa4b6..92287d3b 100644
--- 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 b9bbb888..42e89965 100644
--- 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 9eb362d0..fdc38f13 100644
--- 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 4ed06c53..a663b8c4 100644
--- 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 78959a54..a7df3b32 100644
--- 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 317a79f9..a5c98e1f 100644
--- 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 215efd93..7349599f 100644
--- 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 bcea5bf6..a663b8c4 100644
--- 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 e9b2e7e7..6f0d3896 100644
--- 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 9ab7c70d..fa8e5771 100644
--- 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 40a871b9..0c41e043 100644
--- 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 094f8804..d1edbff1 100644
--- 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 3f20aba7..e7b653df 100644
--- 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 ab42d552..55610b8c 100644
--- 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 4f78f88a..c06f5a17 100644
--- 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 e467254f..011063b1 100644
--- 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" />
-- 
2.30.2