diff options
Diffstat (limited to 'src/lib/Server/Reports/reports/templates')
| -rw-r--r-- | src/lib/Server/Reports/reports/templates/clients/client-nodebox.html | 26 | ||||
| -rw-r--r-- | src/lib/Server/Reports/reports/templates/config_items/listing.html | 4 |
2 files changed, 15 insertions, 15 deletions
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 77621cace..88cf05345 100644 --- a/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html +++ b/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html @@ -26,33 +26,33 @@ <div class="warning"> <span class="nodelisttitle">This node did not run within the last 24 hours-- it may be out of date.</span> </div> - {% endif %} - {% if interaction.bad_items.all %} + {% endif %} + {% if interaction.bad %} <div class="bad"> - <span class="nodelisttitle"><a href="javascript:toggleLayer('{{client.name}}-bad');" title="Click to expand" class="commentLink">{{interaction.bad_items.count}}</a> items did not verify and are considered Dirty.<br /></span> + <span class="nodelisttitle"><a href="javascript:toggleLayer('{{client.name}}-bad');" title="Click to expand" class="commentLink">{{interaction.bad.count}}</a> items did not verify and are considered Dirty.<br /></span> <div class="items" id="{{client.name}}-bad"><ul class="plain"> - {% for bad in interaction.bad_items.all|sortwell %} - <li><strong>{{bad.kind}}: </strong><tt><a href="{% url Bcfg2.Server.Reports.reports.views.config_item_bad bad.id%}">{{bad.name}}</a></tt></li> + {% for bad in interaction.bad|sortwell %} + <li><strong>{{bad.entry.kind}}: </strong><tt><a href="{% url Bcfg2.Server.Reports.reports.views.config_item_bad bad.id%}">{{bad.entry.name}}</a></tt></li> {% endfor %} </ul></div> </div> {% endif %} - {% if interaction.modified_items.all %} + {% if interaction.modified %} <div class="modified"> - <span class="nodelisttitle"><a href="javascript:toggleLayer('{{client.name}}-modified');" title="Click to expand" class="commentLink">{{interaction.modified_items.count}}</a> items were modified in the last run.<br /></span> + <span class="nodelisttitle"><a href="javascript:toggleLayer('{{client.name}}-modified');" title="Click to expand" class="commentLink">{{interaction.modified.count}}</a> items were modified in the last run.<br /></span> <div class="items" id="{{client.name}}-modified"><ul class="plain"> - {% for modified in interaction.modified_items.all|sortwell %} - <li><strong>{{modified.kind}}: </strong><tt><a href="{% url Bcfg2.Server.Reports.reports.views.config_item_modified modified.id %}">{{modified.name}}</a></tt></li> + {% for modified in interaction.modified|sortwell %} + <li><strong>{{modified.entry.kind}}: </strong><tt><a href="{% url Bcfg2.Server.Reports.reports.views.config_item_modified modified.id %}">{{modified.name}}</a></tt></li> {% endfor %} </ul></div> </div> {% endif %} - {% if interaction.extra_items.all %} + {% if interaction.extra %} <div class="extra"> - <span class="nodelisttitle"><a href="javascript:toggleLayer('{{client.name}}-extra');" title="Click to expand" class="commentLink">{{interaction.extra_items.count}}</a> extra configuration elements on the node.<br /></span> + <span class="nodelisttitle"><a href="javascript:toggleLayer('{{client.name}}-extra');" title="Click to expand" class="commentLink">{{interaction.extra.count}}</a> extra configuration elements on the node.<br /></span> <div class="items" id="{{client.name}}-extra"><ul class="plain"> - {% for extra in interaction.extra_items.all|sortwell %} - <li><strong>{{extra.kind}}: </strong><tt>{{extra.name}}</tt></li> + {% for extra in interaction.extra|sortwell %} + <li><strong>{{extra.entry.kind}}: </strong><tt>{{extra.entry.name}}</tt></li> {% endfor %} </ul></div> </div> 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 f3be1e4d5..1dba4bd6d 100644 --- a/src/lib/Server/Reports/reports/templates/config_items/listing.html +++ b/src/lib/Server/Reports/reports/templates/config_items/listing.html @@ -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.kind}}: </strong><tt>{% ifequal mod_or_bad "modified" %}<a href="{%url Bcfg2.Server.Reports.reports.views.config_item_modified eyedee=item.id%}">{{item.name}}</a>{% else %}<a href="{%url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.id%}">{{item.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 %} @@ -48,4 +48,4 @@ YAHOO.example.init(); {% else %} <p>There are currently no inconsistent configuration entries.</p> {% endif %} -{% endblock %}
\ No newline at end of file +{% endblock %} |