Reports: Add support for Django 1.5

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
author: Sol Jerome <sol.jerome@gmail.com> 2013-04-29 07:37:38 -0500
committer: Sol Jerome <sol.jerome@gmail.com> 2013-04-29 07:37:38 -0500
commit: 84a83cab07853b83e91c40c440f65b911e3296a5 (patch)
tree: d473706546a624ffef8ab497fb4b7cefe2d66866 /src/lib/Bcfg2/Reporting/templates
parent: 139e8abff3eba4a1c6ce1a33f9835b42463583f9 (diff)
download: bcfg2-84a83cab07853b83e91c40c440f65b911e3296a5.tar.gz
bcfg2-84a83cab07853b83e91c40c440f65b911e3296a5.tar.bz2
bcfg2-84a83cab07853b83e91c40c440f65b911e3296a5.zip
11 files changed, 61 insertions, 52 deletions
diff --git a/src/lib/Bcfg2/Reporting/templates/base.html b/src/lib/Bcfg2/Reporting/templates/base.html
index c73339911..7f1fcba3b 100644
--- a/src/lib/Bcfg2/Reporting/templates/base.html
+++ b/src/lib/Bcfg2/Reporting/templates/base.html
@@ -1,4 +1,8 @@
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 <?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -25,8 +29,9 @@
 
   <div id="header">
     <a href="http://bcfg2.org"><img src='{% to_media_url bcfg2_logo.png %}'
-		height='115' width='300' alt='Bcfg2' style='float:left; height: 115px' /></a>
-	</div>
+                                    height='115' width='300' alt='Bcfg2'
+                                    style='float:left; height: 115px' /></a>
+  </div>
 
 <div id="document">
   <div id="content"><div id="contentwrapper">
@@ -46,26 +51,26 @@
       <li>Overview</li>
     </ul>
     <ul class='menu-level2'>
-      <li><a href="{% url reports_summary %}">Summary</a></li>
-      <li><a href="{% url reports_history %}">Recent Interactions</a></li>
-      <li><a href="{% url reports_timing %}">Timing</a></li>
+      <li><a href="{% url "reports_summary" %}">Summary</a></li>
+      <li><a href="{% url "reports_history" %}">Recent Interactions</a></li>
+      <li><a href="{% url "reports_timing" %}">Timing</a></li>
     </ul>
     <ul class='menu-level1'>
       <li>Clients</li>
     </ul>
     <ul class='menu-level2'>
-      <li><a href="{% url reports_grid_view %}">Grid View</a></li>
-      <li><a href="{% url reports_detailed_list %}">Detailed List</a></li>
-      <li><a href="{% url reports_client_manage %}">Manage</a></li>
+      <li><a href="{% url "reports_grid_view" %}">Grid View</a></li>
+      <li><a href="{% url "reports_detailed_list" %}">Detailed List</a></li>
+      <li><a href="{% url "reports_client_manage" %}">Manage</a></li>
     </ul>
     <ul class='menu-level1'>
       <li>Entries Configured</li>
     </ul>
     <ul class='menu-level2'>
-      <li><a href="{% url reports_common_problems %}">Common problems</a></li>
-      <li><a href="{% url reports_item_list "bad" %}">Bad</a></li>
-      <li><a href="{% url reports_item_list "modified" %}">Modified</a></li>
-      <li><a href="{% url reports_item_list "extra" %}">Extra</a></li>
+      <li><a href="{% url "reports_common_problems" %}">Common problems</a></li>
+      <li><a href="{% url "reports_item_list" "bad" %}">Bad</a></li>
+      <li><a href="{% url "reports_item_list" "modified" %}">Modified</a></li>
+      <li><a href="{% url "reports_item_list" "extra" %}">Extra</a></li>
     </ul>
 {% comment %}
  TODO
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 %}" />
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/common.html b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
index 57191ec39..0dbd52156 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/common.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
@@ -29,9 +29,9 @@
       {% for item in type_list %}
         <tr class='{% cycle listview,listview_alt %}'>
           <td>{{ item.ENTRY_TYPE }}</td>
-          <td><a href="{% url reports_entry item.class_name, item.pk %}">{{ item.name }}</a></td>
+          <td><a href='{% url "reports_entry" item.class_name  item.pk %}'>{{ item.name }}</a></td>
           <td>{{ item.num_entries }}</td>
-          <td><a href="{% url reports_item item.ENTRY_TYPE, item.pk %}">{{ item.short_list|join:"," }}</a></td>
+          <td><a href='{% url "reports_item" item.ENTRY_TYPE  item.pk %}'>{{ item.short_list|join:"," }}</a></td>
         </tr>
       {% endfor %}
       </table>
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html b/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
index e940889ab..e3befb0eb 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.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 - Entry Status{% endblock %}
 
@@ -17,10 +21,10 @@
         {% for item, inters in items %}
           {% for inter in inters %}
           <tr class='{% cycle listview,listview_alt %}'>
-            <td><a href='{% url reports_client_detail hostname=inter.client.name %}'>{{inter.client.name}}</a></td>
-            <td><a href='{% url reports_client_detail_pk hostname=inter.client.name, pk=inter.pk %}'>{{inter.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe}}</a></td>
+            <td><a href='{% url "reports_client_detail" hostname=inter.client.name %}'>{{inter.client.name}}</a></td>
+            <td><a href='{% url "reports_client_detail_pk" hostname=inter.client.name pk=inter.pk %}'>{{inter.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe}}</a></td>
             <td>{{ item.get_state_display }}</td>
-            <td style='white-space: nowrap'><a href="{% url reports_item entry_type=item.class_name pk=item.pk %}">({{item.pk}}) {{item.short_list|join:","}}</a></td>
+            <td style='white-space: nowrap'><a href='{% url "reports_item" entry_type=item.class_name pk=item.pk %}'>({{item.pk}}) {{item.short_list|join:","}}</a></td>
           </tr>
           {% endfor %}
         {% endfor %}
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/item.html b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
index 259414399..c15a85e0a 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/item.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
@@ -9,20 +9,20 @@
 {% block extra_header_info %}
 <style type="text/css">
 #table_list_header {
-	font-size: 100%;
+    font-size: 100%;
 }
 table.entry_list {
-        width: auto;
+    width: auto;
 }
 div.information_wrapper {
-	margin: 15px;
+    margin: 15px;
 }
 div.diff_wrapper {
-	overflow: auto;
+    overflow: auto;
 }
 div.entry_list h3 {
-	font-size: 90%;
-	padding: 5px;
+    font-size: 90%;
+    padding: 5px;
 }
 </style>
 {% endblock%}
@@ -131,9 +131,9 @@ div.entry_list h3 {
     {% if associated_list %}
       <table class="entry_list" cellpadding="3">
         {% for inter in associated_list %}
-          <tr><td><a href="{% url reports_client_detail inter.client.name %}"
+          <tr><td><a href='{% url "reports_client_detail" inter.client.name %}'
               >{{inter.client.name}}</a></td>
-          <td><a href="{% url reports_client_detail_pk hostname=inter.client.name,pk=inter.id %}"
+          <td><a href='{% url "reports_client_detail_pk" hostname=inter.client.name pk=inter.id %}'
               >{{inter.timestamp}}</a></td>
           </tr>
         {% endfor %}
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
index 864392754..fb10bb020 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
@@ -21,9 +21,9 @@
         <tr style='text-align: left' ><th>Name</th><th>Count</th><th>Reason</th></tr>
         {% for entry in type_data %}
           <tr class='{% cycle listview,listview_alt %}'>
-            <td><a href="{% url reports_entry entry.class_name entry.pk %}">{{entry.name}}</a></td>
+            <td><a href='{% url "reports_entry" entry.class_name entry.pk %}'>{{entry.name}}</a></td>
             <td>{{entry.num_entries}}</td>
-            <td><a href="{% url reports_item entry.class_name entry.pk %}">{{entry.short_list|join:","}}</a></td>
+            <td><a href='{% url "reports_item" entry.class_name entry.pk %}'>{{entry.short_list|join:","}}</a></td>
           </tr>
         {% endfor %}
       </table>
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>
author	Sol Jerome <sol.jerome@gmail.com>	2013-04-29 07:37:38 -0500
committer	Sol Jerome <sol.jerome@gmail.com>	2013-04-29 07:37:38 -0500
commit	84a83cab07853b83e91c40c440f65b911e3296a5 (patch)
tree	d473706546a624ffef8ab497fb4b7cefe2d66866 /src/lib/Bcfg2/Reporting/templates
parent	139e8abff3eba4a1c6ce1a33f9835b42463583f9 (diff)
download	bcfg2-84a83cab07853b83e91c40c440f65b911e3296a5.tar.gz bcfg2-84a83cab07853b83e91c40c440f65b911e3296a5.tar.bz2 bcfg2-84a83cab07853b83e91c40c440f65b911e3296a5.zip