Merge branch 'master' of https://github.com/arulrajnet/attila into upstream

This commit is contained in:
Yorick Barbanneau 2020-02-19 10:57:30 +01:00
commit 1057189416
21 changed files with 304 additions and 77 deletions

View file

@ -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>

View file

@ -27,10 +27,10 @@
{% set selected_color = HEADER_COLOR %}
{% endif %}
{% block canonical_url %}<link href="{{ SITEURL }}/{{ article.url }}" rel="canonical" />{% endblock canonical_url %}
{% block head %}
{{ super() }}
<link href="{{ SITEURL }}/{{ article.url }}" rel="canonical" />
{% for keyword in article.keywords %}
<meta name="keywords" content="{{keyword}}" >
{% endfor %}
@ -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="post-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>

View file

@ -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 %}

View file

@ -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>

View file

@ -21,7 +21,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="referrer" content="origin" />
<meta name="generator" content="Pelican" />
<link href="{{ SITEURL }}/" rel="canonical" />
{% block canonical_url %}<link href="{{ SITEURL }}/" rel="canonical" />{% endblock canonical_url %}
<!-- Feed -->
{% for name,link in SOCIAL if name.lower() in ['rss', 'rss-square', 'feed'] %}
@ -116,6 +116,7 @@
</footer>
</section>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script type="text/javascript" src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/script.js"></script>
{% if JS_OVERRIDE %}

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -2,6 +2,10 @@
{% block title %}{{ page.title }}{% endblock title %}
{% block canonical_url %}
<link href="{{ SITEURL }}/{{ page.url }}" rel="canonical" />
{% endblock canonical_url %}
{# <!-- Choosing cover image --> #}
{% if page.cover %}
{% if page.cover|lower|truncate(4, True, '') == "http" %}
@ -30,7 +34,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 +55,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>

View file

@ -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 %}

View file

@ -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>

View file

@ -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>