diff options
author | Dave Lerner <dave.lerner@windriver.com> | 2014-03-24 16:37:17 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-28 13:44:52 +0000 |
commit | 14a84434a1c76f5d0bef7a75f2c7529a9ff166cf (patch) | |
tree | 1f00f4bb710398382d20aeaf56e701b328eb8765 /bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html | |
parent | c07a294e30e09926a07081ebc275c1766304ce38 (diff) | |
download | poky-14a84434a1c76f5d0bef7a75f2c7529a9ff166cf.tar.gz |
bitbake: toaster: show installed package name
[YOCTO #5922]
Implement changes that show the installed package name after the
official 'recipe-named' package name. If the alias exists and
is different than the package name, then the alias is shown as a
'muted' string after the package name in the form 'as some-alias-name'.
This formatting appears in the included package pages in the elements:
* local breadcrumbs at the top of package included pages,
* <h1> title headings along with a help bubble that is not hovering,
and
* package lists where the help bubble appears when the mouse hovers
over the row.
The changes in detail in this patch per file are:
views.py
- added function that tests whether the package object's installed_name
should be shown,
- added function that appends package name with version and revision to
encapsulate package name formatting in one place and referred to as
package.fullpackagespec,
- changed package_built* and package_included* functions to use both
of the above new formatting functions, passing the formatted values to
templates, and
- adhered to django coding styles by renaming module local
'get_package*' functions with "_" prefix.
package_detail_base.html
- added display of package aliases for included package page,
- refactored to use package.fullpackagespec, formatted by view function,
- added javascript function to format package alias with help, and
- removed trailing whitespace.
package_included_detail.html
- used javascript function above to format package alias, and
- refactored to use package.fullpackagespec.
package_included_dependencies.html
- used javascript function above to format package alias,
- refactored to use package.fullpackagespec,
- forced empty data cells following hover-help to draw borders
by appending space, and
- removed trailing whitespace.
package_included_reverse_dependencies.html
- use javascript function above to format package alias,
- refactor to use views fullpackagespe, and
- force empty data cells following hover-help to draw borders
by appending space.
package_built_detail.html
- refactored to use package.fullpackagespec, and
- removed trailing whitespace.
package_built_dependencies.html
- refactored to use package.fullpackagespec, and
- removed trailing whitespace.
projecttags.py
- removed unused filter to handle installed name
- removed extra spaces around "title = " in format_vpackage_namehelp
(Bitbake rev: c604e14df8cdb1f47535f093d7044955d4c2057d)
Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html index 4932f74c88..a2011d6fb6 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html +++ b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html | |||
@@ -2,7 +2,6 @@ | |||
2 | {% load projecttags %} | 2 | {% load projecttags %} |
3 | 3 | ||
4 | {% block tabcontent %} | 4 | {% block tabcontent %} |
5 | {% with fullPackageSpec=package.name|add:"-"|add:package.version|add:"-"|add:package.revision|filtered_packagespec %} | ||
6 | <ul class="nav nav-pills"> | 5 | <ul class="nav nav-pills"> |
7 | <li class=""> | 6 | <li class=""> |
8 | <a href="{% url 'package_built_detail' build.id package.id %}"> | 7 | <a href="{% url 'package_built_detail' build.id package.id %}"> |
@@ -21,11 +20,11 @@ | |||
21 | <div class="tab-pane active" id="dependencies"> | 20 | <div class="tab-pane active" id="dependencies"> |
22 | {% ifequal runtime_deps|length 0 %} | 21 | {% ifequal runtime_deps|length 0 %} |
23 | <div class="alert alert-info"> | 22 | <div class="alert alert-info"> |
24 | <strong>{{fullPackageSpec}}</strong> has no runtime dependencies. | 23 | <strong>{{package.fullpackagespec}}</strong> has no runtime dependencies. |
25 | </div> | 24 | </div> |
26 | {% else %} | 25 | {% else %} |
27 | <div class="alert alert-info"> | 26 | <div class="alert alert-info"> |
28 | <strong>{{fullPackageSpec}}</strong> is <strong>not included</strong> in any image. These are its projected runtime dependencies if you were to include it in future builds. | 27 | <strong>{{package.fullpackagespec}}</strong> is <strong>not included</strong> in any image. These are its projected runtime dependencies if you were to include it in future builds. |
29 | </div> | 28 | </div> |
30 | <table class="table table-bordered table-hover"> | 29 | <table class="table table-bordered table-hover"> |
31 | <thead> | 30 | <thead> |
@@ -56,7 +55,7 @@ | |||
56 | </tr> | 55 | </tr> |
57 | {% endifequal %} | 56 | {% endifequal %} |
58 | {% endfor %} | 57 | {% endfor %} |
59 | </tbody> | 58 | </tbody> |
60 | </table> | 59 | </table> |
61 | {% endifequal %} | 60 | {% endifequal %} |
62 | {% ifnotequal other_deps|length 0 %} | 61 | {% ifnotequal other_deps|length 0 %} |
@@ -72,7 +71,7 @@ | |||
72 | Relationship type | 71 | Relationship type |
73 | </th> | 72 | </th> |
74 | </tr> | 73 | </tr> |
75 | </thead> | 74 | </thead> |
76 | <tbody> | 75 | <tbody> |
77 | {% for other_dep in other_deps %} | 76 | {% for other_dep in other_deps %} |
78 | {% ifequal other_dep.version '' %} | 77 | {% ifequal other_dep.version '' %} |
@@ -106,5 +105,4 @@ | |||
106 | {% endifnotequal %} | 105 | {% endifnotequal %} |
107 | </div> <!-- tab-pane --> | 106 | </div> <!-- tab-pane --> |
108 | </div> <!-- tab-content --> | 107 | </div> <!-- tab-content --> |
109 | {% endwith %} | ||
110 | {% endblock tabcontent %} | 108 | {% endblock tabcontent %} |