diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-01-20 17:31:08 +0000 |
---|---|---|
committer | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-01-27 15:19:50 +0000 |
commit | 9164948e387a726f318f723f63e8d93435d7afe6 (patch) | |
tree | 7e6c1c21e2d01e03e2fe8a2478c710cc0263aa99 /lib | |
parent | 8b44955bb836ccad384718247ceb08d713ebc152 (diff) | |
download | bitbake-9164948e387a726f318f723f63e8d93435d7afe6.tar.gz |
toaster: fix builds page CSS and functionality
This patch fixes a set of CSS and functionality problems
with the build list page:
* Fix Recent Builds text styles
* Added proper links from Failed Tasks entries.
* Always Search returns to the first page of results.
* Clear search button appears only if search is active.
* Search shows the number of object, proper no objects found
* Various smaller fixes.
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/toaster/toastergui/templates/basetable_top.html | 3 | ||||
-rw-r--r-- | lib/toaster/toastergui/templates/build.html | 16 | ||||
-rw-r--r-- | lib/toaster/toastergui/views.py | 3 |
3 files changed, 12 insertions, 10 deletions
diff --git a/lib/toaster/toastergui/templates/basetable_top.html b/lib/toaster/toastergui/templates/basetable_top.html index 7b3017aff..67a1d103d 100644 --- a/lib/toaster/toastergui/templates/basetable_top.html +++ b/lib/toaster/toastergui/templates/basetable_top.html @@ -31,9 +31,10 @@ <div class="navbar-inner"> <form class="navbar-search input-append pull-left" id="searchform"> <div class="input-append" style="padding-right:1em"> - <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search {{objectname}}" value="{{request.GET.search}}"/><a href="javascript:$('#search').val('');searchform.submit()" class="add-on"><i class="icon-remove"></i></a> + <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search {{objectname}}" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on"><i class="icon-remove"></i></a>{%endif%} </div> <input type="hidden" name="orderby" value="{{request.GET.orderby}}"> + <input type="hidden" name="page" value="1"> <input class="btn" type="submit" value="Search"/> </form> <div class="pull-right"> diff --git a/lib/toaster/toastergui/templates/build.html b/lib/toaster/toastergui/templates/build.html index a15702463..5914f5775 100644 --- a/lib/toaster/toastergui/templates/build.html +++ b/lib/toaster/toastergui/templates/build.html @@ -19,7 +19,7 @@ <div class="lead span5"> {%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%} {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - <a href="{%url 'builddashboard' build.pk%}"> + <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}"> {% endif %} <span data-toggle="tooltip" {%if build.target_set.all.count > 1%}title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|naturaltime}})</span> {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} @@ -55,9 +55,9 @@ <div class="page-header" style="margin-top:40px;"> <h1> - {% if request.GET.filter or request.GET.search and objects.ocount > 0 %} - {{objects.ocount}} build{{objects.ocount|pluralize}} found - {%elif objects.ocount == 0%} + {% if request.GET.filter or request.GET.search and objects.count > 0 %} + {{objects.paginator.count}} build{{objects.paginator.count|pluralize}} found + {%elif objects.paginator.count == 0%} No builds {%else%} All builds @@ -65,12 +65,12 @@ </h1> </div> - {% if objects.ocount == 0 %} + {% if objects.paginator.count == 0 %} <div class="row-fluid"> <div class="alert"> - <form class="no-results"> + <form class="no-results" id="searchform"> <div class="input-append"> - <input class="input-xxlarge" type="text" placeholder="{{request.GET.search}}" /> + <input id="search" name="search" class="input-xxlarge" type="text" placeholder="{{request.GET.search}}" /><a href="javascript:$('#search').val('');searchform.submit()" class="add-on"><i class="icon-remove"></i></a> <input class="btn" type="submit" value="Search"/> <button class="btn btn-link" onclick="javascript:reload_params({'search':'', 'filter':''})">Show all builds</button> </div> @@ -89,7 +89,7 @@ <td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td> <td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on|date:"d/m/y H:i"}}</a></td> <td class="completed_on"><a href="{% url "builddashboard" build.id %}">{{build.completed_on|date:"d/m/y H:i"}}</a></td> - <td class="failed_tasks error">{% query build.task_build outcome=4 order__gt=0 as exectask%}{% if exectask.count == 1 %}{{exectask.0.recipe.name}}.{{exectask.0.task_name}}{% elif exectask.count > 1%}{{exectask.count}}{%endif%}</td> + <td class="failed_tasks error">{% query build.task_build outcome=4 order__gt=0 as exectask%}{% if exectask.count == 1 %}<a href="{% url "task" build.id exectask.0.id %}">{{exectask.0.recipe.name}}.{{exectask.0.task_name}}</a>{% elif exectask.count > 1%}<a href="{% url "tasks" build.id %}">{{exectask.count}}</a>{%endif%}</td> <td class="errors_no">{% if build.errors_no %}<a class="errors_no error" href="{% url "builddashboard" build.id %}#errors">{{build.errors_no}} error{{build.errors_no|pluralize}}</a>{%endif%}</td> <td class="warnings_no">{% if build.warnings_no %}<a class="warnings_no warning" href="{% url "builddashboard" build.id %}#warnings">{{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a>{%endif%}</td> <td class="time"><a href="{% url "buildtime" build.id %}">{{build.timespent|sectohms}}</a></td> diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index ab8b938cd..f3baf047a 100644 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -307,7 +307,8 @@ def builds(request): {'name': 'Log', 'dclass': "span4", 'qhelp': "The location in disk of the build main log file", - 'clclass': 'log', 'hidden': 1 + 'clclass': 'log', 'hidden': 1, + 'orderfield': _get_toggle_order(request, "cooker_log_path"), }, {'name': 'Output', 'clclass': 'output', 'qhelp': "The root file system types produced by the build. You can find them in your <code>/build/tmp/deploy/images/</code> directory", |