From d9d2d4ca476898e288f4b8ba493cf0fce291cf92 Mon Sep 17 00:00:00 2001
From: Rizmari Versfeld <rizmari@praekeltconsulting.com>
Date: Thu, 18 Apr 2013 10:52:32 +0200
Subject: [PATCH 1/4] quote view_name in {% url view_name %}

---
 holodeck/templates/holodeck/dashboard.html    |  6 +++---
 .../templates/holodeck/dashboard/manage.html  | 10 +++++-----
 .../templates/holodeck/dashboard/new.html     |  2 +-
 .../templates/holodeck/dashboard/share.html   |  6 +++---
 .../templates/holodeck/dashboard/view.html    | 14 ++++++-------
 holodeck/templates/holodeck/header.html       | 20 +++++++++----------
 .../inclusion_tags/dashboard_dropdown.html    |  4 ++--
 .../dashboard_list_summary.html               |  4 ++--
 holodeck/templates/holodeck/layout.html       |  6 +++---
 holodeck/templates/holodeck/login.html        |  2 +-
 .../templates/holodeck/metric/manage.html     | 10 +++++-----
 holodeck/templates/holodeck/metric/new.html   |  4 ++--
 .../templates/holodeck/widgets/base_full.html |  6 +++---
 13 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/holodeck/templates/holodeck/dashboard.html b/holodeck/templates/holodeck/dashboard.html
index 716465c..9a4ed0b 100644
--- a/holodeck/templates/holodeck/dashboard.html
+++ b/holodeck/templates/holodeck/dashboard.html
@@ -5,11 +5,11 @@
 {% block title %}{% trans "Dashboard Overview" %} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
-    <li><a href="{% url holodeck %}">{% trans "Dashboard Overview" %}</a></li>
+    <li><a href="{% url "holodeck" %}">{% trans "Dashboard Overview" %}</a></li>
 {% endblock %}
 
 {% block page_header %}
-    <a href="{% url holodeck-new-dashboard %}" class="btn pull-right btn-primary">{% trans "Create a new dashboard" %}</a>
+    <a href="{% url "holodeck-new-dashboard" %}" class="btn pull-right btn-primary">{% trans "Create a new dashboard" %}</a>
     {{ block.super }}
 {% endblock %}
 
@@ -24,7 +24,7 @@
         <ul class="events" id="event_list">
             <li class="empty-result" id="no_messages">
                 <div class="alert alert-block alert-notice">
-                    {% url holodeck-new-dashboard as link %}
+                    {% url "holodeck-new-dashboard" as link %}
                     <p>{% blocktrans %}This Holodeck does not contain any dashboards. Would you like to <a href="{{ link }}">create a new dashboard now</a>?{% endblocktrans %}</p>
                 </div>
             </li>
diff --git a/holodeck/templates/holodeck/dashboard/manage.html b/holodeck/templates/holodeck/dashboard/manage.html
index f0d6a27..4659661 100644
--- a/holodeck/templates/holodeck/dashboard/manage.html
+++ b/holodeck/templates/holodeck/dashboard/manage.html
@@ -5,13 +5,13 @@
 {% block title %}{% blocktrans with dashboard.name as name %}Manage Dashboard: {{ name }}{% endblocktrans %} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
-    <li><a href="{% url holodeck-view-dashboard dashboard.pk %}">{{ dashboard.name }}</a></li>
+    <li><a href="{% url "holodeck-view-dashboard" dashboard.pk %}">{{ dashboard.name }}</a></li>
     <li class="divider">/</li>
-    <li><a href="{% url holodeck-manage-dashboard dashboard.id %}">Edit</a></li>
+    <li><a href="{% url "holodeck-manage-dashboard" dashboard.id %}">Edit</a></li>
 {% endblock %}
 
 {% block page_header %}
-    <a href="{% url holodeck-new-metric dashboard.pk %}" class="btn pull-right btn-primary">{% trans "Create a new metric" %}</a>
+    <a href="{% url "holodeck-new-metric" dashboard.pk %}" class="btn pull-right btn-primary">{% trans "Create a new metric" %}</a>
     {{ block.super }}
 {% endblock %}
 
@@ -40,11 +40,11 @@
                 <fieldset id="client-security">
                     <div><legend>{% trans "Sharing URL" %}</legend></div>
                     <p>{% trans "To share this dashboard with 3rd parties for viewing send them the following publicly accessible URL:" %}</p>
-                    <p><code class="clippy">{{ SITE_URL }}{% url holodeck-share-dashboard dashboard.id dashboard.share_key %}</code></p>
+                    <p><code class="clippy">{{ SITE_URL }}{% url "holodeck-share-dashboard" dashboard.id dashboard.share_key %}</code></p>
                 </fieldset>
                 <div class="form-actions">
                     <button type="submit" class="btn btn-primary">{% trans "Save Changes" %}</button>
-                    <a href="{% url holodeck-remove-dashboard dashboard.id %}" class="btn btn-danger">{% trans "Remove Dashboard" %}</a>
+                    <a href="{% url "holodeck-remove-dashboard" dashboard.id %}" class="btn btn-danger">{% trans "Remove Dashboard" %}</a>
                 </div>
             </form>
         {% endblock %}
diff --git a/holodeck/templates/holodeck/dashboard/new.html b/holodeck/templates/holodeck/dashboard/new.html
index ee7fabe..a401b0f 100644
--- a/holodeck/templates/holodeck/dashboard/new.html
+++ b/holodeck/templates/holodeck/dashboard/new.html
@@ -5,7 +5,7 @@
 {% block title %}{% trans "New Dashboard" %} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
-    <li><a href="{% url holodeck-new-dashboard %}">{% trans "New Dashboard" %}</a></li>
+    <li><a href="{% url "holodeck-new-dashboard" %}">{% trans "New Dashboard" %}</a></li>
 {% endblock %}
 
 {% block main %}
diff --git a/holodeck/templates/holodeck/dashboard/share.html b/holodeck/templates/holodeck/dashboard/share.html
index 8dfe0c7..256a25c 100644
--- a/holodeck/templates/holodeck/dashboard/share.html
+++ b/holodeck/templates/holodeck/dashboard/share.html
@@ -5,12 +5,12 @@
 {% block title %}{{ dashboard.name }} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
-    <li><a href="{% url holodeck-share-dashboard dashboard.pk dashboard.share_key %}">{{ dashboard.name }}</a></li>
+    <li><a href="{% url "holodeck-share-dashboard" dashboard.pk dashboard.share_key %}">{{ dashboard.name }}</a></li>
 {% endblock %}
 
 {% block page_header %}
     <div class="btn-group pull-right">
-        <a class="btn btn-primary" title="Export" href="{% url holodeck-export-shared-dashboard dashboard.pk dashboard.share_key %}"><i class="icon-file icon-white"></i></a>
+        <a class="btn btn-primary" title="Export" href="{% url "holodeck-export-shared-dashboard" dashboard.pk dashboard.share_key %}"><i class="icon-file icon-white"></i></a>
     </div>    
     {{ block.super }}
 {% endblock %}
@@ -18,7 +18,7 @@
 {% block main %}
     <section class="body">
         {% if not metrics %}
-            {% url holodeck-new-metric dashboard.pk as link %}
+            {% url "holodeck-new-metric" dashboard.pk as link %}
             <div class="alert alert-info">{% blocktrans %}This dashboard does not currently have any metrics. Would you like to <a href="{{ link }}">create a new metric now</a>?{% endblocktrans %}</div>
         {% else %}
             {% for metric in metrics %}
diff --git a/holodeck/templates/holodeck/dashboard/view.html b/holodeck/templates/holodeck/dashboard/view.html
index 27893b5..f6f027d 100644
--- a/holodeck/templates/holodeck/dashboard/view.html
+++ b/holodeck/templates/holodeck/dashboard/view.html
@@ -5,15 +5,15 @@
 {% block title %}{{ dashboard.name }} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
-    <li><a href="{% url holodeck-view-dashboard dashboard.id %}">{{ dashboard.name }}</a></li>
+    <li><a href="{% url "holodeck-view-dashboard" dashboard.id %}">{{ dashboard.name }}</a></li>
 {% endblock %}
 
 {% block page_header %}
     <div class="btn-group pull-right">
-        <a class="btn" title="Export" href="{% url holodeck-export-dashboard dashboard.id %}"><i class="icon-file"></i></a>
-        <a class="btn" title="Share" href="{{ SITE_URL }}{% url holodeck-share-dashboard dashboard.id dashboard.share_key %}"><i class="icon-share"></i></a>
-        <a class="btn" title="Edit" href="{% url holodeck-manage-dashboard dashboard.id %}"><i class="icon-pencil"></i></a>
-        <a class="btn btn-primary" title="Add Metric" href="{% url holodeck-new-metric dashboard.id %}"><i class="icon-white icon-plus-sign"></i></a>
+        <a class="btn" title="Export" href="{% url "holodeck-export-dashboard" dashboard.id %}"><i class="icon-file"></i></a>
+        <a class="btn" title="Share" href="{{ SITE_URL }}{% url "holodeck-share-dashboard" dashboard.id dashboard.share_key %}"><i class="icon-share"></i></a>
+        <a class="btn" title="Edit" href="{% url "holodeck-manage-dashboard" dashboard.id %}"><i class="icon-pencil"></i></a>
+        <a class="btn btn-primary" title="Add Metric" href="{% url "holodeck-new-metric" dashboard.id %}"><i class="icon-white icon-plus-sign"></i></a>
     </div>    
     {{ block.super }}
 {% endblock %}
@@ -21,7 +21,7 @@
 {% block main %}
     <section class="body" id="sortable">
         {% if not metrics %}
-            {% url holodeck-new-metric dashboard.id as link %}
+            {% url "holodeck-new-metric" dashboard.id as link %}
             <div class="alert alert-info">{% blocktrans %}This dashboard does not currently have any metrics. Would you like to <a href="{{ link }}">create a new metric now</a>?{% endblocktrans %}</div>
         {% else %}
             {% for metric in metrics %}
@@ -41,7 +41,7 @@
                 },
                 update: function(event, ui) {
                     var order = $(this).sortable("toArray").toString();
-                    $.get("{% url holodeck-sort-dashboard dashboard.id %}", {order: order});
+                    $.get("{% url "holodeck-sort-dashboard" dashboard.id %}", {order: order});
                 }
 		    });
     		$("#sortable").disableSelection();
diff --git a/holodeck/templates/holodeck/header.html b/holodeck/templates/holodeck/header.html
index a49986c..5887fba 100644
--- a/holodeck/templates/holodeck/header.html
+++ b/holodeck/templates/holodeck/header.html
@@ -4,11 +4,11 @@
     <div class="navbar">
         <div class="navbar-inner">
             <div class="container">
-                <a id="logo" href="{% url holodeck %}">Holodeck</a>
+                <a id="logo" href="{% url "holodeck" %}">Holodeck</a>
                 {% comment %}
                 {% block search %}
                     {% if project %}
-                        <form action="{% url sentry-search project.slug %}" class="navbar-search pull-right" id="search">
+                        <form action="{% url "sentry-search" project.slug %}" class="navbar-search pull-right" id="search">
                             <input type="hidden" name="sort" value="{% if sort %}{{ sort }}{% endif %}"/>
                             <input type="text" name="q" value="{% if query %}{{ query }}{% endif %}" placeholder="{% if HAS_SEARCH %}{% trans "search query or message id" %}{% else %}{% trans "message id" %}{% endif %}" class="search-query pull-left" />
                         </form>
@@ -24,8 +24,8 @@
                 {% comment %}
                 <ul class="nav">
                     {% if project %}
-                        <li{% if PAGE == 'dashboard' %} class="active"{% endif %}><a href="{% url sentry project.slug %}">{% trans "Dashboard" %}</a></li>
-                        <li{% if PAGE == 'stream' %} class="active"{% endif %}><a href="{% url sentry-events project.slug %}">{% trans "Stream" %}</a></li>
+                        <li{% if PAGE == 'dashboard' %} class="active"{% endif %}><a href="{% url "sentry" project.slug %}">{% trans "Dashboard" %}</a></li>
+                        <li{% if PAGE == 'stream' %} class="active"{% endif %}><a href="{% url "sentry-events" project.slug %}">{% trans "Stream" %}</a></li>
                     {% endif %}
                 </ul>
                 {% endcomment %}
@@ -38,19 +38,19 @@
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img class="avatar" src=""> {{ user.username}} <span class="caret"></span></a>
                                 <ul class="dropdown-menu">
                                     {% comment %}
-                                    <li><a href="{% url sentry-project-list %}">{% trans "Projects" %}</a></li>
-                                    <li><a href="{% url sentry-team-list %}">{% trans "Teams" %}</a></li>
+                                    <li><a href="{% url "sentry-project-list" %}">{% trans "Projects" %}</a></li>
+                                    <li><a href="{% url "sentry-team-list" %}">{% trans "Teams" %}</a></li>
                                     {% if request.user.is_staff %}
-                                        <li><a href="{% url sentry-admin-status %}">{% trans "Admin" %}</a></li>
+                                        <li><a href="{% url "sentry-admin-status" %}">{% trans "Admin" %}</a></li>
                                     {% endif %}
                                     <li class="divider"></li>
-                                    <li><a href="{% url sentry-account-settings %}">{% trans "Settings" %}</a></li>
+                                    <li><a href="{% url "sentry-account-settings" %}">{% trans "Settings" %}</a></li>
                                     {% endcomment %}
-                                    <li><a href="{% url holodeck-logout %}">{% trans "Logout" %}</a></li>
+                                    <li><a href="{% url "holodeck-logout" %}">{% trans "Logout" %}</a></li>
                                 </ul>
                             </li>
                         {% else %}
-                            <li><a href="{% url holodeck-login %}">{% trans "Login" %}</a></li>
+                            <li><a href="{% url "holodeck-login" %}">{% trans "Login" %}</a></li>
                         {% endif %}
                     {% endblock %}
                 </ul>
diff --git a/holodeck/templates/holodeck/inclusion_tags/dashboard_dropdown.html b/holodeck/templates/holodeck/inclusion_tags/dashboard_dropdown.html
index adbe029..ae496f7 100644
--- a/holodeck/templates/holodeck/inclusion_tags/dashboard_dropdown.html
+++ b/holodeck/templates/holodeck/inclusion_tags/dashboard_dropdown.html
@@ -4,9 +4,9 @@
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Dashboards" %} <span class="caret"></span></a>
     <ul class="dropdown-menu">
         {% for object in dashboard_list %}
-            <li{% if object == dashboard %} class="active"{% endif %}><a href="{% url holodeck-view-dashboard object.pk %}">{{ object.name }}</a></li>
+            <li{% if object == dashboard %} class="active"{% endif %}><a href="{% url "holodeck-view-dashboard" object.pk %}">{{ object.name }}</a></li>
         {% endfor %}
         {% if dashboard_list %}<li class="divider"></li>{% endif %}
-        <li><a href="{% url holodeck-new-dashboard %}">{% trans "Create New Dashboard" %} </a></li>
+        <li><a href="{% url "holodeck-new-dashboard" %}">{% trans "Create New Dashboard" %} </a></li>
     </ul>
 </li>
diff --git a/holodeck/templates/holodeck/inclusion_tags/dashboard_list_summary.html b/holodeck/templates/holodeck/inclusion_tags/dashboard_list_summary.html
index bd10007..1ff181b 100644
--- a/holodeck/templates/holodeck/inclusion_tags/dashboard_list_summary.html
+++ b/holodeck/templates/holodeck/inclusion_tags/dashboard_list_summary.html
@@ -4,7 +4,7 @@
 <div class="count {{ previous.color }}"><span>{% if metric %}{{ previous.percentage }}%{% else %} NA {% endif %}</span></div>
     <div class="details">
         <h3>
-            <a href="{% url holodeck-view-dashboard dashboard.id %}">{{ dashboard.name }}</a>
+            <a href="{% url "holodeck-view-dashboard" dashboard.id %}">{{ dashboard.name }}</a>
         </h3>
         <p class="message" title="{{ group.message }}">
             {{ metric.name }}
@@ -14,7 +14,7 @@ <h3>
         {% if metric %}
             <span class="loading">{% trans "Loading data..." %}</span>
         {% else %}
-            {% url holodeck-new-metric dashboard.pk as link %}
+            {% url "holodeck-new-metric" dashboard.pk as link %}
             <div class="alert alert-info">{% blocktrans %}This dashboard does not currently have any metrics. Would you like to <a href="{{ link }}">create a new metric now</a>?{% endblocktrans %}</div>
         {% endif %}
     </div>
diff --git a/holodeck/templates/holodeck/layout.html b/holodeck/templates/holodeck/layout.html
index 9b0777e..a366e91 100644
--- a/holodeck/templates/holodeck/layout.html
+++ b/holodeck/templates/holodeck/layout.html
@@ -15,7 +15,7 @@
         <script type="text/javascript" src="{{ STATIC_URL }}holodeck/scripts/client.js" %}"></script>
         <script type="text/javascript">
         Sentry.client.config({
-            server: '{% url sentry-api-store %}',
+            server: '{% url "sentry-api-store" %}',
             logger: 'sentry.errors.javascript'
         })
         Sentry.client.registerGlobalHandler();
@@ -56,10 +56,10 @@
             {% block page_header %}
                 <ul class="breadcrumb">
                     {% comment %}
-                    <li><a href="{% url holodeck %}">{% trans "Dashboard" %}</a></li>
+                    <li><a href="{% url "holodeck" %}">{% trans "Dashboard" %}</a></li>
                     {% if project %}
                         <li class="divider">/</li>
-                        <li><a href="{% url sentry project.slug %}">{{ project.name }}</a> <a class="action" href="{% url sentry-manage-project project.slug %}">Edit</a></li>
+                        <li><a href="{% url "sentry" project.slug %}">{{ project.name }}</a> <a class="action" href="{% url "sentry-manage-project" project.slug %}">Edit</a></li>
                     {% endif %}
                     {% endcomment %}
                     {% block breadcrumb %}
diff --git a/holodeck/templates/holodeck/login.html b/holodeck/templates/holodeck/login.html
index d98d95b..d42cb0f 100644
--- a/holodeck/templates/holodeck/login.html
+++ b/holodeck/templates/holodeck/login.html
@@ -5,7 +5,7 @@
 {% block title %}{% trans "Login" %} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
-    <li><a href="{% url holodeck-login %}">{% trans "Login" %}</a></li>
+    <li><a href="{% url "holodeck-login" %}">{% trans "Login" %}</a></li>
 {% endblock %}
 
 {% block search %}{% endblock %}
diff --git a/holodeck/templates/holodeck/metric/manage.html b/holodeck/templates/holodeck/metric/manage.html
index 717b081..9a6e588 100644
--- a/holodeck/templates/holodeck/metric/manage.html
+++ b/holodeck/templates/holodeck/metric/manage.html
@@ -5,13 +5,13 @@
 {% block title %}{% blocktrans with metric.name as name %}Manage Metric: {{ name }}{% endblocktrans %} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
-<li><a href="{% url holodeck-view-dashboard dashboard.pk %}">{{ dashboard.name }}</a></li>
+<li><a href="{% url "holodeck-view-dashboard" dashboard.pk %}">{{ dashboard.name }}</a></li>
     <li class="divider">/</li>
-    <li><a href="{% url holodeck-manage-metric metric.id %}">{{ metric.name }}</a></li>
+    <li><a href="{% url "holodeck-manage-metric" metric.id %}">{{ metric.name }}</a></li>
 {% endblock %}
 
 {% block page_header %}
-    <a href="{% url holodeck-new-metric dashboard.pk %}" class="btn pull-right btn-primary">{% trans "Create a new metric" %}</a>
+    <a href="{% url "holodeck-new-metric" dashboard.pk %}" class="btn pull-right btn-primary">{% trans "Create a new metric" %}</a>
     {{ block.super }}
 {% endblock %}
 
@@ -49,8 +49,8 @@
                 </fieldset>
                 <div class="form-actions">
                     <button type="submit" class="btn btn-primary">{% trans "Save Changes" %}</button>
-                    <a href="{% url holodeck-remove-metric metric.id %}" class="btn btn-danger">{% trans "Remove Metric" %}</a>
-                    <a href="{% url holodeck-purge-metric-samples metric.id %}" class="btn btn-danger">{% trans "Purge Samples" %}</a>
+                    <a href="{% url "holodeck-remove-metric" metric.id %}" class="btn btn-danger">{% trans "Remove Metric" %}</a>
+                    <a href="{% url "holodeck-purge-metric-samples" metric.id %}" class="btn btn-danger">{% trans "Purge Samples" %}</a>
                 </div>
             </form>
         {% endblock %}
diff --git a/holodeck/templates/holodeck/metric/new.html b/holodeck/templates/holodeck/metric/new.html
index fbc95ed..92e318d 100644
--- a/holodeck/templates/holodeck/metric/new.html
+++ b/holodeck/templates/holodeck/metric/new.html
@@ -5,9 +5,9 @@
 {% block title %}{% trans "New Metric" %} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
-<li><a href="{% url holodeck-view-dashboard dashboard.pk %}">{{ dashboard.name }}</a></li>
+<li><a href="{% url "holodeck-view-dashboard" dashboard.pk %}">{{ dashboard.name }}</a></li>
     <li class="divider">/</li>
-    <li><a href="{% url holodeck-new-metric dashboard.pk %}">{% trans "New Metric" %}</a></li>
+    <li><a href="{% url "holodeck-new-metric" dashboard.pk %}">{% trans "New Metric" %}</a></li>
 {% endblock %}
 
 {% block main %}
diff --git a/holodeck/templates/holodeck/widgets/base_full.html b/holodeck/templates/holodeck/widgets/base_full.html
index 6491c48..6bba5e3 100644
--- a/holodeck/templates/holodeck/widgets/base_full.html
+++ b/holodeck/templates/holodeck/widgets/base_full.html
@@ -5,12 +5,12 @@
         <span{% if metric.description %} title="{{ metric.description }}"{% endif %}>{{ metric.name }}</span>
         {% if request.user.is_authenticated %}
             <div class="btn-group pull-right">
-                <a class="btn btn-icon" title="Share" href="{% url holodeck-share-metric metric.id metric.share_key %}"><i class="icon-share"></i></a>
-                <a class="btn btn-icon" title="Edit" href="{% url holodeck-manage-metric metric.id %}"><i class="icon-pencil"></i></a>
+                <a class="btn btn-icon" title="Share" href="{% url "holodeck-share-metric" metric.id metric.share_key %}"><i class="icon-share"></i></a>
+                <a class="btn btn-icon" title="Edit" href="{% url "holodeck-manage-metric" metric.id %}"><i class="icon-pencil"></i></a>
                 <a class="btn btn-icon btn-primary dropdown-toggle" title="Switch Type" data-toggle="dropdown" href="#"><span class="caret"></span></a>
                 <ul class="dropdown-menu">
                     {% for widget_type in widget_types %}
-                        <li><a href="{% url holodeck-type-change-metric metric.id forloop.counter0 %}">{{ widget_type.1 }}</a></li>
+                        <li><a href="{% url "holodeck-type-change-metric" metric.id forloop.counter0 %}">{{ widget_type.1 }}</a></li>
                     {% endfor %}
                 </ul>
             </div>    

From 71cd1d5c0cfc5790f4f8447b039d6b3a59988bbb Mon Sep 17 00:00:00 2001
From: Rizmari Versfeld <rizmari@praekeltconsulting.com>
Date: Thu, 18 Apr 2013 11:11:26 +0200
Subject: [PATCH 2/4] use load url from future in template so that it works in
 django 1.4 + 1.5

---
 holodeck/templates/holodeck/dashboard.html                       | 1 +
 holodeck/templates/holodeck/dashboard/manage.html                | 1 +
 holodeck/templates/holodeck/dashboard/new.html                   | 1 +
 holodeck/templates/holodeck/dashboard/share.html                 | 1 +
 holodeck/templates/holodeck/dashboard/view.html                  | 1 +
 holodeck/templates/holodeck/header.html                          | 1 +
 .../templates/holodeck/inclusion_tags/dashboard_dropdown.html    | 1 +
 .../holodeck/inclusion_tags/dashboard_list_summary.html          | 1 +
 holodeck/templates/holodeck/layout.html                          | 1 +
 holodeck/templates/holodeck/login.html                           | 1 +
 holodeck/templates/holodeck/metric/manage.html                   | 1 +
 holodeck/templates/holodeck/metric/new.html                      | 1 +
 holodeck/templates/holodeck/metric/share.html                    | 1 +
 holodeck/templates/holodeck/widgets/base_full.html               | 1 +
 14 files changed, 14 insertions(+)

diff --git a/holodeck/templates/holodeck/dashboard.html b/holodeck/templates/holodeck/dashboard.html
index 9a4ed0b..d9cba2e 100644
--- a/holodeck/templates/holodeck/dashboard.html
+++ b/holodeck/templates/holodeck/dashboard.html
@@ -1,6 +1,7 @@
 {% extends "holodeck/layout.html" %}
 
 {% load i18n holodeck_inclusion_tags %}
+{% load url from future %}
 
 {% block title %}{% trans "Dashboard Overview" %} | {{ block.super }}{% endblock %}
 
diff --git a/holodeck/templates/holodeck/dashboard/manage.html b/holodeck/templates/holodeck/dashboard/manage.html
index 4659661..9043d86 100644
--- a/holodeck/templates/holodeck/dashboard/manage.html
+++ b/holodeck/templates/holodeck/dashboard/manage.html
@@ -1,6 +1,7 @@
 {% extends "holodeck/layout.html" %}
 
 {% load i18n %}
+{% load url from future %}
 
 {% block title %}{% blocktrans with dashboard.name as name %}Manage Dashboard: {{ name }}{% endblocktrans %} | {{ block.super }}{% endblock %}
 
diff --git a/holodeck/templates/holodeck/dashboard/new.html b/holodeck/templates/holodeck/dashboard/new.html
index a401b0f..7ebc43e 100644
--- a/holodeck/templates/holodeck/dashboard/new.html
+++ b/holodeck/templates/holodeck/dashboard/new.html
@@ -1,6 +1,7 @@
 {% extends "holodeck/layout.html" %}
 
 {% load i18n %}
+{% load url from future %}
 
 {% block title %}{% trans "New Dashboard" %} | {{ block.super }}{% endblock %}
 
diff --git a/holodeck/templates/holodeck/dashboard/share.html b/holodeck/templates/holodeck/dashboard/share.html
index 256a25c..2e58590 100644
--- a/holodeck/templates/holodeck/dashboard/share.html
+++ b/holodeck/templates/holodeck/dashboard/share.html
@@ -1,6 +1,7 @@
 {% extends "holodeck/layout.html" %}
 
 {% load i18n holodeck_inclusion_tags %}
+{% load url from future %}
 
 {% block title %}{{ dashboard.name }} | {{ block.super }}{% endblock %}
 
diff --git a/holodeck/templates/holodeck/dashboard/view.html b/holodeck/templates/holodeck/dashboard/view.html
index f6f027d..c503da9 100644
--- a/holodeck/templates/holodeck/dashboard/view.html
+++ b/holodeck/templates/holodeck/dashboard/view.html
@@ -1,6 +1,7 @@
 {% extends "holodeck/layout.html" %}
 
 {% load i18n holodeck_inclusion_tags %}
+{% load url from future %}
 
 {% block title %}{{ dashboard.name }} | {{ block.super }}{% endblock %}
 
diff --git a/holodeck/templates/holodeck/header.html b/holodeck/templates/holodeck/header.html
index 5887fba..22ef657 100644
--- a/holodeck/templates/holodeck/header.html
+++ b/holodeck/templates/holodeck/header.html
@@ -1,4 +1,5 @@
 {% load i18n holodeck_inclusion_tags %}
+{% load url from future %}
 
 <header id="header">
     <div class="navbar">
diff --git a/holodeck/templates/holodeck/inclusion_tags/dashboard_dropdown.html b/holodeck/templates/holodeck/inclusion_tags/dashboard_dropdown.html
index ae496f7..fa5ef10 100644
--- a/holodeck/templates/holodeck/inclusion_tags/dashboard_dropdown.html
+++ b/holodeck/templates/holodeck/inclusion_tags/dashboard_dropdown.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load url from future %}
 
 <li class="dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Dashboards" %} <span class="caret"></span></a>
diff --git a/holodeck/templates/holodeck/inclusion_tags/dashboard_list_summary.html b/holodeck/templates/holodeck/inclusion_tags/dashboard_list_summary.html
index 1ff181b..618f68b 100644
--- a/holodeck/templates/holodeck/inclusion_tags/dashboard_list_summary.html
+++ b/holodeck/templates/holodeck/inclusion_tags/dashboard_list_summary.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load url from future %}
 
 <li class="event" data-count="{{ group.times_seen|safe }}" data-score="{{ group.sort_value|safe }}" data-group="{{ group.id|safe }}">
 <div class="count {{ previous.color }}"><span>{% if metric %}{{ previous.percentage }}%{% else %} NA {% endif %}</span></div>
diff --git a/holodeck/templates/holodeck/layout.html b/holodeck/templates/holodeck/layout.html
index a366e91..deb0e62 100644
--- a/holodeck/templates/holodeck/layout.html
+++ b/holodeck/templates/holodeck/layout.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load url from future %}
 
 <!DOCTYPE html>
 <html lang="en">
diff --git a/holodeck/templates/holodeck/login.html b/holodeck/templates/holodeck/login.html
index d42cb0f..08a804e 100644
--- a/holodeck/templates/holodeck/login.html
+++ b/holodeck/templates/holodeck/login.html
@@ -1,6 +1,7 @@
 {% extends "holodeck/layout.html" %}
 
 {% load i18n %}
+{% load url from future %}
 
 {% block title %}{% trans "Login" %} | {{ block.super }}{% endblock %}
 
diff --git a/holodeck/templates/holodeck/metric/manage.html b/holodeck/templates/holodeck/metric/manage.html
index 9a6e588..91052fe 100644
--- a/holodeck/templates/holodeck/metric/manage.html
+++ b/holodeck/templates/holodeck/metric/manage.html
@@ -1,6 +1,7 @@
 {% extends "holodeck/layout.html" %}
 
 {% load i18n %}
+{% load url from future %}
 
 {% block title %}{% blocktrans with metric.name as name %}Manage Metric: {{ name }}{% endblocktrans %} | {{ block.super }}{% endblock %}
 
diff --git a/holodeck/templates/holodeck/metric/new.html b/holodeck/templates/holodeck/metric/new.html
index 92e318d..eb925cc 100644
--- a/holodeck/templates/holodeck/metric/new.html
+++ b/holodeck/templates/holodeck/metric/new.html
@@ -1,6 +1,7 @@
 {% extends "holodeck/layout.html" %}
 
 {% load i18n %}
+{% load url from future %}
 
 {% block title %}{% trans "New Metric" %} | {{ block.super }}{% endblock %}
 
diff --git a/holodeck/templates/holodeck/metric/share.html b/holodeck/templates/holodeck/metric/share.html
index 8de47ea..a02d20c 100644
--- a/holodeck/templates/holodeck/metric/share.html
+++ b/holodeck/templates/holodeck/metric/share.html
@@ -1,6 +1,7 @@
 {% extends "holodeck/layout.html" %}
 
 {% load i18n holodeck_inclusion_tags %}
+{% load url from future %}
 
 {% block body %}
     {% render_metric metric minimal="True" %}
diff --git a/holodeck/templates/holodeck/widgets/base_full.html b/holodeck/templates/holodeck/widgets/base_full.html
index 6bba5e3..fa54004 100644
--- a/holodeck/templates/holodeck/widgets/base_full.html
+++ b/holodeck/templates/holodeck/widgets/base_full.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load url from future %}
 
 <div class="widget span{{ width }}" id="metric_{{ metric.id }}">
     <div class="widget-header">

From 0f3aedc3d4e1232e7bf3a7719b64de654500b823 Mon Sep 17 00:00:00 2001
From: Rizmari Versfeld <rizmari@praekeltconsulting.com>
Date: Thu, 18 Apr 2013 16:07:59 +0200
Subject: [PATCH 3/4] pin django version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 3e4354b..dbbc4d2 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
     url='http://github.com/shaunsephton/holodeck',
     packages = find_packages(),
     install_requires = [
-        'django',
+        'django>1.3',
         'logan',
         'south',
         'xlwt',

From 9b06990ce0823c36dc79a9d5ca2ddf45a2885eff Mon Sep 17 00:00:00 2001
From: Rizmari Versfeld <rizmari@praekeltconsulting.com>
Date: Thu, 18 Apr 2013 16:08:28 +0200
Subject: [PATCH 4/4] fix pin

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index dbbc4d2..9b3361f 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
     url='http://github.com/shaunsephton/holodeck',
     packages = find_packages(),
     install_requires = [
-        'django>1.3',
+        'django>=1.3',
         'logan',
         'south',
         'xlwt',