summaryrefslogtreecommitdiffstats
path: root/lib/toaster/toastergui/templatetags
diff options
context:
space:
mode:
authorDave Lerner <dave.lerner@windriver.com>2014-03-24 16:37:17 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-28 13:44:26 +0000
commitc604e14df8cdb1f47535f093d7044955d4c2057d (patch)
tree39069ee519a36b4f54e0bb517d18ed69bc90e06c /lib/toaster/toastergui/templatetags
parent65bdd6cf8d0cc2af6cd424de735a5e3f2e54fa99 (diff)
downloadbitbake-c604e14df8cdb1f47535f093d7044955d4c2057d.tar.gz
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 Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
Diffstat (limited to 'lib/toaster/toastergui/templatetags')
-rw-r--r--lib/toaster/toastergui/templatetags/projecttags.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/toaster/toastergui/templatetags/projecttags.py b/lib/toaster/toastergui/templatetags/projecttags.py
index 34c3c21d2..76166ca94 100644
--- a/lib/toaster/toastergui/templatetags/projecttags.py
+++ b/lib/toaster/toastergui/templatetags/projecttags.py
@@ -208,14 +208,6 @@ def filtered_installedsize(size, installed_size):
return size if (installed_size == 0) or (installed_size == "") or (installed_size == None) else installed_size
@register.filter
-def filtered_installedname(name, installed_name):
- """If package.installed_name not null and not empty
- return <div class=muted> as {{package.installed_name}}
- otherwise ""
- """
- return name if (name == installed_name) or (not installed_name) or (installed_name == "") else name + " as " + installed_name
-
-@register.filter
def filtered_packageversion(version, revision):
""" Emit "version-revision" if version and revision are not null
else "version" if version is not null
@@ -245,6 +237,6 @@ def format_vpackage_rowclass(size):
def format_vpackage_namehelp(name):
r = name + '&nbsp;'
r += '<i class="icon-question-sign get-help hover-help"'
- r += ' title = "' + name + ' only has dependency information available.">'
+ r += ' title="' + name + ' only has dependency information available.">'
r += '</i>'
return mark_safe(r)