diff options
| -rw-r--r-- | built-texts/templates/article.html | 3 | ||||
| -rw-r--r-- | built-texts/templates/base.html | 23 | ||||
| -rw-r--r-- | built-texts/templates/page.html | 4 |
3 files changed, 22 insertions, 8 deletions
diff --git a/built-texts/templates/article.html b/built-texts/templates/article.html index 0fb7d2a..cf598be 100644 --- a/built-texts/templates/article.html +++ b/built-texts/templates/article.html @@ -1,9 +1,10 @@ {% extends "base.html" %} +{% block title %}{{ article.title|striptags }} - {{ SITENAME }}{%endblock%} {% block content %} <div class='article'> <div class="row-fluid"> <div class="content-title span9"> - <h1>{{ article.title }}</h1b> + <h1>{{ article.title }}</h1> </div> </div> <div class="row-fluid"> diff --git a/built-texts/templates/base.html b/built-texts/templates/base.html index c081927..397cda3 100644 --- a/built-texts/templates/base.html +++ b/built-texts/templates/base.html @@ -1,8 +1,10 @@ <!DOCTYPE html> -<html lang="en"> +<html lang="{{ DEFAULT_LANG }}"> <head> + {% block head %} + <meta charset="utf-8"> - <title>{% block windowtitle %}{{ SITENAME }}{% endblock %}</title> + <title>{% block title %}{{ SITENAME }}{% endblock title %}</title> <meta name="description" content=""> <meta name="author" content="{{ AUTHOR }}"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> @@ -11,12 +13,21 @@ <script src="{{ SITEURL }}/theme/html5.js"></script> <![endif]--> + {% if FEED_RSS %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> + {% endif %} + {% if FEED_ATOM %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" /> + {% endif %} + <!-- Le styles --> <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/css/bootstrap.no-icons.min.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/pygments.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/font-awesome.css" rel="stylesheet"> <link href='http://fonts.googleapis.com/css?family=Gudea:400,400italic|Alegreya+SC' rel='stylesheet' type='text/css'> + + {% endblock head %} </head> <body> @@ -105,13 +116,15 @@ </i>Tags</a></li> {% if FEED_RSS %} - <li> <a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate"> + <li> <a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate"> <i class="icon-rss" style="color: #1f334b"></i> RSS Feed</a></li> {% endif %} - <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate"> - <i class="icon-rss-sign" style="color: #1f334b"></i> + {% if FEED_ATOM %} + <li> <a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate"> + <i class="icon-rss" style="color: #1f334b"></i> Atom Feed</a></li> + {% endif %} </ul> </div> diff --git a/built-texts/templates/page.html b/built-texts/templates/page.html index 6c0e36a..1cb55a1 100644 --- a/built-texts/templates/page.html +++ b/built-texts/templates/page.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %} {% endblock %} -{% block content %} +{% block title %}{{ page.title }}- {{ SITENAME }}{%endblock%} +{% block content %} <section id="content" class="body span10"> <h2 class="content-title">{{ page.title }}</h2> {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get |