ui: Put the project name by default on project pages

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Acked-by: Stephen Finucane <stephen.finucane@intel.com>

diff --git a/patchwork/templates/patchwork/bundle.html b/patchwork/templates/patchwork/bundle.html
index aa46e94dc1238207fb28e5d0d4f7349e7b701237..ebedad1552af142b6658993af4f51563aa025a02 100644 (file)
--- 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 6467a30744aea96a5390757ac3439d2cda648beb..1d3a8ae9f5e3ec5bb6f4311e8535347ab0a416c9 100644 (file)
--- 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 fc33d7bdb1d13ad1363b09fc372cab7cb93d4c52..9fec773c8867076a54dd3887a2534201f495065b 100644 (file)
--- 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 b84e5dcfc798b4747920fed38eb1a15c3718e60e..28c8da31da19110db842518a88b20e531cc0949e 100644 (file)
--- 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 5e60446a73caa4fb438caa854e6093e424d2f95c..282c33c74d189e3fa3078ff35068e143d82a2c78 100644 (file)
--- 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 09839e90a124513382daab6c62770f46731152a8..625da851ec7ad80a0014ca90cb2bcde498c9dc6a 100644 (file)
--- 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 %}