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_detail.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_detail.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/package_built_detail.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_detail.html b/bitbake/lib/toaster/toastergui/templates/package_built_detail.html index d8f0b75381..6ccd4056cb 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_built_detail.html +++ b/bitbake/lib/toaster/toastergui/templates/package_built_detail.html | |||
@@ -2,7 +2,7 @@ | |||
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 packageFileCount=package.buildfilelist_package.count %} | 5 | {% with packageFileCount=package.buildfilelist_package.count %} |
6 | <!-- Generated Files --> | 6 | <!-- Generated Files --> |
7 | {% if package.buildtargetlist_package.count == 0 %} | 7 | {% if package.buildtargetlist_package.count == 0 %} |
8 | {# Not included case #} | 8 | {# Not included case #} |
@@ -21,7 +21,7 @@ | |||
21 | <!-- Package file list or if empty, alert pane --> | 21 | <!-- Package file list or if empty, alert pane --> |
22 | {% if packageFileCount > 0 %} | 22 | {% if packageFileCount > 0 %} |
23 | <div class="alert alert-info"> | 23 | <div class="alert alert-info"> |
24 | {{fullPackageSpec}} is <strong>not included</strong> in any image. These are the files that would be added to an image root file system if you were to include it in future builds. | 24 | {{package.fullpackagespec}} is <strong>not included</strong> in any image. These are the files that would be added to an image root file system if you were to include it in future builds. |
25 | </div> | 25 | </div> |
26 | <table class="table table-bordered table-hover"> | 26 | <table class="table table-bordered table-hover"> |
27 | <thead> | 27 | <thead> |
@@ -29,7 +29,7 @@ | |||
29 | <th>File</th> | 29 | <th>File</th> |
30 | <th>Size</th> | 30 | <th>Size</th> |
31 | </tr> | 31 | </tr> |
32 | </thead> | 32 | </thead> |
33 | <tbody> | 33 | <tbody> |
34 | {% for file in package.buildfilelist_package.all|dictsort:"path" %} | 34 | {% for file in package.buildfilelist_package.all|dictsort:"path" %} |
35 | <tr> | 35 | <tr> |
@@ -42,7 +42,7 @@ | |||
42 | 42 | ||
43 | {% else %} | 43 | {% else %} |
44 | <div class="alert alert-info"> | 44 | <div class="alert alert-info"> |
45 | <strong>{{fullPackageSpec}}</strong> does not generate any files. | 45 | <strong>{{package.fullpackagespec}}</strong> does not generate any files. |
46 | </div> | 46 | </div> |
47 | {% endif %} | 47 | {% endif %} |
48 | 48 | ||