diff options
| author | Stephen Finucane <stephen.finucane@intel.com> | 2016-03-29 17:10:20 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephen.finucane@intel.com> | 2016-04-01 13:19:34 +0100 |
| commit | 657dce56798ed58bde08ea2f808989a516964671 (patch) | |
| tree | f19d6c8a734d02113edbf354fcba59e3553a2e22 /templates | |
| parent | ec29c4a971ab2073f0f0508229256584e208be6a (diff) | |
| download | patchwork-657dce56798ed58bde08ea2f808989a516964671.tar patchwork-657dce56798ed58bde08ea2f808989a516964671.tar.gz | |
ui: Cleanup the navbar "brand"
The text shown in the top-left corner of a navbar, known as the "brand"
in Bootstrap parlance, normally brings you to the homepage. However,
when viewing patches or details about a project this name of this
project is included in this link. This gave some users the idea that
clicking this button would return them to the project patch list
instead. To resolve this confusion, break the project name and any
other non-Patchwork title out of this clickable link. A new
"navbar-subnav" style is introduced to do this, seeing as Bootstrap
does not appear to support something like this natively.
Once this is done, this also allows for the removal of the "All
Projects" button, which both duplicates this functionality and did
nothing when there was only one project available on an instance.
Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/templates/base.html b/templates/base.html index 8521edf..af0c124 100644 --- a/templates/base.html +++ b/templates/base.html @@ -23,7 +23,7 @@ {% block headers %}{% endblock %} </head> <body> - <nav class="navbar navbar-inverse navbar-patchwork"> + <nav class="navbar navbar-inverse navbar-static-top"> <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"> @@ -32,9 +32,9 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <span class="navbar-brand"> - <a href="{% url 'project-list' %}">Patchwork{% if project %} {{project.name}}{% endif %}</a> - {% block heading %}{% endblock %} + <a class="navbar-brand" href="{% url 'project-list' %}">Patchwork</a> + <span class="navbar-subbrand"> + {% block heading %}{% if project %} {{project.name}}{% endif %}{% endblock %} </span> </div> <div class="collapse navbar-collapse" id="navbar-collapse"> @@ -59,13 +59,7 @@ About this project </a> </li> - <li> - <a href="{% url 'project-list' %}"> - <span class="glyphicon glyphicon-home"></span> - All projects - </a> - </li> - </ul> + </ul> {% endif %} {% endblock %} <ul class="nav navbar-nav navbar-right"> |