ephase/attila_pelican_theme
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Header fixes (#25)

Browse source 
* #21 changing logic to selecting cover image

- For categories, tags

- Some code refactor and indenting

* #21 initial codes for pelican unit tests

* #21 few more testing changes

* Ref #21 unit tests for article tests coverimages

* Ref #21 unit tests for page, tags, category and author coverimages

* Ref #21 readme updated
This commit is contained in:
Arul 2018-05-14 13:26:35 +05:30 • committed by GitHub
parent 994b999633
commit 7b26ad1013
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 1283 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

20
templates/archives.html
View file

@ -2,6 +2,16 @@
{% block title %}{{ SITENAME }} - Archives{% 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. -->
@ -22,12 +32,12 @@
</span>
</nav>
<h1 class="post-title">{{ SITENAME }} - Archives</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 }}">
{% 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 }}">
{% else %}
<div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
<div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %}
</div>
</header>

80
templates/article.html
View file

@ -3,53 +3,53 @@
{# <!-- Choosing cover image --> #}
{% if article.cover %}
{% if article.cover|lower|truncate(4, True, '') == "http" %}
{% set default_cover = article.cover %}
{% else %}
{% set default_cover = SITEURL+"/"+article.cover %}
{% endif %}
{% if article.cover|lower|truncate(4, True, '') == "http" %}
{% set selected_cover = article.cover %}
{% else %}
{% set selected_cover = SITEURL+"/"+article.cover %}
{% endif %}
{% elif article.og_image %}
{% if article.og_image|lower|truncate(4, True, '') == "http" %}
{% set default_cover = article.og_image %}
{% else %}
{% set default_cover = SITEURL+"/"+article.og_image %}
{% endif %}
{% if article.og_image|lower|truncate(4, True, '') == "http" %}
{% set selected_cover = article.og_image %}
{% else %}
{% set selected_cover = SITEURL+"/"+article.og_image %}
{% endif %}
{% elif HEADER_COVER %}
{% set default_cover = SITEURL+"/"+HEADER_COVER %}
{% endif %}
{% if article.color %}
{% set default_color = article.color %}
{% 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 default_color = HEADER_COLOR %}
{% set selected_color = HEADER_COLOR %}
{% endif %}
{% block head %}
{{ super() }}
{{ super() }}
<link href="{{ SITEURL }}/{{ article.url }}" rel="canonical" />
{% for keyword in article.keywords %}
<meta name="keywords" content="{{keyword}}" >
{% endfor %}
<link href="{{ SITEURL }}/{{ article.url }}" rel="canonical" />
{% for keyword in article.keywords %}
<meta name="keywords" content="{{keyword}}" >
{% endfor %}
{% if description %}
<meta name="description" content="{{ description }}">
{% elif article.headline %}
<meta name="description" content="{{ article.headline }}">
{% elif article.summary %}
<meta name="description" content="{{ article.summary|striptags|truncate(140) }}">
{% endif %}
{% if description %}
<meta name="description" content="{{ description }}">
{% elif article.headline %}
<meta name="description" content="{{ article.headline }}">
{% elif article.summary %}
<meta name="description" content="{{ article.summary|striptags|truncate(140) }}">
{% endif %}
{% for author in article.authors %}
<meta name="author" content="{{ author }}">
{% endfor %}
{% for author in article.authors %}
<meta name="author" content="{{ author }}">
{% endfor %}
{% for tag in article.tags %}
<meta name="tags" content="{{tag}}">
{% endfor %}
{% for tag in article.tags %}
<meta name="tags" content="{{tag}}">
{% endfor %}
{% include 'partials/og_article.html' %}
{% include 'partials/jsonld_article.html' %}
{% include 'partials/og_article.html' %}
{% include 'partials/jsonld_article.html' %}
{% endblock %}
{% block header %}
@ -95,10 +95,10 @@
{% if article.modified %}
<span class="post-meta"> | Updated on {{ article.locale_modified }}</span>
{% endif %}
{% if default_cover %}
<div class="post-cover cover" style="background-image: url('{{ default_cover }}')">
{% elif default_color %}
<div class="post-cover cover" style="background-color: {{ default_color }}">
{% if selected_cover %}
<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 %}

50
templates/author.html
View file

@ -3,21 +3,33 @@
<!-- To support both image in relative path and url -->
{% set author_name = author.name | title %}
{% if AUTHORS_BIO and author.name.lower() in AUTHORS_BIO %}
{% set author_avatar = AUTHORS_BIO[author.name.lower()].image %}
{% if author_avatar %}
{% if author_avatar|lower|truncate(4, True, '') != "http" %}
{% set author_avatar = SITEURL+"/"+author_avatar %}
{% endif %}
{% set author_avatar = AUTHORS_BIO[author.name.lower()].image %}
{% if author_avatar %}
{% if author_avatar|lower|truncate(4, True, '') == "http" %}
{% set selected_avatar = author_avatar %}
{% else %}
{% set selected_avatar = SITEURL+"/"+author_avatar %}
{% endif %}
{% endif %}
{% set author_cover = AUTHORS_BIO[author.name.lower()].cover %}
{% if author_cover %}
{% if author_cover|lower|truncate(4, True, '') != "http" %}
{% set author_cover= SITEURL+"/"+author_cover %}
{% endif %}
{% set author_cover = AUTHORS_BIO[author.name.lower()].cover %}
{% if author_cover %}
{% if author_cover|lower|truncate(4, True, '') == "http" %}
{% set selected_cover = author_cover %}
{% else %}
{% set selected_cover = SITEURL+"/"+author_cover %}
{% endif %}
{% endif %}
{% set author_name = AUTHORS_BIO[author.name.lower()].name or author.name %}
{% set author_name = AUTHORS_BIO[author.name.lower()].name or author.name %}
{% elif 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 title %}{{ SITENAME }} - Articles by {{ author_name }}{% endblock %}
@ -50,14 +62,12 @@
<a class="menu-button"><i class="ic ic-menu"></i> Menu</a>
</span>
</nav>
{% if AUTHORS_BIO and author.name.lower() in AUTHORS_BIO and author_cover %}
<div class="blog-cover cover" style="background-image: url('{{ author_cover }}')">
{% elif 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 }}">
{% 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 }}">
{% else %}
<div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
<div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %}
</div>
</header>
@ -66,9 +76,9 @@
<section id="blog-author" class="has-cover" >
<div class="inner">
<aside class="post-author">
{% if author_avatar %}
{% if selected_avatar %}
<figure class="post-author-avatar">
<img src="{{author_avatar}}" alt="{{author_name}}" />
<img src="{{selected_avatar}}" alt="{{author_name}}" />
</figure>
{% endif %}
<div class="post-author-bio">

21
templates/authors.html
View file

@ -2,6 +2,17 @@
{% block title %}{{ SITENAME }} - Authors{% endblock title %}
{% 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. -->
@ -22,12 +33,12 @@
</span>
</nav>
<h1 class="post-title">{{ SITENAME }} - Authors</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 }}">
{% 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 }}">
{% else %}
<div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
<div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %}
</div>
</header>

20
templates/categories.html
View file

@ -2,6 +2,16 @@
{% block title %}{{ SITENAME }} - Categories{% 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. -->
@ -22,12 +32,12 @@
</span>
</nav>
<h1 class="post-title">{{ SITENAME }} - Categories</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 }}">
{% 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 }}">
{% else %}
<div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
<div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %}
</div>
</header>

30
templates/category.html
View file

@ -2,6 +2,24 @@
{% block title %}{{ SITENAME }} - Articles in the {{ category }} category{% endblock %}
{# <!-- Choosing cover image --> #}
{% if category in HEADER_COVERS_BY_CATEGORY %}
{% set category_cover = HEADER_COVERS_BY_CATEGORY.get(category) %}
{% if category_cover|lower|truncate(4, True, '') == "http" %}
{% set selected_cover = category_cover %}
{% else %}
{% set selected_cover = SITEURL+"/"+category_cover %}
{% endif %}
{% elif 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. -->
@ -23,14 +41,12 @@
</nav>
<h1 class="post-title">Category {{ category }}</h1>
<span class="blog-description">Posts: {{ articles|count }}</span>
{% if category in HEADER_COVERS_BY_CATEGORY %}
<div class="blog-cover cover" style="background-image: url('{{ HEADER_COVERS_BY_CATEGORY.get(category) }}')">
{% elif 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 }}">
{% 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 }}">
{% else %}
<div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
<div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %}
</div>
</header>

25
templates/index.html
View file

@ -6,6 +6,16 @@
{% include 'partials/jsonld.html' %}
{% 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. -->
@ -25,13 +35,14 @@
{% if SITESUBTITLE %}
<span class="blog-description">{{ SITESUBTITLE }}</span>
{% endif %}
{% if HEADER_COVER %}
<div class="blog-cover cover" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<div class="blog-cover cover" style="background-color: {{ HEADER_COLOR }}">
{% 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 }}">
{% else %}
<div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %}
<div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %}
</div>
</header>
@ -44,4 +55,4 @@
{% include "partials/loop.html" %}
</main>
</div>
{% endblock content %}
{% endblock content %}

36
templates/page.html
View file

@ -4,19 +4,25 @@
{# <!-- Choosing cover image --> #}
{% if page.cover %}
{% if page.cover|lower|truncate(4, True, '') == "http" %}
{% set default_cover = page.cover %}
{% else %}
{% set default_cover = SITEURL+"/"+page.cover %}
{% endif %}
{% if page.cover|lower|truncate(4, True, '') == "http" %}
{% set selected_cover = page.cover %}
{% else %}
{% set selected_cover = SITEURL+"/"+page.cover %}
{% endif %}
{% elif page.og_image %}
{% if page.og_image|lower|truncate(4, True, '') == "http" %}
{% set default_cover = page.og_image %}
{% else %}
{% set default_cover = SITEURL+"/"+page.og_image %}
{% endif %}
{% if page.og_image|lower|truncate(4, True, '') == "http" %}
{% set selected_cover = page.og_image %}
{% else %}
{% set selected_cover = SITEURL+"/"+page.og_image %}
{% endif %}
{% elif HEADER_COVER %}
{% set default_cover = SITEURL+"/"+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 %}
@ -39,10 +45,10 @@
</span>
</nav>
<h1 class="post-title">{{ page.title }}</h1>
{% if default_cover %}
<div class="post-cover cover" style="background-image: url('{{ default_cover }}')">
{% elif HEADER_COLOR %}
<div class="post-cover cover" style="background-color: {{ HEADER_COLOR }}">
{% if selected_cover %}
<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 %}

30
templates/tag.html
View file

@ -1,6 +1,24 @@
{% extends "index.html" %}
{% block title %}{{ SITENAME }} - Tag {{ tag }}{% endblock %}
{# <!-- Choosing cover image --> #}
{% if tag in HEADER_COVERS_BY_TAG %}
{% set tag_cover = HEADER_COVERS_BY_TAG.get(tag) %}
{% if tag_cover|lower|truncate(4, True, '') == "http" %}
{% set selected_cover = tag_cover %}
{% else %}
{% set selected_cover = SITEURL+"/"+tag_cover %}
{% endif %}
{% elif 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. -->
@ -22,14 +40,12 @@
</nav>
<h1 class="post-title">Tag {{ tag }}</h1>
<span class="blog-description">Posts: {{ articles|count }}</span>
{% if tag in HEADER_COVERS_BY_TAG %}
<div class="blog-cover cover" style="background-image: url('{{ HEADER_COVERS_BY_TAG.get(tag) }}')">
{% elif 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 }}">
{% 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 }}">
{% else %}
<div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
<div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %}
</div>
</header>

24
templates/tags.html
View file

@ -2,6 +2,16 @@
{% block title %}{{ SITENAME }} - Tags{% 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. -->
@ -22,15 +32,15 @@
</span>
</nav>
<h1 class="post-title">{{ SITENAME }} - Tags</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 }}">
{% 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 }}">
{% else %}
<div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %}
<div class="blog-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %}
</div>
</header>
</header>
{% endblock header %}
{% block content %}