From 84a83cab07853b83e91c40c440f65b911e3296a5 Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Mon, 29 Apr 2013 07:37:38 -0500
Subject: Reports: Add support for Django 1.5

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 src/lib/Bcfg2/Reporting/templates/displays/summary.html |  2 +-
 src/lib/Bcfg2/Reporting/templates/displays/timing.html  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib/Bcfg2/Reporting/templates/displays')

diff --git a/src/lib/Bcfg2/Reporting/templates/displays/summary.html b/src/lib/Bcfg2/Reporting/templates/displays/summary.html
index b9847cf96..c432da95d 100644
--- a/src/lib/Bcfg2/Reporting/templates/displays/summary.html
+++ b/src/lib/Bcfg2/Reporting/templates/displays/summary.html
@@ -30,7 +30,7 @@ hide_tables[{{ forloop.counter0 }}] = "table_{{ summary.name }}";
       <table id='table_{{ summary.name }}' class='entry_list'>
         {% for node in summary.nodes|sort_interactions_by_name %}
           <tr class='{% cycle listview,listview_alt %}'>
-              <td><a href="{% url reports_client_detail_pk hostname=node.client.name,pk=node.id %}">{{ node.client.name }}</a></td>
+              <td><a href='{% url "reports_client_detail_pk" hostname=node.client.name pk=node.id %}'>{{ node.client.name }}</a></td>
           </tr>
         {% endfor %}
       </table>
diff --git a/src/lib/Bcfg2/Reporting/templates/displays/timing.html b/src/lib/Bcfg2/Reporting/templates/displays/timing.html
index ff775ded5..57806b63a 100644
--- a/src/lib/Bcfg2/Reporting/templates/displays/timing.html
+++ b/src/lib/Bcfg2/Reporting/templates/displays/timing.html
@@ -12,7 +12,7 @@
 <div class='client_list_box'>
   {% if metrics %}
       <table cellpadding="3">
-	  <tr id='table_list_header' class='listview'>
+          <tr id='table_list_header' class='listview'>
               <td>Name</td>
               <td>Parse</td>
               <td>Probe</td>
@@ -21,15 +21,15 @@
               <td>Config</td>
               <td>Total</td>
           </tr>
-	  {% for metric in metrics|dictsort:"name" %}
+          {% for metric in metrics|dictsort:"name" %}
           <tr class='{% cycle listview,listview_alt %}'>
               <td><a style='font-size: 100%'
-                   href="{% url reports_client_detail hostname=metric.name %}">{{ metric.name }}</a></td>
+                   href='{% url "reports_client_detail" hostname=metric.name %}'>{{ metric.name }}</a></td>
               {% for mitem in metric|build_metric_list %}
               <td>{{ mitem }}</td>
               {% endfor %}
-	  </tr>
-	  {% endfor %}
+          </tr>
+          {% endfor %}
       </table>
   {% else %}
     <p>No metric data available</p>
-- 
cgit v1.2.3-1-g7c22


From fd993228d36c166593285a8ebbd2e6fb45c36d4d Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Mon, 6 May 2013 15:16:34 -0500
Subject: Add url loads for all templates

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 src/lib/Bcfg2/Reporting/templates/displays/summary.html | 4 ++++
 src/lib/Bcfg2/Reporting/templates/displays/timing.html  | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'src/lib/Bcfg2/Reporting/templates/displays')

diff --git a/src/lib/Bcfg2/Reporting/templates/displays/summary.html b/src/lib/Bcfg2/Reporting/templates/displays/summary.html
index c432da95d..ffafd52e0 100644
--- a/src/lib/Bcfg2/Reporting/templates/displays/summary.html
+++ b/src/lib/Bcfg2/Reporting/templates/displays/summary.html
@@ -1,5 +1,9 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Client Summary{% endblock %}
 {% block pagebanner %}Clients - Summary{% endblock %}
diff --git a/src/lib/Bcfg2/Reporting/templates/displays/timing.html b/src/lib/Bcfg2/Reporting/templates/displays/timing.html
index 57806b63a..8ac5e49bb 100644
--- a/src/lib/Bcfg2/Reporting/templates/displays/timing.html
+++ b/src/lib/Bcfg2/Reporting/templates/displays/timing.html
@@ -1,5 +1,9 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Performance Metrics{% endblock %}
 {% block pagebanner %}Performance Metrics{% endblock %}
-- 
cgit v1.2.3-1-g7c22