Get rid of old settings.

I broke things with 795d243e9d because I
forgot to remove it everywhere from functions and templates. Also
removed the old PUPPETDB_EXPERIMENTAL switching.
This commit is contained in:
Daniele Sluijters
2013-10-28 21:46:34 +01:00
parent 029b50405b
commit 75da9b9209
3 changed files with 6 additions and 37 deletions

View File

@@ -18,16 +18,13 @@
<td>Facts retrieved at</td>
<td rel="utctimestamp">{{node.facts_timestamp}}</td>
</tr>
{% if config.PUPPETDB_EXPERIMENTAL %}
<tr>
<td>Report uploaded at</td>
<td rel="utctimestamp">{{node.report_timestamp}}</td>
</tr>
{% endif %}
</tbody>
</table>
</div>
{% if config.PUPPETDB_API > 2 %}
<div class="span4">
<h1>Facts</h1>
{{macros.facts_table(facts, condensed=True, margin_top=10)}}
@@ -36,11 +33,5 @@
<h1>Reports</h1>
{{ macros.reports_table(reports, node.name, condensed=True, hash_truncate=True, show_conf_col=False, show_agent_col=False, show_host_col=False)}}
</div>
{% else %}
<div class="span8">
<h1>Facts</h1>
{{macros.facts_table(facts, condensed=True, margin_top=10)}}
</div>
{% endif %}
</div>
{% endblock content %}

View File

@@ -21,10 +21,8 @@
<th>Status</th>
<th>Hostname</th>
<th>Catalog compiled at</th>
{% if config.PUPPETDB_API > 2 %}
<th>Last report</th>
<th>&nbsp;</th>
{% endif %}
</tr>
</thead>
<tbody class="searchable">
@@ -38,7 +36,6 @@
</td>
<td><a href="{{url_for('node', node_name=node.name)}}">{{node.name}}</a></td>
<td rel="utctimestamp">{{node.catalog_timestamp}}</td>
{% if config.PUPPETDB_API > 2 %}
<td>
{% if node.report_timestamp %}
<span rel="utctimestamp">{{ node.report_timestamp }}</span>
@@ -52,7 +49,6 @@
<a class="btn btn-small btn-primary" href="{{url_for('reports_node', node=node.name)}}">Reports</a>
{% endif %}
</td>
{% endif %}
</tr>
{% endfor %}
</tbody>