Namespace templatetags so they don't clash with existing application …

…templatetags.
jazzband · Oct 14, 2015 · ce50e97 · ce50e97 · avelis · Dec 30, 2015
1 parent 2af9a66
commit ce50e97
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → silk/templatetags/silk_filters.py b/silk/templatetags/filters.py → silk/templatetags/silk_filters.py
diff --git a/silk/templatetags/inclusion.py → silk/templatetags/silk_inclusion.py b/silk/templatetags/inclusion.py → silk/templatetags/silk_inclusion.py
diff --git a/silk/templatetags/nav.py → silk/templatetags/silk_nav.py b/silk/templatetags/nav.py → silk/templatetags/silk_nav.py