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
---
 src/lib/Server/Reports/reports/templates/base.html   | 10 ++++++----
 .../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 ++++++++------
 .../reports/templates/config_items/index.html        | 16 +++++++++-------
 .../reports/templates/config_items/listing.html      |  6 +++---
 .../reports/templates/displays/summary-block.html    | 16 ++++++++--------
 .../Reports/reports/templates/displays/summary.html  | 16 +++++++++-------
 .../Reports/reports/templates/displays/timing.html   | 18 ++++++++++--------
 10 files changed, 66 insertions(+), 54 deletions(-)

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

diff --git a/src/lib/Server/Reports/reports/templates/base.html b/src/lib/Server/Reports/reports/templates/base.html
index 8844e07c9..d42e26960 100644
--- a/src/lib/Server/Reports/reports/templates/base.html
+++ b/src/lib/Server/Reports/reports/templates/base.html
@@ -21,10 +21,12 @@
         {% block sidebar %}
         <ul class="sidebar">
             <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../" class="sidebar">Home</a></li>
-            <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_index %}" class="sidebar">Clients</a></li>
-        <ul class="sidebar-level2">
-            <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_detailed_list %}" class="sidebar">Detailed List</a></li>
-        </ul>
+            <li>
+		<a href="{% url Bcfg2.Server.Reports.reports.views.client_index %}" class="sidebar">Clients</a>
+		<ul class="sidebar-level2">
+		    <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_detailed_list %}" class="sidebar">Detailed List</a></li>
+		</ul>
+	    </li>
 	    <li>
 	    <a href="{% url Bcfg2.Server.Reports.reports.views.display_index %}" class="sidebar">Displays</a>
 	    <ul class="sidebar-level2">
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>
 
diff --git a/src/lib/Server/Reports/reports/templates/config_items/index.html b/src/lib/Server/Reports/reports/templates/config_items/index.html
index 8de1a63cc..313e28633 100644
--- a/src/lib/Server/Reports/reports/templates/config_items/index.html
+++ b/src/lib/Server/Reports/reports/templates/config_items/index.html
@@ -5,7 +5,7 @@
 {% block extra_header_info %}
 <link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/syntax-coloring.css" />
 <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 %}Configuration Element Details{% endblock %}
 
@@ -52,10 +52,12 @@
 <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>
 {% ifequal mod_or_bad "modified" %}
     <input type="button"
@@ -76,8 +78,8 @@
              value="Now"
              onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.entry.id %}';"/>
 {% endifequal %}
-</form>
-</span><br/><br/><br/></div>
+</span></form>
+<br/><br/><br/></div>
 {% if associated_client_list %}
     <p>The following clients had this problem as of {{timestamp_date}}@{{timestamp_time}}:</p>
     {% for client in associated_client_list %}
diff --git a/src/lib/Server/Reports/reports/templates/config_items/listing.html b/src/lib/Server/Reports/reports/templates/config_items/listing.html
index 1dba4bd6d..64a60e506 100644
--- a/src/lib/Server/Reports/reports/templates/config_items/listing.html
+++ b/src/lib/Server/Reports/reports/templates/config_items/listing.html
@@ -2,8 +2,8 @@
 {% load django_templating_sigh %}
 
 {% block extra_header_info %}
-<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/tabview/assets/tabview.css">
-<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/round_tabs.css">
+<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/tabview/assets/tabview.css" />
+<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/round_tabs.css" />
 
 <script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/yahoo/yahoo.js"></script>
 <script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/event/event.js"></script>
@@ -15,7 +15,7 @@ YAHOO.example.init = function( ){
     {% for item_list in item_list_pseudodict %}
     tabView.addTab( new YAHOO.widget.Tab({
         label: '{{item_list.0}}',
-        content: '<p><ul style="list-style-type:none;">{% for item in item_list.1|sortwell %}<li><strong>{{item.entry.kind}}: </strong><tt>{% ifequal mod_or_bad "modified" %}<a href="{%url Bcfg2.Server.Reports.reports.views.config_item_modified eyedee=item.id%}">{{item.entry.name}}</a>{% else %}<a href="{%url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.id%}">{{item.entry.name}}</a>{% endifequal %}</tt></li>{% endfor %}</ul></p>',
+        content: '<p><ul style="list-style-type:none;">{% for item in item_list.1|sortwell %}<li><strong>{{item.entry.kind}}: <'+'/strong><tt>{% ifequal mod_or_bad "modified" %}<a href="{%url Bcfg2.Server.Reports.reports.views.config_item_modified eyedee=item.id%}">{{item.entry.name}}<'+'/a>{% else %}<a href="{%url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.id%}">{{item.entry.name}}<'+'/a>{% endifequal %}<'+'/tt><'+'/li>{% endfor %}<'+'/ul><'+'/p>',
         active: 'True'
     }));
     {% endfor %}
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 %}
-- 
cgit v1.2.3-1-g7c22