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_included_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_included_detail.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/package_included_detail.html | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_detail.html b/bitbake/lib/toaster/toastergui/templates/package_included_detail.html index ce4f1cb33c..e89ebdf58c 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_included_detail.html +++ b/bitbake/lib/toaster/toastergui/templates/package_included_detail.html | |||
@@ -2,13 +2,17 @@ | |||
2 | {% load projecttags %} | 2 | {% load projecttags %} |
3 | 3 | ||
4 | {% block title %} | 4 | {% block title %} |
5 | {% with fullPackageSpec=package.name|add:"_"|add:package.version|add:"-"|add:package.revision|filtered_packagespec %} | 5 | <h1> |
6 | <h1>{{fullPackageSpec}} <small>({{target.target}})</small></h1> | 6 | {{package.fullpackagespec}} |
7 | {% endwith %} | 7 | <script> |
8 | fmtAliasHelp("{{package.name}}", "{{package.alias}}", false) | ||
9 | </script> | ||
10 | <small>({{target.target}})</small> | ||
11 | </h1> | ||
8 | {% endblock title %} | 12 | {% endblock title %} |
9 | 13 | ||
10 | {% block tabcontent %} | 14 | {% block tabcontent %} |
11 | {% with fullPackageSpec=package.name|add:"_"|add:package.version|add:"-"|add:package.revision|filtered_packagespec packageFileCount=package.buildfilelist_package.count %} | 15 | {% with packageFileCount=package.buildfilelist_package.count %} |
12 | {% include "package_included_tabs.html" with active_tab="detail" %} | 16 | {% include "package_included_tabs.html" with active_tab="detail" %} |
13 | <div class="tab-content"> | 17 | <div class="tab-content"> |
14 | <div class="tab-pane active" id="files"> | 18 | <div class="tab-pane active" id="files"> |
@@ -36,7 +40,7 @@ | |||
36 | 40 | ||
37 | {% else %} | 41 | {% else %} |
38 | <div class="alert alert-info"> | 42 | <div class="alert alert-info"> |
39 | <strong>{{fullPackageSpec}}</strong> does not generate any files. | 43 | <strong>{{package.fullpackagespec}}</strong> does not generate any files. |
40 | </div> | 44 | </div> |
41 | {% endif %} | 45 | {% endif %} |
42 | </div> <!-- end tab-pane --> | 46 | </div> <!-- end tab-pane --> |