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 | 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 c76774ac9c..e06e073688 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 @@ | |||
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> fmtAliasHelp("{{package.name}}", "{{package.alias}}", false) </script> |
8 | <small>({{target.target}})</small> | ||
9 | </h1> | ||
8 | {% endblock title %} | 10 | {% endblock title %} |
9 | 11 | ||
10 | {% block tabcontent %} | 12 | {% block tabcontent %} |
11 | {% with fullPackageSpec=package.name|add:"_"|add:package.version|add:"-"|add:package.revision|filtered_packagespec packageFileCount=package.buildfilelist_package.count %} | 13 | {% with packageFileCount=package.buildfilelist_package.count %} |
12 | {% include "package_included_tabs.html" with active_tab="dependencies" %} | 14 | {% include "package_included_tabs.html" with active_tab="dependencies" %} |
13 | <div class="tab-content"> | 15 | <div class="tab-content"> |
14 | <div class="tab-pane active" id="dependencies"> | 16 | <div class="tab-pane active" id="dependencies"> |
@@ -29,22 +31,22 @@ | |||
29 | <a href="{% url 'package_included_detail' build.id target.id runtime_dep.depends_on_id %}"> | 31 | <a href="{% url 'package_included_detail' build.id target.id runtime_dep.depends_on_id %}"> |
30 | {{runtime_dep.name}} | 32 | {{runtime_dep.name}} |
31 | </a> | 33 | </a> |
34 | <script>fmtAliasHelp("{{runtime_dep.name}}", "{{runtime_dep.alias}}", true)</script> | ||
32 | </td> | 35 | </td> |
33 | {% else %} | 36 | {% else %} |
34 | <td> | 37 | <td> |
35 | {{runtime_dep.name|format_vpackage_namehelp}} | 38 | {{runtime_dep.name|format_vpackage_namehelp}} |
36 | </td> | 39 | </td> |
37 | {% endif %} | 40 | {% endif %} |
38 | 41 | <td>{{runtime_dep.version}} </td> | |
39 | <td>{{runtime_dep.version}}</td> | 42 | <td>{{runtime_dep.size|filtered_filesizeformat}} </td> |
40 | <td>{{runtime_dep.size|filtered_filesizeformat}}</td> | ||
41 | </tr> | 43 | </tr> |
42 | {% endfor %} | 44 | {% endfor %} |
43 | </tbody> | 45 | </tbody> |
44 | </table> | 46 | </table> |
45 | {% else %} | 47 | {% else %} |
46 | <div class="alert alert-info"> | 48 | <div class="alert alert-info"> |
47 | <strong>{{fullPackageSpec}}</strong> has no runtime dependencies. | 49 | <strong>{{package.fullpackagespec}}</strong> has no runtime dependencies. |
48 | </div> | 50 | </div> |
49 | {% endifnotequal %} | 51 | {% endifnotequal %} |
50 | 52 | ||
@@ -61,7 +63,7 @@ | |||
61 | Relationship type | 63 | Relationship type |
62 | </th> | 64 | </th> |
63 | </tr> | 65 | </tr> |
64 | </thead> | 66 | </thead> |
65 | <tbody> | 67 | <tbody> |
66 | {% for other_dep in other_deps %} | 68 | {% for other_dep in other_deps %} |
67 | {% if other_dep.installed %} | 69 | {% if other_dep.installed %} |
@@ -70,6 +72,9 @@ | |||
70 | <td> | 72 | <td> |
71 | <a href="{% url 'package_included_detail' build.id target.id other_dep.depends_on_id %}"> | 73 | <a href="{% url 'package_included_detail' build.id target.id other_dep.depends_on_id %}"> |
72 | {{other_dep.name}} | 74 | {{other_dep.name}} |
75 | <script> | ||
76 | fmtAliasHelp("{{other_dep.name}}","{{other_dep.alias}}", true) | ||
77 | </script> | ||
73 | </a> | 78 | </a> |
74 | </td> | 79 | </td> |
75 | {% else %} | 80 | {% else %} |
@@ -77,8 +82,8 @@ | |||
77 | {{other_dep.name|format_vpackage_namehelp}} | 82 | {{other_dep.name|format_vpackage_namehelp}} |
78 | </td> | 83 | </td> |
79 | {% endif %} | 84 | {% endif %} |
80 | <td>{{other_dep.version}}</td> | 85 | <td>{{other_dep.version}} </td> |
81 | <td>{{other_dep.size|filtered_filesizeformat}}</td> | 86 | <td>{{other_dep.size|filtered_filesizeformat}} </td> |
82 | <td> | 87 | <td> |
83 | {{other_dep.dep_type_display}} | 88 | {{other_dep.dep_type_display}} |
84 | <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> | 89 | <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> |
@@ -96,7 +101,7 @@ | |||
96 | </tr> | 101 | </tr> |
97 | {% endif %} | 102 | {% endif %} |
98 | {% endfor %} | 103 | {% endfor %} |
99 | </tbody> | 104 | </tbody> |
100 | </table> | 105 | </table> |
101 | {% endifnotequal %} | 106 | {% endifnotequal %} |
102 | </div> <!-- end tab-pane --> | 107 | </div> <!-- end tab-pane --> |