sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Belen Barros Pena 2015-10-28 14:22:05 +00:00 committed by Richard Purdie
parent 5724b2a651
commit 66d3c353f8
28 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitbake/lib/toaster/toastergui/templates/base.html
View File

@ -4,7 +4,9 @@
{% load project_url_tag %}
<html lang="en">
<head>
<title>{% if objectname %} {{objectname|title}} - {% endif %}Toaster</title>
<title>
{% block title %} Toaster {% endblock %}
</title>
<link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css"/>
<link rel="stylesheet" href="{% static 'css/bootstrap-responsive.min.css' %}" type='text/css'/>
<link rel="stylesheet" href="{% static 'css/font-awesome.min.css' %}" type='text/css'/>

3
bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
View File

@ -1,6 +1,9 @@
{% extends "base.html" %}
{% load projecttags %}
{% load humanize %}
{% block title %} {{title}} - {{project.name}} - Toaster {% endblock %}
{% block pagecontent %}
{% include "projecttopbar.html" %}

1
bitbake/lib/toaster/toastergui/templates/bpackage.html
View File

@ -2,6 +2,7 @@
{% load projecttags %}
{% block title %} Packages built - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
{% block localbreadcrumb %}
<li>Packages</li>
{% endblock %}

1
bitbake/lib/toaster/toastergui/templates/builddashboard.html
View File

@ -2,6 +2,7 @@
{% load humanize %}
{% load projecttags %}
{% block title %} {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
{% block parentbreadcrumb %}
{% if build.get_sorted_target_list.count > 0 %}
{{build.get_sorted_target_list.0.target}}

1
bitbake/lib/toaster/toastergui/templates/builds.html
View File

@ -5,6 +5,7 @@
{% load project_url_tag %}
{% load humanize %}
{% block title %} All builds - Toaster {% endblock %}
{% block extraheadcontent %}
<link rel="stylesheet" href="/static/css/jquery-ui.min.css" type='text/css'>
<link rel="stylesheet" href="/static/css/jquery-ui.structure.min.css" type='text/css'>

1
bitbake/lib/toaster/toastergui/templates/configuration.html
View File

@ -1,6 +1,7 @@
{% extends "basebuildpage.html" %}
{% load projecttags %}
{% block title %} Configuration summary - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
{% block localbreadcrumb %}
<li>Configuration</li>
{% endblock %}

1
bitbake/lib/toaster/toastergui/templates/configvars.html
View File

@ -1,6 +1,7 @@
{% extends "basebuildpage.html" %}
{% load projecttags %}
{% block title %} BitBake variables - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
{% block localbreadcrumb %}
<li>Configuration</li>
{% endblock %}

1
bitbake/lib/toaster/toastergui/templates/dirinfo.html
View File

@ -1,4 +1,5 @@
{% extends "basebuildpage.html" %}
{% block title %} Directory structure - {{ target.target }} {{ build.machine }} - {{ build.project.name }} - Toaster {% endblock %}
{% block extraheadcontent %}
{% load static %}
<link rel="stylesheet" href="{% static 'css/jquery.treetable.css' %}" type="text/css">

1
bitbake/lib/toaster/toastergui/templates/importlayer.html
View File

@ -2,6 +2,7 @@
{% load projecttags %}
{% load humanize %}
{% load static %}
{% block title %} Import layer - {{project.name}} - Toaster {% endblock %}
{% block pagecontent %}
{% include "projecttopbar.html" %}

1
bitbake/lib/toaster/toastergui/templates/landing.html
View File

@ -4,6 +4,7 @@
{% load projecttags %}
{% load humanize %}
{% block title %} Welcome to Toaster {% endblock %}
{% block pagecontent %}
{% if BUILD_MODE %}

2
bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
View File

@ -4,6 +4,8 @@
{% load projecttags %}
{% load humanize %}
{% block title %} Welcome to Toaster {% endblock %}
{% block pagecontent %}
<div class="container-fluid">

1
bitbake/lib/toaster/toastergui/templates/layerdetails.html
View File

@ -3,6 +3,7 @@
{% load humanize %}
{% load static %}
{% block title %} {{layerversion.layer.name}} - {{project.name}} - Toaster {% endblock %}
{% block pagecontent %}
<div class="section">

3
bitbake/lib/toaster/toastergui/templates/newproject.html
View File

@ -1,6 +1,9 @@
{% extends "base.html" %}
{% load projecttags %}
{% load humanize %}
{% block title %} Create a new project - Toaster {% endblock %}
{% block pagecontent %}
<div class="row-fluid">
<div class="page-header">

11
bitbake/lib/toaster/toastergui/templates/package_detail_base.html
View File

@ -1,6 +1,13 @@
{% extends "basebuilddetailpage.html" %}
{% load projecttags %}
{% block title %}
{% if target %}
{{package.fullpackagespec}} - {{ target.target }} {{ build.machine }} - {{ build.project.name }} - Toaster
{% else %}
{{package.fullpackagespec}} - {{ build.target_set.all|dictsort:"target"|join:", " }} {{ build.machine }} - {{ build.project.name }} - Toaster
{% endif %}
{% endblock %}
{% block extraheadcontent %}
<!-- functions to format package 'installed_package' alias -->
<script>
@ -38,9 +45,9 @@
{% block pagedetailinfomain %}
<div class="row span11">
<div class="page-header">
{% block title %}
{% block mainheading %}
<h1>{{package.fullpackagespec}}</h1>
{% endblock title %}
{% endblock %}
</div> <!-- page-header -->
</div> <!-- row span11 page-header -->

4
bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
View File

@ -1,13 +1,13 @@
{% extends "package_detail_base.html" %}
{% load projecttags %}
{% block title %}
{% block mainheading %}
<h1>
{{package.fullpackagespec}}
<script> fmtAliasHelp("{{package.name}}", "{{package.alias}}", false) </script>
<small>({{target.target}})</small>
</h1>
{% endblock title %}
{% endblock %}
{% block tabcontent %}
{% with packageFileCount=package.buildfilelist_package.count %}

4
bitbake/lib/toaster/toastergui/templates/package_included_detail.html
View File

@ -1,7 +1,7 @@
{% extends "package_detail_base.html" %}
{% load projecttags %}
{% block title %}
{% block mainheading %}
<h1>
{{package.fullpackagespec}}
<script>
@ -9,7 +9,7 @@
</script>
<small>({{target.target}})</small>
</h1>
{% endblock title %}
{% endblock %}
{% block tabcontent %}
{% with packageFileCount=package.buildfilelist_package.count %}

4
bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
View File

@ -1,13 +1,13 @@
{% extends "package_detail_base.html" %}
{% load projecttags %}
{% block title %}
{% block mainheading %}
<h1>
{{package.fullpackagespec}}
<script> fmtAliasHelp("{{package.name}}", "{{package.alias}}", false) </script>
<small>({{target.target}})</small>
</h1>
{% endblock title %}
{% endblock %}
{% block tabcontent %}
{% with packageFileCount=package.buildfilelist_package.count %}

1
bitbake/lib/toaster/toastergui/templates/project.html
View File

@ -4,6 +4,7 @@
{% load humanize %}
{% load static %}
{% block title %} Configuration - {{project.name}} - Toaster {% endblock %}
{% block projectinfomain %}
<script src="{% static 'js/layerDepsModal.js' %}"></script>

2
bitbake/lib/toaster/toastergui/templates/projectbuilds.html
View File

@ -2,7 +2,7 @@
{% load projecttags %}
{% load humanize %}
{% block title %} Builds - {{project.name}} - Toaster {% endblock %}
{% block extraheadcontent %}
<link rel="stylesheet" href="/static/css/jquery-ui.min.css" type='text/css'>
<link rel="stylesheet" href="/static/css/jquery-ui.structure.min.css" type='text/css'>

2
bitbake/lib/toaster/toastergui/templates/projectconf.html
View File

@ -2,7 +2,7 @@
{% load projecttags %}
{% load humanize %}
{% block title %} BitBake variables - {{project.name}} - Toaster {% endblock %}
{% block projectinfomain %}
<h2>Bitbake variables</h2>

2
bitbake/lib/toaster/toastergui/templates/projects.html
View File

@ -5,6 +5,8 @@
{% load project_url_tag %}
{% load humanize %}
{% block title %} All projects - Toaster {% endblock %}
{% block pagecontent %}

1
bitbake/lib/toaster/toastergui/templates/recipe.html
View File

@ -2,6 +2,7 @@
{% load projecttags %}
{% block title %} {{object.name}}_{{object.version}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
{% block localbreadcrumb %}
<li><a href="{% url 'recipes' build.pk %}">Recipes</a></li>
<li>{{object.name}}_{{object.version}} </li>

1
bitbake/lib/toaster/toastergui/templates/recipes.html
View File

@ -2,6 +2,7 @@
{% load projecttags %}
{% block title %} Recipes - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster {% endblock %}
{% block localbreadcrumb %}
<li>Recipes</li>
{% endblock %}

1
bitbake/lib/toaster/toastergui/templates/target.html
View File

@ -1,4 +1,5 @@
{% extends "basebuildpage.html" %}
{% block title %} Packages included - {{ target.target }} {{ target.build.machine }} - {{ target.build.project.name }} - Toaster {% endblock %}
{% block localbreadcrumb %}
<li>{{target.target}}</li>
{% endblock localbreadcrumb%}

1
bitbake/lib/toaster/toastergui/templates/task.html
View File

@ -3,6 +3,7 @@
{% load projecttags %}
{% load humanize %}
{% 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 %}
{% block localbreadcrumb %}
<li><a href="{% url 'tasks' build.pk %}">Tasks</a></li>
<li>{{task.recipe.name}}_{{task.recipe.version}} {{task.task_name}}</li>

15
bitbake/lib/toaster/toastergui/templates/tasks.html
View File

@ -1,33 +1,34 @@
{% extends "basebuildpage.html" %}
{% load projecttags %}
{% block title %} {{mainheading}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster{% endblock %}
{% block localbreadcrumb %}
<li>{{title}}</li>
<li>{{mainheading}}</li>
{% endblock %}
{% block nav-tasks %}
{% if 'Tasks' == title %}
{% if 'Tasks' == mainheading %}
<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 %}
{% if 'Time' == mainheading %}
<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 %}
{% if 'CPU usage' == mainheading %}
<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 %}
{% if 'Disk I/O' == mainheading %}
<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>
@ -39,7 +40,7 @@
{% if not request.GET.filter and not request.GET.search and not objects.paginator.count %}
<!-- Empty - no data in database -->
<div class="page-header">
<h1>{{title}}</h1>
<h1>{{mainheading}}</h1>
</div>
<div class="alert alert-info lead">
No data was recorded for this build.
@ -54,7 +55,7 @@
{%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %}
No tasks found
{%else%}
{{title}}
{{mainheading}}
{%endif%}
</h1>
</div>

2
bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
View File

@ -3,6 +3,8 @@
{% load humanize %}
{% load static %}
{% block title %} Build artifact no longer exists - Toaster {% endblock %}
{% block pagecontent %}
<div class="row-fluid air">

2
bitbake/lib/toaster/toastergui/views.py
View File

@ -1236,7 +1236,7 @@ def tasks_common(request, build_id, variant, task_anchor):
context = { 'objectname': variant,
'object_search_display': object_search_display,
'filter_search_display': filter_search_display,
'title': title_variant,
'mainheading': title_variant,
'build': build,
'objects': task_objects,
'default_orderby' : orderby,