diff options
14 files changed, 73 insertions, 61 deletions
diff --git a/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl b/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl index 6e358df8b..74adbfe94 100644 --- a/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl +++ b/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl @@ -3,7 +3,8 @@ <xsl:template match="Node"> <xsl:if test="count(Statistics/Good)+count(Statistics/Bad)+count(Statistics/Extra)+count(Statistics/Modified)+count(Statistics/Stale) > 0"> - <div class="nodebox" name="{Client/@name}"> + <a name="{Client/@name}}"></a> + <div class="nodebox""> <span class="notebox">Time Ran: <xsl:value-of select="Statistics/@time" /></span> <span class="configbox">(<xsl:value-of select="Client/@profile" />)</span> @@ -146,4 +147,4 @@ <li><b>SymLink: </b> <tt><xsl:value-of select="@name"/></tt></li> </xsl:template> -</xsl:stylesheet>
\ No newline at end of file +</xsl:stylesheet> diff --git a/reports/xsl-transforms/xsl-transform-includes/sorttable-js.xsl b/reports/xsl-transforms/xsl-transform-includes/sorttable-js.xsl index ea2cb64a5..9c3742861 100644 --- a/reports/xsl-transforms/xsl-transform-includes/sorttable-js.xsl +++ b/reports/xsl-transforms/xsl-transform-includes/sorttable-js.xsl @@ -5,7 +5,7 @@ <xsl:output method="html" indent="no"/> <xsl:variable name="sorttable-js"> -<script language="JavaScript"><xsl:comment> +<script language="JavaScript" type="text/javascript"><xsl:comment> <![CDATA[ // @@ -213,4 +213,4 @@ function addEvent(elm, evType, fn, useCapture) ]]> // </xsl:comment></script> </xsl:variable> -</xsl:stylesheet>
\ No newline at end of file +</xsl:stylesheet> diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html index 62109b2db..8df833821 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html @@ -20,7 +20,7 @@ {% block content %} -<script language=JavaScript type=text/Javascript> +<script language="JavaScript" type="text/Javascript"> function toggleAddr(interface_id){ if(document.getElementById){ var style = document.getElementById('ipaddr'+interface_id).style; diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html index e0d6f3c40..ceb4cc3b3 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html @@ -19,7 +19,7 @@ {% block content %} -<script language=JavaScript type=text/Javascript> +<script language="JavaScript" type="text/Javascript"> function toggleField(fieldname){ if(document.getElementById){ var style = document.getElementById(fieldname).style; @@ -79,4 +79,3 @@ div#address{ </form> {% endblock %} - 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 %} |