diff mbox

[15/46] html: Turn the navbar into a breadcrumb bar

Message ID 1415473744-31531-16-git-send-email-damien.lespiau@intel.com
State Superseded
Headers show

Commit Message

Damien Lespiau Nov. 8, 2014, 7:08 p.m. UTC 
From: Belén Barros Peña <belen.barros.pena@intel.com>

So we can have a somewhat of a hierarchical progression:

  All projects -> $project patches -> patch name

That should also help when we add series, we'll be able to just add the
series in there.

By default, we have:

  All projects -> $project patches

both being links, so we can return to the list of patches from any page
where the project is defined. The '$project patches' link becomes
insensitive in the list page. Finally the patch page adds the patch at
the end.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Belén Barros Peña <belen.barros.pena@intel.com>
---
 templates/base.html            | 15 ++++++---------
 templates/patchwork/list.html  |  1 +
 templates/patchwork/patch.html |  7 ++++++-
 3 files changed, 13 insertions(+), 10 deletions(-)
diff mbox

Patch

diff --git a/templates/base.html b/templates/base.html
index 80e07dc..5515ece 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -66,15 +66,12 @@ 
 {% if project %}
   <div id="nav">
    <div id="navleft">
-    <strong>Project</strong>: {{ project.linkname }}
-     :
-     <a href="{% url 'patchwork.views.patch.list' project_id=project.linkname %}"
-      >patches</a>
-    {% if other_projects %}
-     :
-     <a href="{% url 'patchwork.views.projects' %}"
-     >other projects</a>
-    {% endif %}
+     <a href="{% url 'patchwork.views.projects' %}">All projects</a>
+     &#8594;
+     {% block breadcrumb %}
+      <a href="{% url 'patchwork.views.patch.list' project_id=project.linkname %}"
+       >{{ project.linkname }} patches</a>
+     {% endblock %}
    </div>
    <div style="clear: both"></div>
   </div>
diff --git a/templates/patchwork/list.html b/templates/patchwork/list.html
index 8054063..0f3961b 100644
--- a/templates/patchwork/list.html
+++ b/templates/patchwork/list.html
@@ -4,6 +4,7 @@ 
 
 {% block title %}{{project.name}}{% endblock %}
 {% block heading %}{{project.name}}{% endblock %}
+{% block breadcrumb %}{{ project.linkname }} patches{% endblock %}
 
 {% block body %}
 
diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html
index c04e32b..b2096aa 100644
--- a/templates/patchwork/patch.html
+++ b/templates/patchwork/patch.html
@@ -5,7 +5,12 @@ 
 {% load patch %}
 
 {% block title %}{{patch.name}}{% endblock %}
-{% block heading %}{{patch.name}}{%endblock%}
+{% block breadcrumb %}
+<a href="{% url 'patchwork.views.patch.list' project_id=project.linkname %}"
+ >{{ project.linkname }} patches</a>
+ &#8594;
+ {{ patch.name }}
+{% endblock %}
 
 {% block body %}
 <script language="JavaScript" type="text/javascript">