Move header, footer, xml_feeds to include; reason base.html

main
Raymond Wanyoike 2017-11-21 11:15:58 +03:00
parent 1c944d0f3d
commit 4aee394acb
4 changed files with 81 additions and 76 deletions

View File

@ -10,31 +10,6 @@
<title>{% block title %}| {{ SITENAME }}{% endblock %}</title>
<link rel="canonical" href="{{ SITEURL }}/{{ output_file }}">
{% if FEED_ALL_ATOM %}
<link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" title="Full Atom Feed">
{% endif %}
{% if FEED_ALL_RSS %}
<link rel="alternate" type="application/rss+xml" href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" title="Full RSS Feed">
{% endif %}
{% if FEED_ATOM %}
<link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" title="Atom Feed">
{% endif %}
{% if FEED_RSS %}
<link rel="alternate" type="application/rss+xml" href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" title="RSS Feed">
{% endif %}
{% if CATEGORY_FEED_ATOM and category %}
<link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" title="Categories Atom Feed">
{% endif %}
{% if CATEGORY_FEED_RSS and category %}
<link rel="alternate" type="application/rss+xml" href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" title="Categories RSS Feed">
{% endif %}
{% if TAG_FEED_ATOM and tag %}
<link rel="alternate" type="application/atom+xml" href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" title="Tags Atom Feed">
{% endif %}
{% if TAG_FEED_RSS and tag %}
<link rel="alternate" type="application/rss+xml" href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" title="Tags RSS Feed">
{% endif %}
{% if RFG_FAVICONS %}
<link rel="apple-touch-icon" href="{{ SITEURL }}/apple-touch-icon.png" sizes="180x180">
<link rel="icon" type="image/png" href="{{ SITEURL }}/favicon-32x32.png" sizes="32x32">
@ -48,6 +23,7 @@
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/pygments/{{ PYGMENTS_STYLE|default('default') }}.min.css">
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/theme.css">
{% include 'include/xml_feeds.html' %}
{% block head %}{% endblock %}
{% include 'include/analytics.html' %}
</head>
@ -55,42 +31,7 @@
<body>
<header class="header">
<div class="container">
<div class="row">
{% if SITEIMAGE %}
<div class="col-sm-4">
<a href="{{ SITEURL }}/">
<img class="img-fluid" src={{ SITEURL }}{{ SITEIMAGE }} alt="{{ SITENAME }}">
</a>
</div>
{% endif %}
<div class="col-sm-{% if SITEIMAGE %}8{% else %}12{% endif %}">
<h1 class="title"><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>
{% if SITESUBTITLE %}
<p class="text-muted">{{ SITESUBTITLE }}</p>
{% endif %}
{% if LINKS or (DISPLAY_PAGES_ON_MENU and pages) or ICONS %}
<ul class="list-inline">
{% for title, link in LINKS %}
<li class="list-inline-item"><a href="{{ link }}" target="_blank">{{ title }}</a></li>
{% endfor %}
{% if DISPLAY_PAGES_ON_MENU %}
{% for page in pages %}
{% if LINKS and loop.first %}
<li class="list-inline-item text-muted">|</li>
{% endif %}
<li class="list-inline-item"><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
{% endfor %}
{% endif %}
{% for icon, link in ICONS %}
{% if (LINKS or (DISPLAY_PAGES_ON_MENU and pages)) and loop.first %}
<li class=" list-inline-item text-muted">|</li>
{% endif %}
<li class="list-inline-item"><a class="fa fa-{{ icon }}" href="{{ link }}" target="_blank"></a></li>
{% endfor %}
</ul>
{% endif %}
</div>
</div>
{% include 'include/header.html' %}
</div>
</header>
@ -104,21 +45,7 @@
<footer class="footer">
<div class="container">
<div class="row">
<ul class="col-sm-6 list-inline">
{% if not HIDE_AUTHORS %}
<li class="list-inline-item"><a href="{{ SITEURL }}/authors.html">Authors</a></li>
{% endif %}
<li class="list-inline-item"><a href="{{ SITEURL }}/archives.html">Archives</a></li>
<li class="list-inline-item"><a href="{{ SITEURL }}/categories.html">Categories</a></li>
{% if tags|length %}
<li class="list-inline-item"><a href="{{ SITEURL }}/tags.html">Tags</a></li>
{% endif %}
</ul>
<p class="col-sm-6 text-sm-right text-muted">
Generated by <a href="https://github.com/getpelican/pelican" target="_blank">Pelican</a> / <a href="https://github.com/nairobilug/pelican-alchemy" target="_blank">&#x2728;</a>
</p>
</div>
{% include 'include/footer.html' %}
</div>
</footer>
</body>

View File

@ -0,0 +1,16 @@
<div class="row">
<ul class="col-sm-6 list-inline">
{% if not HIDE_AUTHORS %}
<li class="list-inline-item"><a href="{{ SITEURL }}/authors.html">Authors</a></li>
{% endif %}
<li class="list-inline-item"><a href="{{ SITEURL }}/archives.html">Archives</a></li>
<li class="list-inline-item"><a href="{{ SITEURL }}/categories.html">Categories</a></li>
{% if tags|length %}
<li class="list-inline-item"><a href="{{ SITEURL }}/tags.html">Tags</a></li>
{% endif %}
</ul>
<p class="col-sm-6 text-sm-right text-muted">
Generated by <a href="https://github.com/getpelican/pelican" target="_blank">Pelican</a>
/ <a href="https://github.com/nairobilug/pelican-alchemy" target="_blank">&#x2728;</a>
</p>
</div>

View File

@ -0,0 +1,36 @@
<div class="row">
{% if SITEIMAGE %}
<div class="col-sm-4">
<a href="{{ SITEURL }}/">
<img class="img-fluid" src={{ SITEURL }}{{ SITEIMAGE }} alt="{{ SITENAME }}">
</a>
</div>
{% endif %}
<div class="col-sm-{% if SITEIMAGE %}8{% else %}12{% endif %}">
<h1 class="title"><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>
{% if SITESUBTITLE %}
<p class="text-muted">{{ SITESUBTITLE }}</p>
{% endif %}
{% if LINKS or (DISPLAY_PAGES_ON_MENU and pages) or ICONS %}
<ul class="list-inline">
{% for title, link in LINKS %}
<li class="list-inline-item"><a href="{{ link }}" target="_blank">{{ title }}</a></li>
{% endfor %}
{% if DISPLAY_PAGES_ON_MENU %}
{% for page in pages %}
{% if LINKS and loop.first %}
<li class="list-inline-item text-muted">|</li>
{% endif %}
<li class="list-inline-item"><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
{% endfor %}
{% endif %}
{% for icon, link in ICONS %}
{% if (LINKS or (DISPLAY_PAGES_ON_MENU and pages)) and loop.first %}
<li class=" list-inline-item text-muted">|</li>
{% endif %}
<li class="list-inline-item"><a class="fa fa-{{ icon }}" href="{{ link }}" target="_blank"></a></li>
{% endfor %}
</ul>
{% endif %}
</div>
</div>

View File

@ -0,0 +1,26 @@
{% if FEED_ALL_ATOM %}
<link rel="alternate" type="application/atom+xml" title="Full Atom Feed"
href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">
{% endif %}
{% if FEED_ALL_RSS %}
<link rel="alternate" type="application/rss+xml" title="Full RSS Feed"
href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">{% endif %}
{% if FEED_ATOM %}
<link rel="alternate" type="application/atom+xml" title="Atom Feed"
href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}">{% endif %}
{% if FEED_RSS %}
<link rel="alternate" type="application/rss+xml" title="RSS Feed"
href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}">{% endif %}
{% if CATEGORY_FEED_ATOM and category %}
<link rel="alternate" type="application/atom+xml" title="Categories Atom Feed"
href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}">{% endif %}
{% if CATEGORY_FEED_RSS and category %}
<link rel="alternate" type="application/rss+xml" title="Categories RSS Feed"
href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}">{% endif %}
{% if TAG_FEED_ATOM and tag %}
<link rel="alternate" type="application/atom+xml" title="Tags Atom Feed"
href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}">{% endif %}
{% if TAG_FEED_RSS and tag %}
<link rel="alternate" type="application/rss+xml" title="Tags RSS Feed"
href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}">
{% endif %}