From 6576ab0e80fc1fe7dd22d449ffb7ea604b0437f2 Mon Sep 17 00:00:00 2001
From: olipratt <olipratt@users.noreply.github.com>
Date: Sat, 4 Mar 2017 12:49:16 +0000
Subject: [PATCH] Apply feedback from issue discussion - remove config option
 and simplify change

---
 templates/base.html           | 6 +++++-
 tests/content/pages/hidden.md | 2 +-
 tests/pelicanconf.py          | 2 --
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 8b3ba8e..8f79b77 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -40,7 +40,11 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="HandheldFriendly" content="True" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="robots" content="{{ ROBOTS_HIDDEN if (ROBOTS_HIDDEN and page in hidden_pages) else ROBOTS }}" />
+  {% if page in hidden_pages %}
+    <meta name="robots" content="noindex, nofollow" />
+  {% else %}
+    <meta name="robots" content="{{ ROBOTS }}" />
+  {% endif %}
 
   {% if BROWSER_COLOR %}
     <!-- Chrome, Firefox OS and Opera -->
diff --git a/tests/content/pages/hidden.md b/tests/content/pages/hidden.md
index ca607a4..1d03981 100644
--- a/tests/content/pages/hidden.md
+++ b/tests/content/pages/hidden.md
@@ -5,4 +5,4 @@ Status: hidden
 
 This is a hidden page.
 
-It will have the contents of `ROBOTS_HIDDEN` as the value of the `robots` `<meta>` tag.
+It will have `noindex, nofollow` as the value of the `robots` `<meta>` tag.
diff --git a/tests/pelicanconf.py b/tests/pelicanconf.py
index 2b8d965..86b2f4a 100644
--- a/tests/pelicanconf.py
+++ b/tests/pelicanconf.py
@@ -18,9 +18,7 @@ SITELOGO = u'https://www.example.com/img/profile.png'
 FAVICON = SITEURL + '/images/favicon.ico'
 BROWSER_COLOR = '#333'
 
-# 'robots' meta tag values for normal and hidden pages.
 ROBOTS = u'index, follow'
-ROBOTS_HIDDEN = u'noindex, nofollow'
 
 THEME = u'../'
 PATH = u'content'