From: Michael Wood <michael.g.wood@intel.com>
To: toaster@yoctoproject.org
Subject: Re: [PATCH 08/20] toaster: build data Tasks table to Bootstrap 3
Date: Fri, 10 Jun 2016 12:53:52 +0100 [thread overview]
Message-ID: <575AAA50.9020306@intel.com> (raw)
In-Reply-To: <1465478673-23191-9-git-send-email-belen.barros.pena@linux.intel.com>
On 09/06/16 14:24, Belen Barros Pena wrote:
> Make sure the tasks table and all build performance tables display
> correctly with Bootstrap 3.
>
> Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
> ---
> bitbake/lib/toaster/toastergui/buildtables.py | 39 +++++++++++-----------
> .../templates/buildinfo-toastertable.html | 4 +--
> 2 files changed, 22 insertions(+), 21 deletions(-)
>
> diff --git a/bitbake/lib/toaster/toastergui/buildtables.py b/bitbake/lib/toaster/toastergui/buildtables.py
> index 5d00aa4..b92d405 100644
> --- a/bitbake/lib/toaster/toastergui/buildtables.py
> +++ b/bitbake/lib/toaster/toastergui/buildtables.py
> @@ -426,9 +426,7 @@ class BuildTasksTable(BuildTablesMixin):
> '</a>'
>
> recipe_version_tmpl =\
> - '<a href="{% url "recipe" extra.build.pk data.recipe.pk %}">'\
> - '{{data.recipe.version}}'\
> - '</a>'
> + '{{data.recipe.version}}'
As you've removed the template we no longer need recipe_version_tmpl, it
can just be changed to display the field as normal.
>
> def task_link_tmpl(val):
> return ('<a name="task-{{data.order}}"'
> @@ -438,7 +436,13 @@ class BuildTasksTable(BuildTablesMixin):
>
> self.add_column(title="Order",
> static_data_name="order",
> - static_data_template=task_link_tmpl('{{data.order}}'),
> + static_data_template='{{data.order}}',
> + orderable=True)
> +
> + self.add_column(title="Task",
> + static_data_name="task_name",
> + static_data_template=task_link_tmpl(
> + "{{data.task_name}}"),
> orderable=True)
>
> self.add_column(title="Recipe",
> @@ -450,31 +454,24 @@ class BuildTasksTable(BuildTablesMixin):
> static_data_name='recipe__version',
> static_data_template=recipe_version_tmpl)
>
> - self.add_column(title="Task",
> - static_data_name="task_name",
> - static_data_template=task_link_tmpl(
> - "{{data.task_name}}"),
> - orderable=True)
> -
> self.add_column(title="Executed",
> static_data_name="task_executed",
> - static_data_template=task_link_tmpl(
> - "{{data.get_executed_display}}"),
> + static_data_template='{{data.get_executed_display}}',
> filter_name='execution_outcome',
> orderable=True)
>
> self.static_context_extra['OUTCOME_FAILED'] = Task.OUTCOME_FAILED
> - outcome_tmpl = task_link_tmpl("{{data.outcome_text}}")
> + outcome_tmpl = '{{data.outcome_text}}'
> outcome_tmpl = ('%s '
> '{%% if data.outcome = extra.OUTCOME_FAILED %%}'
> '<a href="{%% url "build_artifact" extra.build.pk '
> ' "tasklogfile" data.pk %%}">'
> - ' <i class="icon-download-alt" '
> - ' title="Download task log file"></i>'
> + ' <span class="glyphicon glyphicon-download-alt get-help" '
> + ' title="Download task log file"></span>'
> '</a> {%% endif %%}'
> - '<i class="icon-question-sign get-help '
> + '<span class="glyphicon glyphicon-question-sign get-help '
> 'hover-help" style="visibility: hidden;" '
> - 'title="{{data.get_outcome_help}}"></i>'
> + 'title="{{data.get_outcome_help}}"></span>'
> ) % outcome_tmpl
>
> self.add_column(title="Outcome",
> @@ -483,10 +480,11 @@ class BuildTasksTable(BuildTablesMixin):
> filter_name="task_outcome",
> orderable=True)
>
> + self.toggle_columns['sstate_result'] = len(self.columns)
> +
> self.add_column(title="Cache attempt",
> static_data_name="sstate_result",
> - static_data_template=task_link_tmpl(
> - "{{data.sstate_text}}"),
> + static_data_template='{{data.sstate_text}}',
> filter_name="sstate_outcome",
> orderable=True)
>
> @@ -542,6 +540,7 @@ class BuildTimeTable(BuildTasksTable):
> super(BuildTimeTable, self).setup_columns(**kwargs)
>
> self.columns[self.toggle_columns['order']]['hidden'] = True
> + self.columns[self.toggle_columns['sstate_result']]['hidden'] = True
> self.columns[self.toggle_columns['elapsed_time']]['hidden'] = False
>
>
> @@ -556,6 +555,7 @@ class BuildCPUTimeTable(BuildTasksTable):
> super(BuildCPUTimeTable, self).setup_columns(**kwargs)
>
> self.columns[self.toggle_columns['order']]['hidden'] = True
> + self.columns[self.toggle_columns['sstate_result']]['hidden'] = True
> self.columns[self.toggle_columns['cpu_time_sys']]['hidden'] = False
> self.columns[self.toggle_columns['cpu_time_user']]['hidden'] = False
>
> @@ -571,4 +571,5 @@ class BuildIOTable(BuildTasksTable):
> super(BuildIOTable, self).setup_columns(**kwargs)
>
> self.columns[self.toggle_columns['order']]['hidden'] = True
> + self.columns[self.toggle_columns['sstate_result']]['hidden'] = True
> self.columns[self.toggle_columns['disk_io']]['hidden'] = False
> diff --git a/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html b/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html
> index 52cc056..eb4c656 100644
> --- a/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html
> +++ b/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html
> @@ -11,10 +11,10 @@
> {% endblock %}
>
> {% block buildinfomain %}
> -<div class="span10">
> +<div class="col-md-10">
> {# xhr_table_url is just the current url so leave it blank #}
> {% with xhr_table_url='' %}
> - <div class="page-header">
> + <div class="page-header build-data">
> <h1>
> {{title}} (<span class="table-count-{{table_name}}">0</span>) </h2>
> </h1>
next prev parent reply other threads:[~2016-06-10 11:53 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-09 13:24 [PATCH 00/20] toaster: Move build information to Bootstrap 3 Belen Barros Pena
2016-06-09 13:24 ` [PATCH 01/20] toaster: build data Breadcrumbs to Bootstrap3 Belen Barros Pena
2016-06-09 13:24 ` [PATCH 02/20] toaster: build data Build dashboard to Bootstrap 3 Belen Barros Pena
2016-06-09 13:24 ` [PATCH 03/20] toaster: build data Left nav actions " Belen Barros Pena
2016-06-09 13:24 ` [PATCH 04/20] toaster: build data Packages installed " Belen Barros Pena
2016-06-10 11:18 ` Michael Wood
2016-06-10 11:21 ` Barros Pena, Belen
2016-06-09 13:24 ` [PATCH 05/20] toaster: build data Directory structure to Boostrap 3 Belen Barros Pena
2016-06-09 13:24 ` [PATCH 06/20] toaster: build data Configuration to Bootstrap 3 Belen Barros Pena
2016-06-09 13:24 ` [PATCH 07/20] toaster: build data Variables " Belen Barros Pena
2016-06-09 13:24 ` [PATCH 08/20] toaster: build data Tasks table " Belen Barros Pena
2016-06-10 11:53 ` Michael Wood [this message]
2016-06-09 13:24 ` [PATCH 09/20] toaster: build data Recipes " Belen Barros Pena
2016-06-09 13:24 ` [PATCH 10/20] toaster: build data Task details " Belen Barros Pena
2016-06-09 13:24 ` [PATCH 11/20] toaster: build data Recipe " Belen Barros Pena
2016-06-09 13:24 ` [PATCH 12/20] toaster: css Remove markup Belen Barros Pena
2016-06-10 13:05 ` Michael Wood
2016-06-09 13:24 ` [PATCH 13/20] toaster: build data Package details to Bootstrap 3 Belen Barros Pena
2016-06-09 13:24 ` [PATCH 14/20] toaster: build data Fix left navigation Belen Barros Pena
2016-06-09 13:24 ` [PATCH 15/20] toaster: build data Format empty state in packages table Belen Barros Pena
2016-06-09 13:24 ` [PATCH 16/20] toaster: build data Add css for highlight animation Belen Barros Pena
2016-06-09 13:24 ` [PATCH 17/20] toaster: task filters Remove invalid option Belen Barros Pena
2016-06-09 13:24 ` [PATCH 18/20] toaster: css Remove Bootstrap theme Belen Barros Pena
2016-06-09 13:24 ` [PATCH 19/20] toaster: build data Unavailable artifact to Bootstrap 3 Belen Barros Pena
2016-06-09 13:24 ` [PATCH 20/20] toaster: loading notification Make it spin Belen Barros Pena
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=575AAA50.9020306@intel.com \
--to=michael.g.wood@intel.com \
--cc=toaster@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.