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>
---
 .../Bcfg2/Reporting/templates/clients/detail.html  | 28 +++++++++++-----------
 .../Reporting/templates/clients/detailed-list.html |  2 +-
 .../Bcfg2/Reporting/templates/clients/index.html   |  4 ++--
 .../Bcfg2/Reporting/templates/clients/manage.html  |  4 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)

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

diff --git a/src/lib/Bcfg2/Reporting/templates/clients/detail.html b/src/lib/Bcfg2/Reporting/templates/clients/detail.html
index 4608ce6f1..9c0299121 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/detail.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/detail.html
@@ -6,19 +6,19 @@
 {% block extra_header_info %}
 <style type="text/css">
 .node_data {
-	border: 1px solid #98DBCC;
-	margin: 10px;
-	padding-left: 18px;
+    border: 1px solid #98DBCC;
+    margin: 10px;
+    padding-left: 18px;
 }
 .node_data td {
-	padding: 1px 20px 1px 2px;
+    padding: 1px 20px 1px 2px;
 }
 span.history_links {
-	font-size: 90%;
-	margin-left: 50px;
+    font-size: 90%;
+    margin-left: 50px;
 }
 span.history_links a {
-	font-size: 90%;
+    font-size: 90%;
 }
 </style>
 {% endblock %}
@@ -30,12 +30,12 @@ span.history_links a {
 {% block content %}
   <div class='detail_header'>
     <h2>{{client.name}}</h2>
-    <a href='{% url reports_client_manage %}#{{ client.name }}'>[manage]</a>
-  <span class='history_links'><a href="{% url reports_client_history client.name %}">View History</a> | Jump to&nbsp;
+    <a href='{% url "reports_client_manage" %}#{{ client.name }}'>[manage]</a>
+  <span class='history_links'><a href="{% url "reports_client_history" client.name %}">View History</a> | Jump to&nbsp;
     <select id="quick" name="quick" onchange="javascript:pageJump('quick');">
     <option value="" selected="selected">--- Time ---</option>
     {% for i in client.interactions.all|slice:":25" %}
-        <option value="{% url reports_client_detail_pk hostname=client.name, pk=i.id %}">{{i.timestamp|date:"c"}}</option>
+        <option value="{% url "reports_client_detail_pk" hostname=client.name pk=i.id %}">{{i.timestamp|date:"c"}}</option>
     {% endfor %}
   </select></span>
   </div>
@@ -110,7 +110,7 @@ span.history_links a {
       {% for entry in entry_list %}
         <tr class='{% cycle listview,listview_alt %}'>
           <td class='entry_list_type'>{{entry.entry_type}}</td>
-          <td><a href="{% url reports_item entry.class_name entry.pk interaction.pk %}">
+          <td><a href="{% url "reports_item" entry.class_name entry.pk interaction.pk %}">
               {{entry.name}}</a></td>
         </tr>
       {% endfor %}
@@ -129,7 +129,7 @@ span.history_links a {
       {% for failure in interaction.failures.all %}
         <tr class='{% cycle listview,listview_alt %}'>
           <td class='entry_list_type'>{{failure.entry_type}}</td>
-          <td><a href="{% url reports_item failure.class_name failure.pk interaction.pk %}">
+          <td><a href="{% url "reports_item" failure.class_name failure.pk interaction.pk %}">
               {{failure.name}}</a></td>
         </tr>
       {% endfor %}
@@ -140,11 +140,11 @@ span.history_links a {
   {% if entry_list %}
   <div class="entry_list recent_history_wrapper">
     <div class="entry_list_head" style="border-bottom: 2px solid #98DBCC;">
-      <h4 style="display: inline"><a href="{% url reports_client_history client.name %}">Recent Interactions</a></h4>
+      <h4 style="display: inline"><a href="{% url "reports_client_history" client.name %}">Recent Interactions</a></h4>
     </div>
     <div class='recent_history_box'>
       {% include "widgets/interaction_list.inc" %}
-      <div style='padding-left: 5px'><a href="{% url reports_client_history client.name %}">more...</a></div>
+      <div style='padding-left: 5px'><a href="{% url "reports_client_history" client.name %}">more...</a></div>
     </div>
   </div>
   {% endif %}
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
index fd9a545ce..2a03eede1 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
@@ -21,7 +21,7 @@
   </tr>
   {% for entry in entry_list %}
   <tr class='{% cycle listview,listview_alt %}'>
-    <td class='left_column'><a href='{% url Bcfg2.Reporting.views.client_detail hostname=entry.client.name, pk=entry.id %}'>{{ entry.client.name }}</a></td>
+    <td class='left_column'><a href='{% url "Bcfg2.Reporting.views.client_detail" hostname=entry.client.name pk=entry.id %}'>{{ entry.client.name }}</a></td>
     <td class='right_column' style='width:75px'><a href='{% add_url_filter state=entry.state %}'
       class='{{entry|determine_client_state}}'>{{ entry.state }}</a></td>
     <td class='right_column_narrow'>{{ entry.good_count }}</td>
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/index.html b/src/lib/Bcfg2/Reporting/templates/clients/index.html
index d9c415c20..957cbffd2 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/index.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/index.html
@@ -17,9 +17,9 @@
       <td class='{{ inter|determine_client_state }}'>
           <a href="{% spaceless %}
               {% if not timestamp %}
-                  {% url reports_client_detail inter.client.name %}
+                  {% url "reports_client_detail" inter.client.name %}
               {% else %}
-                  {% url reports_client_detail_pk inter.client.name,inter.id %}
+                  {% url "reports_client_detail_pk" inter.client.name inter.id %}
               {% endif %}
               {% endspaceless %}">{{ inter.client.name }}</a>
       </td>
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/manage.html b/src/lib/Bcfg2/Reporting/templates/clients/manage.html
index 443ec8ccb..5ba3393b2 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/manage.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/manage.html
@@ -24,10 +24,10 @@
       <td><span id="{{ client.name }}"> </span>
           <span id="ttag-{{ client.name }}"> </span>
           <span id="s-ttag-{{ client.name }}"> </span>
-          <a href="{% url reports_client_detail client.name %}">{{ client.name }}</a></td>
+          <a href='{% url "reports_client_detail" client.name %}'>{{ client.name }}</a></td>
       <td>{% firstof client.expiration 'Active' %}</td>
       <td>
-          <form method="post" action="{% url reports_client_manage %}">
+          <form method="post" action='{% url "reports_client_manage" %}'>
             <div> {# here for no reason other then to validate #}
               <input type="hidden" name="client_name" value="{{ client.name }}" />
               <input type="hidden" name="client_action" value="{% if client.expiration %}unexpire{% else %}expire{% endif %}" />
-- 
cgit v1.2.3-1-g7c22