summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-10-24 21:07:42 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-10-24 21:07:42 +0000
commit1ab7b6e110dbdf4d7ae5758913a29c065076579f (patch)
tree1f838d1233bc045be8ec537b63f4a49f3dc1c610 /src/lib
parent736d6e83a98719896f348e1554cd7fb9dda70a52 (diff)
downloadbcfg2-1ab7b6e110dbdf4d7ae5758913a29c065076579f.tar.gz
bcfg2-1ab7b6e110dbdf4d7ae5758913a29c065076579f.tar.bz2
bcfg2-1ab7b6e110dbdf4d7ae5758913a29c065076579f.zip
Reports: Fix django templates so that they work with 1.0
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5503 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Server/Reports/reports/templates/clients/client-nodebox.html2
-rw-r--r--src/lib/Server/Reports/reports/templates/clients/detail.html4
-rw-r--r--src/lib/Server/Reports/reports/templates/config_items/index.html4
3 files changed, 5 insertions, 5 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 5aae03c30..db64c2c96 100644
--- a/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html
+++ b/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html
@@ -7,7 +7,7 @@
<table class="invisitable">
<tr><td width="43%"><h2>Node: <span class="nodename">
- <a href="{% url Bcfg2.Server.Reports.reports.views.client_detail client.name,pk=i.id %}">{{client.name}}</a></span></h2></td>
+ <a href="{% url Bcfg2.Server.Reports.reports.views.client_detail hostname=client.name, pk=client.current_interaction.id %}">{{client.name}}</a></span></h2></td>
<td width="23%">
{% if interaction.repo_rev_code %}Revision: {{interaction.repo_rev_code}}{% endif %}
</td>
diff --git a/src/lib/Server/Reports/reports/templates/clients/detail.html b/src/lib/Server/Reports/reports/templates/clients/detail.html
index dd992547c..77f505804 100644
--- a/src/lib/Server/Reports/reports/templates/clients/detail.html
+++ b/src/lib/Server/Reports/reports/templates/clients/detail.html
@@ -7,11 +7,11 @@
<b>Select time: </b>
<select name=quick onChange="MM_jumpMenu('parent',this,0)">
{% for i in client.interactions.all %}
- <option {% ifequal i.id interaction.id %}selected {% endifequal %} value="{% url Bcfg2.Server.Reports.reports.views.client_detail client.name,pk=i.id %}"> {{i.timestamp}}
+ <option {% ifequal i.id interaction.id %}selected {% endifequal %} value="{% url Bcfg2.Server.Reports.reports.views.client_detail hostname=client.name, pk=i.id %}"> {{i.timestamp}}
{% endfor %}
</select>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<a href="{% url Bcfg2.Server.Reports.reports.views.client_manage client.name %}">Manage</a> {{client.name}} options.<br/>
+<a href="{% url Bcfg2.Server.Reports.reports.views.client_manage hostname=client.name %}">Manage</a> {{client.name}} options.<br/>
{% include "clients/client-nodebox.html" %}
{% endblock %}
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 159ff8579..d9747904e 100644
--- a/src/lib/Server/Reports/reports/templates/config_items/index.html
+++ b/src/lib/Server/Reports/reports/templates/config_items/index.html
@@ -1,7 +1,7 @@
-{% load syntax_coloring %}
-
{% extends "base.html" %}
+{% load syntax_coloring %}
+
{% 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>