From e7a78c4ff7b5e79c57a988b824424577dbc66256 Mon Sep 17 00:00:00 2001
From: Arul <arulrajnet@users.noreply.github.com>
Date: Mon, 11 Mar 2019 07:53:39 +0530
Subject: [PATCH] #44 no default cover (#45)

support for HOME_COVER and HOME_COLOR
---
 .gitignore                     |  1 +
 README.adoc                    | 21 ++++++++++++++++-----
 templates/archives.html        |  4 +---
 templates/article.html         |  4 +---
 templates/author.html          |  6 ++----
 templates/authors.html         |  4 +---
 templates/categories.html      |  4 +---
 templates/category.html        |  4 +---
 templates/index.html           | 12 +++++++++---
 templates/page.html            |  4 +---
 templates/period_archives.html | 26 +++++++++++++++++---------
 templates/tag.html             |  4 +---
 templates/tags.html            |  4 +---
 tests/default_conf.py          |  1 +
 tests/test_coverimages.py      | 32 ++++++++++++++++----------------
 15 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3752df0..c53652a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.pyc
 *.log
 output
+tests/.cache/
\ No newline at end of file
diff --git a/README.adoc b/README.adoc
index b6f3129..ea2556d 100644
--- a/README.adoc
+++ b/README.adoc
@@ -81,14 +81,20 @@ You can set cover images for your blog, article, page, tag, category and author.
 
 The is the cover image for your site main index.html.
 
-To set blog cover, set the property `HEADER_COVER` in
+To set blog cover, set the property `HOME_COVER` in
 `pelicanconf.py`:
 
 [source,python]
 ----
-HEADER_COVER = '/assets/images/blog_cover.png'
+HOME_COVER = '/assets/images/blog_cover.png'
 ----
 
+[NOTE]
+====
+HEADER_COVER property is deprecated. Work around will be use HOME_COVER and use cover in individual articles.
+This property will be used if there is no cover image set to an article, page, tag, category, author.
+====
+
 [[article-cover]]
 ==== Article Cover
 
@@ -167,17 +173,22 @@ For more refer link:#author-bio[author] .
 === Header Color
 
 To define a simple header background color, set the property
-`HEADER_COLOR` in `pelicanconf.py`:
+`HOME_COLOR` in `pelicanconf.py`:
 
 [source,python]
 ----
-HEADER_COLOR = 'black'
+HOME_COLOR = 'black'
 ----
 
 you can use any valid css color. This will be used if there is no cover
 image set in link:#articles[article] level and site level.
 
-This property will be used if there is no cover image set to an article, page, tag, category, author.
+
+[NOTE]
+====
+HEADER_COLOR property is deprecated. Work around will be use HOME_COLOR and use color in individual articles.
+This property will be used if there is no HEADER_COVER and cover image set to an article, page, tag, category, author.
+====
 
 [[social-urls]]
 === Social URLs
diff --git a/templates/archives.html b/templates/archives.html
index 439ef12..5d422b7 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -15,7 +15,7 @@
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="blog-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -36,8 +36,6 @@
           <div class="blog-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
           <div class="blog-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-          <div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
diff --git a/templates/article.html b/templates/article.html
index d160912..b74ec05 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -63,7 +63,7 @@
 
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="post-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -102,8 +102,6 @@
             <div class="post-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
             <div class="post-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-            <div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
diff --git a/templates/author.html b/templates/author.html
index d423016..d863d79 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -46,7 +46,7 @@
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="blog-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -66,14 +66,12 @@
             <div class="blog-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
             <div class="blog-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-            <div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
 
     {% if AUTHORS_BIO and author.name.lower() in AUTHORS_BIO %}
-    <section id="blog-author" class="has-cover" >
+    <section id="blog-author" {% if selected_cover or selected_color %}class="has-cover"{% endif %} >
         <div class="inner">
             <aside class="post-author">
                 {% if selected_avatar %}
diff --git a/templates/authors.html b/templates/authors.html
index ac226aa..08d0fa0 100644
--- a/templates/authors.html
+++ b/templates/authors.html
@@ -16,7 +16,7 @@
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="blog-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -37,8 +37,6 @@
           <div class="blog-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
           <div class="blog-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-          <div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
diff --git a/templates/categories.html b/templates/categories.html
index d5be758..81055e3 100644
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -15,7 +15,7 @@
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="blog-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -36,8 +36,6 @@
           <div class="blog-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
           <div class="blog-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-          <div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
diff --git a/templates/category.html b/templates/category.html
index 5cc43a5..4de9d7c 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -23,7 +23,7 @@
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="blog-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -45,8 +45,6 @@
             <div class="blog-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
             <div class="blog-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-            <div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
diff --git a/templates/index.html b/templates/index.html
index 4fd4a00..f18aefe 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -12,14 +12,22 @@
   {% else %}
     {% set selected_cover = SITEURL+"/"+HEADER_COVER %}
   {% endif %}
+{% elif HOME_COVER %}
+  {% if HOME_COVER|lower|truncate(4, True, '') == "http" %}
+    {% set selected_cover = HOME_COVER %}
+  {% else %}
+    {% set selected_cover = SITEURL+"/"+HOME_COVER %}
+  {% endif %}
 {% elif HEADER_COLOR %}
   {% set selected_color = HEADER_COLOR %}
+{% elif HOME_COLOR %}
+  {% set selected_color = HOME_COLOR %}
 {% endif %}
 
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="blog-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -40,8 +48,6 @@
           <div class="blog-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
           <div class="blog-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-          <div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
diff --git a/templates/page.html b/templates/page.html
index 2414549..a6293db 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -30,7 +30,7 @@
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="post-header" class="has-cover">
+    <header id="post-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -51,8 +51,6 @@
             <div class="post-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
             <div class="post-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-            <div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
diff --git a/templates/period_archives.html b/templates/period_archives.html
index 34b4274..4378392 100644
--- a/templates/period_archives.html
+++ b/templates/period_archives.html
@@ -2,10 +2,20 @@
 
 {% block title %}{{ SITENAME }} - Archives for {{ period | reverse | join (' ') }}{% endblock %}
 
+{% if HEADER_COVER %}
+  {% if HEADER_COVER|lower|truncate(4, True, '') == "http" %}
+    {% set selected_cover = HEADER_COVER %}
+  {% else %}
+    {% set selected_cover = SITEURL+"/"+HEADER_COVER %}
+  {% endif %}
+{% elif HEADER_COLOR %}
+  {% set selected_color = HEADER_COLOR %}
+{% endif %}
+
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="blog-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -22,15 +32,13 @@
           </span>
         </nav>
         <h1 class="post-title">Archives for {{ period | reverse | join (' ') }}</h1>
-        {% if HEADER_COVER %}
-            <div class="blog-cover cover" style="background-image: url('{{ HEADER_COVER }}')">            
-        {% elif HEADER_COLOR %}
-            <div class="post-cover cover" style="background-color: {{ HEADER_COLOR }}">
-        {% else %}
-            <div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
-        {% endif %}        
+        {% if selected_cover %}
+          <div class="blog-cover cover" style="background-image: url('{{ selected_cover }}')">
+        {% elif selected_color %}
+          <div class="blog-cover cover" style="background-color: {{ selected_color }}">
+        {% endif %}
       </div>
-    </header>    
+    </header>
 {% endblock header %}
 
 {% block content %}
diff --git a/templates/tag.html b/templates/tag.html
index d036ac4..ddfd96f 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -23,7 +23,7 @@
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="blog-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -45,8 +45,6 @@
           <div class="blog-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
           <div class="blog-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-          <div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
diff --git a/templates/tags.html b/templates/tags.html
index 579d351..0a17922 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -15,7 +15,7 @@
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
-    <header id="blog-header" class="has-cover">
+    <header id="blog-header" {% if selected_cover or selected_color %}class="has-cover"{% endif %}>
       <div class="inner">
         <nav id="navigation">
           {% if SITE_LOGO %}
@@ -36,8 +36,6 @@
           <div class="blog-cover cover" style="background-image: url('{{ selected_cover }}')">
         {% elif selected_color %}
           <div class="blog-cover cover" style="background-color: {{ selected_color }}">
-        {% else %}
-          <div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
         {% endif %}
       </div>
     </header>
diff --git a/tests/default_conf.py b/tests/default_conf.py
index 2d8bd64..63b49a1 100644
--- a/tests/default_conf.py
+++ b/tests/default_conf.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 
 AUTHOR = u'Zutrinken'
 SITENAME = u'Attila Demo'
+SITESUBTITLE = u'Blog description here.'
 SITEURL = ''
 
 PATH = 'content'
diff --git a/tests/test_coverimages.py b/tests/test_coverimages.py
index 23af4ee..18ec146 100644
--- a/tests/test_coverimages.py
+++ b/tests/test_coverimages.py
@@ -59,9 +59,9 @@ class ArticleCoverImageTest(unittest.TestCase, BaseTest):
   def test_article_theme_cover(self):
     rstPath="content/article_without_cover.rst"
     result, soup = self.gen_article_and_html_from_rst(rstPath)
-    selected = soup.find(name="div", attrs={"class": "post-cover cover"})
+    selected = soup.find(id="blog-header")
     # Assertion
-    self.assertTrue("/theme/images/post-bg.jpg" in selected["style"])
+    self.assertTrue("class" not in selected)
 
   def test_article_header_color(self):
     self.settings['HEADER_COLOR']='blue'
@@ -120,9 +120,9 @@ class PageCoverImageTest(unittest.TestCase, BaseTest):
   def test_page_theme_cover(self):
     rstPath="content/pages/page_without_cover_image.rst"
     result, soup = self.gen_page_and_html_from_rst(rstPath)
-    selected = soup.find(name="div", attrs={"class": "post-cover cover"})
+    selected = soup.find(id="post-header")
     # Assertion
-    self.assertTrue("/theme/images/post-bg.jpg" in selected["style"])
+    self.assertTrue("class" not in selected)
 
   def test_page_header_color(self):
     self.settings['HEADER_COLOR']='blue'
@@ -156,9 +156,9 @@ class TagCoverImageTest(unittest.TestCase, BaseTest):
 
   def test_footag_theme_cover(self):
     result, soup = self.gen_tag_and_html_from_name("footag")
-    selected = soup.find(name="div", attrs={"class": "blog-cover cover"})
+    selected = soup.find(id="blog-header")
     # Assertion
-    self.assertTrue("/theme/images/post-bg.jpg" in selected["style"])
+    self.assertTrue("class" not in selected)
 
   def test_footag_cover(self):
     tagName = "footag"
@@ -204,9 +204,9 @@ class TagCoverImageTest(unittest.TestCase, BaseTest):
 
   def test_bartag_theme_cover(self):
     result, soup = self.gen_tag_and_html_from_name("bartag")
-    selected = soup.find(name="div", attrs={"class": "blog-cover cover"})
+    selected = soup.find(id="blog-header")
     # Assertion
-    self.assertTrue("/theme/images/post-bg.jpg" in selected["style"])
+    self.assertTrue("class" not in selected)
 
   def test_bartag_cover(self):
     tagName = "bartag"
@@ -261,9 +261,9 @@ class CategoryCoverImageTest(unittest.TestCase, BaseTest):
 
   def test_foo_theme_cover(self):
     result, soup = self.gen_category_and_html_from_name("foo")
-    selected = soup.find(name="div", attrs={"class": "blog-cover cover"})
+    selected = soup.find(id="blog-header")
     # Assertion
-    self.assertTrue("/theme/images/post-bg.jpg" in selected["style"])
+    self.assertTrue("class" not in selected)
 
   def test_foo_cover(self):
     categoryName = "foo"
@@ -309,9 +309,9 @@ class CategoryCoverImageTest(unittest.TestCase, BaseTest):
 
   def test_bar_theme_cover(self):
     result, soup = self.gen_category_and_html_from_name("bar")
-    selected = soup.find(name="div", attrs={"class": "blog-cover cover"})
+    selected = soup.find(id="blog-header")
     # Assertion
-    self.assertTrue("/theme/images/post-bg.jpg" in selected["style"])
+    self.assertTrue("class" not in selected)
 
   def test_bar_cover(self):
     categoryName = "bar"
@@ -365,9 +365,9 @@ class AuthorCoverImageTest(unittest.TestCase, BaseTest):
 
   def test_arul_theme_cover(self):
     result, soup = self.gen_author_and_html_from_name("arul")
-    selected = soup.find(name="div", attrs={"class": "blog-cover cover"})
+    selected = soup.find(id="blog-header")
     # Assertion
-    self.assertTrue("/theme/images/post-bg.jpg" in selected["style"])
+    self.assertTrue("class" not in selected)
 
   def test_arul_cover(self):
     authorName = "arul"
@@ -417,9 +417,9 @@ class AuthorCoverImageTest(unittest.TestCase, BaseTest):
 
   def test_raj_theme_cover(self):
     result, soup = self.gen_author_and_html_from_name("raj")
-    selected = soup.find(name="div", attrs={"class": "blog-cover cover"})
+    selected = soup.find(id="blog-header")
     # Assertion
-    self.assertTrue("/theme/images/post-bg.jpg" in selected["style"])
+    self.assertTrue("class" not in selected)
 
   def test_raj_cover(self):
     authorName = "raj"