From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 88BBEE00CD9; Fri, 10 Jun 2016 04:18:07 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [74.125.82.52 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 27B5FE00CC0 for ; Fri, 10 Jun 2016 04:18:03 -0700 (PDT) Received: by mail-wm0-f52.google.com with SMTP id m124so97487148wme.1 for ; Fri, 10 Jun 2016 04:18:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=CF5vnxzqYc+Tcgo5yr96dkihriyLWCF7xPZxGUVpZQU=; b=yZW4ldIAc9LLWg3fssHgE7OqPcrqCYAf6LDiDFjr4hrC0jfe8rN0tYKy1m0ZwS6dR0 38urgjOujurbrqBbKfqcSBRJtCarQLae39Pp4u1nVDEPZc3eWXRdjoMacINJParuPKnP /MEmc6p5D+lFkX8AWKx78FBt3e2woOmS2L1pGtHCMcoAZgjyWfVefleTAcBM8JySa5+n aIq1YN7NNSr14bKq7P+M0zo9y2dp00CcZzWsZoDFEA3dpknugoff9LYPTRegseSLolh0 Fy+wn+1bJFrhDxvqVf1dmuXJ2cY/k3g+RKNJJSi8X/0++h5KiHaLk7BAmBp+mDoDY7R8 SUwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=CF5vnxzqYc+Tcgo5yr96dkihriyLWCF7xPZxGUVpZQU=; b=evJMlJIxb32Y47ZC1KZ44l9jV2L1+/bI5UA0CQgnnMqxNs2A93a19rouwefRmrQNxw +/t8UNEn0gngTOdfpiUxELgzPv12MXJuIRXUXD8o0mwP3HrtCYHDXmvY2e1PVuErq/XU PGwthI1XQ+QGFwDDVVjL8pk3qaVZ+WsuE/6kdyuiKjPihd/TGqd25k0WsdeuW5eBiAZT +yLBFHoCAXw/wInVb6voCmA09II5q6aP3psQqGK/UnZRwygRBi398K2SgxtgHQzjcRAz 4DZqyHfAg8IC/aE2RsosiuLAVdKvoZ7vGENNnO/hbcsyvenuwzkU8VsddPukZVm9gHy5 wuJw== X-Gm-Message-State: ALyK8tIlBbhcMxOz8S8suUikf9sWK1Jtf1I+4kK1qPeB8iM6PULs+Qan6DUCVYhrpGSfp27/ X-Received: by 10.195.18.3 with SMTP id gi3mr1892546wjd.66.1465557482593; Fri, 10 Jun 2016 04:18:02 -0700 (PDT) Received: from [192.168.0.78] (host109-150-165-138.range109-150.btcentralplus.com. [109.150.165.138]) by smtp.googlemail.com with ESMTPSA id d7sm35269417wmd.11.2016.06.10.04.18.01 for (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Jun 2016 04:18:01 -0700 (PDT) To: toaster@yoctoproject.org References: <1465478673-23191-1-git-send-email-belen.barros.pena@linux.intel.com> <1465478673-23191-5-git-send-email-belen.barros.pena@linux.intel.com> From: Michael Wood Message-ID: <575AA1E9.3020009@intel.com> Date: Fri, 10 Jun 2016 12:18:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <1465478673-23191-5-git-send-email-belen.barros.pena@linux.intel.com> Subject: Re: [PATCH 04/20] toaster: build data Packages installed to Bootstrap 3 X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2016 11:18:07 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit On 09/06/16 14:24, Belen Barros Pena wrote: > Make sure the table showing the list of packages installed in an > image displays correctly with Bootstrap 3. > > Signed-off-by: Belen Barros Pena > --- > bitbake/lib/toaster/toastergui/buildtables.py | 12 ++++++------ > bitbake/lib/toaster/toastergui/static/css/default.css | 8 +++++++- > bitbake/lib/toaster/toastergui/static/js/libtoaster.js | 4 +--- > .../toastergui/templates/snippets/gitrev_popover.html | 2 +- > .../templates/snippets/pkg_dependencies_popover.html | 2 +- > .../templates/snippets/pkg_revdependencies_popover.html | 2 +- > bitbake/lib/toaster/toastergui/templates/target.html | 10 +++++----- > 7 files changed, 22 insertions(+), 18 deletions(-) > > diff --git a/bitbake/lib/toaster/toastergui/buildtables.py b/bitbake/lib/toaster/toastergui/buildtables.py > index e237e4e..5d00aa4 100644 > --- a/bitbake/lib/toaster/toastergui/buildtables.py > +++ b/bitbake/lib/toaster/toastergui/buildtables.py > @@ -75,8 +75,8 @@ class BuiltPackagesTableBase(tables.PackagesTable): > {%% endif %%} > ''' % {'value': val}) > > - add_pkg_link_to = ['name', 'version', 'size', 'license'] > - add_recipe_link_to = ['recipe__name', 'recipe__version'] > + add_pkg_link_to = ['name'] > + add_recipe_link_to = ['recipe__name'] If you're getting rid of multiple items having links we don't need this to be a list any more. Will fix this up. > > # Add the recipe and pkg build links to the required columns > for column in self.columns: > @@ -160,7 +160,7 @@ class InstalledPackagesTable(BuildTablesMixin, BuiltPackagesTableBase): > """ Show all packages installed in an image """ > def __init__(self, *args, **kwargs): > super(InstalledPackagesTable, self).__init__(*args, **kwargs) > - self.title = "Installed Packages" > + self.title = "Packages Included" > self.default_orderby = "name" > > def make_package_list(self, target): > @@ -213,11 +213,11 @@ class InstalledPackagesTable(BuildTablesMixin, BuiltPackagesTableBase): > ' extra.target_id data.pk %}">{{data.name}}' > '{% if data.installed_name and data.installed_name !=' > ' data.name %}' > - ' as {{data.installed_name}}' > - ' + ' as {{data.installed_name}}' > + ' ' title="{{data.name}} was renamed at packaging time and' > ' was installed in your image as {{data.installed_name}}' > - '">{% endif %} ') > + '">{% endif %} ') > > for column in self.columns: > if column['static_data_name'] == 'name': > diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css > index c275dbb..d808ab0 100644 > --- a/bitbake/lib/toaster/toastergui/static/css/default.css > +++ b/bitbake/lib/toaster/toastergui/static/css/default.css > @@ -22,6 +22,9 @@ img.logo { height: 30px; vertical-align: bottom; } > /* Increase popovers width to fit commit SHAs */ > .popover { max-width: 350px; } > > +/* Set a limit to popover height to handle long dependency lists */ > +.popover-content { max-height: 350px; overflow: scroll; } > + > /* Increase bottom margin of definition lists inside popovers for the Toaster version information in the top navbar, and also inside the right hand columns of our details pages */ > .popover-content dd, > .item-info dd { margin-bottom: 15px; } > @@ -55,7 +58,7 @@ img.logo { height: 30px; vertical-align: bottom; } > #edit-columns-button { margin-right: 30px; } > .navbar-default[id^="table-chrome-"] { background-color: transparent; } > [id^="table-chrome-collapse-"] .navbar-form { margin-left: -15px; } > -.dropdown-menu.editcol { padding-left: 10px; min-width: 180px; } > +.dropdown-menu.editcol { padding-left: 10px; min-width: 200px; } > span[class^="remove-search-btn-"] { position: absolute; right: 5px; top: 0; bottom: 0; height: 14px; margin: auto; font-size: 14px; cursor: pointer; color: #777;} > span[class^="remove-search-btn-"]:hover { color: #333; } > #no-results-special-selectpackagestable .form-inline { margin-top: 20px; } > @@ -273,3 +276,6 @@ h2.panel-title { font-size: 30px; } > /* Style the wells in the build dashboard */ > .dashboard-section h3 { margin-top: 10px; margin-bottom: 20px; } > .col-md-4.dashboard-section dd { margin-bottom: 10px; } > + > +/* Make the help in tables insivisble until you hover over the right cell */ > +.hover-help { visibility: hidden; } > diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js > index e4e4f6c..eafe70d 100644 > --- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js > +++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js > @@ -541,9 +541,7 @@ $(document).ready(function() { > delay: { show : 300 } > }); > > - // show help bubble only on hover inside tables > - $(".hover-help").css("visibility","hidden"); > - > + // show help bubble on hover inside tables > $("table").on("mouseover", "th, td", function () { > $(this).find(".hover-help").css("visibility","visible"); > }); > diff --git a/bitbake/lib/toaster/toastergui/templates/snippets/gitrev_popover.html b/bitbake/lib/toaster/toastergui/templates/snippets/gitrev_popover.html > index 281a3bd..c1e3dab 100644 > --- a/bitbake/lib/toaster/toastergui/templates/snippets/gitrev_popover.html > +++ b/bitbake/lib/toaster/toastergui/templates/snippets/gitrev_popover.html > @@ -1,6 +1,6 @@ > {% load projecttags %} > {% if vcs_ref|is_shaid %} > - > + > {{vcs_ref|truncatechars:10}} > > {% else %} > diff --git a/bitbake/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html b/bitbake/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html > index 5be409c..273437e 100644 > --- a/bitbake/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html > +++ b/bitbake/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html > @@ -5,7 +5,7 @@ > {% with count_package=package_deps.packages|length %} > > {% if count_package > 0 %} > - > {% for dep in package_deps.packages %} >
  • > {% if extra.add_links %} > diff --git a/bitbake/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html b/bitbake/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html > index 65c2b29..e6ef816 100644 > --- a/bitbake/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html > +++ b/bitbake/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html > @@ -5,7 +5,7 @@ > {% with count_package=package_deps.packages|length %} > > {% if count_package > 0 %} > - > {% for dep in package_deps.packages|dictsort:"package.name" %} >
  • > {% if extra.add_links %} > diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/bitbake/lib/toaster/toastergui/templates/target.html > index 0b2fe99..1924a0d 100644 > --- a/bitbake/lib/toaster/toastergui/templates/target.html > +++ b/bitbake/lib/toaster/toastergui/templates/target.html > @@ -18,7 +18,7 @@ > > {% block buildinfomain %} >
    > -
    > +
    >

    > {% if request.GET.search and objects.paginator.count > 0 %} > {{objects.paginator.count}} package{{objects.paginator.count|pluralize}} found > @@ -30,16 +30,16 @@ >

    >
    >     > -
    > > +
    > > {% endblock buildinfomain %}