Simplify base.html, include favicon and feed content

main
Raymond Wanyoike 2014-10-28 21:34:13 +03:00
parent 555b2785dc
commit 52380ceab6
4 changed files with 40 additions and 39 deletions

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="{{ DEFAULT_LANG }}">
<head>
<head>
{% block head %}
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@ -9,8 +9,22 @@
<title>{% block title %}{{ SITE_SUBTEXT }}{% endblock title %}</title>
{% include "include/favicon.html" %}
{% include "include/feeds.html" %}
{% if EXTRA_FAVICON %}
<link rel="icon" type="image/png" href="/favicon-196x196.png" sizes="196x196">
<link rel="icon" type="image/png" href="/favicon-160x160.png" sizes="160x160">
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
{% endif %}
{% if FEED_ATOM %}
<link type="application/atom+xml" rel="alternate" href="/{{ FEED_ATOM }}" title="{{ SITENAME }} Atom Feed">
{% endif %}
{% if FEED_RSS %}
<link type="application/rss+xml" rel="alternate" href="/{{ FEED_RSS }}" title="{{ SITENAME }} RSS Feed">
{% endif %}
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css">
<!--[if lt IE 9]>
@ -21,17 +35,17 @@
{% include "include/google_analytics.html" %}
{% endblock %}
</head>
</head>
<body>
<body>
{% include "include/header.html" %}
<div class="container">
{% block content %}{% endblock %}
</div>
{% include "include/footer.html" %}
<script src="{{ SITEURL }}/theme/js/libs/jquery.min.js"></script>
<script src="{{ SITEURL }}/theme/js/jquery.min.js"></script>
<script src="{{ SITEURL }}/theme/js/bootstrap.min.js"></script>
</body> <!-- 42 -->
</body> <!-- 42 -->
</html>

View File

@ -1,7 +0,0 @@
{% if EXTRA_FAVICON %}
<link rel="icon" type="image/png" href="/favicon-196x196.png" sizes="196x196">
<link rel="icon" type="image/png" href="/favicon-160x160.png" sizes="160x160">
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
{% endif %}

View File

@ -1,6 +0,0 @@
{% if FEED_ATOM %}
<link type="application/atom+xml" rel="alternate" href="/{{ FEED_ATOM }}" title="{{ SITENAME }} Atom Feed">
{% endif %}
{% if FEED_RSS %}
<link type="application/rss+xml" rel="alternate" href="/{{ FEED_RSS }}" title="{{ SITENAME }} RSS Feed">
{% endif %}