diff options
8 files changed, 101 insertions, 19 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index 0ce5dbd27f..778c4d4af1 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html @@ -9,7 +9,13 @@ <div class="section"> <ul class="breadcrumb" id="breadcrumb"> <li><a href="{% url 'all-builds' %}">All builds</a></li> -<li><a href="{%url 'builddashboard' build.pk%}">{{build.get_sorted_target_list.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|date:"d/m/y H:i"}})</a></li> + <li> + {% block parentbreadcrumb %} + <a href="{%url 'builddashboard' build.pk%}"> + {{build.get_sorted_target_list.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|date:"d/m/y H:i"}}) + </a> + {% endblock %} + </li> {% block localbreadcrumb %}{% endblock %} </ul> <script> @@ -28,19 +34,35 @@ <ul class="nav nav-list well"> {% if build.target_set.all.0.is_image %} <li class="nav-header">Images</li> - {% for t in build.get_sorted_target_list %} - <li><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li> - {% endfor %} - {% endif %} - <li class="nav-header">Build</li> - <li><a href="{% url 'configuration' build.pk %}">Configuration</a></li> - <li><a href="{% url 'tasks' build.pk %}">Tasks</a></li> - <li><a href="{% url 'recipes' build.pk %}">Recipes</a></li> - <li><a href="{% url 'packages' build.pk %}">Packages</a></li> - <li class="nav-header">Performance</li> - <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> - <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> - <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> + {% block nav-target %} + {% for t in build.get_sorted_target_list %} + <li><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li> + {% endfor %} + {% endblock %} + {% endif %} + <li class="nav-header">Build</li> + {% block nav-configuration %} + <li><a href="{% url 'configuration' build.pk %}">Configuration</a></li> + {% endblock %} + {% block nav-tasks %} + <li><a href="{% url 'tasks' build.pk %}">Tasks</a></li> + {% endblock %} + {% block nav-recipes %} + <li><a href="{% url 'recipes' build.pk %}">Recipes</a></li> + {% endblock %} + {% block nav-packages %} + <li><a href="{% url 'packages' build.pk %}">Packages</a></li> + {% endblock %} + <li class="nav-header">Performance</li> + {% block nav-buildtime %} + <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> + {% endblock %} + {% block nav-cpuusage %} + <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> + {% endblock %} + {% block nav-diskio %} + <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> + {% endblock %} </ul> </div> <!-- end left sidebar container --> diff --git a/bitbake/lib/toaster/toastergui/templates/bpackage.html b/bitbake/lib/toaster/toastergui/templates/bpackage.html index dad0d7f48e..77f789484c 100644 --- a/bitbake/lib/toaster/toastergui/templates/bpackage.html +++ b/bitbake/lib/toaster/toastergui/templates/bpackage.html @@ -6,6 +6,10 @@ <li>Packages</li> {% endblock %} +{% block nav-packages %} + <li class="active"><a href="{% url 'packages' build.pk %}">Packages</a></li> +{% endblock %} + {% block buildinfomain %} <div class="span10"> <div class="page-header"> @@ -30,7 +34,7 @@ </form> </div> </div> - + {% else %} {% include "basetable_top.html" %} diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index 9d91f4031f..65631286b1 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html @@ -2,6 +2,10 @@ {% load humanize %} {% load projecttags %} +{% block parentbreadcrumb %} +{{build.get_sorted_target_list.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|date:"d/m/y H:i"}}) +{% endblock %} + {% block buildinfomain %} <!-- page title --> <div class="row-fluid span10"> diff --git a/bitbake/lib/toaster/toastergui/templates/configuration.html b/bitbake/lib/toaster/toastergui/templates/configuration.html index 674f896b03..49a6a89d5c 100644 --- a/bitbake/lib/toaster/toastergui/templates/configuration.html +++ b/bitbake/lib/toaster/toastergui/templates/configuration.html @@ -1,9 +1,13 @@ {% extends "basebuildpage.html" %} +{% load projecttags %} + {% block localbreadcrumb %} <li>Configuration</li> {% endblock %} -{% load projecttags %} +{% block nav-configuration %} + <li class="active"><a href="{% url 'configuration' build.pk %}">Configuration</a></li> +{% endblock %} {% block buildinfomain %} <!-- page title --> diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html b/bitbake/lib/toaster/toastergui/templates/configvars.html index 24cb2a5427..de4940e12e 100644 --- a/bitbake/lib/toaster/toastergui/templates/configvars.html +++ b/bitbake/lib/toaster/toastergui/templates/configvars.html @@ -1,9 +1,13 @@ {% extends "basebuildpage.html" %} +{% load projecttags %} + {% block localbreadcrumb %} <li>Configuration</li> {% endblock %} -{% load projecttags %} +{% block nav-configuration %} + <li class="active"><a href="{% url 'configuration' build.pk %}">Configuration</a></li> +{% endblock %} {% block buildinfomain %} <!-- page title --> @@ -30,7 +34,7 @@ <!-- variables --> <div id="variables" class="tab-pane"> - + {% if objects.paginator.count == 0 %} <div class="row-fluid"> <div class="alert"> @@ -41,7 +45,7 @@ </form> </div> </div> - + {% else %} {% include "basetable_top.html" %} diff --git a/bitbake/lib/toaster/toastergui/templates/recipes.html b/bitbake/lib/toaster/toastergui/templates/recipes.html index 22c3d1a5ac..907b83d269 100755 --- a/bitbake/lib/toaster/toastergui/templates/recipes.html +++ b/bitbake/lib/toaster/toastergui/templates/recipes.html @@ -6,6 +6,10 @@ <li>Recipes</li> {% endblock %} +{% block nav-recipes %} + <li class="active"><a href="{% url 'recipes' build.pk %}">Recipes</a></li> +{% endblock %} + {% block buildinfomain %} <div class="span10"> <div class="page-header"> diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/bitbake/lib/toaster/toastergui/templates/target.html index 5396b17dc9..ceffada081 100644 --- a/bitbake/lib/toaster/toastergui/templates/target.html +++ b/bitbake/lib/toaster/toastergui/templates/target.html @@ -5,6 +5,16 @@ {% load projecttags %} +{% block nav-target %} + {% for t in build.get_sorted_target_list %} + {% ifequal target.pk t.pk %} + <li class="active"><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li> + {% else %} + <li><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li> + {% endifequal %} + {% endfor %} +{% endblock %} + {% block buildinfomain %} <div class="row-fluid span10"> diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html index ace30de3eb..8c73dc230e 100644 --- a/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html @@ -1,9 +1,39 @@ {% extends "basebuildpage.html" %} {% load projecttags %} + {% block localbreadcrumb %} <li>{{title}}</li> {% endblock %} +{% block nav-tasks %} + {% if 'Tasks' == title %} + <li class="active"><a href="{% url 'tasks' build.pk %}">Tasks</a></li> + {% else %} + <li><a href="{% url 'tasks' build.pk %}">Tasks</a></li> + {% endif %} +{% endblock %} +{% block nav-buildtime %} + {% if 'Time' == title %} + <li class="active"><a href="{% url 'buildtime' build.pk %}">Time</a></li> + {% else %} + <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> + {% endif %} +{% endblock %} +{% block nav-cpuusage %} + {% if 'CPU usage' == title %} + <li class="active"><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> + {% else %} + <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> + {% endif %} +{% endblock %} +{% block nav-diskio %} + {% if 'Disk I/O' == title %} + <li class="active"><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> + {% else %} + <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> + {% endif %} +{% endblock %} + {% block buildinfomain %} <div class="span10"> <div class="page-header"> |