From 29b10c88db1ba16210e753e1fcf08d702455a674 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 16 Jul 2013 02:48:20 -0400
Subject: Outputting thread subject in header/title (issue #122)

---
 templates/index.html  | 2 +-
 templates/thread.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/index.html b/templates/index.html
index 112756d1..9b25e1be 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
-	<title>{{ board.url }} - {{ board.name }}</title>
+	<title>{{ board.url }} - {{ board.title|e }}</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
 	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
diff --git a/templates/thread.html b/templates/thread.html
index 5442166f..aea8abb5 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
-	<title>{{ board.url }} - {{ board.name }}</title>
+	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
 	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
-- 
cgit v1.3