aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2015-02-03 15:04:28 +0100
committerMilo Casagrande <milo.casagrande@linaro.org>2015-02-03 15:04:28 +0100
commit7f0ed513e04bae514e16a81359d0882e6ee310f7 (patch)
tree0ae468186dd769201515614a9184fe581c46c27c
parent000be4aeabddbc95763abeb31a4d11e930056376 (diff)
Fix templates.
* Reorganize content. * Remove table summaries. * Add new placeholders. Change-Id: Ic8de6483939a6cc56abe0ef9f856aa8c3f624351
-rw-r--r--app/dashboard/templates/boots-id.html33
-rw-r--r--app/dashboard/templates/builds-job-kernel-defconf.html35
-rw-r--r--app/dashboard/templates/other-bisect-compare-content.html4
-rw-r--r--app/dashboard/templates/other-bisect-content.html2
4 files changed, 47 insertions, 27 deletions
diff --git a/app/dashboard/templates/boots-id.html b/app/dashboard/templates/boots-id.html
index 4b61e0c..ef9f9d5 100644
--- a/app/dashboard/templates/boots-id.html
+++ b/app/dashboard/templates/boots-id.html
@@ -102,23 +102,34 @@
<div id="other-details-div" class="hidden"></div>
<div class="row" id="multiple-labs">
<div class="page-header">
- <h4>Other boot reports</h4>
+ <h3>Other Boot Reports</h3>
</div>
{%- include "other-multiple-boot-reports.html" %}
</div>
-<div class="row hidden" id="bisect-div">
+<div class="row" id="bisect">
<div class="page-header">
- <h4>Boot bisect for board &#171;{{ board }}&#187;</h4>
+ <h3>Boot Bisect for board &#171;{{ board }}&#187;</h3>
</div>
- {%- include "other-bisect-content.html" %}
-</div>
-<div class="row hidden" id="bisect-compare-div">
- <div class="page-header">
- <h4>
- Boot bisect for board &#171;{{ board }}&#187;&nbsp;<small>(compared to &#171;mainline&#187;)</small>
- </h4>
+ <div class="hidden" id="bisect-div">
+ <div class="other-header">
+ <h4>Default bisect</h4>
+ {# Placeholder for the show/hide button created dynamically #}
+ <span class="pull-right" id="bootb-showhide"></span>
+ <hr class="blurred subheader" />
+ </div>
+ <div id="view-bootb-showhide" class="pull-center"></div>
+ {%- include "other-bisect-content.html" %}
+ </div>
+ <div class="hidden" id="bisect-compare-div">
+ <div class="other-header">
+ <h4>Compared to &#171;mainline&#187;</h4>
+ {# Placeholder for the show/hide button created dynamically #}
+ <span class="pull-right" id="bootb-compare-showhide"></span>
+ <hr class="blurred subheader" />
+ </div>
+ <div id="view-bootb-compare-showhide" class="pull-center"></div>
+ {%- include "other-bisect-compare-content.html" -%}
</div>
- {%- include "other-bisect-compare-content.html" -%}
</div>
<input type="hidden" id="file-server" value='{{ config["FILE_SERVER_URL"] }}'>
<input type="hidden" id="board-name" value="{{ board }}">
diff --git a/app/dashboard/templates/builds-job-kernel-defconf.html b/app/dashboard/templates/builds-job-kernel-defconf.html
index 7846489..152328a 100644
--- a/app/dashboard/templates/builds-job-kernel-defconf.html
+++ b/app/dashboard/templates/builds-job-kernel-defconf.html
@@ -114,23 +114,32 @@
</dl>
</div>
</div>
-<div class="row hidden" id="bisect-div">
- <div class="page-header">
- <h4 id="bisect">Build bisect</h4>
+<div class="row" id="bisect">
+ <div class="page-header"><h3>Build Bisect</h3></div>
+ <div class="hidden" id="bisect-div">
+ <div class="other-header">
+ <h4>Default bisect</h4>
+ {# Placeholder for the show/hide button created dynamically #}
+ <span class="pull-right" id="buildb-showhide"></span>
+ <hr class="blurred subheader" />
+ </div>
+ <div id="view-buildb-showhide" class="pull-center"></div>
+ {%- include "other-bisect-content.html" %}
</div>
- {%- include "other-bisect-content.html" %}
-</div>
-<div class="row hidden" id="bisect-compare-div">
- <div class="page-header">
- <h4>
- Build bisect <small>(compared to &#171;mainline&#187;)</small>
- </h4>
+ <div class="hidden" id="bisect-compare-div">
+ <div class="other-header">
+ <h4>Compared to &#171;mainline&#187;</h4>
+ {# Placeholder for the show/hide button created dynamically #}
+ <span class="pull-right" id="buildb-compare-showhide"></span>
+ <hr class="blurred subheader" />
+ </div>
+ <div id="view-buildb-compare-showhide" class="pull-center"></div>
+ {%- include "other-bisect-compare-content.html" -%}
</div>
- {%- include "other-bisect-compare-content.html" -%}
</div>
<div class="row">
<div class="page-header">
- <h4 id="boot-reports">Boot Reports</h4>
+ <h3 id="boot-reports">Boot Reports</h3>
</div>
<div id="boot-report">
<div class="pull-center">
@@ -140,7 +149,7 @@
</div>
<div class="row">
<div class="page-header">
- <h4 id="platform">Build Platform</h4>
+ <h3 id="platform">Build Platform</h3>
</div>
<div id="build-platform">
<div class="col-xs-7 col-sm-7 col-md-7 col-lg-7">
diff --git a/app/dashboard/templates/other-bisect-compare-content.html b/app/dashboard/templates/other-bisect-compare-content.html
index f84120d..7530855 100644
--- a/app/dashboard/templates/other-bisect-compare-content.html
+++ b/app/dashboard/templates/other-bisect-compare-content.html
@@ -8,7 +8,7 @@
<div class="panel-heading">
<h3 class="panel-title">Bisect comparison summary</h3>
</div>
- <div class="panel-body" id="bisect-summary">
+ <div class="panel-body" id="bisect-compare-summary">
<div id="bisect-compare-description"></div>
<dl class="dl-horizontal hidden" id="dl-bisect-compare-script">
<dt>Bisect script</dt>
@@ -29,7 +29,7 @@
{%- else %}
<div class="table" id="table-compare-div">
{%- endif %}
- <table id="bisect-compare-table" class="bisect-table table" summary="Bisect comparison table">
+ <table id="bisect-compare-table" class="bisect-table table">
<thead>
<tr>
<th class="col-xs-1 col-sm-1 col-md-1 col-lg-1"></th>
diff --git a/app/dashboard/templates/other-bisect-content.html b/app/dashboard/templates/other-bisect-content.html
index 20d0030..0530698 100644
--- a/app/dashboard/templates/other-bisect-content.html
+++ b/app/dashboard/templates/other-bisect-content.html
@@ -26,7 +26,7 @@
{%- else %}
<div class="table" id="table-div">
{%- endif %}
- <table id="bisect-table" class="bisect-table table" summary="Bisect table">
+ <table id="bisect-table" class="bisect-table table">
<thead>
<tr>
<th class="col-xs-1 col-sm-1 col-md-1 col-lg-1"></th>