[PATCH 15/19] ui: Put the project name by default on project pages

[Stephen Finucane]

From: Damien Lespiau <damien.lespiau at intel.com>

Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
Acked-by: Stephen Finucane <stephen.finucane at intel.com>
---
 patchwork/templates/patchwork/bundle.html    | 2 --
 patchwork/templates/patchwork/bundles.html   | 1 -
 patchwork/templates/patchwork/list.html      | 1 -
 patchwork/templates/patchwork/project.html   | 1 -
 patchwork/templates/patchwork/todo-list.html | 1 -
 templates/base.html                          | 7 ++++---
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/patchwork/templates/patchwork/bundle.html b/patchwork/templates/patchwork/bundle.html
index aa46e94..ebedad1 100644
--- a/patchwork/templates/patchwork/bundle.html
+++ b/patchwork/templates/patchwork/bundle.html
@@ -8,8 +8,6 @@
   <script type="text/javascript" src="{% static "js/bundle.js" %}"></script>
 {% endblock %}
 {% block title %}{{project.name}}{% endblock %}
-{% block heading %}bundle: {{bundle.owner.username}} /
-{{bundle.name}}{% endblock %}
 
 {% block body %}
 
diff --git a/patchwork/templates/patchwork/bundles.html b/patchwork/templates/patchwork/bundles.html
index 6467a30..1d3a8ae 100644
--- a/patchwork/templates/patchwork/bundles.html
+++ b/patchwork/templates/patchwork/bundles.html
@@ -3,7 +3,6 @@
 {% load static %}
 
 {% block title %}Bundles{% endblock %}
-{% block heading %}Bundles{% endblock %}
 {% block bundle_active %}active{% endblock %}
 
 {% block body %}
diff --git a/patchwork/templates/patchwork/list.html b/patchwork/templates/patchwork/list.html
index fc33d7b..9fec773 100644
--- a/patchwork/templates/patchwork/list.html
+++ b/patchwork/templates/patchwork/list.html
@@ -4,7 +4,6 @@
 {% load static %}
 
 {% block title %}{{project.name}}{% endblock %}
-{% block heading %}{{project.name}}{% endblock %}
 {% block patch_active %}active{% endblock %}
 
 {% block body %}
diff --git a/patchwork/templates/patchwork/project.html b/patchwork/templates/patchwork/project.html
index b84e5dc..28c8da3 100644
--- a/patchwork/templates/patchwork/project.html
+++ b/patchwork/templates/patchwork/project.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% block title %}{{ project.name }}{% endblock %}
-{% block heading %}{{ project.name }}{% endblock %}
 {% block info_active %}active{% endblock %}
 
 {% block body %}
diff --git a/patchwork/templates/patchwork/todo-list.html b/patchwork/templates/patchwork/todo-list.html
index 5e60446..282c33c 100644
--- a/patchwork/templates/patchwork/todo-list.html
+++ b/patchwork/templates/patchwork/todo-list.html
@@ -3,7 +3,6 @@
 {% load person %}
 
 {% block title %}{{ user }}'s todo list{% endblock %}
-{% block heading %}{{user}}'s todo list for {{ project.linkname }}{% endblock %}
 
 {% block body %}
 <h1>TODO</h1>
diff --git a/templates/base.html b/templates/base.html
index 09839e9..625da85 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -32,9 +32,10 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <span class="navbar-brand"><a
-         href="{% url 'project-list' %}">Patchwork</a>
-       {% block heading %}{% endblock %}</span>
+      <span class="navbar-brand">
+       <a href="{% url 'project-list' %}">Patchwork</a>
+       {% block heading %}{{project.name}}{% endblock %}
+      </span>
     </div>
     <div class="collapse navbar-collapse" id="navbar-collapse">
 {% if project %}
-- 
2.0.0