From: Damien Lespiau <damien.lespiau@intel.com>
Date: Sun, 20 Dec 2015 16:35:08 +0000 (+0000)
Subject: ui: Put the project name by default on project pages
X-Git-Tag: v1.1.0~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfdbb041038b6b1e9a640390d8d68666e123142e;p=thirdparty%2Fpatchwork.git

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 aa46e94d..ebedad15 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 6467a307..1d3a8ae9 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 fc33d7bd..9fec773c 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 b84e5dcf..28c8da31 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 5e60446a..282c33c7 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 09839e90..625da851 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 %}