[LNT] r179191 - Bootstrapify various ui templates
Paul Redmond
paul.redmond at intel.com
Wed Apr 10 11:09:37 PDT 2013
Author: predmond
Date: Wed Apr 10 13:09:37 2013
New Revision: 179191
URL: http://llvm.org/viewvc/llvm-project?rev=179191&view=rev
Log:
Bootstrapify various ui templates
- bootstrap styling added to:
- order, recent_activity, graph, machine, run pages
- remove no longer used v4_utils.html (added directly to v4_run.html)
- the tables generated for reports are not modified
Reviewed by: Daniel Dunbar
Removed:
lnt/trunk/lnt/server/ui/templates/v4_utils.html
Modified:
lnt/trunk/lnt/server/ui/templates/reporting/runs.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_machine.html
lnt/trunk/lnt/server/ui/templates/v4_order.html
lnt/trunk/lnt/server/ui/templates/v4_recent_activity.html
lnt/trunk/lnt/server/ui/templates/v4_run.html
Modified: lnt/trunk/lnt/server/ui/templates/reporting/runs.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/reporting/runs.html?rev=179191&r1=179190&r2=179191&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/reporting/runs.html (original)
+++ lnt/trunk/lnt/server/ui/templates/reporting/runs.html Wed Apr 10 13:09:37 2013
@@ -1,5 +1,4 @@
-{% import "v4_utils.html" as v4_utils %}
{% import "utils.html" as utils %}
{#
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=179191&r1=179190&r2=179191&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/utils.html (original)
+++ lnt/trunk/lnt/server/ui/templates/utils.html Wed Apr 10 13:09:37 2013
@@ -10,3 +10,11 @@
{% macro render_popup_end() -%}
</div>
{%- endmacro %}
+
+{% macro render_result(r) -%}
+<a href="{{v4_url_for('v4_run', id=r.id)}}">View Results</a>
+{%- endmacro %}
+
+{% macro render_machine(m) -%}
+<a href="{{v4_url_for('v4_machine', id=m.id)}}">{{m.name}}:{{m.id}}</a>
+{%- endmacro %}
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=179191&r1=179190&r2=179191&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_global_status.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_global_status.html Wed Apr 10 13:09:37 2013
@@ -1,4 +1,3 @@
-{% import "v4_utils.html" as v4_utils %}
{% import "utils.html" as utils %}
{% extends "layout.html" %}
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=179191&r1=179190&r2=179191&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_graph.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_graph.html Wed Apr 10 13:09:37 2013
@@ -32,6 +32,7 @@
{# Add JS to initialize the graph. #}
{% block onload %}init(){% endblock %}
+
{% block javascript %}
var g = {}
@@ -135,101 +136,124 @@ function update_tooltip(event, pos, item
}
{% endblock %}
-{% block body %}
+{% block sidebar %}
+ <h4>Controls</h4>
+ <ul>
+ <li>Left Mouse: Pan
+ <li>Double Left Mouse: Zoom
+ <li>Wheel: Zoom
+ </ul>
+{% endblock %}
-{{ utils.render_popup_begin('view_options', 'View Options', true) }}
-<form action="" method="get">
-<b>Hide Line Plot:</b>
-<input type="checkbox" name="hide_lineplot" value="yes" {{
- 'checked' if options.hide_lineplot else ""}}><br>
-
-<b>Show Median Absolute Deviation:</b>
-<input type="checkbox" name="show_mad" value="yes" {{
- 'checked' if options.show_mad else ""}}><br>
-
-<b>Show Standard Deviation:</b>
-<input type="checkbox" name="show_stddev" value="yes" {{
- 'checked' if options.show_stddev else ""}}><br>
-
-<b>Show Linear Regression:</b>
-<input type="checkbox" name="show_linear_regression" value="yes" {{
- 'checked' if options.show_linear_regression else ""}}><br>
-
-<b>Show Points For Failures:</b>
-<input type="checkbox" name="show_failures" value="yes" {{
- 'checked' if options.show_failures else ""}}><br>
-
-<b>Show Sample Points:</b>
-<input type="checkbox" name="show_points" value="yes" {{
- 'checked' if options.show_points else ""}}><br>
-
-<b>Show All Sample Points:</b>
-<input type="checkbox" name="show_all_points" value="yes" {{
- 'checked' if options.show_all_points else ""}}><br>
-
-<b>Normalize By Median:</b>
-<input type="checkbox" name="normalize_by_median" value="yes" {{
- 'checked' if options.normalize_by_median else ""}}><br>
-
-<b>Show Moving Average</b>
-<input type="checkbox" name="show_moving_average" value="yes" {{
- 'checked' if options.show_moving_average else ""}}><br>
-
-<b>Show Moving Median</b>
-<input type="checkbox" name="show_moving_median" value="yes" {{
- 'checked' if options.show_moving_median else ""}}><br>
-
-<b>Moving Average/Median Window Size</b>
-<input type="text" name="moving_window_size" value="{{ options.moving_window_size }}"/><br>
-
-<b>Hide Revision Comparison Region Highlight</b>
-<input type="checkbox" name="hide_highlight" value="yes" {{
- 'checked' if options.hide_highlight else ""}}><br>
-
-{# Add all the hidden fields. #}
-{% for name,value in request.args.items() %}
- {% if name.startswith('plot.') %}
- <input type="hidden" name="{{name}}" value="{{value}}">
- {% endif %}
-{% endfor %}
-
-<input type="submit" name="submit" value="Update">
-</form>
-{{ utils.render_popup_end() }}
-
-<h3>Graph</h3>
-<table>
-<tr>
-<td rowspan=2 valign="top">
- <div id="graph" style="width:600px;height:400px;"></div>
- <div id="overview" style="width:600px;height:80px;"></div>
-</td>
-<td valign="top">
-<table cellspacing=4 border=1>
-<tr>
- <th colspan=2>Machine</th>
- <th>Test</th>
- <th>Type</th>
-</tr>
-{% for machine,test_name,field_name,col in legend %}
+{% block body %}
+ <table width="100%">
+ <tr>
+ <td><h3>Graph</h3></td>
+ <td>
+ <div class="dropdown pull-right" id="settings">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#settings">
+ Settings <i class="icon-wrench"></i>
+ </a>
+ <div class="dropdown-menu">
+ <form action="" method="get">
+ <table class="table table-striped table-hover table-condensed">
+ <tbody>
+ <tr>
+ <td>Hide Line Plot:</td>
+ <td><input type="checkbox" name="hide_lineplot" value="yes"
+ {{ '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>
+ </tr>
+ <tr>
+ <td>Show Standard Deviation:</td>
+ <td><input type="checkbox" name="show_stddev" value="yes"
+ {{ '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>
+ </tr>
+ <tr>
+ <td>Show Points For Failures:</td>
+ <td><input type="checkbox" name="show_failures" value="yes"
+ {{ 'checked' if options.show_failures else ""}}></td>
+ </tr>
+ <tr>
+ <td>Show Sample Points:</td>
+ <td><input type="checkbox" name="show_points" value="yes"
+ {{ 'checked' if options.show_points else ""}}></td>
+ </tr>
+ <tr>
+ <td>Show All Sample Points:</td>
+ <td><input type="checkbox" name="show_all_points" value="yes"
+ {{ 'checked' if options.show_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>
+ </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>
+ </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>
+ </tr>
+ <tr>
+ <td>Moving Average/Median Window Size</tr>
+ <td><input type="text" name="moving_window_size"
+ value="{{ options.moving_window_size }}"/></td>
+ </tr>
+ <tr>
+ <td>Hide Revision Comparison Region Highlight</tr>
+ <td><input type="checkbox" name="hide_highlight" value="yes"
+ {{ 'checked' if options.hide_highlight else ""}}></td>
+ </tr>
+ </tbody>
+ </table>
+
+ {# Add all the hidden fields. #}
+ {% for name,value in request.args.items() %}
+ {% if name.startswith('plot.') %}
+ <input type="hidden" name="{{name}}" value="{{value}}">
+ {% endif %}
+ {% endfor %}
+
+ <input class="btn btn-primary" style="clear: left; width: 100%"
+ type="submit" name="submit" value="Update" />
+ </form>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr><td colspan="2"><div id="graph" style="width:100%;height:500px;"></div></td></tr>
+ <tr><td colspan="2"><div id="overview" style="width:100%;height:80px;"></div></td></td>
+ </table>
+
+ <h3>Legend</h3>
+ <table class="table table-condensed table-hover table-striped">
<tr>
- <td bgcolor="{{ '%02x%02x%02x' % (
- 255*col[0], 255*col[1], 255*col[2]) }}"> </td>
- <td>{{machine.name}}:{{machine.id}}</td>
- <td>{{test_name}}</td>
- <td>{{field_name}}</td>
+ <th></th>
+ <th>Machine</th>
+ <th>Test</th>
+ <th>Type</th>
</tr>
-{% endfor %}
-</table>
-</td></tr>
-<tr><td align="right" valign="bottom">
-<font size="-2">
-Left Mouse: Pan<br>
-Double Left Mouse: Zoom<br>
-Wheel: Zoom<br>
-</font>
-</td></tr>
-</table>
-<p>
-
+ {% for machine,test_name,field_name,col in legend %}
+ <tr>
+ <td style="background-color: #{{ '%02x%02x%02x' % (255*col[0], 255*col[1], 255*col[2]) }}"> </td>
+ <td>{{ utils.render_machine(machine) }}</td>
+ <td>{{ test_name }}</td>
+ <td>{{ field_name }}</td>
+ </tr>
+ {% endfor %}
+ </table>
{% endblock %}
Modified: lnt/trunk/lnt/server/ui/templates/v4_machine.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_machine.html?rev=179191&r1=179190&r2=179191&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_machine.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_machine.html Wed Apr 10 13:09:37 2013
@@ -5,94 +5,81 @@
{% extends "layout.html" %}{
{% set components = [(testsuite_name, v4_url_for("v4_overview"))] %}
-{% block head %}
- <script src="{{ url_for('.static', filename='popup.js') }}"></script>
-{% endblock %}
-{% block title %}Machine: {{machine.name}}:{{machine.id}}{% endblock %}
-{% block body %}
+{% block title %}{{machine.name}}:{{machine.id}}{% endblock %}
-<table width="100%%" border=1>
- <tr>
- <td valign="top" width="200">
- <h4>Relatives:</h4>
- <ul>
+{% block sidebar %}
+ <ul class="nav nav-list bs-docs-sidenav">
+ <li><a href="#fields"><i class="icon-chevron-right"></i> Fields</a></li>
+ <li><a href="#parameters"><i class="icon-chevron-right"></i> Parameters</a></li>
+ <li><a href="#submissions"><i class="icon-chevron-right"></i> Submissions</a></li>
+ </ul>
+
+ <h4>Relatives</h4>
+ <ul class="nav nav-list bs-docs-sidenav">
+ {# List all machines with this name. #}
+ {% for m in ts.machines(name=machine.name) %}
+ <li>{{ utils.render_machine(m) }}</li>
+ {% endfor %}
+ </ul>
+{% endblock %}
-{# List all machines with this name. #}
-{% for m in ts.machines(name=machine.name) %}
- <li><a href="{{ v4_url_for('v4_machine', id=m.id)}}">{{
- m.name}}:{{m.id}}</a></li>
-{% endfor %}
- </ul>
- </td>
- <td valign="top">
- <table border=1>
- <tr>
- <td> <b>Nickname</b> </td>
- <td> {{machine.name}} </td>
- </tr>
+{% block body %}
+ <section id="fields" />
+ <h3>Fields</h3>
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
<tr>
- <td> <b>Machine ID</b> </td>
- <td> {{machine.id}} </td>
+ <th>Name</th>
+ <th>Value</th>
</tr>
- </table>
-
-
-{{ utils.render_popup_begin('machine_info', 'Machine Info', true, 1) }}
- <h4>Fields</h4>
- <table border=1>
- <thead>
- <tr><th>Name</th><th>Value</th></tr>
- </thead>
-{% for item in ts.machine_fields %}
+ </thead>
+ {% for item in ts.machine_fields %}
+ <tr>
+ <td>{{item.name}}</td>
+ <td>{{machine.get_field(item)}}</td>
+ </tr>
+ {% endfor %}
+ </table>
+
+ <section id="parameters" />
+ <h3>Parameters</h3>
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
<tr>
- <td> <b>{{item.name}}</b> </td>
- <td>{{machine.get_field(item)}}</td>
+ <th>Name</th>
+ <th>Value</th>
</tr>
-{% endfor %}
- </table>
- <h4>Parameters</h4>
- <table border=1>
- <thead>
- <tr><th>Name</th><th>Value</th></tr>
- </thead>
-{% for key,value in machine.parameters|dictsort %}
+ </thead>
+ {% for key,value in machine.parameters|dictsort %}
+ <tr>
+ <td>{{key}}</td>
+ <td>{{value}}</td>
+ </tr>
+ {% endfor %}
+ </table>
+
+ <section id="submissions" />
+ <h3>Submissions</h3>
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
<tr>
- <td> <b>{{key}}</b> </td>
- <td>{{value}}</td>
+ <th>Run Order</th>
+ <th>Start Time</th>
+ <th>Duration</th>
+ <th> </th>
</tr>
-{% endfor %}
- </table>
-{{ utils.render_popup_end() }}
-
-<p>
-<table class="sortable" border=1>
-<thead>
- <tr>
- <th>Run Order</th>
- <th>Start Time</th>
- <th>Duration</th>
- <th> </th>
- </tr>
-</thead>
-{% for order,runs in associated_runs|sort|reverse %}
-{% for run in runs %}
- <tr>
-{% if loop.first %}
- <td rowspan="{{ runs|length }}" align=right>{{
- order.as_ordered_string() }}</td>
-{% endif %}
- <td>{{ run.start_time }}</td>
- <td>{{ run.end_time - run.start_time }}s</td>
- <td><a href="{{v4_url_for('v4_run', id=run.id)}}">
- View Results</a></td>
- </tr>
-{% endfor %}
-{% endfor %}
-</table>
-
-
- </td>
- </tr>
-</table>
-
+ </thead>
+ {% for order,runs in associated_runs|sort|reverse %}
+ {% for run in runs %}
+ <tr>
+ {% if loop.first %}
+ <td rowspan="{{ runs|length }}" align=right>{{ order.as_ordered_string() }}</td>
+ {% endif %}
+ <td>{{ run.start_time }}</td>
+ <td>{{ run.end_time - run.start_time }}s</td>
+ <td>{{ utils.render_result(run) }}</td>
+ </tr>
+ {% endfor %}
+ {% endfor %}
+ </table>
{% endblock %}
Modified: lnt/trunk/lnt/server/ui/templates/v4_order.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_order.html?rev=179191&r1=179190&r2=179191&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_order.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_order.html Wed Apr 10 13:09:37 2013
@@ -2,74 +2,87 @@
{% extends "layout.html" %}{
{% set components = [(ts.name, v4_url_for("v4_overview"))] %}
-{% block head %}
- <script src="{{ url_for('.static', filename='popup.js') }}"></script>
-{% endblock %}
{% block title %}Order: {{order.id}}{% endblock %}
-{% block body %}
-<h3>Order Fields</h3>
-<table border="1">
- <thead>
- <tr>
- <th>Name</th>
- <th>Value</th>
- </tr>
- </thead>
- <tr>
- <td>ID</td>
- <td>{{order.id}}</td>
- </tr>
- <tr>
- <td>Previous Order ID</td>
- <td>{{order.previous_order_id}}</td>
- </tr>
- <tr>
- <td>Next ID</td>
- <td>{{order.next_order_id}}</td>
- </tr>
-{% for field in order.fields %}
- <tr>
- <td>{{field.name}}</td>
- <td>{{order.get_field(field)}}</td>
- </tr>
-{% endfor %}
-</table>
-
-{# Provide links to the previous and next orders. #}
-{% if order.previous_order_id is not none %}
-<a href="{{v4_url_for('v4_order', id=order.previous_order_id)}}">Previous</a>
-{% endif %}
-{% if order.next_order_id is not none %}
-<a href="{{v4_url_for('v4_order', id=order.next_order_id)}}">Next</a>
-{% endif %}
-
-{# List all submissions which reported for this order. #}
-<h3>Submissions</h3>
-<table class="sortable" border=1>
- <thead>
- <tr>
- <th>Start Time</th>
- <th>Duration</th>
- <th>Machine</th>
- <th>Results</th>
- </tr>
- </thead>
-
-{# Show the active submissions. #}
-{% for r in ts.query(ts.Run).filter_by(order_id = order.id) %}
-{% set m = r.machine %}
- <tr>
- <td>{{r.start_time}}</td>
- <td>{{r.end_time - r.start_time}}</td>
- <td align=left><a href="{{v4_url_for('v4_machine',id=m.id)}}">{{
- m.name}}:{{m.id}}</a></td>
- <td><a href="{{v4_url_for('v4_run', id=r.id)}}">
- View Results</a></td>
- </tr>
-{% endfor %}
-</table>
-<p><b>Num. Submissions:</b> {{
- ts.query(ts.Run).filter_by(order_id = order.id).count()}}</p>
+{% block sidebar %}
+ <ul class="nav nav-list bs-docs-sidenav">
+ <li><a href="#fields"><i class="icon-chevron-right"></i> Fields</a></li>
+ <li><a href="#submissions"><i class="icon-chevron-right"></i> Submissions</a></li>
+ </ul>
+{% endblock %}
+{% block body %}
+ {# Provide links to the previous and next orders. #}
+ <ul class="pager">
+ {% if order.previous_order_id is not none %}
+ <li class="previous"><a href="{{v4_url_for('v4_order', id=order.previous_order_id)}}">
+ {% else %}
+ <li class="previous disabled"><a href="#">
+ {% endif %}
+ ← Previous</a></li>
+
+ {% if order.next_order_id is not none %}
+ <li class="next" ><a href="{{v4_url_for('v4_order', id=order.next_order_id)}}">
+ {% else %}
+ <li class="next disabled"><a href="#">
+ {% endif %}
+ Next →</a></li>
+ </ul>
+
+ <section id="fields" />
+ <h3>Order Fields</h3>
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>ID</td>
+ <td>{{order.id}}</td>
+ </tr>
+ <tr>
+ <td>Previous Order ID</td>
+ <td>{{order.previous_order_id}}</td>
+ </tr>
+ <tr>
+ <td>Next ID</td>
+ <td>{{order.next_order_id}}</td>
+ </tr>
+ {% for field in order.fields %}
+ <tr>
+ <td>{{field.name}}</td>
+ <td>{{order.get_field(field)}}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ <section id="submissions" />
+ {# List all submissions which reported for this order. #}
+ <h3>Submissions</h3>
+ <b>Num. Submissions:</b> {{ts.query(ts.Run).filter_by(order_id = order.id).count()}}
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
+ <tr>
+ <th>Start Time</th>
+ <th>Duration</th>
+ <th>Machine</th>
+ <th>Results</th>
+ </tr>
+ </thead>
+ <tbody>
+ {# Show the active submissions. #}
+ {% for r in ts.query(ts.Run).filter_by(order_id = order.id) %}
+ <tr>
+ <td>{{r.start_time}}</td>
+ <td>{{r.end_time - r.start_time}}</td>
+ <td>{{ utils.render_machine(r.machine) }}</td>
+ <td>{{ utils.render_result(r) }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
{% endblock %}
Modified: lnt/trunk/lnt/server/ui/templates/v4_recent_activity.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_recent_activity.html?rev=179191&r1=179190&r2=179191&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_recent_activity.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_recent_activity.html Wed Apr 10 13:09:37 2013
@@ -1,72 +1,64 @@
+{% import "utils.html" as utils %}
{% set db = request.get_db() %}
{% extends "layout.html" %}
{% set components = [(testsuite_name, v4_url_for("v4_overview"))] %}
-{% block title %}Overview{% endblock %}
-{% block body %}
+{% block title %}Recent Activity{% endblock %}
-{# Find recent runs. #}
-<center><h3>Submission Overview</h3></center>
-<table width="100%%">
- <tr>
- <td valign="top" width="50%">
- <center>
- <h3>Active Machines</h3>
- <table class="sortable" border=1>
- <thead>
- <tr>
- <th>Latest Submission</th>
- <th>Machine</th>
- <th>Results</th>
- </tr>
- </thead>
+{% block sidebar %}
+ <ul class="nav nav-list bs-docs-sidenav">
+ <li><a href="#machines"><i class="icon-chevron-right"></i> Active Machines</a></li>
+ <li><a href="#submissions"><i class="icon-chevron-right"></i> Recent Submissions</a></li>
+ </ul>
+{% endblock %}
-{# Show the most active machines. #}
-{% for machine_name,r in active_machines|dictsort %}
+{% block body %}
+ {# Find recent runs. #}
+ <section id="machines" />
+ <h3>Active Machines</h3>
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
+ <tr>
+ <th>Machine</th>
+ <th>Latest Submission</th>
+ <th>Results</th>
+ </tr>
+ </thead>
+ <tbody>
+ {# Show the most active machines. #}
+ {% for machine_name,r in active_machines|dictsort %}
<tr>
- <td>{{r.start_time}}</td>
- <td align=left><a href="{{v4_url_for('v4_machine', id=r.machine.id)}}">{{
- r.machine.name}}:{{r.machine.id}}</a></td>
- <td><a href="{{v4_url_for('v4_run', id=r.id)}}">
- View Results</a></td>
+ <td>{{ utils.render_machine(r.machine) }}</td>
+ <td>{{ r.start_time }}</td>
+ <td>{{ utils.render_result(r) }}</td>
</tr>
-{% endfor %}
-
- </table>
- </center>
- </td>
- <td valign="top">
- <center>
- <h3>Recent Submissions</h3>
- <table class="sortable" border=1>
- <thead>
- <tr>
- <th>Run Order</th>
- <th>Start Time</th>
- <th>Duration</th>
- <th>Machine</th>
- <th>Results</th>
- </tr>
- </thead>
-
-{# Show the active submissions. #}
-{% for r,run_order in active_submissions %}
-{% set m = r.machine %}
+ {% endfor %}
+ </tbody>
+ </table>
+
+ <section id="submissions" />
+ <h3>Recent Submissions</h3>
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
+ <tr>
+ <th>Run Order</th>
+ <th>Start Time</th>
+ <th>Duration</th>
+ <th>Machine</th>
+ <th>Results</th>
+ </tr>
+ </thead>
+ <tbody>
+ {# Show the active submissions. #}
+ {% for r,run_order in active_submissions %}
<tr>
- <td><a href="{{v4_url_for('v4_order', id=r.order.id)}}">{{
- run_order}}</a></td></td>
- <td>{{r.start_time}}</td>
- <td>{{r.end_time - r.start_time}}</td>
- <td align=left><a href="{{v4_url_for('v4_machine',id=m.id)}}">{{
- m.name}}:{{m.id}}</a></td>
- <td><a href="{{v4_url_for('v4_run', id=r.id)}}">
- View Results</a></td>
+ <td><a href="{{v4_url_for('v4_order', id=r.order.id)}}">{{run_order}}</a></td></td>
+ <td>{{ r.start_time }}</td>
+ <td>{{ r.end_time - r.start_time }}</td>
+ <td>{{ utils.render_machine(r.machine) }}</td>
+ <td>{{ utils.render_result(r) }}</td>
</tr>
-{% endfor %}
- </table>
- </center>
- </td>
- </tr>
-</table>
-
+ {% endfor %}
+ </tbody>
+ </table>
{% endblock %}
Modified: lnt/trunk/lnt/server/ui/templates/v4_run.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_run.html?rev=179191&r1=179190&r2=179191&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_run.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_run.html Wed Apr 10 13:09:37 2013
@@ -1,4 +1,3 @@
-{% import "v4_utils.html" as v4_utils %}
{% import "utils.html" as utils %}
{% set run = request_info.run %}
@@ -6,247 +5,342 @@
{% set baseline = request_info.baseline %}
{% set ts = request_info.ts %}
{% set machine = run.machine %}
+{% set neighboring_runs = request_info.neighboring_runs %}
+{% set comparison_neighboring_runs = request_info.comparison_neighboring_runs %}
{% extends "layout.html" %}
{% set components = [(ts.name, v4_url_for("v4_overview")),
- ('machine', v4_url_for("v4_machine", id=machine.id))] %}
+ ('%s:%s' % (machine.name, machine.id),
+ v4_url_for("v4_machine", id=machine.id))] %}
+
{% block head %}
- <script src="{{ url_for('.static', filename='popup.js') }}"></script>
- <script src="{{ url_for('.static', filename='sorttable.js') }}"></script>
+ <script src="{{ url_for('.static', filename='popup.js') }}"></script>
+ <script src="{{ url_for('.static', filename='sorttable.js') }}"></script>
{% endblock %}
{% block title %}Run Results{% endblock %}
-{% block body %}
-
{% macro get_cell_value(cr) %}
-{% set test_status = cr.get_test_status() %}
-{% set value_status = cr.get_value_status() %}
-{% set run_cell_value = "-" if cr.current is none else "%.4f" % cr.current %}
-
-{% if options.show_previous %}
-{% set prev_cell_value = "-" if cr.previous is none else "%.4f" % cr.previous %}
+ {% set test_status = cr.get_test_status() %}
+ {% set value_status = cr.get_value_status() %}
+ {% set run_cell_value = "-" if cr.current is none else "%.4f" % cr.current %}
+
+ {% if options.show_previous %}
+ {% set prev_cell_value = "-" if cr.previous is none else "%.4f" % cr.previous %}
<td>{{prev_cell_value}}</td>
-{% endif %}
-
-{% set cell_color = none %}
-{% if test_status == analysis.REGRESSED %}
+ {% endif %}
+
+ {% set cell_color = none %}
+ {% if test_status == analysis.REGRESSED %}
{% set cell_color = (233,128,128) %}
-{% elif test_status == analysis.IMPROVED %}
+ {% elif test_status == analysis.IMPROVED %}
{% set cell_color = (143,223,95) %}
-{% elif test_status == analysis.UNCHANGED_FAIL %}
+ {% elif test_status == analysis.UNCHANGED_FAIL %}
{% set cell_color = (255,195,67) %}
-{% endif %}
-
-{% if cell_color %}
- <td bgcolor="{{ '#%02x%02x%02x' % cell_color }}">{{
- run_cell_value}}</td>
-{% else %}
+ {% endif %}
+
+ {% if cell_color %}
+ <td bgcolor="{{ '#%02x%02x%02x' % cell_color }}">{{ run_cell_value }}</td>
+ {% else %}
<td>{{run_cell_value}}</td>
-{% endif %}
-
-{% if (options.show_all or
- value_status == analysis.REGRESSED or
- value_status == analysis.IMPROVED) %}
+ {% endif %}
+
+ {% if (options.show_all or
+ value_status == analysis.REGRESSED or
+ value_status == analysis.IMPROVED) %}
{{ cr.pct_delta|aspctcell|safe }}
-{% else %}
+ {% else %}
<td>-</td>
-{% endif %}
-
-{% if options.show_delta %}
+ {% endif %}
+
+ {% if options.show_delta %}
<td>{{ "-" if cr.delta is none else "%.4f" % cr.delta }}</td>
-{% endif %}
-{% if options.show_stddev %}
+ {% endif %}
+ {% if options.show_stddev %}
<td>{{ "-" if cr.stddev is none else "%.4f" % cr.stddev }}</td>
-{% endif %}
-{% if options.show_mad %}
+ {% endif %}
+ {% if options.show_mad %}
<td>{{ "-" if cr.MAD is none else "%.4f" % cr.MAD }}</td>
-{% endif %}
-{% if options.show_all_samples %}
- <td>[
+ {% endif %}
+ {% if options.show_all_samples %}
+ <td>
+ [
{%- for v in cr.get_samples() -%}
{{ ", " if not loop.first else "" }}
{{ "%.4f" % v }}
- {%- endfor -%}]</td>
-{% endif %}
-
-{% if options.show_sample_counts %}
+ {%- endfor -%}
+ ]
+ </td>
+ {% endif %}
+
+ {% if options.show_sample_counts %}
<td>{{cr.get_samples()|length}}</td>
-{% endif %}
-
+ {% endif %}
{% endmacro %}
-{% call v4_utils.v4_run_page(ts, machine, run, compare_to,
- request_info.neighboring_runs,
- request_info.comparison_neighboring_runs) %}
-
-{{ utils.render_popup_begin('view_options', 'View Options', true) }}
-<form action="" method="get">
-<b>Show Delta:</b>
-<input type="checkbox" name="show_delta" value="yes" {{
- "checked" if options.show_delta else "" }}><br>
-
-<b>Show Previous Value:</b>
-<input type="checkbox" name="show_previous" value="yes" {{
- "checked" if options.show_previous else "" }}><br>
-
-<b>Show Standard Deviation:</b>
-<input type="checkbox" name="show_stddev" value="yes" {{
- "checked" if options.show_stddev else "" }}><br>
-
-<b>Show Median Absolute Deviation:</b>
-<input type="checkbox" name="show_mad" value="yes" {{
- "checked" if options.show_mad else "" }}><br>
-
-<b>Show All Values:</b>
-<input type="checkbox" name="show_all" value="yes" {{
- "checked" if options.show_all else "" }}><br>
-
-<b>Show All Samples:</b>
-<input type="checkbox" name="show_all_samples" value="yes" {{
- "checked" if options.show_all_samples else "" }}><br>
-
-<b>Show Sample Counts:</b>
-<input type="checkbox" name="show_sample_counts" value="yes" {{
- "checked" if options.show_sample_counts else "" }}><br>
-
-<b>Number of Comparison Runs:</b>
-<input type="text" name="num_comparison_runs" value="{{
- options.num_comparison_runs }}"><br>
-
-<b>Show Report Graphs:</b>
-<input type="checkbox" name="show_graphs" value="yes" {{
- "checked" if options.show_graphs else "" }}><br>
-
-<b>Show Data Table:</b>
-<input type="checkbox" name="show_data_table" value="yes" {{
- "checked" if options.show_data_table else ""}}><br>
-
-<b>Hide Report By Default:</b>
-<input type="checkbox" name="hide_report_by_default" value="yes" {{
- "checked" if options.hide_report_by_default else ""}}><br>
-
-<b>Test Filter (regexp):</b>
-<input type="text" name="test_filter" value="{{
- options.test_filter }}"><br>
-
-<b>Test Min. Value Filter:</b>
-<input type="text" name="test_min_value_filter" value="{{
- options.test_min_value_filter }}"><br>
-
-<b>Aggregation Function</b>
-<select name="aggregation_fn">
-<option value="min" {{ " selected"
- if "min" == options.aggregation_fn else ""}}>
- Minimum</value>
-<option value="median" {{ " selected"
- if "median" == options.aggregation_fn else ""}}>
- Median</value>
-</select>
-
-{% if compare_to %}
-<input type="hidden" name="compare_to" value="{{compare_to.id}}">
-{% endif %}
-{% if baseline %}
-<input type="hidden" name="baseline" value="{{baseline.id}}">
-{% endif %}
-
-<input type="submit" name="submit" value="Update">
-</form>
-
-{{ utils.render_popup_end() }}
-
-{{ utils.render_popup_begin('html_report', 'Report',
- options.hide_report_by_default) }}
-{{request_info.html_report|safe}}
-{{ utils.render_popup_end() }}
-
-<h3>Tests</h3>
-
-{% set graph_base=v4_url_for('v4_graph', highlight_run=run.id) %}
-<form method="GET" action="{{ graph_base }}">
-
-{# Report one table for each primary field. #}
-{% for field in primary_fields %}
-{{ utils.render_popup_begin('test_data.' + field.name, field.name, false) }}
-<h4>{{field.name}}</h4>
-
-<table class="sortable" border=1>
-<thead>
- <tr>
- <th rowspan="1"></th>
- <th rowspan="1">Name</th>
- {% if options.show_previous %}
- <th>Prev</th>
- {% endif %}
- <th>Current</th>
- <th>%</th>
- {% if options.show_delta %}
- <th>Δ</th>
- {% endif %}
- {% if options.show_stddev %}
- <th>σ</th>
- {% endif %}
- {% if options.show_mad %}
- <th>MAD</th>
- {% endif %}
- {% if options.show_all_samples %}
- <th>Samples</th>
- {% endif %}
- {% if options.show_sample_counts %}
- <th>N</th>
- {% endif %}
- </tr>
-</thead>
-
-{% for test_name,test_id in test_info %}
-{% set cr = request_info.sri.get_run_comparison_result(
- run, compare_to, test_id, field, request_info.comparison_window) %}
-{% if cr.previous is not none or cr.current is not none %}
-{% if cr.current is none or cr.current >= test_min_value_filter %}
- <tr>
- <td><input type="checkbox" name="plot.{{test_id}}"
- value="{{machine.id}}.{{test_id}}.{{field.index}}"></td>
- <td><a href="{{graph_base}}&plot.{{test_id}}={{
- machine.id}}.{{test_id}}.{{field.index}}">{{
- test_name}}</a></td>
- {{ get_cell_value(cr) }}
- </tr>
-{% endif %}
-{% endif %}
-{% endfor %}
-</table>
-{{ utils.render_popup_end() }}
-
-{% endfor %}
-<p><input type="submit" value="Graph">
-</form>
-
-{% if options.show_data_table %}
-
-<h3>Test Data</h3>
-
-<pre>
-Name{% for field in primary_fields
-%} {{field.name}} {%
- endfor %}
--{% for field in primary_fields
-%} Prev Value %{% endfor %}
-{% for test_name,test_id in test_info
-%}{{
-test_name
-}}{%
- for field in primary_fields
-%}{%
- set cr = request_info.sri.get_run_comparison_result(
- run, compare_to, test_id, field, request_info.comparison_window)
-%} {{cr.previous}} {{cr.current}} {{cr.pct_delta}}{%
- endfor %}
-{%
-endfor %}
-</pre>
-{% endif %}
+{% block sidebar %}
+ <ul class="nav nav-list bs-docs-sidenav">
+ <li><a href="#machine_info"><i class="icon-chevron-right"></i>Machine Info</a></li>
+ <li><a href="#run_info"><i class="icon-chevron-right"></i>Run Info</a></li>
+ <li><a href="#view_options"><i class="icon-chevron-right"></i>View Options</a></li>
+ <li><a href="#report"><i class="icon-chevron-right"></i>Report</a></li>
+ {% for field in primary_fields %}
+ <li><a href="#{{ field.name }}"><i class="icon-chevron-right"></i>{{ field.name }}</a></li>
+ {% endfor %}
+ </ul>
+
+ <h4>Runs:</h4>
+ <ul>
+ {# Show a small number of neighboring runs. #}
+ {% for r in neighboring_runs %}
+ <li>
+ {{ "<b>"|safe if r.id == run.id else "" }}
+ <a href="{{v4_url_for('v4_run', id=r.id)}}">{{ r.start_time }}</a>
+ {{ "</b>"|safe if r.id == run.id else "" }}
+ {% endfor %}
+ </ul>
+ {# Show a small number of runs in the neighborhood of the comparison run. #}
+ {% if comparison_neighboring_runs %}
+ <h4>Compare To:</h4>
+ <ul>
+ {% for r in comparison_neighboring_runs %}
+ <li>
+ {{ "<b>"|safe if compare_to and r.id == compare_to.id else "" }}
+ <a href="{{v4_url_for('v4_run', id=run.id, compare_to=r.id)}}">{{ r.start_time}}</a>
+ {{ "</b>"|safe if compare_to and r.id == compare_to.id else "" }}
+ {% endfor %}
+ </ul>
+ {% endif %}
+{% endblock %}
-{% endcall %}
+{% block body %}
+ <section id="machine_info" />
+ {{ utils.render_popup_begin('machine_info', 'Machine Info', true) }}
+ <h4>Fields</h4>
+ <table class="table table-striped table-condensed table-hover">
+ {% for item in machine.fields %}
+ <tr>
+ <td> <b>{{item.name}}</b> </td>
+ <td>{{machine.get_field(item)}}</td>
+ </tr>
+ {% endfor %}
+ </table>
+
+ <h4>Parameters</h4>
+ <table class="table table-striped table-condensed table-hover">
+ {% for key,value in machine.parameters|dictsort %}
+ <tr>
+ <td> <b>{{key}}</b> </td>
+ <td>{{value}}</td>
+ </tr>
+ {% endfor %}
+ </table>
+ {{ utils.render_popup_end() }}
+
+ <section id="run_info" />
+ {{ utils.render_popup_begin('run_info', 'Run Info', true) }}
+ <h4>Fields</h4>
+ <table class="table table-striped table-condensed table-hover">
+ <thead>
+ <tr><th>Name</th><th>Value</th></tr>
+ </thead>
+ {% for item in run.fields %}
+ <tr>
+ <td> <b>{{item.name}}</b> </td>
+ <td>{{run.get_field(item)}}</td>
+ </tr>
+ {% endfor %}
+ </table>
+
+ <h4>Parameters</h4>
+ <table class="table table-striped table-condensed table-hover">
+ <thead>
+ <tr><th>Name</th><th>Value</th></tr>
+ </thead>
+ {% for key,value in run.parameters|dictsort(case_sensitive=True) %}
+ <tr>
+ <td> <b>{{key}}</b> </td>
+ {# Split lines in multi-line values. #}
+ {% if '\n' in value %}
+ <td>
+ {% for ln in value.split('\n') %}
+ {{ ln }}<br>
+ {% endfor %}
+ </td>
+ {% else %}
+ <td>{{value}}</td>
+ {% endif %}
+ </tr>
+ {% endfor %}
+ </table>
+ {{ utils.render_popup_end() }}
+
+ <section id="view_options" />
+ {{ utils.render_popup_begin('view_options', 'View Options', true) }}
+ <form action="" method="get">
+ <table class="table table-striped table-condensed table-hover">
+ <tr>
+ <td>Show Delta</td>
+ <td><input type="checkbox" name="show_delta" value="yes" {{ "checked" if options.show_delta else "" }}></td>
+ </tr>
+ <tr>
+ <td>Show Previous Value:</td>
+ <td><input type="checkbox" name="show_previous" value="yes" {{ "checked" if options.show_previous 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>
+ </tr>
+ <tr>
+ <td>Show Median Absolute Deviation:</td>
+ <td><input type="checkbox" name="show_mad" value="yes" {{ "checked" if options.show_mad else "" }}></td>
+ </tr>
+ <tr>
+ <td>Show All Values:</td>
+ <td><input type="checkbox" name="show_all" value="yes" {{ "checked" if options.show_all else "" }}><td>
+ </tr>
+ <tr>
+ <td>Show All Samples:</td>
+ <td><input type="checkbox" name="show_all_samples" value="yes" {{ "checked" if options.show_all_samples else "" }}></td>
+ </tr>
+ <tr>
+ <td>Show Sample Counts:</td>
+ <td><input type="checkbox" name="show_sample_counts" value="yes" {{ "checked" if options.show_sample_counts else "" }}></td>
+ </tr>
+ <tr>
+ <td>Number of Comparison Runs:</td>
+ <td><input type="text" name="num_comparison_runs" value="{{ options.num_comparison_runs }}"></td>
+ </tr>
+ <tr>
+ <td>Show Report Graphs:</td>
+ <td><input type="checkbox" name="show_graphs" value="yes" {{ "checked" if options.show_graphs else "" }}></td>
+ </tr>
+ <tr>
+ <td>Show Data Table:</td>
+ <td><input type="checkbox" name="show_data_table" value="yes" {{ "checked" if options.show_data_table else ""}}></td>
+ </tr>
+ <tr>
+ <td>Hide Report By Default:</td>
+ <td><input type="checkbox" name="hide_report_by_default" value="yes" {{ "checked" if options.hide_report_by_default else ""}}></td>
+ </tr>
+ <tr>
+ <td>Test Filter (regexp):</td>
+ <td><input type="text" name="test_filter" value="{{ options.test_filter }}"></td>
+ </tr>
+ <tr>
+ <td>Test Min. Value Filter:</td>
+ <td><input type="text" name="test_min_value_filter" value="{{ options.test_min_value_filter }}"></td>
+ </tr>
+ <tr>
+ <td>Aggregation Function</td>
+ <td>
+ <select name="aggregation_fn">
+ <option value="min" {{ " selected" if "min" == options.aggregation_fn else ""}}>
+ Minimum</value>
+ <option value="median" {{ " selected" if "median" == options.aggregation_fn else ""}}>
+ Median</value>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ {% if compare_to %}
+ <input type="hidden" name="compare_to" value="{{compare_to.id}}">
+ {% endif %}
+ {% if baseline %}
+ <input type="hidden" name="baseline" value="{{baseline.id}}">
+ {% endif %}
+
+ <input type="submit" name="submit" value="Update">
+ </td>
+ </tr>
+ </table>
+ </form>
+ {{ utils.render_popup_end() }}
+
+ <section id="report" />
+ {{ utils.render_popup_begin('html_report', 'Report',
+ options.hide_report_by_default) }}
+ {{request_info.html_report|safe}}
+ {{ utils.render_popup_end() }}
+
+ <h3>Tests</h3>
+
+ {% set graph_base=v4_url_for('v4_graph', highlight_run=run.id) %}
+ <form method="GET" action="{{ graph_base }}">
+
+ {# Report one table for each primary field. #}
+ {% for field in primary_fields %}
+ <section id="{{ field.name }}" />
+ {{ utils.render_popup_begin('test_data-' + field.name, field.name, false) }}
+ <table class="table table-striped table-hover table-condensed">
+ <thead>
+ <tr>
+ <th rowspan="1"></th>
+ <th rowspan="1">Name</th>
+ {% if options.show_previous %}<th>Prev</th>{% endif %}
+ <th>Current</th>
+ <th>%</th>
+ {% if options.show_delta %}<th>Δ</th>{% endif %}
+ {% if options.show_stddev %}<th>σ</th>{% endif %}
+ {% if options.show_mad %}<th>MAD</th>{% endif %}
+ {% if options.show_all_samples %}<th>Samples</th>{% endif %}
+ {% if options.show_sample_counts %}<th>N</th>{% endif %}
+ </tr>
+ </thead>
+ <tbody>
+ {% for test_name,test_id in test_info %}
+ {% set cr = request_info.sri.get_run_comparison_result(
+ run, compare_to, test_id, field, request_info.comparison_window) %}
+ {% if cr.previous is not none or cr.current is not none %}
+ {% if cr.current is none or cr.current >= test_min_value_filter %}
+ <tr>
+ <td><input type="checkbox" name="plot.{{test_id}}" value="{{machine.id}}.{{test_id}}.{{field.index}}"></td>
+ <td><a href="{{graph_base}}&plot.{{test_id}}={{ machine.id}}.{{test_id}}.{{field.index}}">{{ test_name }}</a></td>
+ {{ get_cell_value(cr) }}
+ </tr>
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+ </tbody>
+ </table>
+ {{ utils.render_popup_end() }}
+ {% endfor %}
+ <p><input type="submit" value="Graph">
+ </form>
+
+ {% if options.show_data_table %}
+ <h3>Test Data</h3>
+ <table class="table table-striped table-condensed table-hover">
+ <thead>
+ <th>Name</th>
+ {% for field in primary_fields %}
+ <th colspan="3">{{field.name}}</th>
+ {% endfor %}
+ </thead>
+ <thead>
+ <th>-</th>
+ {% for field in primary_fields %}
+ <th>Prev</th>
+ <th>Value</th>
+ <th>%</th>
+ {% endfor %}
+ </thead>
+ <tbody>
+ {% for test_name,test_id in test_info %}
+ <tr>
+ <td>{{ test_name }}</td>
+ {% for field in primary_fields %}
+ {% set cr = request_info.sri.get_run_comparison_result(run, compare_to, test_id, field, request_info.comparison_window) %}
+ <td>{{cr.previous}}</td>
+ <td>{{cr.current}}</td>
+ <td>{{cr.pct_delta}}</td>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% endif %}
+
{% endblock %}
Removed: lnt/trunk/lnt/server/ui/templates/v4_utils.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_utils.html?rev=179190&view=auto
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_utils.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_utils.html (removed)
@@ -1,135 +0,0 @@
-{% import "utils.html" as utils %}
-
-{% macro v4_run_page(ts, machine, run, compare_to, neighboring_runs,
- comparison_neighboring_runs=none) %}
-
-<center>
- <table>
- <tr>
- <td align=right>Machine:</td>
- <td>{{machine.name}}:{{machine.id}}</td>
- </tr>
- <tr>
- <td align=right>Run:</td>
-{# FIXME: Don't hard code field name. #}
- <td>{{run.start_time}} ({{
- run.order.llvm_project_revision}})</td>
- </tr>
-{% if compare_to %}
- <tr>
- <td align=right>Compare To:</td>
-{# FIXME: Don't hard code field name. #}
- <td>{{compare_to.start_time}} ({{
- compare_to.order.llvm_project_revision}})</td>
- </tr>
-{% endif %}
- </table>
-</center>
-<p>
-
-<table width="100%%" border=1>
- <tr>
- <td valign="top" width="200">
- <h4>Machine:</h4>
- <a href="{{ v4_url_for('v4_machine', id=machine.id) }}">{{
- machine.name}}:{{machine.id}}</a>
- <h4>Runs:</h4>
- <ul>
-
-{# Show a small number of neighboring runs. #}
-{% for r in neighboring_runs %}
- <li>{{ "<h3>"|safe if r.id == run.id else "" }}
- <a href="{{v4_url_for('v4_run', id=r.id)}}">{{
- r.start_time}}</a>{{
- "</h3>"|safe if r.id == run.id else ""}}
-{% endfor %}
- </ul>
-
-{# Show a small number of runs in the neighborhood of the comparison run. #}
-{% if comparison_neighboring_runs %}
- <h4>Compare To:</h4>
- <ul>
-{% for r in comparison_neighboring_runs %}
- <li>{{ "<h3>"|safe if compare_to and r.id == compare_to.id else "" }}
- <a href="{{v4_url_for('v4_run', id=run.id, compare_to=r.id)}}">{{
- r.start_time}}</a>{{
- "</h3>"|safe if compare_to and r.id == compare_to.id else ""}}
-{% endfor %}
- </ul>
-{% endif %}
- </td>
- <td valign="top">
- <table border=1>
- <tr>
- <td> <b>Nickname</b> </td>
- <td> {{machine.name}} </td>
- </tr>
- <tr>
- <td> <b>Machine ID</b> </td>
- <td> {{machine.id}} </td>
- </tr>
- </table>
-{{ utils.render_popup_begin('machine_info', 'Machine Info', true) }}
- <h4>Fields</h4>
- <table border=1>
-{% for item in machine.fields %}
- <tr>
- <td> <b>{{item.name}}</b> </td>
- <td>{{machine.get_field(item)}}</td>
- </tr>
-{% endfor %}
- </table>
- <h4>Parameters</h4>
- <table border=1>
-{% for key,value in machine.parameters|dictsort %}
- <tr>
- <td> <b>{{key}}</b> </td>
- <td>{{value}}</td>
- </tr>
-{% endfor %}
- </table>
-{{ utils.render_popup_end() }}
-
-{{ utils.render_popup_begin('run_info', 'Run Info', true) }}
- <h4>Fields</h4>
- <table border=1>
- <thead>
- <tr><th>Name</th><th>Value</th></tr>
- </thead>
-{% for item in run.fields %}
- <tr>
- <td> <b>{{item.name}}</b> </td>
- <td>{{run.get_field(item)}}</td>
- </tr>
-{% endfor %}
- </table>
-
- <h4>Parameters</h4>
- <table border=1>
- <thead>
- <tr><th>Name</th><th>Value</th></tr>
- </thead>
-{% for key,value in run.parameters|dictsort(case_sensitive=True) %}
- <tr>
- <td> <b>{{key}}</b> </td>
-{# Split lines in multi-line values. #}
-{% if '\n' in value %}
- <td>
- {% for ln in value.split('\n') %}
- {{ ln }}<br>
- {% endfor %}
- </td>
-{% else %}
- <td>{{value}}</td>
-{% endif %}
- </tr>
-{% endfor %}
- </table>
-{{ utils.render_popup_end() }}
-{{ caller() }}
-
- </td>
- </tr>
-</table>
-
-{% endmacro %}
More information about the llvm-commits
mailing list