From 6dd5e472eb244a1c74601d0fe3552bb1031b53ec Mon Sep 17 00:00:00 2001 From: Belen Barros Pena Date: Thu, 26 Mar 2015 16:47:02 +0000 Subject: bitbake: toasterui: rename 'targets' to 'recipes' A recent round of informal user feedback has revealed that the term 'target' is quite problematic. For all the users we spoke to the word refers to the target arch. In Toaster, it refers to the software you build. This patch replaces the word 'target' with 'recipe' across the Toaster interface. This is by no means self-explanatory, but at least it cannot be confused with target hardware, and it is also consistent with the terminology we use in the analysis portion of the interface. (Bitbake rev: ac10b5d83172feb10f1f3a3c894a54d2c4c4f09d) Signed-off-by: Belen Barros Pena Signed-off-by: Richard Purdie --- .../toaster/toastergui/static/js/layerdetails.js | 2 +- bitbake/lib/toaster/toastergui/templates/base.html | 4 ++-- .../toaster/toastergui/templates/layerdetails.html | 16 ++++++++-------- .../lib/toaster/toastergui/templates/project.html | 22 +++++++++++----------- .../lib/toaster/toastergui/templates/targets.html | 16 ++++++++-------- bitbake/lib/toaster/toastergui/views.py | 18 +++++++++--------- 6 files changed, 39 insertions(+), 39 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js index 5b7787728d..bac60c4512 100644 --- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js +++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js @@ -155,7 +155,7 @@ function layerDetailsPageInit (ctx) { if (!ctx.layerVersion.inCurrentPrj){ if (ctx.numTargets > 0) { var text = " Add the "+ctx.layerVersion.name+" layer to your project "+ - "to enable these targets"; + "to enable these recipes"; addRmLayerBtn.text(text); addRmLayerBtn.prepend(""); } else { diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index 2535f70af8..58392b36f5 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html @@ -100,9 +100,9 @@

View project configuration

  • -
    Target(s):
    +
    Recipe(s):
    - + diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 11b1ffc2dc..0d3aa15373 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html @@ -84,7 +84,7 @@ Layer details
  • - Targets ({{total_targets}}) + Recipes ({{total_targets}})
  • Machines ({{total_machines}}) @@ -190,8 +190,8 @@
    {% if total_targets == 0 %}
    -

    Toaster does not have target information for the {{layerversion.layer.name}} layer.

    -

    Toaster learns about layers when you build them. If this layer provides any targets, they will be listed here after you build the {{layerversion.layer.name}} layer.

    +

    Toaster does not have recipe information for the {{layerversion.layer.name}} layer.

    +

    Toaster learns about layers when you build them. If this layer provides any recipes, they will be listed here after you build the {{layerversion.layer.name}} layer.

    {% else %} @@ -210,7 +210,7 @@ {% endif %} - + {% if request.GET.targets_search %} @@ -253,17 +253,17 @@ - Target + Recipe {% if request.GET.targets_search %} {{targets.paginator.count}} {% endif %} - Target version + Recipe version Summary - Build target + Build recipe @@ -277,7 +277,7 @@ {{target.version}} {{target.summary}} - + {% endfor %} diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 9d51a57208..5f8f4d1bc7 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html @@ -104,15 +104,15 @@ vim: expandtab tabstop=2
    - +
    - +

    - View all compatible targets - + View all compatible recipes + {% if completedbuilds.count %} | View all project builds ({{completedbuilds.count}}) {% endif %} @@ -309,24 +309,24 @@ vim: expandtab tabstop=2

    - Targets - + Recipes +

    - +
    {% csrf_token %}

    - View all compatible targets - + View all compatible recipes +

    - Most built targets + Most built recipes

    • @@ -335,7 +335,7 @@ vim: expandtab tabstop=2
    - +
    diff --git a/bitbake/lib/toaster/toastergui/templates/targets.html b/bitbake/lib/toaster/toastergui/templates/targets.html index 6f59a6cdab..c27292095d 100644 --- a/bitbake/lib/toaster/toastergui/templates/targets.html +++ b/bitbake/lib/toaster/toastergui/templates/targets.html @@ -3,20 +3,20 @@ {% load humanize %} {% block localbreadcrumb %} -
  • All compatible targets
    • +
  • All compatible recipes
    • {% endblock %} {% block projectinfomain %}

    {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %} - {{objects.paginator.count}} target{{objects.paginator.count|pluralize}} found + {{objects.paginator.count}} recipe{{objects.paginator.count|pluralize}} found {% elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %} - No targets found + No recipes found {%else%} - All compatible targets + All compatible recipes {%endif%} - +

    @@ -31,13 +31,13 @@
    {% if request.GET.search %}{% endif %} - +
    {% else %}
    -

    Toaster has no target information. To generate target information you can:

    +

    Toaster has no recipe information. To generate recipe information you can: