Taken in. Alex
On Wed, Mar 26, 2014 at 10:42 AM, Barros Pena, Belen < [email protected]> wrote: > All looking good. Thanks! > > Belén > > On 25/03/2014 18:07, "Lerner, Dave" <[email protected]> wrote: > > > > >Branch: (same as v1 RR) lerner/bz5922-installed-package-name > >Fixes for V2: > >1) Add heading-help if h1 tag (not hovering) > >--------------- > >diff --git > >a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html > >b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html > >index 933a96d..5ec9dd7 100644 > >--- a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html > >+++ b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html > >@@ -12,6 +12,9 @@ > > if (hover) { > > r+= ' hover-help'; > > } > >+ else { > >+ r+= ' heading-help'; > >+ } > > r += '"'; > > title = package_name + ' was renamed at packaging time and > >was installed on your system as ' + alias; > > r += ' title="' + title + '">'; > > > >2) Exclude the 'as some-alias-name' from the anchor element > >----------------------------------------------------------- > >diff --git > >a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.h > >tml > >b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.h > >tml > >index 10f1b27..e06e073 100644 > >--- > >a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.h > >tml > >+++ > >b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.h > >tml > >@@ -30,10 +30,8 @@ > > <td> > > <a href="{% url 'package_included_detail' > >build.id target.id runtime_dep.depends_on_id %}"> > > {{runtime_dep.name}} > >- <script> > >- fmtAliasHelp("{{runtime_dep.name}}", > >"{{runtime_dep.alias}}", true) > >- </script> > > </a> > >+ > ><script>fmtAliasHelp("{{runtime_dep.name}}", "{{runtime_dep.alias}}", > >true)</script> > > </td> > > {% else %} > > <td> > >diff --git > >a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_depend > >encies.html > >b/bitbake/lib/toaster/toastergui/templates/package_included_reverse_depend > >encies.html > >index 979ea6d..1efcb1a 100644 > >--- > >a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_depend > >encies.html > >+++ > >b/bitbake/lib/toaster/toastergui/templates/package_included_reverse_depend > >encies.html > >@@ -35,8 +35,8 @@ > > <td> > > <a href="{% url > >'package_included_detail' build.id target.id reverse_dep.dependent_id > %}"> > > {{reverse_dep.name}} > >- > ><script>fmtAliasHelp("{{reverse_dep.name}}", "{{reverse_dep.alias}}", > >true)</script> > > </a> > >+ > ><script>fmtAliasHelp("{{reverse_dep.name}}", "{{reverse_dep.alias}}", > >true)</script> > > </td> > > {% else %} > > <td> > > > >> -----Original Message----- > >> From: Barros Pena, Belen [mailto:[email protected]] > >> Sent: Tuesday, March 25, 2014 12:39 PM > >> To: Lerner, Dave; DAMIAN, ALEXANDRU > >> Cc: [email protected] > >> Subject: Re: [toaster] [review-request] bugzilla 5922: Implement name > >>as installed_name > >> in installed package details page > >> > >> Hi Dave, > >> > >> This is looking good. Only 2 very minor things: > >> > >> * In the h1, we need to add the class heading-help to the <i> tag: that > >> will size the question mark correctly > >> > >> * In the Target page and the directory structure page, only the package > >> name is a link. We should do the same thing in the installed package > >> detail pages, both the in the 'Runtime dependencies' and 'Reverse > >>runtime > >> dependencies' tabs, where right now both name and installed_name are a > >>link > >> > >> Cheers > >> > >> Belén > >> > >> > >> > >> On 25/03/2014 16:27, "Lerner, Dave" <[email protected]> wrote: > >> > >> >Hi Belen, Alex > >> > > >> >Attached is the review request to implement display of installed > >>package > >> >name on the package pages. > >> > > >> >Thanks, > >> >Dave > >> > > >> >============================================= > >> > > >> >Branch: lerner/bz5922-installed-package-name > >> >(Based-on-branch: lerner/bz5966-size-minus-1) > >> > > >> >COMMIT MESSAGE > >> >-------------- > >> > > >> > [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 <[email protected]> > >> >--- > >> > .../templates/package_built_dependencies.html | 10 ++-- > >> > .../toastergui/templates/package_built_detail.html | 8 +-- > >> > .../toastergui/templates/package_detail_base.html | 33 ++++++++--- > >> > .../templates/package_included_dependencies.html | 33 ++++++----- > >> > .../templates/package_included_detail.html | 14 +++-- > >> > .../package_included_reverse_dependencies.html | 17 +++--- > >> > .../toaster/toastergui/templatetags/projecttags.py | 10 +--- > >> > bitbake/lib/toaster/toastergui/views.py | 60 > >> >+++++++++++++++----- > >> > 8 files changed, 120 insertions(+), 65 deletions(-) > >> > > >> > > >> >TESTS AND EXPECTED RESULTS > >> >-------------------------- > >> >build: machine=qemux86, build command=bitbake core-image-minimal > >> > > >> >1) BREADCRUMBS and H1 title > >> >package for each of the 3 included package tabs, that is, > >> > 'Files, 'Runtime, 'Reverse > >> >case: No alias > >> >package: busybox > >> >verify crumb: no 'as' clause, 'busybox_1.22.1-r0' > >> >verify heading: no 'as' clause, 'busybox_1.22.1-r0' > >> >case: Alias exists > >> >package: eglibc > >> >verify crumb: muted 'eglibc_2.19-r0 as libc6' > >> >verify heading: 'eglibc_2.19-r0' (muted) as libc6 (with help)'eglibc6 > >>was > >> >renamed at packaging time and installed on your system as libc6' > >> > > >> >2) Table names runtime dependencies - rdepends list (top table) > >> >case: runtime dependent not aliased > >> >parent pkg: busybox > >> >verify name: update-alternatives-opkg not aliased > >> >case: runtime dependent aliased > >> >parent pkg: busybox > >> >pkg: eglibc > >> >verify name: eglibc (muted) as libc6 (with hover help) 'eglibc6 was > >> >renamed at packaging time and installed on your system as libc6' > >> > > >> >3) Table names runtime dependencies - other depends (bottom table) > >> >case: other dependency not aliased > >> >parent pkg: busybox > >> >veify name: busybox-syslog not aliased > >> >case: other dependency aliased > >> >parent pkg: busybox > >> >( > >> >FORCE DBASE value by running sqlite3 toaster.sqlite command: > >> >update orm_package set installed_name='daves update-rc.d' where > >> >name='update-rc.d'; > >> >) > >> >verify name: shows 'as daves update-rc.d' muted > >> > > >> >4) package reverse dependencies > >> >case: package not aliased > >> >parent pkg: busybox > >> >pkg: base-passwd > >> >verify name: not aliased, 'base-passwd' > >> >case: package aliased > >> >parent pkg: busybox > >> >pkg: libkmod > >> >verify name: aliased, 'libkmod (muted) as libkmod2 (hover-help same > >> >syntax as above)' > >> > > >> > > >> >5) HTML5 validation: > >> >- package built files tab(core-image-minimal, acl-dbg): Pass > >> >- package built dependencies tab(same as above): Pass > >> >- package built link to package included(core-image-minimal eglibc): > >>Pass > >> >- package included files tab (core-image-minimal, eglibc): Pass > >> >- package included runtime tab (core-image-minimal, eglibc): Pass > >> >- package included reverse tab (core-image-minimal, eglibc): Pass > >> > > >> > > >> >6) whitespace eol test: Pass > >> > > >> > > >> > > >> > > >> > > > > -- Alex Damian Yocto Project SSG / OTC
-- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
