summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-08-28 17:27:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-29 14:03:52 +0100
commitab9644f7aca3de443d8da323b7937c4c10d266a1 (patch)
tree0549caf604394e9e1d12571df4be545baddc83e4 /bitbake/lib
parentae329b763304e14fc808e6150a8c076d4816303d (diff)
downloadpoky-ab9644f7aca3de443d8da323b7937c4c10d266a1.tar.gz
bitbake: toaster: fix global navigation
The "All builds" item in the global navigation should only be active when you are in the "all builds" page. The global navigation should not appear at all in the landing page and in the new project page. (Bitbake rev: 120816b133b9c160c68c911a9f4c612ce2f8a9ed) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/base.html6
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html
index f187100264..0b93bb3dde 100644
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/bitbake/lib/toaster/toastergui/templates/base.html
@@ -89,8 +89,9 @@
89 <i class="icon-info-sign" title="<strong>Toaster version information</strong>" data-content="<dl><dt>Branch</dt><dd>{{TOASTER_BRANCH}}</dd><dt>Revision</dt><dd>{{TOASTER_REVISION}}</dd></dl>"></i> 89 <i class="icon-info-sign" title="<strong>Toaster version information</strong>" data-content="<dl><dt>Branch</dt><dd>{{TOASTER_BRANCH}}</dd><dt>Revision</dt><dd>{{TOASTER_REVISION}}</dd></dl>"></i>
90 {% endif %} 90 {% endif %}
91 </span> 91 </span>
92 {% if request.resolver_match.url_name != 'landing' and request.resolver_match.url_name != 'newproject' %}
92 <ul class="nav"> 93 <ul class="nav">
93 <li {% if "builds" in request.path %} 94 <li {% if request.resolver_match.url_name == 'all-builds' %}
94 class="active" 95 class="active"
95 {% endif %}> 96 {% endif %}>
96 <a href="{% url 'all-builds' %}"> 97 <a href="{% url 'all-builds' %}">
@@ -98,7 +99,7 @@
98 All builds 99 All builds
99 </a> 100 </a>
100 </li> 101 </li>
101 <li {% if "projects" in request.path %} 102 <li {% if request.resolver_match.url_name == 'all-projects' %}
102 class="active" 103 class="active"
103 {% endif %}> 104 {% endif %}>
104 <a href="{% url 'all-projects' %}"> 105 <a href="{% url 'all-projects' %}">
@@ -107,6 +108,7 @@
107 </a> 108 </a>
108 </li> 109 </li>
109 </ul> 110 </ul>
111 {% endif %}
110 <ul class="nav pull-right"> 112 <ul class="nav pull-right">
111 <li> 113 <li>
112 <a target="_blank" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html"> 114 <a target="_blank" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">