From b3d1917731f58889328e0cb02cf241e67bd9dcf9 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen.finucane@intel.com>
Date: Tue, 29 Mar 2016 16:38:49 +0100
Subject: [PATCH] ui: Update page titles

Since the page title is displayed in the navbar, they must be limited
length and contain little to no special formatting. Do this.

Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>
---
 patchwork/templates/patchwork/bundle.html            |  1 +
 patchwork/templates/patchwork/help/about.html        |  9 +++------
 patchwork/templates/patchwork/help/pwclient.html     |  5 +++--
 patchwork/templates/patchwork/login.html             |  4 ++--
 patchwork/templates/patchwork/logout.html            |  6 +++---
 patchwork/templates/patchwork/mail-form.html         |  4 ++--
 patchwork/templates/patchwork/mail-settings.html     |  5 ++---
 patchwork/templates/patchwork/optin-request.html     |  5 ++---
 patchwork/templates/patchwork/optin.html             |  5 ++---
 patchwork/templates/patchwork/optout-request.html    |  5 ++---
 patchwork/templates/patchwork/optout.html            |  5 ++---
 patchwork/templates/patchwork/profile.html           |  5 ++---
 patchwork/templates/patchwork/registration_form.html |  4 +---
 patchwork/templates/patchwork/user-link-confirm.html |  5 ++---
 patchwork/templates/patchwork/user-link.html         | 10 ++--------
 15 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/patchwork/templates/patchwork/bundle.html b/patchwork/templates/patchwork/bundle.html
index ebedad15..2042cb96 100644
--- a/patchwork/templates/patchwork/bundle.html
+++ b/patchwork/templates/patchwork/bundle.html
@@ -10,6 +10,7 @@
 {% block title %}{{project.name}}{% endblock %}
 
 {% block body %}
+<h1>Bundle</h1>
 
 <p>This bundle contains patches for the {{ bundle.project.linkname }}
 project.</p>
diff --git a/patchwork/templates/patchwork/help/about.html b/patchwork/templates/patchwork/help/about.html
index 6d3408f2..ed0c4214 100644
--- a/patchwork/templates/patchwork/help/about.html
+++ b/patchwork/templates/patchwork/help/about.html
@@ -1,17 +1,14 @@
 {% extends "base.html" %}
 
 {% block title %}About{% endblock %}
-{% block heading %} - About Patchwork{% endblock %}
+{% block heading %}About Patchwork{% endblock %}
 
 {% block body %}
+<h1>About Patchwork</h1>
 
 <p>Patchwork is free software, and is available from the
 <a href="http://jk.ozlabs.org/projects/patchwork/">Patchwork website</a>.</p>
 
-<p>Patchwork is built on the <a href="http://djangoproject.com/">django</a>
+<p>Patchwork is built on the <a href="http://djangoproject.com/">Django</a>
 web framework.</p>
-
-<p>Icons from the <a href="http://sweetie.sublink.ca/">Sweetie</a> icon set.</a>
-
 {% endblock %}
-
diff --git a/patchwork/templates/patchwork/help/pwclient.html b/patchwork/templates/patchwork/help/pwclient.html
index 1d87ec9b..b419b428 100644
--- a/patchwork/templates/patchwork/help/pwclient.html
+++ b/patchwork/templates/patchwork/help/pwclient.html
@@ -1,9 +1,10 @@
 {% extends "base.html" %}
 
-{% block title %}Command-line client{% endblock %}
-{% block heading %} - Command-line client{% endblock %}
+{% block title %}pwclient: The Patchwork command-line client{% endblock %}
+{% block heading %}pwclient{% endblock %}
 
 {% block body %}
+<h1>pwclient</h1>
 
 <p><code>pwclient</code> is the command-line client for Patchwork. Currently,
 it provides access to some read-only features of Patchwork, such as downloading
diff --git a/patchwork/templates/patchwork/login.html b/patchwork/templates/patchwork/login.html
index 293ada3e..e8b1a4e8 100644
--- a/patchwork/templates/patchwork/login.html
+++ b/patchwork/templates/patchwork/login.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
-{% block title %}Login{% endblock %}
-{% block heading %}Login{% endblock %}
+{% block title %}Sign in to Patchwork{% endblock %}
+{% block heading %}Sign in to Patchwork{% endblock %}
 
 {% block headers %}
   <script type="text/javascript">
diff --git a/patchwork/templates/patchwork/logout.html b/patchwork/templates/patchwork/logout.html
index f030aeef..228b342e 100644
--- a/patchwork/templates/patchwork/logout.html
+++ b/patchwork/templates/patchwork/logout.html
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 
-{% block title %}Logout{% endblock %}
-{% block heading %}Logout{% endblock %}
+{% block title %}Sign out{% endblock %}
+{% block heading %}Sign out{% endblock %}
 
 {% block body %}
-<p>Logged out</p>
+<p>Signed out</p>
 {% endblock %}
diff --git a/patchwork/templates/patchwork/mail-form.html b/patchwork/templates/patchwork/mail-form.html
index 315b7a5d..1c6c0493 100644
--- a/patchwork/templates/patchwork/mail-form.html
+++ b/patchwork/templates/patchwork/mail-form.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
-{% block title %}mail settings{% endblock %}
-{% block heading %}mail settings{% endblock %}
+{% block title %}Mail settings{% endblock %}
+{% block heading %}Mail settings{% endblock %}
 
 {% block body %}
 
diff --git a/patchwork/templates/patchwork/mail-settings.html b/patchwork/templates/patchwork/mail-settings.html
index ab0af4f9..e35fa871 100644
--- a/patchwork/templates/patchwork/mail-settings.html
+++ b/patchwork/templates/patchwork/mail-settings.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
-{% block title %}mail settings{% endblock %}
-{% block heading %}mail settings{% endblock %}
+{% block title %}Mail settings{% endblock %}
+{% block heading %}Mail settings{% endblock %}
 
 {% block body %}
 <p>Settings for <strong>{{email}}</strong>:</p>
@@ -19,7 +19,6 @@
     <input type="submit" value="Opt-in"/>
    </form>
   </td>
-
 {% else %}
   <td>Patchwork <strong>may</strong> send automated notifications to
    this address.</td>
diff --git a/patchwork/templates/patchwork/optin-request.html b/patchwork/templates/patchwork/optin-request.html
index a3dd4b89..dfc104e8 100644
--- a/patchwork/templates/patchwork/optin-request.html
+++ b/patchwork/templates/patchwork/optin-request.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
-{% block title %}opt-in{% endblock %}
-{% block heading %}opt-in{% endblock %}
+{% block title %}Opt-in{% endblock %}
+{% block heading %}Opt-in{% endblock %}
 
 {% block body %}
 {% if email_sent %}
@@ -39,7 +39,6 @@ without your consent.</p>
 >&gt;{% if admins|length > 2 and not forloop.last %}, {% endif %}
 {% endfor %}
 {% endif %}
-
 {% endif %}
 
 {% if user.is_authenticated %}
diff --git a/patchwork/templates/patchwork/optin.html b/patchwork/templates/patchwork/optin.html
index aeb52b33..0775281c 100644
--- a/patchwork/templates/patchwork/optin.html
+++ b/patchwork/templates/patchwork/optin.html
@@ -1,10 +1,9 @@
 {% extends "base.html" %}
 
-{% block title %}opt-in{% endblock %}
-{% block heading %}opt-in{% endblock %}
+{% block title %}Opt-in{% endblock %}
+{% block heading %}Opt-in{% endblock %}
 
 {% block body %}
-
 <p><strong>Opt-in complete</strong>. You have sucessfully opted back in to
 automated email from this Patchwork system, using the address
 <strong>{{email}}</strong>.</p>
diff --git a/patchwork/templates/patchwork/optout-request.html b/patchwork/templates/patchwork/optout-request.html
index 1a5cec4c..eae05e62 100644
--- a/patchwork/templates/patchwork/optout-request.html
+++ b/patchwork/templates/patchwork/optout-request.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
-{% block title %}opt-out{% endblock %}
-{% block heading %}opt-out{% endblock %}
+{% block title %}Opt-out{% endblock %}
+{% block heading %}Opt-out{% endblock %}
 
 {% block body %}
 {% if email_sent %}
@@ -40,7 +40,6 @@ without your consent.</p>
 >&gt;{% if admins|length > 2 and not forloop.last %}, {% endif %}
 {% endfor %}
 {% endif %}
-
 {% endif %}
 
 {% if user.is_authenticated %}
diff --git a/patchwork/templates/patchwork/optout.html b/patchwork/templates/patchwork/optout.html
index 71388549..f3b75ce6 100644
--- a/patchwork/templates/patchwork/optout.html
+++ b/patchwork/templates/patchwork/optout.html
@@ -1,10 +1,9 @@
 {% extends "base.html" %}
 
-{% block title %}opt-out{% endblock %}
-{% block heading %}opt-out{% endblock %}
+{% block title %}Opt-out{% endblock %}
+{% block heading %}Opt-out{% endblock %}
 
 {% block body %}
-
 <p><strong>Opt-out complete</strong>. You have successfully opted-out of
 automated notifications from this Patchwork system, from the address
 <strong>{{email}}</strong></p>
diff --git a/patchwork/templates/patchwork/profile.html b/patchwork/templates/patchwork/profile.html
index 9b6d5b3a..f9761953 100644
--- a/patchwork/templates/patchwork/profile.html
+++ b/patchwork/templates/patchwork/profile.html
@@ -1,8 +1,7 @@
 {% extends "base.html" %}
 
-{% block title %}User Profile: {{ user.username }}{% endblock %}
-{% block heading %}User Profile: {{ user.username }}{% endblock %}
-
+{% block title %}{{ user.username }}{% endblock %}
+{% block heading %}Your Profile{% endblock %}
 
 {% block body %}
 <h1>Your Profile</h1>
diff --git a/patchwork/templates/patchwork/registration_form.html b/patchwork/templates/patchwork/registration_form.html
index 4e610b32..5280b660 100644
--- a/patchwork/templates/patchwork/registration_form.html
+++ b/patchwork/templates/patchwork/registration_form.html
@@ -3,7 +3,6 @@
 {% block title %}Registration{% endblock %}
 {% block heading %}Registration{% endblock %}
 
-
 {% block body %}
 
 {% if confirmation and not error %}
@@ -42,7 +41,7 @@
 {% endif %}
    </td>
   </tr>
-   
+
   <tr>
    <td>{{ form.last_name.label_tag }}</td>
    <td>
@@ -117,5 +116,4 @@
 </table>
 </form>
 {% endif %}
-
 {% endblock %}
diff --git a/patchwork/templates/patchwork/user-link-confirm.html b/patchwork/templates/patchwork/user-link-confirm.html
index 7c418ec0..e85eb1bd 100644
--- a/patchwork/templates/patchwork/user-link-confirm.html
+++ b/patchwork/templates/patchwork/user-link-confirm.html
@@ -1,8 +1,7 @@
 {% extends "base.html" %}
 
-{% block title %}{{ user.username }}{% endblock %}
-{% block heading %}link accounts for {{ user.username }}{% endblock %}
-
+{% block title %}Link accounts{% endblock %}
+{% block heading %}Link accounts for {{ user.username }}{% endblock %}
 
 {% block body %}
 
diff --git a/patchwork/templates/patchwork/user-link.html b/patchwork/templates/patchwork/user-link.html
index bf30cec8..bf331520 100644
--- a/patchwork/templates/patchwork/user-link.html
+++ b/patchwork/templates/patchwork/user-link.html
@@ -1,18 +1,14 @@
 {% extends "base.html" %}
 
-{% block title %}{{ user.username }}{% endblock %}
-{% block heading %}link accounts for {{ user.username }}{% endblock %}
-
+{% block title %}Link accounts{% endblock %}
+{% block heading %}Link accounts for {{ user.username }}{% endblock %}
 
 {% block body %}
-
 {% if confirmation and not error %}
 <p>A confirmation email has been sent to {{ confirmation.email }}. Click
 on the link provided in the email to confirm that this address belongs to
 you.</p>
-
 {% else %}
-
    {% if form.errors %}
    <p>There was an error submitting your link request.</p>
     {{ form.non_field_errors }}
@@ -26,7 +22,5 @@ you.</p>
     {{linkform.email.errors}}
     Link an email address: {{ linkform.email }}
    </form>
-
 {% endif %}
-
 {% endblock %}
-- 
2.47.3