[LNT] r312060 - Fix various html problems
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 29 15:59:28 PDT 2017
Author: matze
Date: Tue Aug 29 15:59:28 2017
New Revision: 312060
URL: http://llvm.org/viewvc/llvm-project?rev=312060&view=rev
Log:
Fix various html problems
Added:
lnt/trunk/lnt/server/ui/static/v4_regression_detail.js
Modified:
lnt/trunk/lnt/server/ui/templates/error.html
lnt/trunk/lnt/server/ui/templates/reporting/run_report.html
lnt/trunk/lnt/server/ui/templates/utils.html
lnt/trunk/lnt/server/ui/templates/v4_global_status.html
lnt/trunk/lnt/server/ui/templates/v4_graph.html
lnt/trunk/lnt/server/ui/templates/v4_matrix.html
lnt/trunk/lnt/server/ui/templates/v4_new_regressions.html
lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html
lnt/trunk/lnt/server/ui/templates/v4_regression_list.html
Added: lnt/trunk/lnt/server/ui/static/v4_regression_detail.js
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/static/v4_regression_detail.js?rev=312060&view=auto
==============================================================================
--- lnt/trunk/lnt/server/ui/static/v4_regression_detail.js (added)
+++ lnt/trunk/lnt/server/ui/static/v4_regression_detail.js Tue Aug 29 15:59:28 2017
@@ -0,0 +1,86 @@
+function clear_checks() {
+ $('input:checkbox').removeAttr('checked');
+ $('input:checkbox').trigger('change');
+}
+
+function all_checks() {
+ $('input:checkbox').prop('checked','checked');
+ $('input:checkbox').trigger('change');
+}
+
+function show_all() {
+ dt.page.len(-1).draw();
+}
+
+function register_checkboxes() {
+ $(':checkbox').change(function(){
+ var c = this.checked
+ var id = this.id;
+ var index = id.split("-")[1];
+ if (c) {
+ var color = color_codes[index % color_codes.length];
+ var prev_cell = $(this).closest('td').prev();
+ prev_cell.css("background-color", color);
+ add_data_to_graph(changes[index]["url"], index, max_samples);
+ } else {
+ is_checked[index] = false;
+ var prev_cell = $(this).closest('td').prev();
+ prev_cell.css("background-color", "transparent");
+ update_graph();
+ }
+
+ });
+ $(':checkbox').css("-webkit-transform", "scale(2)");
+ }
+function update_order_summary() {
+ var start_orders = $(".change-row").map(function () {
+ return parseInt($(this).data('order-start'));
+ });
+ var end_orders = $(".change-row").map(function () {
+ return parseInt($(this).data('order-end'));
+ });
+
+ var min_order = Math.min.apply(Math, start_orders);
+ var min_order_end = Math.min.apply(Math, end_orders);
+ var max_order = Math.max.apply(Math, end_orders);
+ var max_order_start = Math.max.apply(Math, start_orders);
+
+ var times = $(".reltime").map(function () {
+ return Date.parse($(this).data('time'));
+ });
+ var min_time = Math.min.apply(Math, times);
+
+ // Now print all these things.
+ var SIDE_BAR = '#side-bar'
+ $(SIDE_BAR).append("<h3>Summary</h3><br/>")
+
+ $(SIDE_BAR).append("<h4>Found</h4>");
+ var change = " changes.";
+ if (start_orders.length == 1) {
+ change = " change."
+ }
+ $(SIDE_BAR).append(start_orders.length + change + "<br/>");
+
+ $(SIDE_BAR).append($.format.prettyDate(new Date(min_time).toISOString()));
+ $(SIDE_BAR).append(".<br/>");
+
+ $(SIDE_BAR).append(new Date(min_time).toLocaleString());
+ $(SIDE_BAR).append(".<br/>");
+ $(SIDE_BAR).append("<h4>Orders</h4>");
+
+ $(SIDE_BAR).append("<b>Union (" + (max_order - min_order) + " commits):</b><br/>");
+ $(SIDE_BAR).append("<b>Min Order:</b> " + min_order + "<br/>");
+ $(SIDE_BAR).append("<b>Max Order:</b> " + max_order + "<br/><br/>");
+
+ var intersection_size = min_order_end - max_order_start;
+ if (intersection_size > 0) {
+ $(SIDE_BAR).append("<b>Intersection ("+ intersection_size +"): </b><br/>");
+ $(SIDE_BAR).append("<b>Min Order:</b> " + max_order_start + "<br/>");
+ $(SIDE_BAR).append("<b>Max Order:</b> " + min_order_end + "<br/><br/>");
+ } else {
+ $(SIDE_BAR).append("<b>No intersection</b><br/>");
+ }
+
+ $(SIDE_BAR).append("<br/><b><a href=\"?limit=1000\">More data</a></b><br/>");
+ $(SIDE_BAR).append("<b><a href=\"?limit=0\">All data</a></b><br/>");
+}
Modified: lnt/trunk/lnt/server/ui/templates/error.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/error.html?rev=312060&r1=312059&r2=312060&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/error.html (original)
+++ lnt/trunk/lnt/server/ui/templates/error.html Tue Aug 29 15:59:28 2017
@@ -7,6 +7,7 @@
}}" rel="stylesheet" media="screen"/>
<link href="{{ url_for('.static', filename='bootstrap/css/bootstrap-responsive.min.css')
}}" rel="stylesheet"/>
+ <title>LNT Error: {{message}}</title>
</head>
<body>
@@ -15,4 +16,4 @@
{{ message }}
</div>
-</body>
\ No newline at end of file
+</body>
Modified: lnt/trunk/lnt/server/ui/templates/reporting/run_report.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/reporting/run_report.html?rev=312060&r1=312059&r2=312060&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/reporting/run_report.html (original)
+++ lnt/trunk/lnt/server/ui/templates/reporting/run_report.html Tue Aug 29 15:59:28 2017
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<html>
<head>
<title>{{ subject }}</title>
Modified: lnt/trunk/lnt/server/ui/templates/utils.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/utils.html?rev=312060&r1=312059&r2=312060&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/utils.html (original)
+++ lnt/trunk/lnt/server/ui/templates/utils.html Tue Aug 29 15:59:28 2017
@@ -27,7 +27,9 @@
{%- endmacro %}
{% macro render_bug(bug) -%}
+{% if bug %}
<a href="{{bug}}">{{bug}}</a>
+{% endif %}
{%- endmacro %}
{% macro render_profile_link(profile, compare_profile, run_id, compare_run_id, test_id) -%}
@@ -112,14 +114,14 @@ $(document).ready(function() {
<div>
{% endif %}
- <dt>
- <div class="control-label">
- {{ field.label }}
+ <dl>
+ <dt class="control-label">{{ field.label }}</dt>
+ <dd>
+ <div class="controls">
+ {{ field(**kwargs)|safe }}
</div>
- </dt>
- <div class="controls">
- <dd>{{ field(**kwargs)|safe }}</dd>
- </div>
+ </dd>
+ </dl>
<ul class="help-inline">
{% for error in field.errors %}
<li>{{ error }}</li>
Modified: lnt/trunk/lnt/server/ui/templates/v4_global_status.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_global_status.html?rev=312060&r1=312059&r2=312060&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_global_status.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_global_status.html Tue Aug 29 15:59:28 2017
@@ -4,7 +4,7 @@
{% set components = [(ts.name, v4_url_for(".v4_global_status"))] %}
{% block head %}
<link type="text/css" rel="stylesheet"
- href="{{ url_for('.static', filename='v4_global_status.css') }}"></link>
+ href="{{ url_for('.static', filename='v4_global_status.css') }}"/>
<script async src="{{ url_for('.static', filename='popup.js') }}"></script>
<script async src="{{ url_for('.static', filename='sorttable.js') }}"></script>
<script language="javascript" type="text/javascript"
@@ -119,7 +119,14 @@
<div id="toggle-machine-control-panel">
<ul>
{% for m in machines %}
- <li><input machine="{{ m.name }}" id="checkbox-{{ m.css_name }}" checked="checked" type="checkbox" onclick="v4_global_status.toggle_column_visibility('{{ m.css_name }}');">{{ m.name }}</input></li>
+ <li>
+ <div class="checkbox">
+ <label>
+ <input id="checkbox-{{ m.css_name }}" checked="checked" type="checkbox" onclick="v4_global_status.toggle_column_visibility('{{ m.css_name }}');"/>
+ {{ m.name }}
+ </label>
+ </div>
+ </li>
{% endfor %}
<li><button onclick="v4_global_status.update_table();">Set Visibility</button><button onclick="v4_global_status.reset_table();">Reset</button></li>
</ul>
Modified: lnt/trunk/lnt/server/ui/templates/v4_graph.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_graph.html?rev=312060&r1=312059&r2=312060&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_graph.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_graph.html Tue Aug 29 15:59:28 2017
@@ -159,52 +159,52 @@ function init_page() {
<tr>
<td>Mean() as Aggregation</td>
<td><input type="checkbox" name="switch_min_mean" value="yes"
- {{ 'checked' if options.switch_min_mean else ""}}/></td>
+ {{ 'checked="checked"' if options.switch_min_mean else ""}}/></td>
</tr>
<tr>
<td>Hide Line Plot:</td>
<td><input type="checkbox" name="hide_lineplot" value="yes"
- {{ 'checked' if options.hide_lineplot else ""}}/></td>
+ {{ 'checked="checked"' if options.hide_lineplot else ""}}/></td>
</tr>
<tr>
<td>Show Median Absolute Deviation:</td>
<td><input type="checkbox" name="show_mad" value="yes"
- {{ 'checked' if options.show_mad else ""}}/></td>
+ {{ 'checked="checked"' if options.show_mad else ""}}/></td>
</tr>
<tr>
<td>Show Standard Deviation:</td>
<td><input type="checkbox" name="show_stddev" value="yes"
- {{ 'checked' if options.show_stddev else ""}}/></td>
+ {{ 'checked="checked"' if options.show_stddev else ""}}/></td>
</tr>
<tr>
<td>Show Linear Regression:</td>
<td><input type="checkbox" name="show_linear_regression" value="yes"
- {{ 'checked' if options.show_linear_regression else ""}}/></td>
+ {{ 'checked="checked"' if options.show_linear_regression else ""}}/></td>
</tr>
<tr>
<td>Show Points For Failures:</td>
<td><input type="checkbox" name="show_failures" value="yes"
- {{ 'checked' if options.show_failures else ""}}/></td>
+ {{ 'checked="checked"' if options.show_failures else ""}}/></td>
</tr>
<tr>
<td>Hide Sample Points:</td>
<td><input type="checkbox" name="hide_all_points" value="yes"
- {{ 'checked' if options.hide_all_points else ""}}/></td>
+ {{ 'checked="checked"' if options.hide_all_points else ""}}/></td>
</tr>
<tr>
<td>Normalize By Median:</td>
<td><input type="checkbox" name="normalize_by_median" value="yes"
- {{ 'checked' if options.normalize_by_median else ""}}/></td>
+ {{ 'checked="checked"' if options.normalize_by_median else ""}}/></td>
</tr>
<tr>
<td>Show Moving Average</td>
<td><input type="checkbox" name="show_moving_average" value="yes"
- {{ 'checked' if options.show_moving_average else ""}}/></td>
+ {{ 'checked="checked"' if options.show_moving_average else ""}}/></td>
</tr>
<tr>
<td>Show Moving Median</td>
<td><input type="checkbox" name="show_moving_median" value="yes"
- {{ 'checked' if options.show_moving_median else ""}}/></td>
+ {{ 'checked="checked"' if options.show_moving_median else ""}}/></td>
</tr>
<tr>
<td>Moving Average/Median Window Size</td>
@@ -217,7 +217,7 @@ function init_page() {
<tr>
<td>Hide Revision Comparison Region Highlight</td>
<td><input type="checkbox" name="hide_highlight" value="yes"
- {{ 'checked' if options.hide_highlight else ""}}/></td>
+ {{ 'checked="checked"' if options.hide_highlight else ""}}/></td>
</tr>
</tbody>
</table>
Modified: lnt/trunk/lnt/server/ui/templates/v4_matrix.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_matrix.html?rev=312060&r1=312059&r2=312060&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_matrix.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_matrix.html Tue Aug 29 15:59:28 2017
@@ -38,6 +38,7 @@
<form method="POST" action="">
{{ form.hidden_tag() }}
{{ form.limit(class="auto_submit_item") }}
+</form>
<h3>Baseline: {{baseline_rev}}</h3>
<div id="matrix_div">
{% if machine_name_common %}
Modified: lnt/trunk/lnt/server/ui/templates/v4_new_regressions.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_new_regressions.html?rev=312060&r1=312059&r2=312060&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_new_regressions.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_new_regressions.html Tue Aug 29 15:59:28 2017
@@ -248,7 +248,7 @@ function update_tooltip(event, pos, item
{{ utils.get_regression_cell_value(fc.latest_cr, analysis)}}
- <td><span class="reltime" data-toggle="tooltip" title="{{fc.run.end_time}}">{{ fc.run.end_time.isoformat() }}</td>
+ <td><span class="reltime" data-toggle="tooltip" title="{{fc.run.end_time}}">{{ fc.run.end_time.isoformat() }}</span></td>
</tr>
{% endfor %}
</tbody>
Modified: lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html?rev=312060&r1=312059&r2=312060&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html Tue Aug 29 15:59:28 2017
@@ -52,7 +52,7 @@ var changes = [
{% endblock %}
{% block body %}
-<section id="Regression Detail" />
+<section id="regression_detail" />
<h3>Regression: {{regression.title}}</h3>
<div id="graphbox">
<div id="graph" style="height:250px"></div>
@@ -67,10 +67,9 @@ var changes = [
<div id="xaxis">Order</div>
</div>
-
+{% if regression.bug %}
<a href="{{regression.bug}}">{{regression.bug}}</a>
-
-
+{% endif %}
<form method="POST" action="">
@@ -121,7 +120,7 @@ var changes = [
{{ utils.get_regression_cell_value(fc.latest_cr, analysis)}}
- <td><span class="reltime" data-time="{{fc.run.end_time.isoformat()}}" data-toggle="tooltip" title="{{fc.run.end_time}}">{{ fc.run.end_time.isoformat() }}</td>
+ <td><span class="reltime" data-time="{{fc.run.end_time.isoformat()}}" data-toggle="tooltip" title="{{fc.run.end_time}}">{{ fc.run.end_time.isoformat() }}</span></td>
</tr>
{% endfor %}
</tbody>
@@ -196,95 +195,10 @@ var changes = [
</div>
</form>
+<script language="javascript" type="text/javascript"
+ src="{{ url_for('.static', filename='v4_regression_detail.js') }}"></script>
<script type="text/javascript">
-
-function clear_checks() {
- $('input:checkbox').removeAttr('checked');
- $('input:checkbox').trigger('change');
-}
-
-function all_checks() {
- $('input:checkbox').prop('checked','checked');
- $('input:checkbox').trigger('change');
-}
-
-function show_all() {
- dt.page.len(-1).draw();
-}
-
-function register_checkboxes() {
- $(':checkbox').change(function(){
- var c = this.checked
- var id = this.id;
- var index = id.split("-")[1];
- if (c) {
- var color = color_codes[index % color_codes.length];
- var prev_cell = $(this).closest('td').prev();
- prev_cell.css("background-color", color);
- add_data_to_graph(changes[index]["url"], index, max_samples);
- } else {
- is_checked[index] = false;
- var prev_cell = $(this).closest('td').prev();
- prev_cell.css("background-color", "transparent");
- update_graph();
- }
-
- });
- $(':checkbox').css("-webkit-transform", "scale(2)");
- }
-function update_order_summary() {
- var start_orders = $(".change-row").map(function () {
- return parseInt($(this).data('order-start'));
- });
- var end_orders = $(".change-row").map(function () {
- return parseInt($(this).data('order-end'));
- });
-
- var min_order = Math.min.apply(Math, start_orders);
- var min_order_end = Math.min.apply(Math, end_orders);
- var max_order = Math.max.apply(Math, end_orders);
- var max_order_start = Math.max.apply(Math, start_orders);
-
- var times = $(".reltime").map(function () {
- return Date.parse($(this).data('time'));
- });
- var min_time = Math.min.apply(Math, times);
-
- // Now print all these things.
- var SIDE_BAR = '#side-bar'
- $(SIDE_BAR).append("<h3>Summary</h3><br/>")
-
- $(SIDE_BAR).append("<h4>Found</h4>");
- var change = " changes.";
- if (start_orders.length == 1) {
- change = " change."
- }
- $(SIDE_BAR).append(start_orders.length + change + "<br/>");
-
- $(SIDE_BAR).append($.format.prettyDate(new Date(min_time).toISOString()));
- $(SIDE_BAR).append(".<br/>");
-
- $(SIDE_BAR).append(new Date(min_time).toLocaleString());
- $(SIDE_BAR).append(".<br/>");
- $(SIDE_BAR).append("<h4>Orders</h4>");
-
- $(SIDE_BAR).append("<b>Union (" + (max_order - min_order) + " commits):</b><br/>");
- $(SIDE_BAR).append("<b>Min Order:</b> " + min_order + "<br/>");
- $(SIDE_BAR).append("<b>Max Order:</b> " + max_order + "<br/><br/>");
-
- var intersection_size = min_order_end - max_order_start;
- if (intersection_size > 0) {
- $(SIDE_BAR).append("<b>Intersection ("+ intersection_size +"): </b><br/>");
- $(SIDE_BAR).append("<b>Min Order:</b> " + max_order_start + "<br/>");
- $(SIDE_BAR).append("<b>Max Order:</b> " + min_order_end + "<br/><br/>");
- } else {
- $(SIDE_BAR).append("<b>No intersection</b><br/>");
- }
-
- $(SIDE_BAR).append("<br/><b><a href=\"?limit=1000\">More data</a></b><br/>");
- $(SIDE_BAR).append("<b><a href=\"?limit=0\">All data</a></b><br/>");
-}
var dt = null;
$(document).ready( function () {
Modified: lnt/trunk/lnt/server/ui/templates/v4_regression_list.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_regression_list.html?rev=312060&r1=312059&r2=312060&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_regression_list.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_regression_list.html Tue Aug 29 15:59:28 2017
@@ -40,7 +40,7 @@
<td>{{ form_regression }}</td>
<td>{{utils.render_regression(regress)}} {% if regress.id|int == highlight|int %} <span class="label label-success">Updated</span> {% endif %} </td>
<td>{{RegressionState.names.get(regress.state,"Missing")}}</td>
- <td data-order="{{ age.strftime("%s") }}"><span class="reltime" data-time="{{age.isoformat()}}" data-toggle="tooltip" title="{{age}}">{{ age.isoformat() }}</td>
+ <td data-order="{{ age.strftime("%s") }}"><span class="reltime" data-time="{{age.isoformat()}}" data-toggle="tooltip" title="{{age}}">{{ age.isoformat() }}</span></td>
<th>{{ size }}</th>
<td>{{ impact.previous }}</td><td>{{ impact.current }}</td>
{{ utils.get_regression_cell_value(impact, analysis)}}
More information about the llvm-commits
mailing list