Reports: Fix html validation errors for #798 (Patch from Thorsten Lockert)

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5625 ce84e21b-d406-0410-9b95-82705330c041

3 files changed, 27 insertions, 23 deletions

diff --git a/src/lib/Server/Reports/reports/templates/displays/summary-block.html b/src/lib/Server/Reports/reports/templates/displays/summary-block.html
index a42176183..060ff0fa1 100644
--- a/src/lib/Server/Reports/reports/templates/displays/summary-block.html
+++ b/src/lib/Server/Reports/reports/templates/displays/summary-block.html
@@ -9,7 +9,7 @@
                   <div class="items" id="goodsummary"><ul class="plain">
                       {% for client in clean_client_list|sortname %}
                           {% set_interaction "foo" %}
-	                  <li><b>Node: </b></tt>
+	                  <li><b>Node: </b>
 			  <tt><a href="{% block linkprefix1 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li>
                       {% endfor %}
                   </ul></div>
@@ -21,7 +21,7 @@
                   <div class="items" id="badsummary"><ul class="plain">
                       {% for client in bad_client_list|sortname %}
                           {% set_interaction "foo" %}
-	                  <li><b>Node: </b></tt>
+	                  <li><b>Node: </b>
 			  <tt><a href="{% block linkprefix2 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li>
                       {% endfor %}
                   </ul></div>
@@ -33,7 +33,7 @@
                   <div class="items" id="modifiedsummary"><ul class="plain">
                       {% for client in modified_client_list|sortname %}
                           {% set_interaction "foo" %}
-	                  <li><b>Node: </b></tt>
+	                  <li><b>Node: </b>
 			  <tt><a href="{% block linkprefix3 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li>
                       {% endfor %}
                   </ul></div>
@@ -45,7 +45,7 @@
                   <div class="items" id="extrasummary"><ul class="plain">
                       {% for client in extra_client_list|sortname %}
                           {% set_interaction "foo" %}
-	                  <li><b>Node: </b></tt>
+	                  <li><b>Node: </b>
 			  <tt><a href="{% block linkprefix4 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li>
                       {% endfor %}
                   </ul></div>
@@ -57,7 +57,7 @@
                   <div class="items" id="vstalesummary"><ul class="plain">
                       {% for client in stale_up_client_list|sortname %}
                           {% set_interaction "foo" %}
-	                  <li><b>Node: </b></tt>
+	                  <li><b>Node: </b>
 			  <tt><a href="{% block linkprefix5 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li>
                       {% endfor %}
                   </ul></div>
@@ -69,7 +69,7 @@
                   <div class="items" id="stalesummary"><ul class="plain">
                       {% for client in stale_all_client_list|sortname %}
                           {% set_interaction "foo" %}
-	                  <li><b>Node: </b></tt>
+	                  <li><b>Node: </b>
 			  <tt><a href="{% block linkprefix6 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li>
                       {% endfor %}
                   </ul></div>
@@ -81,10 +81,10 @@
                   <div class="items" id="unpingablesummary"><ul class="plain">
                       {% for client in down_client_list|sortname %}
                           {% set_interaction "foo" %}
-	                  <li><b>Node: </b></tt>
+	                  <li><b>Node: </b>
 			  <tt><a href="#{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li>
                       {% endfor %}
                   </ul></div>
               </div>
 	  {% endif %}
-    </div>
\ No newline at end of file
+    </div>
diff --git a/src/lib/Server/Reports/reports/templates/displays/summary.html b/src/lib/Server/Reports/reports/templates/displays/summary.html
index 8c83bd501..29cbb22d7 100644
--- a/src/lib/Server/Reports/reports/templates/displays/summary.html
+++ b/src/lib/Server/Reports/reports/templates/displays/summary.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block extra_header_info %}
 <script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/CalendarPopup.js"></script>
-<script language="JavaScript">var cal = new CalendarPopup();</script>
+<script language="JavaScript" type="text/javascript">var cal = new CalendarPopup();</script>
 {% endblock%}
 {% block title %}Display Index Listing{% endblock %}
 {% block pagebanner %}
@@ -16,14 +16,16 @@
 <div>
 <span class="mini-date">
 <b>Enter date or use calendar popup: </b>
-<form name="timestamp-select">
-<input type="text" name="date1" value="{{timestamp_date}}" size=10>@
-<input type="text" name="time" value="{{timestamp_time}}" size=8>
-<a href="" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;"
+</span>
+<form name="timestamp-select" action="{{path}" method="get">
+<span class="mini-date">
+<input type="text" name="date1" value="{{timestamp_date}}" size="10" />@
+<input type="text" name="time" value="{{timestamp_time}}" size="8" />
+<a href="#" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;"
    name="anchor1" ID="anchor1">Calendar</A>
 <input type="button" name="go" value="Go" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_summary %}'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;" />
  | <input type="button" name="now" value="Now" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_summary %}';"/>
-</form>
-</span><br/><br/><br/></div>
+</span></form>
+<br/><br/><br/></div>
   {% include "displays/summary-block-direct-links.html" %}
 {% endblock %}
diff --git a/src/lib/Server/Reports/reports/templates/displays/timing.html b/src/lib/Server/Reports/reports/templates/displays/timing.html
index 8586de2cf..32ddab464 100644
--- a/src/lib/Server/Reports/reports/templates/displays/timing.html
+++ b/src/lib/Server/Reports/reports/templates/displays/timing.html
@@ -3,7 +3,7 @@
 {% block extra_header_info %}
 <script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/sorttable.js"></script>
 <script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/CalendarPopup.js"></script>
-<script language="JavaScript">var cal = new CalendarPopup();</script>
+<script language="JavaScript" type="text/javascript">var cal = new CalendarPopup();</script>
 {% endblock%}
 {% block title %}Display Index Listing{% endblock %}
 
@@ -16,15 +16,17 @@
 <div>
 <span class="mini-date">
 <b>Enter date or use calendar popup: </b>
-<form name="timestamp-select">
-<input type="text" name="date1" value="{{timestamp_date}}" size=10>@
-<input type="text" name="time" value="{{timestamp_time}}" size=8>
-<a href="" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;"
+</span>
+<form name="timestamp-select" action="{{path}}" method="get">
+<span class="mini-date">
+<input type="text" name="date1" value="{{timestamp_date}}" size="10" />@
+<input type="text" name="time" value="{{timestamp_time}}" size="8" />
+<a href="#" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;"
    name="anchor1" ID="anchor1">Calendar</A>
 <input type="button" name="go" value="Go" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_timing %}'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;" />
  | <input type="button" name="now" value="Now" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_timing %}';"/>
-</form>
-</span><br/><br/><br/></div>
+</span></form>
+<br/><br/><br/></div>
   <center>
       <table id="t1" class="sortable">
           <tr>
@@ -49,4 +51,4 @@
 	  {% endfor %}
       </table>
   </center>
-{% endblock %}
\ No newline at end of file
+{% endblock %}