summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-10-28 14:22:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-29 07:32:10 +0000
commit66d3c353f8e7103b0d60abdeb575cd3ac303e877 (patch)
treed274976092354bfe943fc82fd5e0932eef7e5ea0 /bitbake
parent5724b2a651d22430b055dfcfa714fe412afa2dfc (diff)
downloadpoky-66d3c353f8e7103b0d60abdeb575cd3ac303e877.tar.gz
bitbake: toaster: templates Add meaningful title tags
Our title tags are all over the place, and have no relation to the page content. This commit adds a meaningful title tag to each Toaster page. (Bitbake rev: 1ab8827d684a19a70f3b788aed2327bf30edffe2) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/base.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/baseprojectpage.html3
-rw-r--r--bitbake/lib/toaster/toastergui/templates/bpackage.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/builddashboard.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/builds.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/configuration.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/configvars.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/dirinfo.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/importlayer.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/landing.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/landing_not_managed.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/layerdetails.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/newproject.html3
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package_detail_base.html11
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package_included_detail.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/project.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/projectbuilds.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/projectconf.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/projects.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/recipe.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/recipes.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/target.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/task.html1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/tasks.html15
-rw-r--r--bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html2
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py2
28 files changed, 55 insertions, 19 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html
index dfa6bba70f..11ac2a0355 100644
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/bitbake/lib/toaster/toastergui/templates/base.html
@@ -4,7 +4,9 @@
4{% load project_url_tag %} 4{% load project_url_tag %}
5<html lang="en"> 5<html lang="en">
6 <head> 6 <head>
7 <title>{% if objectname %} {{objectname|title}} - {% endif %}Toaster</title> 7 <title>
8 {% block title %} Toaster {% endblock %}
9 </title>
8<link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css"/> 10<link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css"/>
9<link rel="stylesheet" href="{% static 'css/bootstrap-responsive.min.css' %}" type='text/css'/> 11<link rel="stylesheet" href="{% static 'css/bootstrap-responsive.min.css' %}" type='text/css'/>
10<link rel="stylesheet" href="{% static 'css/font-awesome.min.css' %}" type='text/css'/> 12<link rel="stylesheet" href="{% static 'css/font-awesome.min.css' %}" type='text/css'/>
diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
index 88bf8599e4..1f45be462d 100644
--- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
+++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
@@ -1,6 +1,9 @@
1{% extends "base.html" %} 1{% extends "base.html" %}
2{% load projecttags %} 2{% load projecttags %}
3{% load humanize %} 3{% load humanize %}
4
5{% block title %} {{title}} - {{project.name}} - Toaster {% endblock %}
6
4{% block pagecontent %} 7{% block pagecontent %}
5 8
6{% include "projecttopbar.html" %} 9{% include "projecttopbar.html" %}
diff --git a/bitbake/lib/toaster/toastergui/templates/bpackage.html b/bitbake/lib/toaster/toastergui/templates/bpackage.html
index d775fec737..81973cbc6d 100644
--- a/bitbake/lib/toaster/toastergui/templates/bpackage.html
+++ b/bitbake/lib/toaster/toastergui/templates/bpackage.html
@@ -2,6 +2,7 @@
2 2
3{% load projecttags %} 3{% load projecttags %}
4 4
5{% block title %} Packages built - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
5{% block localbreadcrumb %} 6{% block localbreadcrumb %}
6<li>Packages</li> 7<li>Packages</li>
7{% endblock %} 8{% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
index c39fe3457a..323bbbb6e2 100644
--- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html
+++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
@@ -2,6 +2,7 @@
2{% load humanize %} 2{% load humanize %}
3{% load projecttags %} 3{% load projecttags %}
4 4
5{% block title %} {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
5{% block parentbreadcrumb %} 6{% block parentbreadcrumb %}
6{% if build.get_sorted_target_list.count > 0 %} 7{% if build.get_sorted_target_list.count > 0 %}
7 {{build.get_sorted_target_list.0.target}} 8 {{build.get_sorted_target_list.0.target}}
diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html b/bitbake/lib/toaster/toastergui/templates/builds.html
index 459fcb0744..a27a121913 100644
--- a/bitbake/lib/toaster/toastergui/templates/builds.html
+++ b/bitbake/lib/toaster/toastergui/templates/builds.html
@@ -5,6 +5,7 @@
5{% load project_url_tag %} 5{% load project_url_tag %}
6{% load humanize %} 6{% load humanize %}
7 7
8{% block title %} All builds - Toaster {% endblock %}
8{% block extraheadcontent %} 9{% block extraheadcontent %}
9<link rel="stylesheet" href="/static/css/jquery-ui.min.css" type='text/css'> 10<link rel="stylesheet" href="/static/css/jquery-ui.min.css" type='text/css'>
10<link rel="stylesheet" href="/static/css/jquery-ui.structure.min.css" type='text/css'> 11<link rel="stylesheet" href="/static/css/jquery-ui.structure.min.css" type='text/css'>
diff --git a/bitbake/lib/toaster/toastergui/templates/configuration.html b/bitbake/lib/toaster/toastergui/templates/configuration.html
index 3e489918d2..85d6a622a8 100644
--- a/bitbake/lib/toaster/toastergui/templates/configuration.html
+++ b/bitbake/lib/toaster/toastergui/templates/configuration.html
@@ -1,6 +1,7 @@
1{% extends "basebuildpage.html" %} 1{% extends "basebuildpage.html" %}
2{% load projecttags %} 2{% load projecttags %}
3 3
4{% block title %} Configuration summary - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
4{% block localbreadcrumb %} 5{% block localbreadcrumb %}
5<li>Configuration</li> 6<li>Configuration</li>
6{% endblock %} 7{% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html b/bitbake/lib/toaster/toastergui/templates/configvars.html
index 8a572ae397..e40c225a3a 100644
--- a/bitbake/lib/toaster/toastergui/templates/configvars.html
+++ b/bitbake/lib/toaster/toastergui/templates/configvars.html
@@ -1,6 +1,7 @@
1{% extends "basebuildpage.html" %} 1{% extends "basebuildpage.html" %}
2{% load projecttags %} 2{% load projecttags %}
3 3
4{% block title %} BitBake variables - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
4{% block localbreadcrumb %} 5{% block localbreadcrumb %}
5<li>Configuration</li> 6<li>Configuration</li>
6{% endblock %} 7{% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/templates/dirinfo.html b/bitbake/lib/toaster/toastergui/templates/dirinfo.html
index 7819894b65..ecb46bf7ab 100644
--- a/bitbake/lib/toaster/toastergui/templates/dirinfo.html
+++ b/bitbake/lib/toaster/toastergui/templates/dirinfo.html
@@ -1,4 +1,5 @@
1{% extends "basebuildpage.html" %} 1{% extends "basebuildpage.html" %}
2{% block title %} Directory structure - {{ target.target }} {{ build.machine }} - {{ build.project.name }} - Toaster {% endblock %}
2{% block extraheadcontent %} 3{% block extraheadcontent %}
3{% load static %} 4{% load static %}
4<link rel="stylesheet" href="{% static 'css/jquery.treetable.css' %}" type="text/css"> 5<link rel="stylesheet" href="{% static 'css/jquery.treetable.css' %}" type="text/css">
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html
index ce3d724c89..033f0aedeb 100644
--- a/bitbake/lib/toaster/toastergui/templates/importlayer.html
+++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html
@@ -2,6 +2,7 @@
2{% load projecttags %} 2{% load projecttags %}
3{% load humanize %} 3{% load humanize %}
4{% load static %} 4{% load static %}
5{% block title %} Import layer - {{project.name}} - Toaster {% endblock %}
5{% block pagecontent %} 6{% block pagecontent %}
6 7
7{% include "projecttopbar.html" %} 8{% include "projecttopbar.html" %}
diff --git a/bitbake/lib/toaster/toastergui/templates/landing.html b/bitbake/lib/toaster/toastergui/templates/landing.html
index 65d8c3c626..cafaa1afad 100644
--- a/bitbake/lib/toaster/toastergui/templates/landing.html
+++ b/bitbake/lib/toaster/toastergui/templates/landing.html
@@ -4,6 +4,7 @@
4{% load projecttags %} 4{% load projecttags %}
5{% load humanize %} 5{% load humanize %}
6 6
7{% block title %} Welcome to Toaster {% endblock %}
7{% block pagecontent %} 8{% block pagecontent %}
8 9
9 {% if BUILD_MODE %} 10 {% if BUILD_MODE %}
diff --git a/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html b/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
index 5bc435d149..9b37f55305 100644
--- a/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
+++ b/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
@@ -4,6 +4,8 @@
4{% load projecttags %} 4{% load projecttags %}
5{% load humanize %} 5{% load humanize %}
6 6
7{% block title %} Welcome to Toaster {% endblock %}
8
7{% block pagecontent %} 9{% block pagecontent %}
8 10
9 <div class="container-fluid"> 11 <div class="container-fluid">
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
index 7dd3db27a5..7fe365da38 100644
--- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
+++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
@@ -3,6 +3,7 @@
3{% load humanize %} 3{% load humanize %}
4{% load static %} 4{% load static %}
5 5
6{% block title %} {{layerversion.layer.name}} - {{project.name}} - Toaster {% endblock %}
6{% block pagecontent %} 7{% block pagecontent %}
7 8
8<div class="section"> 9<div class="section">
diff --git a/bitbake/lib/toaster/toastergui/templates/newproject.html b/bitbake/lib/toaster/toastergui/templates/newproject.html
index 997390bcf0..e83b2bea61 100644
--- a/bitbake/lib/toaster/toastergui/templates/newproject.html
+++ b/bitbake/lib/toaster/toastergui/templates/newproject.html
@@ -1,6 +1,9 @@
1{% extends "base.html" %} 1{% extends "base.html" %}
2{% load projecttags %} 2{% load projecttags %}
3{% load humanize %} 3{% load humanize %}
4
5{% block title %} Create a new project - Toaster {% endblock %}
6
4{% block pagecontent %} 7{% block pagecontent %}
5<div class="row-fluid"> 8<div class="row-fluid">
6 <div class="page-header"> 9 <div class="page-header">
diff --git a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
index a24bc8e436..9fa28a8f8a 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
+++ b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
@@ -1,6 +1,13 @@
1{% extends "basebuilddetailpage.html" %} 1{% extends "basebuilddetailpage.html" %}
2{% load projecttags %} 2{% load projecttags %}
3 3
4{% block title %}
5 {% if target %}
6 {{package.fullpackagespec}} - {{ target.target }} {{ build.machine }} - {{ build.project.name }} - Toaster
7 {% else %}
8 {{package.fullpackagespec}} - {{ build.target_set.all|dictsort:"target"|join:", " }} {{ build.machine }} - {{ build.project.name }} - Toaster
9 {% endif %}
10{% endblock %}
4{% block extraheadcontent %} 11{% block extraheadcontent %}
5 <!-- functions to format package 'installed_package' alias --> 12 <!-- functions to format package 'installed_package' alias -->
6 <script> 13 <script>
@@ -38,9 +45,9 @@
38{% block pagedetailinfomain %} 45{% block pagedetailinfomain %}
39 <div class="row span11"> 46 <div class="row span11">
40 <div class="page-header"> 47 <div class="page-header">
41 {% block title %} 48 {% block mainheading %}
42 <h1>{{package.fullpackagespec}}</h1> 49 <h1>{{package.fullpackagespec}}</h1>
43 {% endblock title %} 50 {% endblock %}
44 </div> <!-- page-header --> 51 </div> <!-- page-header -->
45 </div> <!-- row span11 page-header --> 52 </div> <!-- row span11 page-header -->
46 53
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
index 642ca69568..8a0508e703 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
+++ b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
@@ -1,13 +1,13 @@
1{% extends "package_detail_base.html" %} 1{% extends "package_detail_base.html" %}
2{% load projecttags %} 2{% load projecttags %}
3 3
4{% block title %} 4{% block mainheading %}
5 <h1> 5 <h1>
6 {{package.fullpackagespec}} 6 {{package.fullpackagespec}}
7 <script> fmtAliasHelp("{{package.name}}", "{{package.alias}}", false) </script> 7 <script> fmtAliasHelp("{{package.name}}", "{{package.alias}}", false) </script>
8 <small>({{target.target}})</small> 8 <small>({{target.target}})</small>
9 </h1> 9 </h1>
10{% endblock title %} 10{% endblock %}
11 11
12{% block tabcontent %} 12{% block tabcontent %}
13 {% with packageFileCount=package.buildfilelist_package.count %} 13 {% with packageFileCount=package.buildfilelist_package.count %}
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_detail.html b/bitbake/lib/toaster/toastergui/templates/package_included_detail.html
index d2aa26eefa..568e2f235b 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_included_detail.html
+++ b/bitbake/lib/toaster/toastergui/templates/package_included_detail.html
@@ -1,7 +1,7 @@
1{% extends "package_detail_base.html" %} 1{% extends "package_detail_base.html" %}
2{% load projecttags %} 2{% load projecttags %}
3 3
4{% block title %} 4{% block mainheading %}
5 <h1> 5 <h1>
6 {{package.fullpackagespec}} 6 {{package.fullpackagespec}}
7 <script> 7 <script>
@@ -9,7 +9,7 @@
9 </script> 9 </script>
10 <small>({{target.target}})</small> 10 <small>({{target.target}})</small>
11 </h1> 11 </h1>
12{% endblock title %} 12{% endblock %}
13 13
14{% block tabcontent %} 14{% block tabcontent %}
15{% with packageFileCount=package.buildfilelist_package.count %} 15{% with packageFileCount=package.buildfilelist_package.count %}
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
index 5cc8b47a60..fb310c7fc7 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
+++ b/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
@@ -1,13 +1,13 @@
1{% extends "package_detail_base.html" %} 1{% extends "package_detail_base.html" %}
2{% load projecttags %} 2{% load projecttags %}
3 3
4{% block title %} 4{% block mainheading %}
5 <h1> 5 <h1>
6 {{package.fullpackagespec}} 6 {{package.fullpackagespec}}
7 <script> fmtAliasHelp("{{package.name}}", "{{package.alias}}", false) </script> 7 <script> fmtAliasHelp("{{package.name}}", "{{package.alias}}", false) </script>
8 <small>({{target.target}})</small> 8 <small>({{target.target}})</small>
9 </h1> 9 </h1>
10{% endblock title %} 10{% endblock %}
11 11
12{% block tabcontent %} 12{% block tabcontent %}
13 {% with packageFileCount=package.buildfilelist_package.count %} 13 {% with packageFileCount=package.buildfilelist_package.count %}
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html
index 2f978bc715..4e83981f84 100644
--- a/bitbake/lib/toaster/toastergui/templates/project.html
+++ b/bitbake/lib/toaster/toastergui/templates/project.html
@@ -4,6 +4,7 @@
4{% load humanize %} 4{% load humanize %}
5{% load static %} 5{% load static %}
6 6
7{% block title %} Configuration - {{project.name}} - Toaster {% endblock %}
7{% block projectinfomain %} 8{% block projectinfomain %}
8 9
9<script src="{% static 'js/layerDepsModal.js' %}"></script> 10<script src="{% static 'js/layerDepsModal.js' %}"></script>
diff --git a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
index fde7e3b9da..bb38284aab 100644
--- a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
+++ b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
@@ -2,7 +2,7 @@
2{% load projecttags %} 2{% load projecttags %}
3{% load humanize %} 3{% load humanize %}
4 4
5 5{% block title %} Builds - {{project.name}} - Toaster {% endblock %}
6{% block extraheadcontent %} 6{% block extraheadcontent %}
7<link rel="stylesheet" href="/static/css/jquery-ui.min.css" type='text/css'> 7<link rel="stylesheet" href="/static/css/jquery-ui.min.css" type='text/css'>
8<link rel="stylesheet" href="/static/css/jquery-ui.structure.min.css" type='text/css'> 8<link rel="stylesheet" href="/static/css/jquery-ui.structure.min.css" type='text/css'>
diff --git a/bitbake/lib/toaster/toastergui/templates/projectconf.html b/bitbake/lib/toaster/toastergui/templates/projectconf.html
index 5333ec5d05..30fd03e32e 100644
--- a/bitbake/lib/toaster/toastergui/templates/projectconf.html
+++ b/bitbake/lib/toaster/toastergui/templates/projectconf.html
@@ -2,7 +2,7 @@
2{% load projecttags %} 2{% load projecttags %}
3{% load humanize %} 3{% load humanize %}
4 4
5 5{% block title %} BitBake variables - {{project.name}} - Toaster {% endblock %}
6{% block projectinfomain %} 6{% block projectinfomain %}
7 7
8<h2>Bitbake variables</h2> 8<h2>Bitbake variables</h2>
diff --git a/bitbake/lib/toaster/toastergui/templates/projects.html b/bitbake/lib/toaster/toastergui/templates/projects.html
index 7c612e8c43..678a7963b7 100644
--- a/bitbake/lib/toaster/toastergui/templates/projects.html
+++ b/bitbake/lib/toaster/toastergui/templates/projects.html
@@ -5,6 +5,8 @@
5{% load project_url_tag %} 5{% load project_url_tag %}
6{% load humanize %} 6{% load humanize %}
7 7
8{% block title %} All projects - Toaster {% endblock %}
9
8{% block pagecontent %} 10{% block pagecontent %}
9 11
10 12
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/bitbake/lib/toaster/toastergui/templates/recipe.html
index b5e4192d6b..c6ae2f3802 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipe.html
@@ -2,6 +2,7 @@
2 2
3{% load projecttags %} 3{% load projecttags %}
4 4
5{% block title %} {{object.name}}_{{object.version}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
5{% block localbreadcrumb %} 6{% block localbreadcrumb %}
6<li><a href="{% url 'recipes' build.pk %}">Recipes</a></li> 7<li><a href="{% url 'recipes' build.pk %}">Recipes</a></li>
7<li>{{object.name}}_{{object.version}} </li> 8<li>{{object.name}}_{{object.version}} </li>
diff --git a/bitbake/lib/toaster/toastergui/templates/recipes.html b/bitbake/lib/toaster/toastergui/templates/recipes.html
index 5cdac437c4..d144893461 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipes.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipes.html
@@ -2,6 +2,7 @@
2 2
3{% load projecttags %} 3{% load projecttags %}
4 4
5{% block title %} Recipes - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
5{% block localbreadcrumb %} 6{% block localbreadcrumb %}
6<li>Recipes</li> 7<li>Recipes</li>
7{% endblock %} 8{% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/bitbake/lib/toaster/toastergui/templates/target.html
index 65e6c4a07b..4c33eaa848 100644
--- a/bitbake/lib/toaster/toastergui/templates/target.html
+++ b/bitbake/lib/toaster/toastergui/templates/target.html
@@ -1,4 +1,5 @@
1{% extends "basebuildpage.html" %} 1{% extends "basebuildpage.html" %}
2{% block title %} Packages included - {{ target.target }} {{ target.build.machine }} - {{ target.build.project.name }} - Toaster {% endblock %}
2{% block localbreadcrumb %} 3{% block localbreadcrumb %}
3<li>{{target.target}}</li> 4<li>{{target.target}}</li>
4{% endblock localbreadcrumb%} 5{% endblock localbreadcrumb%}
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html
index 635098a024..ef628d9f9b 100644
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ b/bitbake/lib/toaster/toastergui/templates/task.html
@@ -3,6 +3,7 @@
3{% load projecttags %} 3{% load projecttags %}
4{% load humanize %} 4{% load humanize %}
5 5
6{% block title %} {{task.recipe.name}}_{{task.recipe.version}} {{task.task_name}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
6{% block localbreadcrumb %} 7{% block localbreadcrumb %}
7<li><a href="{% url 'tasks' build.pk %}">Tasks</a></li> 8<li><a href="{% url 'tasks' build.pk %}">Tasks</a></li>
8<li>{{task.recipe.name}}_{{task.recipe.version}} {{task.task_name}}</li> 9<li>{{task.recipe.name}}_{{task.recipe.version}} {{task.task_name}}</li>
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html
index b18b5c7c46..353410f92a 100644
--- a/bitbake/lib/toaster/toastergui/templates/tasks.html
+++ b/bitbake/lib/toaster/toastergui/templates/tasks.html
@@ -1,33 +1,34 @@
1{% extends "basebuildpage.html" %} 1{% extends "basebuildpage.html" %}
2{% load projecttags %} 2{% load projecttags %}
3 3
4{% block title %} {{mainheading}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster{% endblock %}
4{% block localbreadcrumb %} 5{% block localbreadcrumb %}
5<li>{{title}}</li> 6<li>{{mainheading}}</li>
6{% endblock %} 7{% endblock %}
7 8
8{% block nav-tasks %} 9{% block nav-tasks %}
9 {% if 'Tasks' == title %} 10 {% if 'Tasks' == mainheading %}
10 <li class="active"><a href="{% url 'tasks' build.pk %}">Tasks</a></li> 11 <li class="active"><a href="{% url 'tasks' build.pk %}">Tasks</a></li>
11 {% else %} 12 {% else %}
12 <li><a href="{% url 'tasks' build.pk %}">Tasks</a></li> 13 <li><a href="{% url 'tasks' build.pk %}">Tasks</a></li>
13 {% endif %} 14 {% endif %}
14{% endblock %} 15{% endblock %}
15{% block nav-buildtime %} 16{% block nav-buildtime %}
16 {% if 'Time' == title %} 17 {% if 'Time' == mainheading %}
17 <li class="active"><a href="{% url 'buildtime' build.pk %}">Time</a></li> 18 <li class="active"><a href="{% url 'buildtime' build.pk %}">Time</a></li>
18 {% else %} 19 {% else %}
19 <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> 20 <li><a href="{% url 'buildtime' build.pk %}">Time</a></li>
20 {% endif %} 21 {% endif %}
21{% endblock %} 22{% endblock %}
22{% block nav-cpuusage %} 23{% block nav-cpuusage %}
23 {% if 'CPU usage' == title %} 24 {% if 'CPU usage' == mainheading %}
24 <li class="active"><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> 25 <li class="active"><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li>
25 {% else %} 26 {% else %}
26 <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> 27 <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li>
27 {% endif %} 28 {% endif %}
28{% endblock %} 29{% endblock %}
29{% block nav-diskio %} 30{% block nav-diskio %}
30 {% if 'Disk I/O' == title %} 31 {% if 'Disk I/O' == mainheading %}
31 <li class="active"><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> 32 <li class="active"><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li>
32 {% else %} 33 {% else %}
33 <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> 34 <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li>
@@ -39,7 +40,7 @@
39{% if not request.GET.filter and not request.GET.search and not objects.paginator.count %} 40{% if not request.GET.filter and not request.GET.search and not objects.paginator.count %}
40 <!-- Empty - no data in database --> 41 <!-- Empty - no data in database -->
41 <div class="page-header"> 42 <div class="page-header">
42 <h1>{{title}}</h1> 43 <h1>{{mainheading}}</h1>
43 </div> 44 </div>
44 <div class="alert alert-info lead"> 45 <div class="alert alert-info lead">
45 No data was recorded for this build. 46 No data was recorded for this build.
@@ -54,7 +55,7 @@
54 {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %} 55 {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %}
55 No tasks found 56 No tasks found
56 {%else%} 57 {%else%}
57 {{title}} 58 {{mainheading}}
58 {%endif%} 59 {%endif%}
59 </h1> 60 </h1>
60 </div> 61 </div>
diff --git a/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html b/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
index b9f8fee037..0301a6c608 100644
--- a/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
+++ b/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
@@ -3,6 +3,8 @@
3{% load humanize %} 3{% load humanize %}
4{% load static %} 4{% load static %}
5 5
6{% block title %} Build artifact no longer exists - Toaster {% endblock %}
7
6{% block pagecontent %} 8{% block pagecontent %}
7 9
8<div class="row-fluid air"> 10<div class="row-fluid air">
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 6ebb6a927a..0e255f1b86 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -1236,7 +1236,7 @@ def tasks_common(request, build_id, variant, task_anchor):
1236 context = { 'objectname': variant, 1236 context = { 'objectname': variant,
1237 'object_search_display': object_search_display, 1237 'object_search_display': object_search_display,
1238 'filter_search_display': filter_search_display, 1238 'filter_search_display': filter_search_display,
1239 'title': title_variant, 1239 'mainheading': title_variant,
1240 'build': build, 1240 'build': build,
1241 'objects': task_objects, 1241 'objects': task_objects,
1242 'default_orderby' : orderby, 1242 'default_orderby' : orderby,
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-01 16:06:29 +0000