Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Namespace templatetags so they don't clash with existing application templatetags #81

Merged
merged 1 commit into from
Nov 17, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion silk/request_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')


Expand Down
4 changes: 2 additions & 2 deletions silk/templates/silk/base/root_base.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "silk/base/base.html" %}
{% load nav %}
{% load inclusion %}
{% load silk_nav %}
{% load silk_inclusion %}
{% load staticfiles %}

{% block body_class %}
Expand Down
2 changes: 1 addition & 1 deletion silk/templates/silk/inclusion/profile_menu.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load nav %}
{% load silk_nav %}
<a href="
{% if silk_request %}
{% url "silk:request_profiling" silk_request.id %}
Expand Down
2 changes: 1 addition & 1 deletion silk/templates/silk/inclusion/profile_summary.html
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion silk/templates/silk/inclusion/request_menu.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load nav %}
{% load silk_nav %}
<a href="

{% url "silk:requests" %}
Expand Down
2 changes: 1 addition & 1 deletion silk/templates/silk/inclusion/request_summary.html
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion silk/templates/silk/inclusion/root_menu.html
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
6 changes: 3 additions & 3 deletions silk/templates/silk/profile_detail.html
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion silk/templates/silk/profiling.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends 'silk/base/root_base.html' %}
{% load staticfiles %}
{% load inclusion %}
{% load silk_inclusion %}

{% block menu %}
{% if silk_request %}
Expand Down
4 changes: 2 additions & 2 deletions silk/templates/silk/request.html
Original file line number Diff line number Diff line change
@@ -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' %}"/>
Expand Down
2 changes: 1 addition & 1 deletion silk/templates/silk/requests.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'silk/base/root_base.html' %}
{% load inclusion %}
{% load silk_inclusion %}
{% load staticfiles %}

{% block menu %}
Expand Down
6 changes: 3 additions & 3 deletions silk/templates/silk/sql.html
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions silk/templates/silk/sql_detail.html
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion silk/templates/silk/summary.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'silk/base/root_base.html' %}
{% load inclusion %}
{% load silk_inclusion %}
{% load staticfiles %}
{% block menu %}
{% root_menu request %}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.