From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id C5544E00A21; Mon, 4 Jul 2016 04:53:37 -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 * [209.85.192.180 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-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 8668EE009C3 for ; Mon, 4 Jul 2016 04:53:36 -0700 (PDT) Received: by mail-pf0-f180.google.com with SMTP id i123so61109676pfg.0 for ; Mon, 04 Jul 2016 04:53:36 -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=xnyfptP7yM2zEgjIDcYZQAJXk+1FlpNIz2BTDnV28c4=; b=2Ar7a2YmSFcG2xG7SlJWyShD+LC+wjXm0aRITKT4LoYykDqW3HESFmPIX1eIFbnoHz XGsSNF/3iTumkDFgUlWfmeJbqdToRi/Twitp1Z5gN4rqdSRPWp9NNG60PQpwDouSigz+ YnuZXQswcnwy22RwUr8C5Hesw5UzX1xJVNfPZ/dZSk2t4WNACKv8ogyI9V+l1cSwihdR fF/qJh8KReixbdWVGyvQiGlTWEYYvBe4Ny7gWqHxrutYKzz5d2BS9i3IOBPvqV5MUMHo qYcWHCOq8lztOOp8OsbjrPkF0LLIr4HYXtumPkvRVm673XPF94FVN+Mm4zieLBf3td/i 1mIg== 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=xnyfptP7yM2zEgjIDcYZQAJXk+1FlpNIz2BTDnV28c4=; b=Xw9SLsDK+S1fcAmf64iQ/PrNVLxZVz3g7WL7r6pqcB8wRVaojWcH0aADNS/DBuyXKB 7sDdv1HRyZAsJbSO21tlbrVZQndUocEoI6sNwIm+nJb7phrFZ+cYUkJTDNFxWf0jkZ8w 5PHUpZh2Y6auEh9A1RMcxBmlKbgYbV0P2wPs6fxp9yP7oDUiTo/PNvpQp759HeJ7bIye 9Gpn23DqAMTgcFX/n/dQtWdzuI5XCtWmO2wSCLb5r1yHMoWYJTi63OSLtNIu/Z4KVVNv 6kXBsr5e5wQkKOrz0dA7rCrFCNUJNjM3rNhDsPImGV1YgwaTOwoQrcofic8iX2VDL9qC 09lQ== X-Gm-Message-State: ALyK8tJf+VEz/SyA4BLPh8pxP/CCAJ5DTgn6jv4kquDEx8p2rqj1ixCRpekxFkNPUf3yJj3H X-Received: by 10.98.54.198 with SMTP id d189mr21683600pfa.39.1467633215443; Mon, 04 Jul 2016 04:53:35 -0700 (PDT) Received: from [192.168.0.78] (host86-169-85-169.range86-169.btcentralplus.com. [86.169.85.169]) by smtp.googlemail.com with ESMTPSA id xs12sm4960630pac.7.2016.07.04.04.53.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jul 2016 04:53:34 -0700 (PDT) To: toaster@yoctoproject.org References: <1467280579-9954-1-git-send-email-elliot.smith@intel.com> From: Michael Wood Message-ID: <577A4E3C.8010606@intel.com> Date: Mon, 4 Jul 2016 12:53:32 +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: Subject: Re: [PATCH] toaster: fix layout for command-line builds in recent builds area 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: Mon, 04 Jul 2016 11:53:37 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Thanks. Applied to toaster-next and sent to bitbake-devel Michael On 30/06/16 11:38, Barros Pena, Belen wrote: > > On 30/06/2016 10:56, "toaster-bounces@yoctoproject.org on behalf of Elliot > Smith" elliot.smith@intel.com> wrote: > >> Command-line builds were displayed incorrectly, so that the >> HTML elements for other builds were being "consumed" by the >> command-line build elements due to incorrect positioning of >> element end tags. >> >> Fix by ensuring end tags close elements in the right places. >> >> As the indentation was all over the place in the most recent >> builds section template, it was almost impossible to see what the >> problem was. So that was fixed, too. > Thanks for this. It looks great. > > Cheers > > Belén > >> [YOCTO #9842] >> >> Signed-off-by: Elliot Smith >> --- >> .../toaster/toastergui/templates/mrb_section.html | 247 >> ++++++++++----------- >> 1 file changed, 123 insertions(+), 124 deletions(-) >> >> diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html >> b/bitbake/lib/toaster/toastergui/templates/mrb_section.html >> index 4b4e3e6..b164269 100644 >> --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html >> +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html >> @@ -3,6 +3,7 @@ >> {% load project_url_tag %} >> {% load humanize %} >> >> + >> >> >> -{%if mru %} >> +{% if mru %} >> >> - {%if mrb_type == 'project' %} >> -

>> - Latest project builds >> + {% if mrb_type == 'project' %} >> +

>> + Latest project builds >> >> - {% if project.is_default %} >> - >> - {% endif %} >> -

>> + {% if project.is_default %} >> + >> + {% endif %} >> + >> {% else %} >>
>> -

>> - Latest builds >> -

>> +

Latest builds

>>
>> {% endif %} >> + >>
>> - {% for build in mru %} >> -
>> + {% for build in mru %} >> +
>> {% if mrb_type != 'project' %} >> -
>> -
>> - >> - > build.project %}>{{build.project.name}} >> - >> +
>> +
>> + >> + > build.project %}>{{build.project.name}} >> + >> +
>>
>> -
>> {% endif %} >> + >>
>>
>> - {%if build.outcome == build.SUCCEEDED or build.outcome == >> build.FAILED %} >> - > class="alert-link"> >> - {% endif %} >> + {% if build.outcome == build.SUCCEEDED or build.outcome == >> build.FAILED %} >> + > class="alert-link"> >> + {% endif %} >> + >> {% if build.target_set.all.count > 0 %} >> - > - {% if build.target_set.all.count > 1 %} >> - {{build.get_sorted_target_list.0.target}} >> - title="Recipes: >> - {% for target in build.get_sorted_target_list %} >> - {% if target.task %} >> - {{target.target}}:{{target.task}} >> - {% else %} >> - {{target.target}} >> - {% endif %} >> - {% endfor %}" >> - {% endif %} >> - > >> + > + {% if build.target_set.all.count > 1 %} >> + {{build.get_sorted_target_list.0.target}} >> + title="Recipes: >> + {% for target in build.get_sorted_target_list %} >> + {% if target.task %} >> + {{target.target}}:{{target.task}} >> + {% else %} >> + {{target.target}} >> + {% endif %} >> + {% endfor %}" >> + {% endif %} >> + > >> {% if build.target_set.all.0.task %} >> - >> {{build.get_sorted_target_list.0.target}}:{{build.target_set.all.0.task}} >> + >> {{build.get_sorted_target_list.0.target}}:{{build.target_set.all.0.task}} >> {% else %} >> - {{build.get_sorted_target_list.0.target}} >> + {{build.get_sorted_target_list.0.target}} >> {% endif %} >> + >> {% if build.target_set.all.count > 1 %} >> - (+{{build.target_set.all.count|add:"-1"}}) >> + (+{{build.target_set.all.count|add:"-1"}}) >> {% endif %} >> - >> - {% endif %} >> - {%if build.outcome == build.SUCCEEDED or build.outcome == >> build.FAILED %} >> - >> - {% endif %} >> -
>> - {% if build.outcome == build.SUCCEEDED or build.outcome == >> build.FAILED %} >> + >> + {% endif %} >> + {% if build.outcome == build.SUCCEEDED or build.outcome == >> build.FAILED %} >> + >> + {% endif %} >> +
>> + >> + {% if build.outcome == build.SUCCEEDED or build.outcome == >> build.FAILED %} >>
>> - {% if build.completed_on|format_build_date %} >> - {{ build.completed_on|date:'d/m/y H:i' }} >> - {% else %} >> - {{ build.completed_on|date:'H:i' }} >> - {% endif %} >> + {% if build.completed_on|format_build_date %} >> + {{build.completed_on|date:'d/m/y H:i'}} >> + {% else %} >> + {{ build.completed_on|date:'H:i' }} >> + {% endif %} >>
>> - {% endif %} >> - {%if build.outcome == build.SUCCEEDED or build.outcome == >> build.FAILED %} >> + {% endif %} >> + >> + {% if build.outcome == build.SUCCEEDED or build.outcome == >> build.FAILED %} >>
>> - {% if build.errors.count %} >> + {% if build.errors.count %} >> >> - > class="alert-link">{{build.errors.count}} >> error{{build.errors.count|pluralize}} >> - {% endif %} >> + > class="alert-link"> >> + {{build.errors.count}} >> error{{build.errors.count|pluralize}} >> + >> + {% endif %} >>
>> + >>
>> - {% if build.warnings.count %} >> + {% if build.warnings.count %} >> >> - > class="alert-link build-warnings">{{build.warnings.count}} >> warning{{build.warnings.count|pluralize}} >> - {% endif %} >> + > class="alert-link build-warnings"> >> + {{build.warnings.count}} >> warning{{build.warnings.count|pluralize}} >> + >> + {% endif %} >>
>> + >>
>> Build time: {{ build.timespent_seconds|sectohms }} >> >> + >> {% if build.project.is_default %} >> - >> - >> + > + title="Builds in this project cannot be started from >> Toaster: they are started from the command line"> >> + >> {% else %} >> - > - data-request-url="{% url 'xhr_buildrequest' >> build.project.pk %}" >> - >> data-target='{{build.target_set.all|get_tasks|json}}'> >> - >> - Rebuild >> - >> + > + data-request-url="{% url 'xhr_buildrequest' >> build.project.pk %}" >> + data-target='{{build.target_set.all|get_tasks|json}}'> >> + >> + Rebuild >> + >> {% endif %} >>
>> - {%endif%} >> + {% endif %} >> >> - {%if build.outcome == build.IN_PROGRESS %} >> - >> -
>> -
>> -
>> -
>> -
>> -
> id="build-pc-done-{{build.pk}}">{{build.completeper}}% of tasks >> complete >> - {# No build cancel for command line builds project #} >> - {% if build.project.is_default %} >> - >> - {% else %} >> - > - data-buildrequest-id={{build.buildrequest.pk}} >> - data-request-url="{% url 'xhr_buildrequest' build.project.pk >> %}" > >> - >> - Cancel >> - >> -
>> - {% endif %} >> + {% if build.outcome == build.IN_PROGRESS %} >> + >> >> - {%endif%} {# end if in progress #} >> +
>> +
> id="build-pc-done-title-{{build.pk}}"> >> +
>> +
>> +
>> +
>> >> - {% if build.outcome == build.CANCELLED %} >> -
>> - Build cancelled >> -
>> -
>> - > - data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" >> - data-target='{{build.target_set.all|get_tasks|json}}'> >> - >> - Rebuild >> - >> -
>> - {% endif %} >> -
>> -
>> - {% endfor %} >> -
>> +
>> + > id="build-pc-done-{{build.pk}}">{{build.completeper}}% of tasks >> complete >> + {# No build cancel for command line builds project #} >> + {% if build.project.is_default %} >> + >> + {% else %} >> + > + data-buildrequest-id={{build.buildrequest.pk}} >> + data-request-url="{% url 'xhr_buildrequest' >> build.project.pk %}"> >> + >> + Cancel >> + >> + {% endif %} >> +
>> + {% endif %} {# end if in progress #} >> >> -{%endif%} >> + {% if build.outcome == build.CANCELLED %} >> +
>> + Build cancelled >> +
>> >> +
>> + > + data-request-url="{% url 'xhr_buildrequest' >> build.project.pk %}" >> + data-target='{{build.target_set.all|get_tasks|json}}'> >> + >> + Rebuild >> + >> +
>> + {% endif %} >> +
>> + >> + {% endfor %} >> + >> +{% endif %} >> \ No newline at end of file >> -- >> 2.7.4 >> >> -- >> _______________________________________________ >> toaster mailing list >> toaster@yoctoproject.org >> https://lists.yoctoproject.org/listinfo/toaster