From b1eef95d3d00595afc53ac0f56c6627cf04fb2c8 Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Sat, 19 Dec 2009 19:00:39 +0000
Subject: 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
---
 .../reports/templates/clients/client-nodebox.html    |  2 +-
 .../reports/templates/clients/detailed-list.html     |  2 +-
 .../Reports/reports/templates/clients/index.html     | 20 +++++++++++---------
 .../Reports/reports/templates/clients/manage.html    | 14 ++++++++------
 4 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'src/lib/Server/Reports/reports/templates/clients')

diff --git a/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html b/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html
index db64c2c96..8dbd01d9a 100644
--- a/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html
+++ b/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html
@@ -1,7 +1,7 @@
 {% load django_templating_sigh %}
 {% if client %}
         <a name="{{client.name}}"></a>
-        <div class="nodebox" name="{{client.name}}">
+        <div class="nodebox">
             <span class="notebox">Time Ran: {{interaction.timestamp}}</span>
               <!--<span class="configbox">(-Insert Profile Name Here-)</span>-->
             
diff --git a/src/lib/Server/Reports/reports/templates/clients/detailed-list.html b/src/lib/Server/Reports/reports/templates/clients/detailed-list.html
index d6736c827..37bfb006b 100644
--- a/src/lib/Server/Reports/reports/templates/clients/detailed-list.html
+++ b/src/lib/Server/Reports/reports/templates/clients/detailed-list.html
@@ -40,7 +40,7 @@
 <b>Enter date or use calendar popup: </b>
 <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;"
+<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" value="Go" onclick="document.forms['timestamp-select'].submit();"/>
  | <input type="button" name="now" value="Now" onclick="location.href='{{ path }}';"/>
diff --git a/src/lib/Server/Reports/reports/templates/clients/index.html b/src/lib/Server/Reports/reports/templates/clients/index.html
index e928fbae6..708d52ad1 100644
--- a/src/lib/Server/Reports/reports/templates/clients/index.html
+++ b/src/lib/Server/Reports/reports/templates/clients/index.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 %}Client Index Listing{% endblock %}
@@ -19,18 +19,20 @@
 <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.client_index %}'+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.client_index %}';"/>
-</form>
-</span><br/><br/><br/></div>
+</span></form>
+<br/><br/><br/></div>
 
 {% if client_list_b %}
-<table><tr><td align="top">
+<table><tr><td valign="top">
     <ul style="list-style-type:none;">
     {% for client in client_list_b %}
         <li><div class="{{client.current_interaction.state}}-lineitem">
@@ -38,7 +40,7 @@
 		</div></li>
     {% endfor %}
     </ul>
-</td><td align="top">
+</td><td valign="top">
     <ul style="list-style-type:none;">
     {% if client_list_a %}
       {% for client in client_list_a %}
diff --git a/src/lib/Server/Reports/reports/templates/clients/manage.html b/src/lib/Server/Reports/reports/templates/clients/manage.html
index 6b7cd2ee0..61f0fe017 100644
--- a/src/lib/Server/Reports/reports/templates/clients/manage.html
+++ b/src/lib/Server/Reports/reports/templates/clients/manage.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 %}{{client.name}}{% endblock %}
 
@@ -13,14 +13,16 @@
 <div>
 <span class="mini-date">
 <b>Enter date or use calendar popup: </b>
+</span>
 <form name="timestamp-select" action="{% url Bcfg2.Server.Reports.reports.views.client_manage client.name %}" method="post">
-<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 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="submit" value="Submit">
-</form>
-</span><br/><br/><br/></div>
+</span></form>
+<br/><br/><br/></div>
 <br/><br/>
 <p>{{message}}</p>
 
-- 
cgit v1.2.3-1-g7c22