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_dependencies.html | |
parent | c07a294e30e09926a07081ebc275c1766304ce38 (diff) | |
download | ast2050-yocto-poky-14a84434a1c76f5d0bef7a75f2c7529a9ff166cf.zip ast2050-yocto-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_dependencies.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html index c76774a..e06e073 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html +++ b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html @@ -2,13 +2,15 @@ {% load projecttags %} {% block title %} - {% with fullPackageSpec=package.name|add:"_"|add:package.version|add:"-"|add:package.revision|filtered_packagespec %} - <h1>{{fullPackageSpec}} <small>({{target.target}})</small></h1> - {% endwith %} + <h1> + {{package.fullpackagespec}} + <script> fmtAliasHelp("{{package.name}}", "{{package.alias}}", false) </script> + <small>({{target.target}})</small> + </h1> {% endblock title %} {% block tabcontent %} - {% with fullPackageSpec=package.name|add:"_"|add:package.version|add:"-"|add:package.revision|filtered_packagespec packageFileCount=package.buildfilelist_package.count %} + {% with packageFileCount=package.buildfilelist_package.count %} {% include "package_included_tabs.html" with active_tab="dependencies" %} <div class="tab-content"> <div class="tab-pane active" id="dependencies"> @@ -29,22 +31,22 @@ <a href="{% url 'package_included_detail' build.id target.id runtime_dep.depends_on_id %}"> {{runtime_dep.name}} </a> + <script>fmtAliasHelp("{{runtime_dep.name}}", "{{runtime_dep.alias}}", true)</script> </td> {% else %} <td> {{runtime_dep.name|format_vpackage_namehelp}} </td> {% endif %} - - <td>{{runtime_dep.version}}</td> - <td>{{runtime_dep.size|filtered_filesizeformat}}</td> + <td>{{runtime_dep.version}} </td> + <td>{{runtime_dep.size|filtered_filesizeformat}} </td> </tr> {% endfor %} - </tbody> + </tbody> </table> {% else %} <div class="alert alert-info"> - <strong>{{fullPackageSpec}}</strong> has no runtime dependencies. + <strong>{{package.fullpackagespec}}</strong> has no runtime dependencies. </div> {% endifnotequal %} @@ -61,7 +63,7 @@ Relationship type </th> </tr> - </thead> + </thead> <tbody> {% for other_dep in other_deps %} {% if other_dep.installed %} @@ -70,6 +72,9 @@ <td> <a href="{% url 'package_included_detail' build.id target.id other_dep.depends_on_id %}"> {{other_dep.name}} + <script> + fmtAliasHelp("{{other_dep.name}}","{{other_dep.alias}}", true) + </script> </a> </td> {% else %} @@ -77,8 +82,8 @@ {{other_dep.name|format_vpackage_namehelp}} </td> {% endif %} - <td>{{other_dep.version}}</td> - <td>{{other_dep.size|filtered_filesizeformat}}</td> + <td>{{other_dep.version}} </td> + <td>{{other_dep.size|filtered_filesizeformat}} </td> <td> {{other_dep.dep_type_display}} <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> @@ -96,7 +101,7 @@ </tr> {% endif %} {% endfor %} - </tbody> + </tbody> </table> {% endifnotequal %} </div> <!-- end tab-pane --> |