[PATCH] toaster: Bring back the download icon

[PATCH] toaster: Bring back the download icon

[Belen Barros Pena]

From: Belen Barros Pena <belen.barros.pena@intel.com>

The 'all builds' page was missing the download icon
next to the outcome icon, which allows you to download
a build log from the 'all builds' page.

This patch brings it back.

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
---
 bitbake/lib/toaster/toastergui/templates/builds.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html b/bitbake/lib/toaster/toastergui/templates/builds.html
index a27a121..9f07211 100644
--- a/bitbake/lib/toaster/toastergui/templates/builds.html
+++ b/bitbake/lib/toaster/toastergui/templates/builds.html
@@ -62,7 +62,13 @@
         {% for build in objects %}
         <tr class="data" data-table-build-result="{{ build.id }}">
             <td class="outcome">
-                <a href="{% url "builddashboard" build.id %}">{%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a> &nbsp;
+                <a href="{% url "builddashboard" build.id %}">{%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a>
+                {% if build.project %}
+                  &nbsp;
+                  <a href="{% url 'build_artifact' build.id "cookerlog" build.id %}">
+                    <i class="icon-download-alt" title="" data-original-title="Download build log"></i>
+                  </a>
+                {% endif %}
             </td>
             <td class="target">
                 {% for t in build.target_set.all %}
-- 
2.4.9 (Apple Git-60)

Re: [PATCH] toaster: Bring back the download icon

[Michael Wood]

On 10/11/15 14:51, Belen Barros Pena wrote:
> From: Belen Barros Pena <belen.barros.pena@intel.com>
>
> The 'all builds' page was missing the download icon
> next to the outcome icon, which allows you to download
> a build log from the 'all builds' page.
>
> This patch brings it back.
>
> Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
> ---
>   bitbake/lib/toaster/toastergui/templates/builds.html | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html b/bitbake/lib/toaster/toastergui/templates/builds.html
> index a27a121..9f07211 100644
> --- a/bitbake/lib/toaster/toastergui/templates/builds.html
> +++ b/bitbake/lib/toaster/toastergui/templates/builds.html
> @@ -62,7 +62,13 @@
>           {% for build in objects %}
>           <tr class="data" data-table-build-result="{{ build.id }}">
>               <td class="outcome">
> -                <a href="{% url "builddashboard" build.id %}">{%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a> &nbsp;
> +                <a href="{% url "builddashboard" build.id %}">{%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a>
> +                {% if build.project %}
> +                  &nbsp;
> +                  <a href="{% url 'build_artifact' build.id "cookerlog" build.id %}">
> +                    <i class="icon-download-alt" title="" data-original-title="Download build log"></i>
> +                  </a>
> +                {% endif %}
>               </td>
>               <td class="target">
>                   {% for t in build.target_set.all %}
Could you format the template logic on that first line so that there is 
indentation in the logic sequence, for ease of reading. To avoid an 
empty else statement it's better to switch round the logic to be inclusive.

Something more like

{% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED 
%} <a href="{% url "builddashboard" build.id %}"> <i class=" {% if 
build.outcome == build.SUCCEEDED %} icon-ok-sign success {% elif 
build.outcome == build.FAILED %} icon-minus-sign error {% endif %} 
"></i> </a> {% endif %}

more info on 
https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster#Templates

Thanks

Michael

Re: [PATCH] toaster: Bring back the download icon

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 3044 bytes --]

On 10 November 2015 at 15:33, Michael Wood <michael.g.wood@intel.com> wrote:

> On 10/11/15 14:51, Belen Barros Pena wrote:
>
>> From: Belen Barros Pena <belen.barros.pena@intel.com>
>>
>> The 'all builds' page was missing the download icon
>> next to the outcome icon, which allows you to download
>> a build log from the 'all builds' page.
>>
>> This patch brings it back.
>>
>
Did this ever get a v2, incorporating Michael's comments?

Elliot


>
>> Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
>> ---
>>   bitbake/lib/toaster/toastergui/templates/builds.html | 8 +++++++-
>>   1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html
>> b/bitbake/lib/toaster/toastergui/templates/builds.html
>> index a27a121..9f07211 100644
>> --- a/bitbake/lib/toaster/toastergui/templates/builds.html
>> +++ b/bitbake/lib/toaster/toastergui/templates/builds.html
>> @@ -62,7 +62,13 @@
>>           {% for build in objects %}
>>           <tr class="data" data-table-build-result="{{ build.id }}">
>>               <td class="outcome">
>> -                <a href="{% url "builddashboard" build.id %}">{%if
>> build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign
>> success"></i>{%elif build.outcome == build.FAILED%}<i
>> class="icon-minus-sign error"></i>{%else%}{%endif%}</a> &nbsp;
>> +                <a href="{% url "builddashboard" build.id %}">{%if
>> build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign
>> success"></i>{%elif build.outcome == build.FAILED%}<i
>> class="icon-minus-sign error"></i>{%else%}{%endif%}</a>
>> +                {% if build.project %}
>> +                  &nbsp;
>> +                  <a href="{% url 'build_artifact' build.id "cookerlog"
>> build.id %}">
>> +                    <i class="icon-download-alt" title=""
>> data-original-title="Download build log"></i>
>> +                  </a>
>> +                {% endif %}
>>               </td>
>>               <td class="target">
>>                   {% for t in build.target_set.all %}
>>
> Could you format the template logic on that first line so that there is
> indentation in the logic sequence, for ease of reading. To avoid an empty
> else statement it's better to switch round the logic to be inclusive.
>
> Something more like
>
> {% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}
> <a href="{% url "builddashboard" build.id %}"> <i class=" {% if
> build.outcome == build.SUCCEEDED %} icon-ok-sign success {% elif
> build.outcome == build.FAILED %} icon-minus-sign error {% endif %} "></i>
> </a> {% endif %}
>
> more info on
> https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster#Templates
>
> Thanks
>
> Michael
>
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>



-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 5331 bytes --]

Re: [PATCH] toaster: Bring back the download icon

[Barros Pena, Belen]

On 26/11/2015 14:51, "toaster-bounces@yoctoproject.org on behalf of Smith,
Elliot" <toaster-bounces@yoctoproject.org on behalf of
elliot.smith@intel.com> wrote:

>On 10 November 2015 at 15:33, Michael Wood
><michael.g.wood@intel.com> wrote:
>
>On 10/11/15 14:51, Belen Barros Pena wrote:
>
>From: Belen Barros Pena <belen.barros.pena@intel.com>
>
>The 'all builds' page was missing the download icon
>next to the outcome icon, which allows you to download
>a build log from the 'all builds' page.
>
>This patch brings it back.
>
>Did this ever get a v2, incorporating Michael's comments?

Yes, this is merged to master already

http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=88f9310ce0015be53
9ffefbeff4b64c73779fdc9

Cheers

Belén

>
>
>Elliot
> 
>
>
>
>Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
>---
>  bitbake/lib/toaster/toastergui/templates/builds.html | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html
>b/bitbake/lib/toaster/toastergui/templates/builds.html
>index a27a121..9f07211 100644
>--- a/bitbake/lib/toaster/toastergui/templates/builds.html
>+++ b/bitbake/lib/toaster/toastergui/templates/builds.html
>@@ -62,7 +62,13 @@
>          {% for build in objects %}
>          <tr class="data" data-table-build-result="{{
>build.id <http://build.id> }}">
>              <td class="outcome">
>-                <a href="{% url "builddashboard"
>build.id <http://build.id> %}">{%if build.outcome == build.SUCCEEDED%}<i
>class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i
>class="icon-minus-sign error"></i>{%else%}{%endif%}</a> &nbsp;
>+                <a href="{% url "builddashboard"
>build.id <http://build.id> %}">{%if build.outcome == build.SUCCEEDED%}<i
>class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i
>class="icon-minus-sign error"></i>{%else%}{%endif%}</a>
>+                {% if build.project %}
>+                  &nbsp;
>+                  <a href="{% url 'build_artifact'
>build.id <http://build.id> "cookerlog"
>build.id <http://build.id> %}">
>+                    <i class="icon-download-alt" title=""
>data-original-title="Download build log"></i>
>+                  </a>
>+                {% endif %}
>              </td>
>              <td class="target">
>                  {% for t in build.target_set.all %}
>
>
>
>
>Could you format the template logic on that first line so that there is
>indentation in the logic sequence, for ease of reading. To avoid an empty
>else statement it's better to switch round the logic to be inclusive.
>
>Something more like
>
>{% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED
>%} <a href="{% url "builddashboard"
>build.id <http://build.id> %}"> <i class=" {% if build.outcome ==
>build.SUCCEEDED %} icon-ok-sign success {% elif build.outcome ==
>build.FAILED %} icon-minus-sign error {% endif %} "></i> </a> {% endif %}
>
>more info on 
>https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster#Templates
><https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster#Templates>
>
>Thanks
>
>Michael
>
>-- 
>_______________________________________________
>toaster mailing list
>toaster@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster
>
>
>
>
>
>
>
>
>
>-- 
>Elliot Smith
>Software Engineer
>Intel Open Source Technology Centre
>
>
>
>