Skip to content

Added support for Content Security Policy, Rebase #330 #704

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.

Sign up for GitHub

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

Closed
wants to merge 4 commits into from
Closed

Added support for Content Security Policy, Rebase #330 #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81b8c61
Remove the use of inline scripts for CSP compatibility
gavinwahl Jan 11, 2015
cf19370
Remove the use of inline styles for CSP compatibility
gavinwahl Jan 11, 2015
c0f77bc
Support XML validator
Apr 10, 2015
bfc3d61
prefix all new CSS classes with djdt-
Apr 26, 2015
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
3 changes: 3 additions & 0 deletions debug_toolbar/static/debug_toolbar/css/print.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#djDebug {
display:none;
}
10 changes: 10 additions & 0 deletions debug_toolbar/static/debug_toolbar/css/toolbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,3 +646,13 @@
display: none;
}
}

#djDebug .djdt-width-20 {
width: 20%;
}
#djDebug .djdt-width-60 {
width: 60%;
}
#djDebug .djdt-highlighted {
background-color: lightgrey;
}
1 change: 1 addition & 0 deletions debug_toolbar/static/debug_toolbar/js/jquery_existing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
var djdt = {jQuery: jQuery};
1 change: 1 addition & 0 deletions debug_toolbar/static/debug_toolbar/js/jquery_post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
var djdt = {jQuery: jQuery.noConflict(true)}; window.define = _djdt_define_backup;
1 change: 1 addition & 0 deletions debug_toolbar/static/debug_toolbar/js/jquery_pre.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
var _djdt_define_backup = window.define; window.define = undefined;
10 changes: 9 additions & 1 deletion debug_toolbar/static/debug_toolbar/js/toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,21 @@

return value;
}
},
applyStyle: function(name) {
$('#djDebug [data-' + name + ']').each(function() {
var css = {};
css[name] = $(this).data(name);
$(this).css(css);
});
}
};
$.extend(publicAPI, {
show_toolbar: djdt.show_toolbar,
hide_toolbar: djdt.hide_toolbar,
close: djdt.close,
cookie: djdt.cookie
cookie: djdt.cookie,
applyStyle: djdt.applyStyle
});
$(document).ready(djdt.init);
})(djdt.jQuery, djdt);
1 change: 1 addition & 0 deletions debug_toolbar/static/debug_toolbar/js/toolbar.profiling.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@
subcalls.hide();
}
});
djdt.applyStyle('padding-left');
})(djdt.jQuery);
3 changes: 3 additions & 0 deletions debug_toolbar/static/debug_toolbar/js/toolbar.sql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
$(this).parent().find('.djDebugCollapsed').toggle();
$(this).parent().find('.djDebugUncollapsed').toggle();
});
djdt.applyStyle('background-color');
djdt.applyStyle('left');
djdt.applyStyle('width');
})(djdt.jQuery);
7 changes: 5 additions & 2 deletions debug_toolbar/static/debug_toolbar/js/toolbar.timer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,17 @@
if (endStat) {
// Render a start through end bar
$row.html('<td>' + stat.replace('Start', '') + '</td>' +
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart" style="left:' + getLeft(stat) + '%;"><strong style="width:' + getCSSWidth(stat, endStat) + ';">&nbsp;</strong></div></div></td>' +
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&nbsp;</strong></div></div></td>' +
'<td>' + (perf.timing[stat] - timingOffset) + ' (+' + (perf.timing[endStat] - perf.timing[stat]) + ')</td>');
$row.find('strong').css({width: getCSSWidth(stat, endStat)});
} else {
// Render a point in time
$row.html('<td>' + stat + '</td>' +
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart" style="left:' + getLeft(stat) + '%;"><strong style="width:2px;">&nbsp;</strong></div></div></td>' +
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&nbsp;</strong></div></div></td>' +
'<td>' + (perf.timing[stat] - timingOffset) + '</td>');
$row.find('strong').css({width: 2});
}
$row.find('djDebugLineChart').css({left: getLeft(stat) + '%'});
$('#djDebugBrowserTimingTableBody').append($row);
}

Expand Down
16 changes: 7 additions & 9 deletions debug_toolbar/templates/debug_toolbar/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
{% load i18n %}{% load static from staticfiles %}{% load url from compat %}
<style type="text/css">
@media print { #djDebug {display:none;}}
</style>
<link rel="stylesheet" href="{% static 'debug_toolbar/css/print.css' %}" type="text/css" media="print" />
<link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}" type="text/css" />
{% if toolbar.config.JQUERY_URL %}
<!-- Prevent our copy of jQuery from registering as an AMD module on sites that use RequireJS. -->
<script>var _djdt_define_backup = window.define; window.define = undefined;</script>
<script src="{% static 'debug_toolbar/js/jquery_pre.js' %}"></script>
<script src="{{ toolbar.config.JQUERY_URL }}"></script>
<script>var djdt = {jQuery: jQuery.noConflict(true)}; window.define = _djdt_define_backup;</script>
<script src="{% static 'debug_toolbar/js/jquery_post.js' %}"></script>
{% else %}
<script>var djdt = {jQuery: jQuery};</script>
<script src="{% static 'debug_toolbar/js/jquery_existing.js' %}"></script>
{% endif %}
<script src="{% static 'debug_toolbar/js/toolbar.js' %}"></script>
<div id="djDebug" style="display:none;" dir="ltr"
<div id="djDebug" hidden="hidden" dir="ltr"
data-store-id="{{ toolbar.store_id }}" data-render-panel-url="{% url 'djdt:render_panel' %}"
{{ toolbar.config.ROOT_TAG_EXTRA_ATTRS|safe }}>
<div style="display:none;" id="djDebugToolbar">
<div hidden="hidden" id="djDebugToolbar">
<ul id="djDebugPanelList">
{% if toolbar.panels %}
<li><a id="djHideToolBarButton" href="#" title="{% trans "Hide toolbar" %}">{% trans "Hide" %} &#187;</a></li>
Expand Down Expand Up @@ -45,7 +43,7 @@
{% endfor %}
</ul>
</div>
<div style="display:none;" id="djDebugToolbarHandle">
<div hidden="hidden" id="djDebugToolbarHandle">
<span title="{% trans "Show toolbar" %}" id="djShowToolBarButton">&#171;</span>
</div>
{% for panel in toolbar.panels %}
Expand Down
2 changes: 1 addition & 1 deletion debug_toolbar/templates/debug_toolbar/panels/cache.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h4>{% trans "Calls" %}</h4>
{% for call in calls %}
<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}" id="cacheMain_{{ forloop.counter }}">
<td class="djdt-toggle">
<a class="djToggleSwitch" data-toggle-name="cacheMain" data-toggle-id="{{ forloop.counter }}" data-toggle-open="+" data-toggle-close="-" href="javascript:void(0)">+</a>
<a class="djToggleSwitch" data-toggle-name="cacheMain" data-toggle-id="{{ forloop.counter }}" data-toggle-open="+" data-toggle-close="-" href>+</a>
</td>
<td>{{ call.time|floatformat:"4" }}</td>
<td>{{ call.name|escape }}</td>
Expand Down
7 changes: 3 additions & 4 deletions debug_toolbar/templates/debug_toolbar/panels/profiling.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
</thead>
<tbody>
{% for call in func_list %}
<!-- style="background:{{ call.background }}" -->
<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %} djDebugProfileRow{% for parent_id in call.parent_ids %} djToggleDetails_{{ parent_id }}{% endfor %}" depth="{{ call.depth }}">
<tr class="djDebugProfileRow{% for parent_id in call.parent_ids %} djToggleDetails_{{ parent_id }}{% endfor %}" depth="{{ call.depth }}">
<td>
<div style="padding-left: {{ call.indent }}px;">
<div data-padding-left="{{ call.indent }}px">
{% if call.has_subfuncs %}
<a class="djProfileToggleDetails djToggleSwitch" data-toggle-id="{{ call.id }}" data-toggle-open="+" data-toggle-close="-" href="javascript:void(0)">-</a>
<a class="djProfileToggleDetails djToggleSwitch" data-toggle-id="{{ call.id }}" data-toggle-open="+" data-toggle-close="-" href>-</a>
{% else %}
<span class="djNoToggleSwitch"></span>
{% endif %}
Expand Down
8 changes: 4 additions & 4 deletions debug_toolbar/templates/debug_toolbar/panels/request.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h4>{% trans "View information" %}</h4>
<h4>{% trans "Cookies" %}</h4>
<table>
<colgroup>
<col style="width:20%"/>
<col class="djdt-width-20"/>
<col/>
</colgroup>
<thead>
Expand All @@ -50,7 +50,7 @@ <h4>{% trans "No cookies" %}</h4>
<h4>{% trans "Session data" %}</h4>
<table>
<colgroup>
<col style="width:20%"/>
<col class="djdt-width-20"/>
<col/>
</colgroup>
<thead>
Expand All @@ -76,7 +76,7 @@ <h4>{% trans "No session data" %}</h4>
<h4>{% trans "GET data" %}</h4>
<table>
<colgroup>
<col style="width:20%"/>
<col class="djdt-width-20"/>
<col/>
</colgroup>
<thead>
Expand All @@ -102,7 +102,7 @@ <h4>{% trans "No GET data" %}</h4>
<h4>{% trans "POST data" %}</h4>
<table>
<colgroup>
<col style="width:20%"/>
<col class="djdt-width-20"/>
<col/>
</colgroup>
<tr>
Expand Down
10 changes: 5 additions & 5 deletions debug_toolbar/templates/debug_toolbar/panels/sql.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ul class="djdt-stats">
{% for alias, info in databases %}
<li>
<strong class="djdt-label"><span style="background-color: rgb({{ info.rgb_color|join:", " }})" class="djdt-color">&#160;</span> {{ alias }}</strong>
<strong class="djdt-label"><span data-background-color="rgb({{ info.rgb_color|join:", " }})" class="djdt-color">&#160;</span> {{ alias }}</strong>
<span class="djdt-info">{{ info.time_spent|floatformat:"2" }} ms ({% blocktrans count info.num_queries as num %}{{ num }} query{% plural %}{{ num }} queries{% endblocktrans %})</span>
</li>
{% endfor %}
Expand All @@ -24,17 +24,17 @@
<tbody>
{% for query in queries %}
<tr class="djDebugHoverable {% cycle 'djDebugOdd' 'djDebugEven' %}{% if query.is_slow %} djDebugRowWarning{% endif %}{% if query.starts_trans %} djDebugStartTransaction{% endif %}{% if query.ends_trans %} djDebugEndTransaction{% endif %}{% if query.in_trans %} djDebugInTransaction{% endif %}" id="sqlMain_{{ forloop.counter }}">
<td class="djdt-color"><span style="background-color: rgb({{ query.rgb_color|join:", " }});">&#160;</span></td>
<td class="djdt-color"><span data-background-color="rgb({{ query.rgb_color|join:", " }})">&#160;</span></td>
<td class="djdt-toggle">
<a class="djToggleSwitch" data-toggle-name="sqlMain" data-toggle-id="{{ forloop.counter }}" data-toggle-open="+" data-toggle-close="-" href="javascript:void(0)">+</a>
<a class="djToggleSwitch" data-toggle-name="sqlMain" data-toggle-id="{{ forloop.counter }}" data-toggle-open="+" data-toggle-close="-" href>+</a>
</td>
<td class="query">
<div class="djDebugSqlWrap">
<div class="djDebugSql">{{ query.sql|safe }}</div>
</div>
</td>
<td class="timeline">
<div class="djDebugTimeline"><div class="djDebugLineChart{% if query.is_slow %} djDebugLineChartWarning{% endif %}" style="left:{{ query.start_offset|unlocalize }}%;"><strong style="width:{{ query.width_ratio_relative|unlocalize }}%; background-color:{{ query.trace_color }};">{{ query.width_ratio }}%</strong></div></div>
<div class="djDebugTimeline"><div class="djDebugLineChart{% if query.is_slow %} djDebugLineChartWarning{% endif %}" data-left="{{ query.start_offset|unlocalize }}%"><strong data-width="{{ query.width_ratio_relative|unlocalize }}%" data-background-color"{{ query.trace_color }}">{{ query.width_ratio }}%</strong></div></div>
</td>
<td class="djdt-time">
{{ query.duration|floatformat:"2" }}
Expand Down Expand Up @@ -76,7 +76,7 @@
{% for line in query.template_info.context %}
<tr>
<td>{{ line.num }}</td>
<td><code style="font-family: monospace;{% if line.highlight %}background-color: lightgrey{% endif %}">{{ line.content }}</code></td>
<td><code {% if line.highlight %}class="djdt-highlighted"{% endif %}>{{ line.content }}</code></td>
</tr>
{% endfor %}
</table>
Expand Down
4 changes: 2 additions & 2 deletions debug_toolbar/templates/debug_toolbar/panels/templates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h4>{% blocktrans count templates|length as template_count %}Template{% plural %
{% if template.context %}
<dd>
<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext"><span class="toggleArrow">&#x25B6;</span> {% trans "Toggle context" %}</a></div>
<div class="djTemplateHideContextDiv" style="display:none;"><code>{{ template.context }}</code></div>
<div class="djTemplateHideContextDiv" hidden="hidden"><code>{{ template.context }}</code></div>
</dd>
{% endif %}
{% endfor %}
Expand All @@ -35,7 +35,7 @@ <h4>{% blocktrans count context_processors|length as context_processors_count %}
<dt><strong>{{ key|escape }}</strong></dt>
<dd>
<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext"><span class="toggleArrow">&#x25B6;</span> {% trans "Toggle context" %}</a></div>
<div class="djTemplateHideContextDiv" style="display:none;"><code>{{ value|escape }}</code></div>
<div class="djTemplateHideContextDiv" hidden="hidden"><code>{{ value|escape }}</code></div>
</dd>
{% endfor %}
</dl>
Expand Down
10 changes: 5 additions & 5 deletions debug_toolbar/templates/debug_toolbar/panels/timer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h4>{% trans "Resource usage" %}</h4>
<table>
<colgroup>
<col style="width:20%"/>
<col class="djdt-width-20"/>
<col/>
</colgroup>
<thead>
Expand All @@ -22,13 +22,13 @@ <h4>{% trans "Resource usage" %}</h4>
</table>

<!-- This hidden div is populated and displayed by code in toolbar.timer.js -->
<div id="djDebugBrowserTiming" style="display:none">
<div id="djDebugBrowserTiming" hidden="hidden">
<h4>{% trans "Browser timing" %}</h4>
<table>
<colgroup>
<col style="width:20%"/>
<col style="width:60%"/>
<col style="width:20%"/>
<col class="djdt-width-20"/>
<col class="djdt-width-60"/>
<col class="djdt-width-20"/>
</colgroup>
<thead>
<tr>
Expand Down