Ticket #798: validation.diff

File validation.diff, 22.4 KB (added by https://www.google.com/accounts/o8/id?id=AItOawmgjcCg7lAJ6ZhqeaZka53jw8AUv8fpG2E, 13 years ago)

Patches to fix validation errors

  • src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html

     
    1919 
    2020{% block content %} 
    2121 
    22 <script language=JavaScript type=text/Javascript> 
     22<script language="JavaScript" type="text/Javascript"> 
    2323function toggleField(fieldname){ 
    2424   if(document.getElementById){ 
    2525      var style = document.getElementById(fieldname).style; 
    … …  
    7979</form> 
    8080 
    8181{% endblock %} 
    82  

  • src/lib/Server/Hostbase/hostbase/webtemplates/edit.html

     
    2020 
    2121{% block content %} 
    2222 
    23 <script language=JavaScript type=text/Javascript> 
     23<script language="JavaScript" type="text/Javascript"> 
    2424function toggleAddr(interface_id){ 
    2525   if(document.getElementById){ 
    2626      var style = document.getElementById('ipaddr'+interface_id).style; 

  • src/lib/Server/Reports/reports/templates/clients/detailed-list.html

     
    4040<b>Enter date or use calendar popup: </b> 
    4141<input type="text" name="date1" value="{{timestamp_date}}" size="10" />@ 
    4242<input type="text" name="time" value="{{timestamp_time}}" size="8" /> 
    43 <a href="" onclick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
     43<a href="#" onclick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
    4444   name="anchor1" id="anchor1">Calendar</a> 
    4545<input type="button" value="Go" onclick="document.forms['timestamp-select'].submit();"/> 
    4646 | <input type="button" name="now" value="Now" onclick="location.href='{{ path }}';"/> 

  • src/lib/Server/Reports/reports/templates/clients/index.html

     
    33{% block extra_header_info %} 
    44<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/sorttable.js"></script> 
    55<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/CalendarPopup.js"></script> 
    6 <script language="JavaScript">var cal = new CalendarPopup();</script> 
     6<script language="JavaScript" type="text/javascript">var cal = new CalendarPopup();</script> 
    77{% endblock%} 
    88 
    99{% block title %}Client Index Listing{% endblock %} 
    … …  
    1919<div> 
    2020<span class="mini-date"> 
    2121<b>Enter date or use calendar popup: </b> 
    22 <form name="timestamp-select"> 
    23 <input type="text" name="date1" value="{{timestamp_date}}" size=10>@ 
    24 <input type="text" name="time" value="{{timestamp_time}}" size=8> 
    25 <a href="" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
     22</span> 
     23<form name="timestamp-select" action="{{path}}" method="get"> 
     24<span class="mini-date"> 
     25<input type="text" name="date1" value="{{timestamp_date}}" size=10 />@ 
     26<input type="text" name="time" value="{{timestamp_time}}" size=8 /> 
     27<a href="#" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
    2628   name="anchor1" ID="anchor1">Calendar</A> 
    2729<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;" /> 
    2830 | <input type="button" name="now" value="Now" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.client_index %}';"/> 
    29 </form> 
    30 </span><br/><br/><br/></div> 
     31</span></form> 
     32<br/><br/><br/></div> 
    3133 
    3234{% if client_list_b %} 
    33 <table><tr><td align="top"> 
     35<table><tr><td valign="top"> 
    3436    <ul style="list-style-type:none;"> 
    3537    {% for client in client_list_b %} 
    3638        <li><div class="{{client.current_interaction.state}}-lineitem"> 
    … …  
    3840                </div></li> 
    3941    {% endfor %} 
    4042    </ul> 
    41 </td><td align="top"> 
     43</td><td valign="top"> 
    4244    <ul style="list-style-type:none;"> 
    4345    {% if client_list_a %} 
    4446      {% for client in client_list_a %} 

  • src/lib/Server/Reports/reports/templates/clients/manage.html

     
    11{% extends "base.html" %} 
    22{% block extra_header_info %} 
    33<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/CalendarPopup.js"></script> 
    4 <script language="JavaScript">var cal = new CalendarPopup();</script> 
     4<script language="JavaScript" type="text/javascript">var cal = new CalendarPopup();</script> 
    55{% endblock%} 
    66{% block title %}{{client.name}}{% endblock %} 
    77 
    … …  
    1313<div> 
    1414<span class="mini-date"> 
    1515<b>Enter date or use calendar popup: </b> 
     16</span> 
    1617<form name="timestamp-select" action="{% url Bcfg2.Server.Reports.reports.views.client_manage client.name %}" method="post"> 
    17 <input type="text" name="date1" value="{{timestamp_date}}" size=10>@ 
    18 <input type="text" name="time" value="{{timestamp_time}}" size=8> 
    19 <a href="" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
     18<span class="mini-date"> 
     19<input type="text" name="date1" value="{{timestamp_date}}" size="10" />@ 
     20<input type="text" name="time" value="{{timestamp_time}}" size="8" /> 
     21<a href="#" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
    2022   name="anchor1" ID="anchor1">Calendar</a> 
    2123<input type="submit" value="Submit"> 
    22 </form> 
    23 </span><br/><br/><br/></div> 
     24</span></form> 
     25<br/><br/><br/></div> 
    2426<br/><br/> 
    2527<p>{{message}}</p> 
    2628 

  • src/lib/Server/Reports/reports/templates/clients/client-nodebox.html

     
    11{% load django_templating_sigh %} 
    22{% if client %} 
    33        <a name="{{client.name}}"></a> 
    4         <div class="nodebox" name="{{client.name}}"> 
     4        <div class="nodebox"> 
    55            <span class="notebox">Time Ran: {{interaction.timestamp}}</span> 
    66              <!--<span class="configbox">(-Insert Profile Name Here-)</span>--> 
    77             

  • src/lib/Server/Reports/reports/templates/config_items/index.html

     
    55{% block extra_header_info %} 
    66<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/syntax-coloring.css" /> 
    77<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/CalendarPopup.js"></script> 
    8 <script language="JavaScript">var cal = new CalendarPopup();</script> 
     8<script language="JavaScript" type="text/javascript">var cal = new CalendarPopup();</script> 
    99{% endblock%} 
    1010{% block title %}Configuration Element Details{% endblock %} 
    1111 
    … …  
    5252<div> 
    5353<span class="mini-date"> 
    5454<b>Enter date or use calendar popup: </b> 
    55 <form name="timestamp-select"> 
    56 <input type="text" name="date1" value="{{timestamp_date}}" size=10>@ 
    57 <input type="text" name="time" value="{{timestamp_time}}" size=8> 
    58 <a href="" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
     55</span> 
     56<form name="timestamp-select" action="{{path}}" method="get"> 
     57<span class="mini-date"> 
     58<input type="text" name="date1" value="{{timestamp_date}}" size="10" />@ 
     59<input type="text" name="time" value="{{timestamp_time}}" size="8" /> 
     60<a href="#" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
    5961   name="anchor1" ID="anchor1">Calendar</A> 
    6062{% ifequal mod_or_bad "modified" %} 
    6163    <input type="button" 
    … …  
    7678             value="Now" 
    7779             onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.entry.id %}';"/> 
    7880{% endifequal %} 
    79 </form> 
    80 </span><br/><br/><br/></div> 
     81</span></form> 
     82<br/><br/><br/></div> 
    8183{% if associated_client_list %} 
    8284    <p>The following clients had this problem as of {{timestamp_date}}@{{timestamp_time}}:</p> 
    8385    {% for client in associated_client_list %} 

  • src/lib/Server/Reports/reports/templates/config_items/listing.html

     
    22{% load django_templating_sigh %} 
    33 
    44{% block extra_header_info %} 
    5 <link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/tabview/assets/tabview.css"> 
    6 <link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/round_tabs.css"> 
     5<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/tabview/assets/tabview.css" /> 
     6<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/round_tabs.css" /> 
    77 
    88<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/yahoo/yahoo.js"></script> 
    99<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/event/event.js"></script> 
    … …  
    1515    {% for item_list in item_list_pseudodict %} 
    1616    tabView.addTab( new YAHOO.widget.Tab({ 
    1717        label: '{{item_list.0}}', 
    18         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>', 
     18        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>', 
    1919        active: 'True' 
    2020    })); 
    2121    {% endfor %} 

  • src/lib/Server/Reports/reports/templates/displays/summary.html

     
    11{% extends "base.html" %} 
    22{% block extra_header_info %} 
    33<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/CalendarPopup.js"></script> 
    4 <script language="JavaScript">var cal = new CalendarPopup();</script> 
     4<script language="JavaScript" type="text/javascript">var cal = new CalendarPopup();</script> 
    55{% endblock%} 
    66{% block title %}Display Index Listing{% endblock %} 
    77{% block pagebanner %} 
    … …  
    1616<div> 
    1717<span class="mini-date"> 
    1818<b>Enter date or use calendar popup: </b> 
    19 <form name="timestamp-select"> 
    20 <input type="text" name="date1" value="{{timestamp_date}}" size=10>@ 
    21 <input type="text" name="time" value="{{timestamp_time}}" size=8> 
    22 <a href="" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
     19</span> 
     20<form name="timestamp-select" action="{{path}" method="get"> 
     21<span class="mini-date"> 
     22<input type="text" name="date1" value="{{timestamp_date}}" size="10" />@ 
     23<input type="text" name="time" value="{{timestamp_time}}" size="8" /> 
     24<a href="#" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
    2325   name="anchor1" ID="anchor1">Calendar</A> 
    2426<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;" /> 
    2527 | <input type="button" name="now" value="Now" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_summary %}';"/> 
    26 </form> 
    27 </span><br/><br/><br/></div> 
     28</span></form> 
     29<br/><br/><br/></div> 
    2830  {% include "displays/summary-block-direct-links.html" %} 
    2931{% endblock %} 

  • src/lib/Server/Reports/reports/templates/displays/summary-block.html

     
    99                  <div class="items" id="goodsummary"><ul class="plain"> 
    1010                      {% for client in clean_client_list|sortname %} 
    1111                          {% set_interaction "foo" %} 
    12                           <li><b>Node: </b></tt> 
     12                          <li><b>Node: </b> 
    1313                          <tt><a href="{% block linkprefix1 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li> 
    1414                      {% endfor %} 
    1515                  </ul></div> 
    … …  
    2121                  <div class="items" id="badsummary"><ul class="plain"> 
    2222                      {% for client in bad_client_list|sortname %} 
    2323                          {% set_interaction "foo" %} 
    24                           <li><b>Node: </b></tt> 
     24                          <li><b>Node: </b> 
    2525                          <tt><a href="{% block linkprefix2 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li> 
    2626                      {% endfor %} 
    2727                  </ul></div> 
    … …  
    3333                  <div class="items" id="modifiedsummary"><ul class="plain"> 
    3434                      {% for client in modified_client_list|sortname %} 
    3535                          {% set_interaction "foo" %} 
    36                           <li><b>Node: </b></tt> 
     36                          <li><b>Node: </b> 
    3737                          <tt><a href="{% block linkprefix3 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li> 
    3838                      {% endfor %} 
    3939                  </ul></div> 
    … …  
    4545                  <div class="items" id="extrasummary"><ul class="plain"> 
    4646                      {% for client in extra_client_list|sortname %} 
    4747                          {% set_interaction "foo" %} 
    48                           <li><b>Node: </b></tt> 
     48                          <li><b>Node: </b> 
    4949                          <tt><a href="{% block linkprefix4 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li> 
    5050                      {% endfor %} 
    5151                  </ul></div> 
    … …  
    5757                  <div class="items" id="vstalesummary"><ul class="plain"> 
    5858                      {% for client in stale_up_client_list|sortname %} 
    5959                          {% set_interaction "foo" %} 
    60                           <li><b>Node: </b></tt> 
     60                          <li><b>Node: </b> 
    6161                          <tt><a href="{% block linkprefix5 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li> 
    6262                      {% endfor %} 
    6363                  </ul></div> 
    … …  
    6969                  <div class="items" id="stalesummary"><ul class="plain"> 
    7070                      {% for client in stale_all_client_list|sortname %} 
    7171                          {% set_interaction "foo" %} 
    72                           <li><b>Node: </b></tt> 
     72                          <li><b>Node: </b> 
    7373                          <tt><a href="{% block linkprefix6 %}#{% endblock %}{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li> 
    7474                      {% endfor %} 
    7575                  </ul></div> 
    … …  
    8181                  <div class="items" id="unpingablesummary"><ul class="plain"> 
    8282                      {% for client in down_client_list|sortname %} 
    8383                          {% set_interaction "foo" %} 
    84                           <li><b>Node: </b></tt> 
     84                          <li><b>Node: </b> 
    8585                          <tt><a href="#{{client.name}}">{{client.name}}</a></tt><span class="mini-date">{{interaction.timestamp}}</span></li> 
    8686                      {% endfor %} 
    8787                  </ul></div> 
    8888              </div> 
    8989          {% endif %} 
    90     </div> 
    91  No newline at end of file 
     90    </div> 

  • src/lib/Server/Reports/reports/templates/displays/timing.html

     
    33{% block extra_header_info %} 
    44<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/sorttable.js"></script> 
    55<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/CalendarPopup.js"></script> 
    6 <script language="JavaScript">var cal = new CalendarPopup();</script> 
     6<script language="JavaScript" type="text/javascript">var cal = new CalendarPopup();</script> 
    77{% endblock%} 
    88{% block title %}Display Index Listing{% endblock %} 
    99 
    … …  
    1616<div> 
    1717<span class="mini-date"> 
    1818<b>Enter date or use calendar popup: </b> 
    19 <form name="timestamp-select"> 
    20 <input type="text" name="date1" value="{{timestamp_date}}" size=10>@ 
    21 <input type="text" name="time" value="{{timestamp_time}}" size=8> 
    22 <a href="" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
     19</span> 
     20<form name="timestamp-select" action="{{path}}" method="get"> 
     21<span class="mini-date"> 
     22<input type="text" name="date1" value="{{timestamp_date}}" size="10" />@ 
     23<input type="text" name="time" value="{{timestamp_time}}" size="8" /> 
     24<a href="#" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;" 
    2325   name="anchor1" ID="anchor1">Calendar</A> 
    2426<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;" /> 
    2527 | <input type="button" name="now" value="Now" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_timing %}';"/> 
    26 </form> 
    27 </span><br/><br/><br/></div> 
     28</span></form> 
     29<br/><br/><br/></div> 
    2830  <center> 
    2931      <table id="t1" class="sortable"> 
    3032          <tr> 
    … …  
    4951          {% endfor %} 
    5052      </table> 
    5153  </center> 
    52 {% endblock %} 
    53  No newline at end of file 
     54{% endblock %} 

  • src/lib/Server/Reports/reports/templates/base.html

     
    2121        {% block sidebar %} 
    2222        <ul class="sidebar"> 
    2323            <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../" class="sidebar">Home</a></li> 
    24             <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_index %}" class="sidebar">Clients</a></li> 
    25         <ul class="sidebar-level2"> 
    26             <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_detailed_list %}" class="sidebar">Detailed List</a></li> 
    27         </ul> 
     24            <li> 
     25                <a href="{% url Bcfg2.Server.Reports.reports.views.client_index %}" class="sidebar">Clients</a> 
     26                <ul class="sidebar-level2"> 
     27                    <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_detailed_list %}" class="sidebar">Detailed List</a></li> 
     28                </ul> 
     29            </li> 
    2830            <li> 
    2931            <a href="{% url Bcfg2.Server.Reports.reports.views.display_index %}" class="sidebar">Displays</a> 
    3032            <ul class="sidebar-level2"> 

  • reports/xsl-transforms/xsl-transform-includes/html-templates.xsl

     
    33      <xsl:template match="Node"> 
    44        <xsl:if test="count(Statistics/Good)+count(Statistics/Bad)+count(Statistics/Extra)+count(Statistics/Modified)+count(Statistics/Stale) > 0"> 
    55         
    6         <div class="nodebox" name="{Client/@name}"> 
     6        <a name="{Client/@name}}"></a> 
     7        <div class="nodebox""> 
    78            <span class="notebox">Time Ran: <xsl:value-of select="Statistics/@time" /></span> 
    89              <span class="configbox">(<xsl:value-of select="Client/@profile" />)</span> 
    910             
    … …  
    146147        <li><b>SymLink: </b> 
    147148        <tt><xsl:value-of select="@name"/></tt></li> 
    148149    </xsl:template> 
    149 </xsl:stylesheet> 
    150  No newline at end of file 
     150</xsl:stylesheet> 

  • reports/xsl-transforms/xsl-transform-includes/sorttable-js.xsl

     
    55<xsl:output method="html" indent="no"/> 
    66<xsl:variable name="sorttable-js"> 
    77 
    8 <script language="JavaScript"><xsl:comment> 
     8<script language="JavaScript" type="text/javascript"><xsl:comment> 
    99<![CDATA[ 
    1010 
    1111//  
    … …  
    213213]]> 
    214214// </xsl:comment></script> 
    215215</xsl:variable> 
    216 </xsl:stylesheet> 
    217  No newline at end of file 
     216</xsl:stylesheet>