aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaiju Muto <hello@tai2.net>2014-07-03 03:10:18 +0900
committerTaiju Muto <hello@tai2.net>2014-07-03 03:14:38 +0900
commit6ab8b2906a212a6e7ef0f2a92ca8844dd998e7f5 (patch)
tree6a3928a9a41d76858aa7ec09a68798d7c1d6ead7
parent2074d08fad36f9e39218526c3936d9e7857aa071 (diff)
downloadpelican-themes-6ab8b2906a212a6e7ef0f2a92ca8844dd998e7f5.tar.gz
Display article/page title.
-rw-r--r--built-texts/templates/article.html3
-rw-r--r--built-texts/templates/base.html6
-rw-r--r--built-texts/templates/page.html4
3 files changed, 9 insertions, 4 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..444568f 100644
--- a/built-texts/templates/base.html
+++ b/built-texts/templates/base.html
@@ -1,8 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<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">
@@ -17,6 +19,8 @@
<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>
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