Fix missing/mismatched html tags

[MatzeB]

Summary

• Fix various missing end tags and mismatched tags
• Also add closing slash to various empty tags (<br> => <br/>, <input> => <input/>...)
• Replace some html entities with the actual UTF-8 characters; This looks nicer and makes it easier to run xmllint on the output.

[cmatthews]

It would be wonderful if we could programmatically check these during testing. Thanks Matthias!

[kristof.beyls]

In D34581#790607, @cmatthews wrote:

It would be wonderful if we could programmatically check these during testing. Thanks Matthias!

I had to make the tags XML-compliant in the daily report page to make testing its content in tests/server/ui/V4Pages.py possible using the Python built-in xml parser (see functions check_nr_machines_reported and get_xml_tree).
So, in other words, I think checking this programmatically would probably be easy and boil down to parsing every HTML page using the Python built-in xml parser, see function get_xml_tree pointed to in the sentence above.

[MatzeB]

In D34581#790630, @kristof.beyls wrote:

In D34581#790607, @cmatthews wrote:

It would be wonderful if we could programmatically check these during testing. Thanks Matthias!

I had to make the tags XML-compliant in the daily report page to make testing its content in tests/server/ui/V4Pages.py possible using the Python built-in xml parser (see functions check_nr_machines_reported and get_xml_tree).
So, in other words, I think checking this programmatically would probably be easy and boil down to parsing every HTML page using the Python built-in xml parser, see function get_xml_tree pointed to in the sentence above.

Adding the tests would be easy (you could easy tweak the V4Pages script to not just check the presence of pages but also the well-formedness). Unforunately I had to give up the approach of validating XML for now:
The flask WTForms stuff only outputs HTML5 and has no option (at least nothing without a lot of hackery accessible according to my websearches) that outputs XHTML, so it produces <input> elements that aren't properly closed according to xml rules.

[MatzeB]

For the record: I just added an optional integration to pytidylib/tidy-html5 that checks lnt pages for html problems (r312061). It can be used with lnt -Dtidylib=1.

[kristof.beyls]

In D34581#856055, @MatzeB wrote:

For the record: I just added an optional integration to pytidylib/tidy-html5 that checks lnt pages for html problems (r312061). It can be used with lnt -Dtidylib=1.

Very nice! Thanks for all the cleanups and improvements you've been making to LNT lately!

I guess there's a chance tidylib might be better than just aiming to parse XHTML as proper XML, as it may go beyond what an XML validator is capable of, by being written specifically for HTML?

[MatzeB]

In D34581#856259, @kristof.beyls wrote:

In D34581#856055, @MatzeB wrote:

For the record: I just added an optional integration to pytidylib/tidy-html5 that checks lnt pages for html problems (r312061). It can be used with lnt -Dtidylib=1.

Very nice! Thanks for all the cleanups and improvements you've been making to LNT lately!

I guess there's a chance tidylib might be better than just aiming to parse XHTML as proper XML, as it may go beyond what an XML validator is capable of, by being written specifically for HTML?

I would have preferred simpler xml validation too, in fact that is what I tried first. In the end I failed with that approach because the WTForms library that we use only outputs HTML5 and has no way to produce XHTML, thus resulting in unclosed <input> tags without an good way to fix it. So various pages with forms on them will fail xml validation right now.

So the best thing I could find was the tidylib/tidy-html5 combination.

lnt/trunk/lnt/server/ui/templates/index.html

 {% extends "layout.html" %}
 {% set components = [] %}
 {% block title %}Overview{% endblock %}
 {% block body %}
 
 {# Display available test result suites. #}
 <h3>Test Suites</h3>
 {% for name in request.get_db().testsuite %}
-  <a href="{{db_url_for('v4_recent_activity', testsuite_name=name)}}">{{name}}</a><br>
+  <a href="{{db_url_for('v4_recent_activity', testsuite_name=name)}}">{{name}}</a><br/>
 {% endfor %}
 
 {% endblock %}

lnt/trunk/lnt/server/ui/templates/reporting/runs.html

<table style="{{ styles['table'] }}" class="{{ classes['table'] }}">
          </thead>
          <tbody class="searchable">
          {% for name in test_names %}
            <tr><td class="benchmark-name" style="{{ styles['td'] }}">
                {{ name }}</td></tr>
          {% endfor %}
          </tbody>
        {% else %}
-         <th style="{{ styles['th'] }}">&Delta; {{ metric_field_suffix }}</th>
+         <th style="{{ styles['th'] }}">Δ {{ metric_field_suffix }}</th>
          <th style="{{ styles['th'] }}">{{ metric_name }}</th>
          <th style="{{ styles['th'] }}">Current</th>
-         <th style="{{ styles['th'] }}">&sigma; {{ metric_field_suffix }}</th>
+         <th style="{{ styles['th'] }}">σ {{ metric_field_suffix }}</th>
          {% if secondary_info %}
-         <th style="{{ styles['th'] }}">&Delta; {{ secondary_field_suffix }}</th>
-         <th style="{{ styles['th'] }}">&sigma; {{ secondary_field_suffix }}</th>
+         <th style="{{ styles['th'] }}">Δ {{ secondary_field_suffix }}</th>
+         <th style="{{ styles['th'] }}">σ {{ secondary_field_suffix }}</th>
          {% endif %}
          </tr>
          </thead>
          <tbody class="searchable">
          
          {% for name, cr, test_id in bucket %}
          <tr>
            <td class="benchmark-name" style="{{ styles['td'] }}">
<table style="{{ styles['table'] }}" class="{{ classes['table'] }}">
              {{ a_cr.pct_delta|aspctcell(style=styles['td'],reverse=cr.bigger_is_better)|safe }}
              <td style="{{ styles['td'] }}">{{ "%.4f" | format_or_default(a_cr.stddev, '-') }}</td>
            {% endif %}
          </tr>
          {% endfor %}
          </tbody>
        {% endif %}
      </table>
+   </p>
 {% endif %}
 {% endmacro %}
 
 {% if not only_html_body %}
 <html>
 <head>
    <title>{{ subject }}</title>
 </head>
<tbody>
     {% else %}
     <tr id="run-table-{{ title }}">
       <td style="{{ styles['td'] }}" colspan="5">No {{ title }} Run</td>
     </tr>
     {% endif %}
   {% endfor %}
  </tbody>
 </table>
+</p>
 
 {% if compare_to and run.machine != compare_to.machine %}
 <p><b>
 *** WARNING ***: comparison is against a different machine ({{compare_to.machine.name}},{{compare_to.machine.id}})
 </b></p>
 {% endif %}
 {% if baseline and run.machine != baseline.machine %}
 <p><b>
 *** WARNING ***: baseline is against a different machine ({{baseline.machine.name}},{{baseline.machine.id}})
 </b></p>
 {% endif %}
 
-<hr>
+<hr/>
 <h3>Tests Summary</h3>
 <table style="{{ styles['table'] }}" class="{{ classes['table'] }}">
   <thead>
     <tr>
       <th style="{{ styles['th'] }}">Status Group</th>
       <th style="{{ styles['th'] }}; text-align:right">#</th>
       {% if baseline %}
         <th style="{{ styles['th'] }}; text-align:right"># (B)</th>
<h3>Run-Over-Run Changes Detail</h3>
   {% set field_display_name = {"compile_time":"Compile Time",
                                "execution_time":"Execution Time"}.get(field.name, field.name) %}
   {{
     add_report_changes_detail_for_field_and_bucket(compare_to, field, show_perf, run_url, field_index, field_display_name,
                                                    bucket_name, sorted_bucket, test_names,
                                                    'Previous', '', ' (B)', run_to_baseline_info, styles, classes)
   }}
 {% endfor %}
-<p>
+</p>
 {% if baseline %}
 <h3>Run-Over-Baseline Changes Detail</h3>
 {% for _, field, bucket_name, sorted_bucket, test_names, show_perf in prioritized_buckets_run_over_baseline %}
   {% set field_index = ts.sample_fields.index(field) %}
   {% set field_display_name = {"compile_time":"Compile Time",
                                "execution_time":"Execution Time"}.get(field.name, field.name) %}
   {{
     add_report_changes_detail_for_field_and_bucket(baseline, field, show_perf, run_url, field_index, field_display_name,

lnt/trunk/lnt/server/ui/templates/rules.html

 
   <section id="rules" />
   {# List all rules which are loaded into the system. #}
   <h3>Rules</h3>
   <table class="table table-striped table-hover table-condensed">
     <thead>
       <tr>
         <th>Name</th>
-        <th>Description<th>
+        <th>Description</th>
       </tr>
     </thead>
     <tbody class="searchable">
       {% for name, desc in rules.items() %}
       <tr>
         <td>{{ name }}</td>
         <td>{{ desc }}</td>
 
       </tr>
       {% endfor %}
     </tbody>
   </table>
 {% endblock %}

lnt/trunk/lnt/server/ui/templates/submit_run.html

 {% extends "layout.html" %}
 {% set components = [] %}
 {% block title %}Submit Run{% endblock %}
 {% block body %}
 
 {% if error is defined %}
   <p><font color="#FF0000">{{ error }}</font></p>
 {% endif %}
 
 <form method="post" enctype="multipart/form-data" action="">
-<b>Input File (plist):</b><br>
-<input type="file" name="file"><br>
+<b>Input File (plist):</b><br/>
+<input type="file" name="file"><br/>
 
-<p><b>Input Data (plist):</b><br>
+<p><b>Input Data (plist):</b><br/>
 <textarea name="input_data"></textarea>
 
-<p><b>Commit*:</b><br>
+<p><b>Commit*:</b><br/>
 <select name="commit">
 <option selected="selected" value="0">0</option>
 <option value="1">1</option>
-</select><br>
+</select><br/>
 
 <p><input type="submit" name="submit" value="Submit">
 </form>
 
 {% endblock %}

lnt/trunk/lnt/server/ui/templates/utils.html

</script>
     {{ cr.pct_delta|aspctcell(reverse=cr.bigger_is_better)|safe}}
   {% endif %}
 
 {% endmacro %}
 
 
 {% macro render_field(field) %}
     {%  if field.errors %}
-        <div class="control-group error">
     {% else %}
-        <div>
     {% endif %}
 
     <dt>
         <div class="control-label">
             {{ field.label }}
         </div>
     </dt>
     <div class="controls">
-        <dd>{{ field(**kwargs)|safe }}
+      <dd>{{ field(**kwargs)|safe }}</dd>
     </div>
     <ul class="help-inline">
     {% for error in field.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
 
     </div>
-    </dd>
-{% endmacro %}
+{% endmacro %}
 

lnt/trunk/lnt/server/ui/templates/v4_graph.html

<td>
         </a>
         <div class="dropdown-menu">
           <form action="" method="get">
           <table class="table table-striped table-hover table-condensed">
             <tbody>
               <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' 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' 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' 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' 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' 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' if options.show_failures else ""}}/></td>
               </tr>
               <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' 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' 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' 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' if options.show_moving_median else ""}}/></td>
               </tr>
               <tr>
                 <td>Moving Average/Median Window Size</td>
               </tr>
               {# Split this into a new row to avoid making the dialog wider. #}
               <tr>
                 <td><input type="text" name="moving_window_size"
                      value="{{ options.moving_window_size }}"/></td>
               </tr>
               <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' 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}}">
+          <input type="hidden" name="{{name}}" value="{{value}}"/>
           {% endif %}
           {% if name.startswith('baseline.') %}
-          <input type="hidden" name="{{name}}" value="{{value}}">
+          <input type="hidden" name="{{name}}" value="{{value}}"/>
           {% endif %}
           {% if name == 'mean' %}
-          <input type="hidden" name="{{name}}" value="{{value}}">
+          <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="graphbox" style="margin-left:20px">
                 <div id="graph" style="height:500px"></div>
                 <div id="zoombar" style="width:40px;">
                     <button id="in" type="button" class="btn btn-default" style="width:100%;text-align:center;">+</button>
-                    <br>
+                    <br/>
                     <button id="out" type="button" class="btn btn-default" style="width:100%; text-align:center;">-</button>
                 </div>
                 <div id="yaxis">Metric</div>
                 <div id="xaxis">Order</div>
             </div>
         </td>
     </tr>
 
     <tr>
         <td colspan="2">
             <div id="overview" style="height:80px;margin-top:20px;margin-left:20px"></div>
         </td>
-    </td>
+    </tr>
 
 </table>
 
   <h3>Legend</h3>
   <table class="table table-condensed table-hover table-striped">
     <tr>
       <th></th>
       <th>Machine</th>

lnt/trunk/lnt/server/ui/templates/v4_machine.html

<section id="compare">
                 Compare {{ machine.name }} to
                 <select name="compare_to_id">
                     {%  for machine in machines %}
                         <option value="{{ machine.id }}">{{ machine.name }}:{{ machine.id }}</option>
                     {% endfor %}
                 </select>
                 </p>
                 <p>
-                    <input class="btn" type="submit" value="Compare">
+                    <input class="btn" type="submit" value="Compare"/>
                 </p>
 
             </form>
     </section>
 
   <section id="submissions">
   <h3>Submissions</h3>
   <table class="table table-striped table-hover table-condensed">

lnt/trunk/lnt/server/ui/templates/v4_matrix.html

</tr>
 
             {% set baseline_rev = None if order == baseline_rev else "" %}
 
             <tr class="{{baseline_class}}">
                 <td>
                     <a href="{{v4_url_for('v4_order', id=order_to_id[order])}}">
                         {{name}}
                     </a>
-                    <br>
+                    <br/>
                     <span class="shortDateFormat" data-toggle="tooltip" title="{{order_to_date[order]}}">
                         {{ order_to_date[order].isoformat() }}
                     </span>
                 </td>
                 {% for req in associated_runs: %}
                     {{ get_cell_value(req.change.get(order)) }}
                 {% endfor %}
                 {{ get_cell_value(geomeans[order]) }}

lnt/trunk/lnt/server/ui/templates/v4_new_regressions.html

function extract_metadata(item, graph_data) {
         return meta_data;
 
     }
     var data = item.datapoint;
     var meta_data = extract_metadata(item, graph_data);
     var tip_body = '<div id="tooltip">';
 
     if ("test_name" in meta_data) {
-        tip_body += "<b>Test:</b> " + meta_data.test_name + "<br>";
+        tip_body += "<b>Test:</b> " + meta_data.test_name + "<br/>";
     }
 
     if ("label" in meta_data) {
-        tip_body += "<b>Revision:</b> " + meta_data.label + "<br>";
+        tip_body += "<b>Revision:</b> " + meta_data.label + "<br/>";
     }
-    tip_body += "<b>Value:</b> " + data[1].toFixed(4) + "<br>";
+    tip_body += "<b>Value:</b> " + data[1].toFixed(4) + "<br/>";
 
     if ("date" in meta_data) {
         tip_body += "<b>Date:</b> " + meta_data.date;
     }
     tip_body += "</div>";
     var tooltip_div = $(tip_body).css( {
         position: 'absolute',
         display: 'none',

 
 
 <section id="Changes" />
 <h3>Recent Changes</h3>
 <table><td><tr>Data: More </tr><tr><input type="range" id="graph_range" value="1" onchange="update_graph()"></tr><tr> Less</tr></td></table>
 <div id="graph" style="height:250px"></div>
 <div id="zoombar" style="width:40px;z-index: 999;">
     <button id="in" type="button" class="btn btn-default" style="width:100%;text-align:center;">+</button>
-    <br>
+    <br/>
     <button id="out" type="button" class="btn btn-default" style="width:100%; text-align:center;">-</button>
-    <br>
+    <br/>
     <button id="normalize" type="button" class="btn btn-default" style="width:100%; text-align:center;">%</button>
 </div>
 
 
 <form method="POST" action="{{ v4_url_for("v4_new_regressions") }}">
     {{ form.hidden_tag() }}
 
 <table id="changes_table" class="display">
   
   <thead>
   <tr>
     <th>X</th>
     <th>Machine</th>
     <th>Metric</th>
     <th>Test</th>
     <th>Good, Bad</th>
     <th>Old</th><th>New</th>
-    <th>%&Delta;</th>
+    <th>Δ</th>
     <th>Now</th>
     <th>Curernt</th>
     <th>Age</th>
 
   </tr>
   </thead>
   <tbody>
     {% set graph_base=v4_url_for('v4_graph') %}

lnt/trunk/lnt/server/ui/templates/v4_order.html

 {% 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 %}
-    &larr; Previous</a></li>
+    ← 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 &rarr;</a></li>
+    Next →</a></li>
   </ul>
 
-  <section id="fields" />
+  <section id="fields">
   <h3>Order Fields</h3>
   <table class="table table-striped table-hover table-condensed">
     <thead>
       <tr>
         <th>Name</th>
         <th>ID</th>
         {% for field in order.fields %}
            <th>{{field.name}}</th>
<tbody>
           {% set next_order = ts.query(ts.Order).filter(ts.Order.id == order.next_order_id).one() %}
           {% for field in next_order.fields %}
                 <td>{{next_order.get_field(field)}}</td>
           {% endfor %}
       </tr>
      {%  endif %}
     </tbody>
   </table>
+  </section>
 
   <section id="baseline">
   <div class="accordion" id="accordion">
     <div class="accordion-group">
       <div class="accordion-heading">
         <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
            {% if form.name.data %}
                Baseline - {{ form.name.data }}
             {% else %}
                Configure as a baseline
             {% endif %}
         </a>
       </div>
       <div id="collapseOne" class="accordion-body collapse">
         <div class="accordion-inner">
-              <form method="POST" action="">
             <div class="form-group">
          {{ form.hidden_tag() }}
             {{ utils.render_field(form.name) }}
             {{ utils.render_field(form.description) }}
            {% if form.name.data %}
                 {{ form.update }}
                 {{ form.demote }}
                 {% else %}
                 {{ form.promote }}
           {% endif %}
             </div>
           </form>
         </div>
       </div>
     </div>
+  </div>
 
   </section>
 
-  <section id="submissions" />
+  <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><span class="utctime">{{ r.start_time.isoformat() }}</span></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>
+  </section>
 {% endblock %}

lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html

 
 {% block body %}
 <section id="Regression Detail" />
 <h3>Regression: {{regression.title}}</h3>
 <div id="graphbox">
     <div id="graph" style="height:250px"></div>
     <div id="zoombar" style="width:40px;z-index: 999;">
         <button id="in" type="button" class="btn btn-default" style="width:100%;text-align:center;">+</button>
-        <br>
+        <br/>
         <button id="out" type="button" class="btn btn-default" style="width:100%; text-align:center;">-</button>
-        <br>
+        <br/>
         <button id="normalize" type="button" class="btn btn-default" style="width:100%; text-align:center;">%</button>
     </div>
     <div id="yaxis">Metric</div>
     <div id="xaxis">Order</div>
 </div>
 
 
 <a href="{{regression.bug}}">{{regression.bug}}</a>
 
 
 
 
 <form method="POST" action="">
     {{ form.hidden_tag() }}
 
 <table id="changes_table" class="display">
   
   <thead>
   <tr>
     <th></th>
-    <th>&Delta; ID</th>
+    <th>Δ ID</th>
     <th>Machine</th>
     <th>Metric</th>
     <th>Test</th>
     <th>Good, Bad</th>
     <th>Old</th><th>New</th>
-    <th>%&Delta;</th>
+    <th>%Δ</th>
     <th>Now</th>
     <th>Current</th>
     <th>Age</th>
 
   </tr>
   </thead>
   <tbody>
     {% set graph_base=v4_url_for('v4_graph') %}
function update_order_summary() {
     
     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("<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(start_orders.length + change + "<br/>");
 
     $(SIDE_BAR).append($.format.prettyDate(new Date(min_time).toISOString()));
-    $(SIDE_BAR).append(".</br>");
+    $(SIDE_BAR).append(".<br/>");
     
     $(SIDE_BAR).append(new Date(min_time).toLocaleString());
-    $(SIDE_BAR).append(".</br>");
+    $(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>");
+    $(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>");
+        $(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("<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>");
+     $(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 () {
     dt = $('#changes_table').DataTable({
     "dom": '<"top">rt<"bottom">',
     "drawCallback": function( settings ) {
         register_checkboxes();

lnt/trunk/lnt/server/ui/templates/v4_regression_list.html

 
 <!-- Modal -->
 <div id="mergeRegressionModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mergeRegressionModal" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="editRegressionModal">Merge Regression</h3>
   </div>
      
-      <div class="modal-body">
-      Merge selected changes into new regression. Are you sure?
-      </div>
-      <div class="modal-footer">
-          <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-          <input name="merge_btn" class="btn btn-primary" type="submit" value="Merge Regressions">
-      </div>
+    <input name="merge_btn" class="btn btn-primary" type="submit" value="Merge Regressions"/>
   </div>
 </div>
 
 
 <!-- Modal -->
 <div id="delRegressionModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="delRegressionModal" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="editRegressionModal">Delete Regression(s)</h3>
   </div>
 
-      <div class="modal-body">
-      Delete selected changes. Are you sure?
-      </div>
-      <div class="modal-footer">
-          <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-          <input name="merge_btn" class="btn btn-primary" type="submit" value="Delete Regressions">
-      </div>
+    <input name="merge_btn" class="btn btn-primary" type="submit" value="Delete Regressions"/>
   </div>
 </div>
 
 
 </form> 
 
 <script type="text/javascript">
 $(document).ready( function () {

lnt/trunk/lnt/server/ui/templates/v4_run.html

<table class="table table-striped table-condensed table-hover">
     </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>
+            {{ ln }}<br/>
           {% endfor %}
           </td>
         {% else %}
           <td>{{value}}</td>
         {% endif %}
       </tr>
     {% endfor %}
   </table>
   {{ utils.render_popup_end() }}
   </section>
 
   <section id="view_options">
   {{ utils.render_popup_begin('view_options', 'View Options', true) }}
   <form 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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <td><input type="checkbox" name="show_sample_counts" value="yes" {{ "checked" if options.show_sample_counts else "" }}/></td>
     </tr>
     <tr>
       <td>Show Small Differences:</td>
-      <td><input type="checkbox" name="show_small_diff" value="yes" {{ "checked" if options.show_small_diff else "" }}></td>
+      <td><input type="checkbox" name="show_small_diff" value="yes" {{ "checked" if options.show_small_diff else "" }}/></td>
     </tr>
     <tr>
       <td>Number of Comparison Runs:</td>
-      <td><input type="text" name="num_comparison_runs" value="{{ options.num_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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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 ""}}>
+        <option value="min" {{ ('selected="selected"' if "min" == options.aggregation_fn else '')|safe}}>
           Minimum</option>
-        <option value="median" {{ " selected" if "median" == options.aggregation_fn else ""}}>
+        <option value="median" {{ ('selected="selected"' if "median" == options.aggregation_fn else '')|safe}}>
           Median</option>
         </select>
       </td>
     </tr>
     <tr>
       <td>Mann-Whitney test confidence level:</td>
       <td>
         <select name="MW_confidence_lv">
-          <option value="0.10" {{ "selected" if options.MW_confidence_lv == 0.10 else ""}}>
+          <option value="0.10" {{ ('selected="selected"' if options.MW_confidence_lv == 0.10 else '')|safe}}>
             10%</option>
-          <option value="0.05" {{ "selected" if options.MW_confidence_lv == 0.05 else ""}}>
+          <option value="0.05" {{ ('selected="selected"' if options.MW_confidence_lv == 0.05 else '')|safe}}>
             5%</option>
-          <option value="0.01" {{ "selected" if options.MW_confidence_lv == 0.01 else ""}}>
+          <option value="0.01" {{ ('selected="selected"' if options.MW_confidence_lv == 0.01 else '')|safe}}>
             1%</option>
         </select>
       </td>
     </tr>
     <tr>
       <td colspan="2">
         {% if compare_to %}
-          <input type="hidden" name="compare_to" value="{{compare_to.id}}">
+          <input type="hidden" name="compare_to" value="{{compare_to.id}}"/>
         {% endif %}
         {% if baseline %}
-          <input type="hidden" name="baseline" value="{{baseline.id}}">
+          <input type="hidden" name="baseline" value="{{baseline.id}}"/>
         {% endif %}
 
-        <input type="submit" name="submit" value="Update">
+        <input type="submit" name="submit" value="Update"/>
       </td>
     </tr>
     </table>
   </form>
   {{ utils.render_popup_end() }}
   </section>
 
   <section id="report">
<form id="graph_selection_form" method="GET" action="{{ graph_base }}">
               {% endif %}
             {% endif %}
           {% endfor %}
         {%  if tests %}
       {{ utils.render_popup_begin('test_data-' + field.name, field.name, false) }}
       <table class="table table-striped table-hover table-condensed floating_header datatable">
         <thead>
           <tr>
-            <th rowspan="1" class="sorttable_nosort"><input type="checkbox" id="select-all-{{ field.name }}" onClick="selectAll(this)"></th>
+            <th rowspan="1" class="sorttable_nosort"><input type="checkbox" id="select-all-{{ field.name }}" onClick="selectAll(this)"/></th>
             <th rowspan="1">Name</th>
             {% if options.show_previous %}<th>Prev</th>{% endif %}
             <th>Current</th>
             <th>%</th>
-            {% if options.show_delta %}<th>&Delta;</th>{% endif %}
-            {% if options.show_stddev %}<th>&sigma;</th>{% endif %}
+            {% 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 class="searchable">
           {% for test_name,test_id,cr in tests %}
             <tr>
-              <td><input type="checkbox" name="plot.{{test_id}}" value="{{machine.id}}.{{test_id}}.{{field.index}}"></td>
+              <td><input type="checkbox" name="plot.{{test_id}}" value="{{machine.id}}.{{test_id}}.{{field.index}}"/></td>
               <td class="benchmark-name">
                 <a href="{{graph_base}}&amp;plot.{{test_id}}={{ machine.id}}.{{test_id}}.{{field.index}}">
                   {{ test_name }}
                 </a>
                 {{ utils.render_profile_link(cr.cur_profile, cr.prev_profile, run.id, compare_to.id, test_id) }}
               </td>
               {{ get_cell_value(cr) }}
             </tr>
           {% endfor %}
         </tbody>
         <tfoot>
           <tr>
             {% set cr = request_info.sri.get_geomean_comparison_result(
                         run, compare_to, field, tests) %}
-            <td><input type="checkbox" name="mean" value="{{machine.id}}.{{field.index}}"></td>
+            <td><input type="checkbox" name="mean" value="{{machine.id}}.{{field.index}}"/></td>
             <td><a href="{{graph_base}}&amp;mean={{machine.id}}.{{field.index}}">Geometric Mean</a></td>
             {{ get_cell_value(cr) }}
           </tr>
         </tfoot>
       </table>
       {{ utils.render_popup_end() }}
         {% else %}
             <script>$('#link_{{ field.name }}').hide();</script>
         {% endif %}
       </section>
     {% endfor %}
-    <p><input id="graph_button" type="submit" value="Graph"> <input id="matrix_button" type="submit" value="Matrix">
+    <p>
+      <input id="graph_button" type="submit" value="Graph"/>
+      <input id="matrix_button" type="submit" value="Matrix"/>
+    </p>
   </form>
   </section>
 
   {% if options.show_data_table %}
     <h3>Test Data</h3>
     <table class="table table-striped table-condensed table-hover">
       <thead>
         <th>Name</th>

 $("#graph_button").on("click", function(e){
     e.preventDefault();
     {% set graph_base=v4_url_for('v4_graph') %}
     $('#graph_selection_form').attr('action', "{{ graph_base }}").submit();
 });
 
 
 </script>
-
-
-</script>
 {% endblock %}

lnt/trunk/lnt/server/ui/templates/v4_summary_report.html

graph.bind("plothover", function(e,p,i) {
         update_tooltip(e, p, i, show_tooltip); });
 }
 
 // Show our overlay tooltip.
 g.current_tip_point = null;
 function show_tooltip(x, y, item, pos) {
     var data = item.datapoint;
     var tip_body = '<div id="tooltip">';
-    tip_body += "<b><u>" + item.series.label + "</u></b><br>";
+    tip_body += "<b><u>" + item.series.label + "</u></b><br/>";
     tip_body += "<b>" + g.tick_list[data[0]][1].toString() + "</b>: ";
     tip_body += data[1].toFixed(2) + "%" + "</div>";
 
     $(tip_body).css( {
         position: 'absolute',
         display: 'none',
         top: y + 5,
         left: x + 5,
         border: '1px solid #fdd',
         padding: '2px',
         'background-color': '#fee',
         opacity: 0.80
     }).appendTo("body").fadeIn(200);
 }
 
 function show_pie_tooltip(x, y, item, pos) {
     var tip_body = '<div id="tooltip">';
-    tip_body += "<b><u>" + item.series.label + "</u></b><br>";
+    tip_body += "<b><u>" + item.series.label + "</u></b><br/>";
     tip_body += item.series.percent.toFixed(2) + "%" + "</div>";
 
     $(tip_body).css( {
         position: 'absolute',
         display: 'none',
         top: pos.pageY + 5,
         left: pos.pageX + 5,
         border: '1px solid #fdd',

lnt/trunk/lnt/server/ui/templates/v4_summary_report_ui.html

 {% endblock %}
 {% block title %}Summary Report Editor{% endblock %}
 {% block body %}
 
 <div class="span2 smbox">
   <h3><center>Report Orders</center></h3>
   <div class="btn-group btn-group-vertical" style="width:100%"  id="report-order-list">
   </div>
-  <br>
-  <br>
+  <br/>
+  <br/>
   <input type="button" value="Add" onclick="add_order();">
 </div>
 
 <div  class="span4 smbox">
   <h3><center>Order Items</center></h3>
   <div class="ui-box"  id="report-order-items">
   </div>
 </div>