From 1ab8827d684a19a70f3b788aed2327bf30edffe2 Mon Sep 17 00:00:00 2001 From: Belen Barros Pena Date: Wed, 28 Oct 2015 14:22:05 +0000 Subject: 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. Signed-off-by: Belen Barros Pena Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- lib/toaster/toastergui/templates/base.html | 4 +++- lib/toaster/toastergui/templates/baseprojectpage.html | 3 +++ lib/toaster/toastergui/templates/bpackage.html | 1 + lib/toaster/toastergui/templates/builddashboard.html | 1 + lib/toaster/toastergui/templates/builds.html | 1 + lib/toaster/toastergui/templates/configuration.html | 1 + lib/toaster/toastergui/templates/configvars.html | 1 + lib/toaster/toastergui/templates/dirinfo.html | 1 + lib/toaster/toastergui/templates/importlayer.html | 1 + lib/toaster/toastergui/templates/landing.html | 1 + lib/toaster/toastergui/templates/landing_not_managed.html | 2 ++ lib/toaster/toastergui/templates/layerdetails.html | 1 + lib/toaster/toastergui/templates/newproject.html | 3 +++ lib/toaster/toastergui/templates/package_detail_base.html | 11 +++++++++-- .../templates/package_included_dependencies.html | 4 ++-- .../toastergui/templates/package_included_detail.html | 4 ++-- .../templates/package_included_reverse_dependencies.html | 4 ++-- lib/toaster/toastergui/templates/project.html | 1 + lib/toaster/toastergui/templates/projectbuilds.html | 2 +- lib/toaster/toastergui/templates/projectconf.html | 2 +- lib/toaster/toastergui/templates/projects.html | 2 ++ lib/toaster/toastergui/templates/recipe.html | 1 + lib/toaster/toastergui/templates/recipes.html | 1 + lib/toaster/toastergui/templates/target.html | 1 + lib/toaster/toastergui/templates/task.html | 1 + lib/toaster/toastergui/templates/tasks.html | 15 ++++++++------- .../toastergui/templates/unavailable_artifact.html | 2 ++ lib/toaster/toastergui/views.py | 2 +- 28 files changed, 55 insertions(+), 19 deletions(-) diff --git a/lib/toaster/toastergui/templates/base.html b/lib/toaster/toastergui/templates/base.html index dfa6bba70..11ac2a035 100644 --- a/lib/toaster/toastergui/templates/base.html +++ b/lib/toaster/toastergui/templates/base.html @@ -4,7 +4,9 @@ {% load project_url_tag %} - {% if objectname %} {{objectname|title}} - {% endif %}Toaster + + {% block title %} Toaster {% endblock %} + diff --git a/lib/toaster/toastergui/templates/baseprojectpage.html b/lib/toaster/toastergui/templates/baseprojectpage.html index 88bf8599e..1f45be462 100644 --- a/lib/toaster/toastergui/templates/baseprojectpage.html +++ b/lib/toaster/toastergui/templates/baseprojectpage.html @@ -1,6 +1,9 @@ {% extends "base.html" %} {% load projecttags %} {% load humanize %} + +{% block title %} {{title}} - {{project.name}} - Toaster {% endblock %} + {% block pagecontent %} {% include "projecttopbar.html" %} diff --git a/lib/toaster/toastergui/templates/bpackage.html b/lib/toaster/toastergui/templates/bpackage.html index d775fec73..81973cbc6 100644 --- a/lib/toaster/toastergui/templates/bpackage.html +++ b/lib/toaster/toastergui/templates/bpackage.html @@ -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 %}
  • Packages
    • {% endblock %} diff --git a/lib/toaster/toastergui/templates/builddashboard.html b/lib/toaster/toastergui/templates/builddashboard.html index c39fe3457..323bbbb6e 100644 --- a/lib/toaster/toastergui/templates/builddashboard.html +++ b/lib/toaster/toastergui/templates/builddashboard.html @@ -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}} diff --git a/lib/toaster/toastergui/templates/builds.html b/lib/toaster/toastergui/templates/builds.html index 459fcb074..a27a12191 100644 --- a/lib/toaster/toastergui/templates/builds.html +++ b/lib/toaster/toastergui/templates/builds.html @@ -5,6 +5,7 @@ {% load project_url_tag %} {% load humanize %} +{% block title %} All builds - Toaster {% endblock %} {% block extraheadcontent %} diff --git a/lib/toaster/toastergui/templates/configuration.html b/lib/toaster/toastergui/templates/configuration.html index 3e489918d..85d6a622a 100644 --- a/lib/toaster/toastergui/templates/configuration.html +++ b/lib/toaster/toastergui/templates/configuration.html @@ -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 %}
  • Configuration
    • {% endblock %} diff --git a/lib/toaster/toastergui/templates/configvars.html b/lib/toaster/toastergui/templates/configvars.html index 8a572ae39..e40c225a3 100644 --- a/lib/toaster/toastergui/templates/configvars.html +++ b/lib/toaster/toastergui/templates/configvars.html @@ -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 %}
  • Configuration
    • {% endblock %} diff --git a/lib/toaster/toastergui/templates/dirinfo.html b/lib/toaster/toastergui/templates/dirinfo.html index 7819894b6..ecb46bf7a 100644 --- a/lib/toaster/toastergui/templates/dirinfo.html +++ b/lib/toaster/toastergui/templates/dirinfo.html @@ -1,4 +1,5 @@ {% extends "basebuildpage.html" %} +{% block title %} Directory structure - {{ target.target }} {{ build.machine }} - {{ build.project.name }} - Toaster {% endblock %} {% block extraheadcontent %} {% load static %} diff --git a/lib/toaster/toastergui/templates/importlayer.html b/lib/toaster/toastergui/templates/importlayer.html index ce3d724c8..033f0aede 100644 --- a/lib/toaster/toastergui/templates/importlayer.html +++ b/lib/toaster/toastergui/templates/importlayer.html @@ -2,6 +2,7 @@ {% load projecttags %} {% load humanize %} {% load static %} +{% block title %} Import layer - {{project.name}} - Toaster {% endblock %} {% block pagecontent %} {% include "projecttopbar.html" %} diff --git a/lib/toaster/toastergui/templates/landing.html b/lib/toaster/toastergui/templates/landing.html index 65d8c3c62..cafaa1afa 100644 --- a/lib/toaster/toastergui/templates/landing.html +++ b/lib/toaster/toastergui/templates/landing.html @@ -4,6 +4,7 @@ {% load projecttags %} {% load humanize %} +{% block title %} Welcome to Toaster {% endblock %} {% block pagecontent %} {% if BUILD_MODE %} diff --git a/lib/toaster/toastergui/templates/landing_not_managed.html b/lib/toaster/toastergui/templates/landing_not_managed.html index 5bc435d14..9b37f5530 100644 --- a/lib/toaster/toastergui/templates/landing_not_managed.html +++ b/lib/toaster/toastergui/templates/landing_not_managed.html @@ -4,6 +4,8 @@ {% load projecttags %} {% load humanize %} +{% block title %} Welcome to Toaster {% endblock %} + {% block pagecontent %}
    diff --git a/lib/toaster/toastergui/templates/layerdetails.html b/lib/toaster/toastergui/templates/layerdetails.html index 7dd3db27a..7fe365da3 100644 --- a/lib/toaster/toastergui/templates/layerdetails.html +++ b/lib/toaster/toastergui/templates/layerdetails.html @@ -3,6 +3,7 @@ {% load humanize %} {% load static %} +{% block title %} {{layerversion.layer.name}} - {{project.name}} - Toaster {% endblock %} {% block pagecontent %}
    diff --git a/lib/toaster/toastergui/templates/newproject.html b/lib/toaster/toastergui/templates/newproject.html index 997390bcf..e83b2bea6 100644 --- a/lib/toaster/toastergui/templates/newproject.html +++ b/lib/toaster/toastergui/templates/newproject.html @@ -1,6 +1,9 @@ {% extends "base.html" %} {% load projecttags %} {% load humanize %} + +{% block title %} Create a new project - Toaster {% endblock %} + {% block pagecontent %}
    diff --git a/lib/toaster/toastergui/templates/package_detail_base.html b/lib/toaster/toastergui/templates/package_detail_base.html index a24bc8e43..9fa28a8f8 100644 --- a/lib/toaster/toastergui/templates/package_detail_base.html +++ b/lib/toaster/toastergui/templates/package_detail_base.html @@ -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 %} ({{target.target}}) -{% endblock title %} +{% endblock %} {% block tabcontent %} {% with packageFileCount=package.buildfilelist_package.count %} diff --git a/lib/toaster/toastergui/templates/package_included_detail.html b/lib/toaster/toastergui/templates/package_included_detail.html index d2aa26eef..568e2f235 100644 --- a/lib/toaster/toastergui/templates/package_included_detail.html +++ b/lib/toaster/toastergui/templates/package_included_detail.html @@ -1,7 +1,7 @@ {% extends "package_detail_base.html" %} {% load projecttags %} -{% block title %} +{% block mainheading %}

    {{package.fullpackagespec}} ({{target.target}})

    -{% endblock title %} +{% endblock %} {% block tabcontent %} {% with packageFileCount=package.buildfilelist_package.count %} diff --git a/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html b/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html index 5cc8b47a6..fb310c7fc 100644 --- a/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html +++ b/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html @@ -1,13 +1,13 @@ {% extends "package_detail_base.html" %} {% load projecttags %} -{% block title %} +{% block mainheading %}

    {{package.fullpackagespec}} ({{target.target}})

    -{% endblock title %} +{% endblock %} {% block tabcontent %} {% with packageFileCount=package.buildfilelist_package.count %} diff --git a/lib/toaster/toastergui/templates/project.html b/lib/toaster/toastergui/templates/project.html index 2f978bc71..4e83981f8 100644 --- a/lib/toaster/toastergui/templates/project.html +++ b/lib/toaster/toastergui/templates/project.html @@ -4,6 +4,7 @@ {% load humanize %} {% load static %} +{% block title %} Configuration - {{project.name}} - Toaster {% endblock %} {% block projectinfomain %} diff --git a/lib/toaster/toastergui/templates/projectbuilds.html b/lib/toaster/toastergui/templates/projectbuilds.html index fde7e3b9d..bb38284aa 100644 --- a/lib/toaster/toastergui/templates/projectbuilds.html +++ b/lib/toaster/toastergui/templates/projectbuilds.html @@ -2,7 +2,7 @@ {% load projecttags %} {% load humanize %} - +{% block title %} Builds - {{project.name}} - Toaster {% endblock %} {% block extraheadcontent %} diff --git a/lib/toaster/toastergui/templates/projectconf.html b/lib/toaster/toastergui/templates/projectconf.html index 5333ec5d0..30fd03e32 100644 --- a/lib/toaster/toastergui/templates/projectconf.html +++ b/lib/toaster/toastergui/templates/projectconf.html @@ -2,7 +2,7 @@ {% load projecttags %} {% load humanize %} - +{% block title %} BitBake variables - {{project.name}} - Toaster {% endblock %} {% block projectinfomain %}

    Bitbake variables

    diff --git a/lib/toaster/toastergui/templates/projects.html b/lib/toaster/toastergui/templates/projects.html index 7c612e8c4..678a7963b 100644 --- a/lib/toaster/toastergui/templates/projects.html +++ b/lib/toaster/toastergui/templates/projects.html @@ -5,6 +5,8 @@ {% load project_url_tag %} {% load humanize %} +{% block title %} All projects - Toaster {% endblock %} + {% block pagecontent %} diff --git a/lib/toaster/toastergui/templates/recipe.html b/lib/toaster/toastergui/templates/recipe.html index b5e4192d6..c6ae2f380 100644 --- a/lib/toaster/toastergui/templates/recipe.html +++ b/lib/toaster/toastergui/templates/recipe.html @@ -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 %}
  • Recipes
  • {{object.name}}_{{object.version}}
    • diff --git a/lib/toaster/toastergui/templates/recipes.html b/lib/toaster/toastergui/templates/recipes.html index 5cdac437c..d14489346 100644 --- a/lib/toaster/toastergui/templates/recipes.html +++ b/lib/toaster/toastergui/templates/recipes.html @@ -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 %}
  • Recipes
    • {% endblock %} diff --git a/lib/toaster/toastergui/templates/target.html b/lib/toaster/toastergui/templates/target.html index 65e6c4a07..4c33eaa84 100644 --- a/lib/toaster/toastergui/templates/target.html +++ b/lib/toaster/toastergui/templates/target.html @@ -1,4 +1,5 @@ {% extends "basebuildpage.html" %} +{% block title %} Packages included - {{ target.target }} {{ target.build.machine }} - {{ target.build.project.name }} - Toaster {% endblock %} {% block localbreadcrumb %}
  • {{target.target}}
    • {% endblock localbreadcrumb%} diff --git a/lib/toaster/toastergui/templates/task.html b/lib/toaster/toastergui/templates/task.html index 635098a02..ef628d9f9 100644 --- a/lib/toaster/toastergui/templates/task.html +++ b/lib/toaster/toastergui/templates/task.html @@ -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 %}
  • Tasks
  • {{task.recipe.name}}_{{task.recipe.version}} {{task.task_name}}
    • diff --git a/lib/toaster/toastergui/templates/tasks.html b/lib/toaster/toastergui/templates/tasks.html index b18b5c7c4..353410f92 100644 --- a/lib/toaster/toastergui/templates/tasks.html +++ b/lib/toaster/toastergui/templates/tasks.html @@ -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 %} -
  • {{title}}
    • +
  • {{mainheading}}
    • {% endblock %} {% block nav-tasks %} - {% if 'Tasks' == title %} + {% if 'Tasks' == mainheading %}
  • Tasks
    • {% else %}
  • Tasks
    • {% endif %} {% endblock %} {% block nav-buildtime %} - {% if 'Time' == title %} + {% if 'Time' == mainheading %}
  • Time
    • {% else %}
  • Time
    • {% endif %} {% endblock %} {% block nav-cpuusage %} - {% if 'CPU usage' == title %} + {% if 'CPU usage' == mainheading %}
  • CPU usage
    • {% else %}
  • CPU usage
    • {% endif %} {% endblock %} {% block nav-diskio %} - {% if 'Disk I/O' == title %} + {% if 'Disk I/O' == mainheading %}
  • Disk I/O
    • {% else %}
  • Disk I/O
    • @@ -39,7 +40,7 @@ {% if not request.GET.filter and not request.GET.search and not objects.paginator.count %}
    -

    {{title}}

    +

    {{mainheading}}

    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%}
    diff --git a/lib/toaster/toastergui/templates/unavailable_artifact.html b/lib/toaster/toastergui/templates/unavailable_artifact.html index b9f8fee03..0301a6c60 100644 --- a/lib/toaster/toastergui/templates/unavailable_artifact.html +++ b/lib/toaster/toastergui/templates/unavailable_artifact.html @@ -3,6 +3,8 @@ {% load humanize %} {% load static %} +{% block title %} Build artifact no longer exists - Toaster {% endblock %} + {% block pagecontent %}
    diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index 6ebb6a927..0e255f1b8 100755 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -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, -- cgit 1.2.3-korg