Make the page title dynamic

11 files changed, 53 insertions, 2 deletions

diff --git a/hyperkitty/templates/500.html b/hyperkitty/templates/500.html
index e8687f4..a2b3d13 100644
--- a/hyperkitty/templates/500.html
+++ b/hyperkitty/templates/500.html
@@ -1,5 +1,10 @@
 {% extends "base.html" %}
 {% load i18n %}
+
+{% block title %}
+Error ! - {{ app_name|title }}
+{% endblock %}
+
 {% block content %}
 		<style>
 			#contentBox
diff --git a/hyperkitty/templates/index.html b/hyperkitty/templates/index.html
index 433cf27..c1aa609 100644
--- a/hyperkitty/templates/index.html
+++ b/hyperkitty/templates/index.html
@@ -1,8 +1,14 @@
 {% extends "base.html" %}
 {% load i18n %}
+
+
+{% block title %}
+{% trans 'Available lists' %} - {{ app_name|title }}
+{% endblock %}
+
 {% block content %}
 
-<h1>{% trans 'Lists' %}</h1>
+<h1>{% trans 'Available lists' %}</h1>
 
 <table class="table table-bordered table-striped">
 	<tbody>
diff --git a/hyperkitty/templates/login.html b/hyperkitty/templates/login.html
index f502aed..f271b80 100644
--- a/hyperkitty/templates/login.html
+++ b/hyperkitty/templates/login.html
@@ -1,6 +1,11 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+
+{% block title %}
+{% trans 'Login' %} - {{ app_name|title }}
+{% endblock %}
+
 {% block content %}
 
 <h2>Login with username and password</h2>
diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html
index 947df56..78462b5 100644
--- a/hyperkitty/templates/message.html
+++ b/hyperkitty/templates/message.html
@@ -3,6 +3,11 @@
 {% load hk_generic %}
 {% load storm %}
 
+
+{% block title %}
+{{ message.subject }} - {{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }}
+{% endblock %}
+
 {% block content %}
 
 <div class="message-header">
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index cfdaf8a..71921c8 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -3,6 +3,11 @@
 {% load hk_generic %}
 {% load storm %}
 
+
+{% block title %}
+{{ month|date:"F Y"|capfirst }} - {{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }}
+{% endblock %}
+
 {% block content %}
 
 <div id="month-view">
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index cec9952..58c784b 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -3,6 +3,11 @@
 {% load gravatar %}
 {% load storm %}
 
+
+{% block title %}
+{{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }}
+{% endblock %}
+
 {% block additional_stylesheets %}
 <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/stats.css" />
 {% endblock %}
diff --git a/hyperkitty/templates/register.html b/hyperkitty/templates/register.html
index bcd955a..7d665ab 100644
--- a/hyperkitty/templates/register.html
+++ b/hyperkitty/templates/register.html
@@ -1,6 +1,11 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+
+{% block title %}
+{% trans 'Register' %} - {{ app_name|title }}
+{% endblock %}
+
 {% block content %}
 
 <form action="" method="post" class="login mm_clear">
diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html
index df29615..ac3b3e5 100644
--- a/hyperkitty/templates/search.html
+++ b/hyperkitty/templates/search.html
@@ -2,6 +2,11 @@
 {% load hk_generic %}
 {% load gravatar %}
 
+
+{% block title %}
+{{ search_type }} - {{ app_name|title }}
+{% endblock %}
+
 {% block content %}
 
 {% if threads.object_list %}
diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html
index cd4efbf..dd17cb2 100644
--- a/hyperkitty/templates/thread.html
+++ b/hyperkitty/templates/thread.html
@@ -4,6 +4,11 @@
 {% load hk_generic %}
 {% load storm %}
 
+
+{% block title %}
+{{ subject }} - {{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }}
+{% endblock %}
+
 {% block content %}
 
 	<div class="thread-header">
diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html
index 4362877..e39c0b6 100644
--- a/hyperkitty/templates/user_profile.html
+++ b/hyperkitty/templates/user_profile.html
@@ -2,6 +2,11 @@
 {% load i18n %}
 {% load hk_generic %}
 
+
+{% block title %}
+{% trans 'User Profile' %} - {{ app_name|title }}
+{% endblock %}
+
 {% block content %}
 	<h1>User Profile <span>- {{ user }}</span></h1>
 
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index fc029b0..a782ffb 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -289,7 +289,7 @@ def _search_results_page(request, mlist_fqdn, threads, search_type,
         'list_name' : list_name,
         'list_address': mlist_fqdn,
         'search_form': search_form,
-        'month': search_type,
+        'search_type': search_type,
         'month_participants': len(participants),
         'month_discussions': res_num,
         'threads': threads,