From 35d3beaeb7775d3ba0b78fbec06afede7d34383b Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Fri, 31 Aug 2018 11:59:18 +0100
Subject: [PATCH] Tidy up the page titles
---
.../apply/activity/templates/messages/email/determination.html | 2 ++
opentech/apply/dashboard/templates/dashboard/dashboard.html | 2 +-
.../templates/determinations/determination_detail.html | 2 ++
opentech/templates/base-apply.html | 2 +-
opentech/templates/base.html | 2 +-
5 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opentech/apply/activity/templates/messages/email/determination.html b/opentech/apply/activity/templates/messages/email/determination.html
index 62fe5a032..335001308 100644
--- a/opentech/apply/activity/templates/messages/email/determination.html
+++ b/opentech/apply/activity/templates/messages/email/determination.html
@@ -1,6 +1,8 @@
{% extends "messages/email/applicant_base.html" %}
{% load bleach_tags %}
+{% block title %}Determination for {{ object.title }}{% endblock %}
+
{% block content %}
Your application has been reviewed and the outcome is: {{ submission.determination.clean_outcome }}
diff --git a/opentech/apply/dashboard/templates/dashboard/dashboard.html b/opentech/apply/dashboard/templates/dashboard/dashboard.html
index a1e56450f..4afdbefae 100644
--- a/opentech/apply/dashboard/templates/dashboard/dashboard.html
+++ b/opentech/apply/dashboard/templates/dashboard/dashboard.html
@@ -1,7 +1,7 @@
{% extends "base-apply.html" %}
{% load render_table from django_tables2 %}
-{% block title %}OTF Dashboard{% endblock %}
+{% block title %}Dashboard{% endblock %}
{% block content %}
<div class="admin-bar">
diff --git a/opentech/apply/determinations/templates/determinations/determination_detail.html b/opentech/apply/determinations/templates/determinations/determination_detail.html
index cc968e9c9..1740acebf 100644
--- a/opentech/apply/determinations/templates/determinations/determination_detail.html
+++ b/opentech/apply/determinations/templates/determinations/determination_detail.html
@@ -1,6 +1,8 @@
{% extends "base-apply.html" %}
{% load bleach_tags %}
+{% block title %}Determination for {{ determination.submission.title }}{% endblock %}
+
{% block content %}
<div class="admin-bar">
<div class="admin-bar__inner">
diff --git a/opentech/templates/base-apply.html b/opentech/templates/base-apply.html
index f44eb0c3f..6355f6438 100644
--- a/opentech/templates/base-apply.html
+++ b/opentech/templates/base-apply.html
@@ -3,7 +3,7 @@
<head>
{# TODO fallbacks if page is not defined e.g. for 404 page #}
<meta charset="utf-8" />
- <title>{% block title_prefix %}{{ TITLE_PREFIX }}{% endblock %}{% block title %}{% if page.seo_title %}{{ page.seo_title }}{% else %}{{ page.title }}{% endif %}{% endblock %}{% block title_suffix %}{{ TITLE_SUFFIX }}{% endblock %}</title>
+ <title>{% block title_prefix %}{{ request.site.site_name }} | {% endblock %}{% block title %}{% if page.seo_title %}{{ page.seo_title }}{% else %}{{ page.title }}{% endif %}{% endblock %}{% block title_suffix %}{{ TITLE_SUFFIX }}{% endblock %}</title>
<meta name="description" content="{% if page.search_description %}{{ page.search_description }}{% else %}{{ page.listing_summary }}{% endif %}" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
diff --git a/opentech/templates/base.html b/opentech/templates/base.html
index 4285eaf19..6f488df26 100644
--- a/opentech/templates/base.html
+++ b/opentech/templates/base.html
@@ -3,7 +3,7 @@
<head>
{# TODO fallbacks if page is not defined e.g. for 404 page #}
<meta charset="utf-8" />
- <title>{% block title_prefix %}{{ TITLE_PREFIX }}{% endblock %}{% block title %}{% if page.seo_title %}{{ page.seo_title }}{% else %}{{ page.title }}{% endif %}{% endblock %}{% block title_suffix %}{{ TITLE_SUFFIX }}{% endblock %}</title>
+ <title>{% block title_prefix %}{{ request.site.site_name }} | {% endblock %}{% block title %}{% if page.seo_title %}{{ page.seo_title }}{% else %}{{ page.title }}{% endif %}{% endblock %}{% block title_suffix %}{{ TITLE_SUFFIX }}{% endblock %}</title>
<meta name="description" content="{% if page.search_description %}{{ page.search_description }}{% else %}{{ page.listing_summary }}{% endif %}" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
--
GitLab