From ce50e972971b06bdc2f0983d73059054388573c8 Mon Sep 17 00:00:00 2001
From: lmortimer <logan.mortimer@pacificedge.co.nz>
Date: Thu, 15 Oct 2015 09:52:08 +1300
Subject: [PATCH] Namespace templatetags so they don't clash with existing
 application templatetags.

---
 silk/request_filters.py                               | 2 +-
 silk/templates/silk/base/root_base.html               | 4 ++--
 silk/templates/silk/inclusion/profile_menu.html       | 2 +-
 silk/templates/silk/inclusion/profile_summary.html    | 2 +-
 silk/templates/silk/inclusion/request_menu.html       | 2 +-
 silk/templates/silk/inclusion/request_summary.html    | 2 +-
 silk/templates/silk/inclusion/root_menu.html          | 2 +-
 silk/templates/silk/profile_detail.html               | 6 +++---
 silk/templates/silk/profiling.html                    | 2 +-
 silk/templates/silk/request.html                      | 4 ++--
 silk/templates/silk/requests.html                     | 2 +-
 silk/templates/silk/sql.html                          | 6 +++---
 silk/templates/silk/sql_detail.html                   | 6 +++---
 silk/templates/silk/summary.html                      | 2 +-
 silk/templatetags/{filters.py => silk_filters.py}     | 0
 silk/templatetags/{inclusion.py => silk_inclusion.py} | 0
 silk/templatetags/{nav.py => silk_nav.py}             | 0
 17 files changed, 22 insertions(+), 22 deletions(-)
 rename silk/templatetags/{filters.py => silk_filters.py} (100%)
 rename silk/templatetags/{inclusion.py => silk_inclusion.py} (100%)
 rename silk/templatetags/{nav.py => silk_nav.py} (100%)

diff --git a/silk/request_filters.py b/silk/request_filters.py
index 6b99b4a1..3cdd28c5 100644
--- a/silk/request_filters.py
+++ b/silk/request_filters.py
@@ -8,7 +8,7 @@
 from django.utils import timezone
 from silk.profiling.dynamic import _get_module
 
-from silk.templatetags.filters import _silk_date_time
+from silk.templatetags.silk_filters import _silk_date_time
 logger = logging.getLogger('silk')
 
 
diff --git a/silk/templates/silk/base/root_base.html b/silk/templates/silk/base/root_base.html
index 4e429215..1ae44d16 100644
--- a/silk/templates/silk/base/root_base.html
+++ b/silk/templates/silk/base/root_base.html
@@ -1,6 +1,6 @@
 {% extends "silk/base/base.html" %}
-{% load nav %}
-{% load inclusion %}
+{% load silk_nav %}
+{% load silk_inclusion %}
 {% load staticfiles %}
 
 {% block body_class %}
diff --git a/silk/templates/silk/inclusion/profile_menu.html b/silk/templates/silk/inclusion/profile_menu.html
index 4cefd25d..0ec7a1b6 100644
--- a/silk/templates/silk/inclusion/profile_menu.html
+++ b/silk/templates/silk/inclusion/profile_menu.html
@@ -1,4 +1,4 @@
-{% load nav %}
+{% load silk_nav %}
 <a href="
     {% if silk_request %}
         {% url "silk:request_profiling" silk_request.id %}
diff --git a/silk/templates/silk/inclusion/profile_summary.html b/silk/templates/silk/inclusion/profile_summary.html
index 2921e6c2..5efd3d01 100644
--- a/silk/templates/silk/inclusion/profile_summary.html
+++ b/silk/templates/silk/inclusion/profile_summary.html
@@ -1,4 +1,4 @@
-{% load filters %}
+{% load silk_filters %}
 <div class="cell">
     <div class="timestamp-div">{{ profile.start_time | silk_date_time }}</div>
     <div class="name-div">{% if profile.name %}{{ profile.name }}{% elif profile.func_name %}{{ profile.func_name }}{% endif %}</div>
diff --git a/silk/templates/silk/inclusion/request_menu.html b/silk/templates/silk/inclusion/request_menu.html
index 9868c742..6eb283d0 100644
--- a/silk/templates/silk/inclusion/request_menu.html
+++ b/silk/templates/silk/inclusion/request_menu.html
@@ -1,4 +1,4 @@
-{% load nav %}
+{% load silk_nav %}
 <a href="
 
     {% url "silk:requests" %}
diff --git a/silk/templates/silk/inclusion/request_summary.html b/silk/templates/silk/inclusion/request_summary.html
index 20f49138..18caa4bb 100644
--- a/silk/templates/silk/inclusion/request_summary.html
+++ b/silk/templates/silk/inclusion/request_summary.html
@@ -1,4 +1,4 @@
-{% load filters %}
+{% load silk_filters %}
 <div class="cell">
     <div class="timestamp-div">{{ silk_request.start_time | silk_date_time }}</div>
     <div class="method-div">{% if silk_request.response.status_code %}{{ silk_request.response.status_code }} {% endif %}{{ silk_request.method }}</div>
diff --git a/silk/templates/silk/inclusion/root_menu.html b/silk/templates/silk/inclusion/root_menu.html
index af2d1131..94fb3534 100644
--- a/silk/templates/silk/inclusion/root_menu.html
+++ b/silk/templates/silk/inclusion/root_menu.html
@@ -1,4 +1,4 @@
-{% load nav %}
+{% load silk_nav %}
 <div class="menu-item selectable-menu-item {% navactive request 'silk:summary' %}">
     <a href="{% url "silk:summary" %}">
         <div class="menu-item-outer">
diff --git a/silk/templates/silk/profile_detail.html b/silk/templates/silk/profile_detail.html
index 119a9f30..32f043cf 100644
--- a/silk/templates/silk/profile_detail.html
+++ b/silk/templates/silk/profile_detail.html
@@ -1,7 +1,7 @@
 {% extends "silk/base/detail_base.html" %}
-{% load filters %}
-{% load nav %}
-{% load inclusion %}
+{% load silk_filters %}
+{% load silk_nav %}
+{% load silk_inclusion %}
 {% load staticfiles %}
 
 {% block js %}
diff --git a/silk/templates/silk/profiling.html b/silk/templates/silk/profiling.html
index 4a60259d..f5044d8b 100644
--- a/silk/templates/silk/profiling.html
+++ b/silk/templates/silk/profiling.html
@@ -1,6 +1,6 @@
 {% extends 'silk/base/root_base.html' %}
 {% load staticfiles %}
-{% load inclusion %}
+{% load silk_inclusion %}
 
 {% block menu %}
     {% if silk_request %}
diff --git a/silk/templates/silk/request.html b/silk/templates/silk/request.html
index 813fc314..6320ee0b 100644
--- a/silk/templates/silk/request.html
+++ b/silk/templates/silk/request.html
@@ -1,6 +1,6 @@
 {% extends "silk/base/base.html" %}
-{% load filters %}
-{% load inclusion %}
+{% load silk_filters %}
+{% load silk_inclusion %}
 {% load staticfiles %}
 {% block style %}
     <link rel="stylesheet" href="{% static 'silk/css/cell.css' %}"/>
diff --git a/silk/templates/silk/requests.html b/silk/templates/silk/requests.html
index 562ee562..72454bff 100644
--- a/silk/templates/silk/requests.html
+++ b/silk/templates/silk/requests.html
@@ -1,5 +1,5 @@
 {% extends 'silk/base/root_base.html' %}
-{% load inclusion %}
+{% load silk_inclusion %}
 {% load staticfiles %}
 
 {% block menu %}
diff --git a/silk/templates/silk/sql.html b/silk/templates/silk/sql.html
index 9a735651..42d675e7 100644
--- a/silk/templates/silk/sql.html
+++ b/silk/templates/silk/sql.html
@@ -1,9 +1,9 @@
 {% extends 'silk/base/base.html' %}
 
-{% load nav %}
-{% load filters %}
+{% load silk_nav %}
+{% load silk_filters %}
 {% load staticfiles %}
-{% load inclusion %}
+{% load silk_inclusion %}
 
 {% block style %}
     <style>
diff --git a/silk/templates/silk/sql_detail.html b/silk/templates/silk/sql_detail.html
index 35446829..d9705470 100644
--- a/silk/templates/silk/sql_detail.html
+++ b/silk/templates/silk/sql_detail.html
@@ -1,7 +1,7 @@
 {% extends "silk/base/detail_base.html" %}
-{% load filters %}
-{% load nav %}
-{% load inclusion %}
+{% load silk_filters %}
+{% load silk_nav %}
+{% load silk_inclusion %}
 
 {% block js %}
     {{ block.super }}
diff --git a/silk/templates/silk/summary.html b/silk/templates/silk/summary.html
index 3de3a9ce..e4a9d11a 100644
--- a/silk/templates/silk/summary.html
+++ b/silk/templates/silk/summary.html
@@ -1,5 +1,5 @@
 {% extends 'silk/base/root_base.html' %}
-{% load inclusion %}
+{% load silk_inclusion %}
 {% load staticfiles %}
 {% block menu %}
     {% root_menu request %}
diff --git a/silk/templatetags/filters.py b/silk/templatetags/silk_filters.py
similarity index 100%
rename from silk/templatetags/filters.py
rename to silk/templatetags/silk_filters.py
diff --git a/silk/templatetags/inclusion.py b/silk/templatetags/silk_inclusion.py
similarity index 100%
rename from silk/templatetags/inclusion.py
rename to silk/templatetags/silk_inclusion.py
diff --git a/silk/templatetags/nav.py b/silk/templatetags/silk_nav.py
similarity index 100%
rename from silk/templatetags/nav.py
rename to silk/templatetags/silk_nav.py