Skip to content

Commit 1bc51ed

Browse files
aaugustinaaugustin
committed
Merge pull request django-commons#613 from tim-schilling/prefix-css-classes-604
Prefixing common CSS classes with djdt-
2 parents f878ec0 + a450969 commit 1bc51ed

File tree

13 files changed

+94
-94
lines changed

13 files changed

+94
-94
lines changed

‎debug_toolbar/panels/profiling.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ def func_std_string(self): # match what old profile produced
6262
file_path, file_name = file_name.rsplit(os.sep, 1)
6363

6464
return mark_safe(
65-
'<span class="path">{0}/</span>'
66-
'<span class="file">{1}</span>'
67-
' in <span class="func">{3}</span>'
68-
'(<span class="lineno">{2}</span>)'.format(
65+
'<span class="djdt-path">{0}/</span>'
66+
'<span class="djdt-file">{1}</span>'
67+
' in <span class="djdt-func">{3}</span>'
68+
'(<span class="djdt-lineno">{2}</span>)'.format(
6969
file_path,
7070
file_name,
7171
line_num,

‎debug_toolbar/static/debug_toolbar/css/toolbar.css

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/* http://www.positioniseverything.net/easyclearing.html */
2-
#djDebug .clearfix:after {
2+
#djDebug .djdt-clearfix:after {
33
content: ".";
44
display: block;
55
height: 0;
66
clear: both;
77
visibility: hidden;
88
}
9-
#djDebug .clearfix {display: inline-block;}
9+
#djDebug .djdt-clearfix {display: inline-block;}
1010
/* Hides from IE-mac \*/
11-
#djDebug .clearfix {display: block;}
12-
* html #djDebug .clearfix {height: 1%;}
11+
#djDebug .djdt-clearfix {display: block;}
12+
* html #djDebug .djdt-clearfix {height: 1%;}
1313
/* end hide from IE-mac */
1414

1515
/* Debug Toolbar CSS Reset, adapted from Eric Meyer's CSS Reset */
@@ -126,7 +126,7 @@
126126
}
127127

128128
#djDebug #djDebugToolbar li>a,
129-
#djDebug #djDebugToolbar li>div.contentless {
129+
#djDebug #djDebugToolbar li>div.djdt-contentless {
130130
font-weight:normal;
131131
font-style:normal;
132132
text-decoration:none;
@@ -135,7 +135,7 @@
135135
padding:10px 10px 5px 25px;
136136
color:#fff;
137137
}
138-
#djDebug #djDebugToolbar li>div.disabled {
138+
#djDebug #djDebugToolbar li>div.djdt-disabled {
139139
font-style: italic;
140140
color: #999;
141141
}
@@ -145,13 +145,13 @@
145145
background-color:#ffc;
146146
}
147147

148-
#djDebug #djDebugToolbar li.active {
148+
#djDebug #djDebugToolbar li.djdt-active {
149149
background: #333 no-repeat left center;
150150
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAQAAAAngNWGAAABe0lEQVR4AW2SO0tDQRCFz+bGJxEUrKzsBBsb/4DYiIWdECvB/6CCYGtp6QNRjJ1FihSCVpZGMIhYSBAfIGKRx70xyY3JbrKOk7DJLp7DXm7Il9nMmREYQgQeAI1W1/zZUhR9ZI9gjSZb0iHMRSPbE1QzhhF2jN4H6YdRCHaPvOTjdDb1jWECBhiJoC1tg6Kotbw9WkxBoIUGaqiiQs8fSCj+t9qAIL1nlg9fKgSGKKNEJ2RUMqh7QCDIr58k31AlrIiA0CqhDTQJtUFAqsTFxjV85FGAz1XrkDZodPewkih8IkdwCRWu2U6VerQ0O3OzuTSJ/k62JiIXJI2NL0wBjDiTseQHW8fnGY6myf3+Dz49x88+vjr9SoPaoG6lLteuCApMiu1otAWG/s7BXtYEzv3yZOyrc5nV3XTZjPAv7Jqp2AVf9+dOyx4EFCTqCAnimZB1z9X38fk05RblfVQE1LkR5a6vwCivruANV2ynjU5FHpIE+AsCnCuNfgGtjt1gZaIn2wAAAABJRU5ErkJggg==");
151151
padding-left:10px;
152152
}
153153

154-
#djDebug #djDebugToolbar li.active a:hover {
154+
#djDebug #djDebugToolbar li.djdt-active a:hover {
155155
color:#b36a60;
156156
background-color:transparent;
157157
}
@@ -214,7 +214,7 @@
214214
background-color:#f5f5f5;
215215
}
216216

217-
#djDebug .panelContent {
217+
#djDebug .djdt-panelContent {
218218
display:none;
219219
position:fixed;
220220
margin:0;
@@ -227,7 +227,7 @@
227227
z-index:100000000;
228228
}
229229

230-
#djDebug .panelContent > div {
230+
#djDebug .djdt-panelContent > div {
231231
border-bottom:1px solid #ddd;
232232
}
233233

@@ -257,12 +257,12 @@
257257
padding:5px 0 0 20px;
258258
}
259259

260-
#djDebug .djDebugPanelContent .loader {
260+
#djDebug .djDebugPanelContent .djdt-loader {
261261
display:block;
262262
margin:80px auto;
263263
}
264264

265-
#djDebug .djDebugPanelContent .scroll {
265+
#djDebug .djDebugPanelContent .djdt-scroll {
266266
height:100%;
267267
overflow:auto;
268268
display:block;
@@ -281,7 +281,7 @@
281281
margin-top:0.8em;
282282
}
283283

284-
#djDebug .panelContent table {
284+
#djDebug .djdt-panelContent table {
285285
border:1px solid #ccc;
286286
border-collapse:collapse;
287287
width:100%;
@@ -290,23 +290,23 @@
290290
margin-top:0.8em;
291291
overflow: auto;
292292
}
293-
#djDebug .panelContent tbody td,
294-
#djDebug .panelContent tbody th {
293+
#djDebug .djdt-panelContent tbody td,
294+
#djDebug .djdt-panelContent tbody th {
295295
vertical-align:top;
296296
padding:2px 3px;
297297
}
298-
#djDebug .panelContent tbody td.time {
298+
#djDebug .djdt-panelContent tbody td.djdt-time {
299299
text-align: center;
300300
}
301301

302-
#djDebug .panelContent thead th {
302+
#djDebug .djdt-panelContent thead th {
303303
padding:1px 6px 1px 3px;
304304
text-align:left;
305305
font-weight:bold;
306306
font-size:14px;
307307
white-space: nowrap;
308308
}
309-
#djDebug .panelContent tbody th {
309+
#djDebug .djdt-panelContent tbody th {
310310
width:12em;
311311
text-align:right;
312312
color:#666;
@@ -318,20 +318,20 @@
318318
}
319319

320320
/*
321-
#djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover {
321+
#djDebug .djdt-panelContent p a:hover, #djDebug .djdt-panelContent dd a:hover {
322322
color:#111;
323323
background-color:#ffc;
324324
}
325325
326-
#djDebug .panelContent p {
326+
#djDebug .djdt-panelContent p {
327327
padding:0 5px;
328328
}
329329
330-
#djDebug .panelContent p, #djDebug .panelContent table, #djDebug .panelContent ol, #djDebug .panelContent ul, #djDebug .panelContent dl {
330+
#djDebug .djdt-panelContent p, #djDebug .djdt-panelContent table, #djDebug .djdt-panelContent ol, #djDebug .djdt-panelContent ul, #djDebug .djdt-panelContent dl {
331331
margin:5px 0 15px;
332332
background-color:#fff;
333333
}
334-
#djDebug .panelContent table {
334+
#djDebug .djdt-panelContent table {
335335
clear:both;
336336
border:0;
337337
padding:0;
@@ -340,36 +340,36 @@
340340
border-spacing:0;
341341
}
342342
343-
#djDebug .panelContent table a {
343+
#djDebug .djdt-panelContent table a {
344344
color:#000;
345345
padding:2px 4px;
346346
}
347-
#djDebug .panelContent table a:hover {
347+
#djDebug .djdt-panelContent table a:hover {
348348
background-color:#ffc;
349349
}
350350
351-
#djDebug .panelContent table th {
351+
#djDebug .djdt-panelContent table th {
352352
background-color:#333;
353353
font-weight:bold;
354354
color:#fff;
355355
padding:3px 7px 3px;
356356
text-align:left;
357357
cursor:pointer;
358358
}
359-
#djDebug .panelContent table td {
359+
#djDebug .djdt-panelContent table td {
360360
padding:5px 10px;
361361
font-size:14px;
362362
background-color:#fff;
363363
color:#000;
364364
vertical-align:top;
365365
border:0;
366366
}
367-
#djDebug .panelContent table tr.djDebugOdd td {
367+
#djDebug .djdt-panelContent table tr.djDebugOdd td {
368368
background-color:#eee;
369369
}
370370
*/
371371

372-
#djDebug .panelContent .djDebugClose {
372+
#djDebug .djdt-panelContent .djDebugClose {
373373
text-indent:-9999999px;
374374
display:block;
375375
position:absolute;
@@ -381,27 +381,27 @@
381381
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAQAAACQTsNJAAABuUlEQVR4Ab2WXeoaMRTFZxHz6pObcA0DeXUHhXktFl8LXYAPXYBLKhQGBOFqW3XS8YOW6vjHmnp6wWZyHU1maqHnQDAf/Ehu7twYhUQxdUixO/wr8ts3oeg9TQjCEx5R7SGvKCd4nPNsIyShD4QGf6QkBBkQWnrgg4zqS2fm01kbze3M3GFGjyBvCdLFqYRUySM1zLAOUXJ6dZAACcoPBOHkFpK5qY1BQBt5sExC0gAijEkriMuLfI9m8SqXNxbSd+QSbVSCnPtXyNjdCCoZ7PANF7C4/Y4tznASNzW+QqaP9lFcj4cLW4PY+vFepsSQ2Hbnp5vw2ShB231Cau72EkfUs53lC4R+YQkSXsBAiFdXc72IkupmDODDfKkhwKtdygUgHAuXw7gEIN7jCIQNsfc43sDuqlgsbC57A+u94q82nFVscv8Vy2Rbi72csGKQ+RPignvytGuZbPW0P6KNjvdpz97aIf3jLz/ArfuKXz9dCt7IojR9qihNAuUx33vL454grOqF+t2/F2rPk/H5pzaa2+Ynw3lIaOlh6BlVlDUCMlLND3pKhRdQUPof/1o4x9Qlxe6G/+T8BlqvQqkd4EyZAAAAAElFTkSuQmCC");
382382
}
383383

384-
#djDebug .panelContent .djDebugClose:hover {
384+
#djDebug .djdt-panelContent .djDebugClose:hover {
385385
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAACiUlEQVR4Ad2Yz2oTURSH+xCz7cqX6DMUZtudCxExigq2WhcKYtGFVLrwAboSKoVGxT+tJWpTa2lLTDsm6SSTjtZoIq0prf+2Hu8PcmHInJvJPYwuPPDBMDPn8DE5c+fcDEgjDENHMahwOwx2zg1IsE1wFXcVvoIM+J173L8hckrRUpAlLeSmITKsKNoKMHioJRUZU1DKjNmKTCUWDWpUL21RJbcAcIxz/chM9StyvVeh8rOHtH7nJi2dOc6Ba7gnSWY8ScQ1JVdfv6C1yQlegAH3+su5XjLDvUTKXNK77H0Ul4Bck0jZJJLhEry5GV1ULvNg1iSTiYlw64SfX0ShNEAtfp3pEhnhjJmekIJapqcyEhWZZt4OtuDqlXPUWHxKYXaGli+c1Ocpf/4E1Wfv0afcPK1dG+VyTW/TdFQk6Pdp7BfWSMdhtQIZSFDbe0s6DiqezVMJtIjTfXGnuv3b9Iib+RxF47C2Te3SJkUDsqZ81GZkHIgMdV+ora8YC62MnqbvH0Iyxa/WZ3pz+awxH7UZkSH9YaMolZfPdaJZZvd9XOJLU0sYQW1ucROJoCcOyh51x1G9ip4Ri1j9NLoxDaEbWPDTWDbrx/lHsZ740dilSKChBc1q+fp+3SyQjp/NBnoi1sB4KpLXl13QSo/n2GKFW1fpaKdG+8UNSEQbmPY2VulbWKfi5A0uFzUTFzR+ib/NFJSBWolLvKYd++i9WkhNxF9i35Y29/W9KB8DxDPJJU4EBP9wMPJFoyLmCetRUc8gPK5JRDOhIBOlJ9nE4Rn3yIdnwXYi2Crq7QSOU99OaGBNKTMu3XK63GQvADXcNDbhGcWeQAA5mf/ybwkOR3FM4XbAsSOt9wcLTn8FNtAKkQAAAABJRU5ErkJggg==");
386386
}
387387

388-
#djDebug .panelContent .djDebugClose.djDebugBack {
388+
#djDebug .djdt-panelContent .djDebugClose.djDebugBack {
389389
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAACBUlEQVR4Ad2Y0WriQBSGfYjc7tW+hM8g5HbfYMHbxcXbhT6AF30AH6cXvRCEttK0JgZi0qhQaRNtNWV2fuiADicZcxirdOCn45mccz4mMyczbXDbeDx2pH5IuRD6n7YGR3UdkPBSaiQlSoQxPOMeA+S3VIxENRXD1wZIS2rAANA1RCwuSAdBLKtTF6RnCur7fjGZTLZJkhQQ+rAdANM7FORfVaA0Td/zPBdlDWN4xgDTNYG4Zc7T6TQjASqA4jjOKmBaVSA3lNN8Pi8Es8GXBkEuGqTNh2DDtCkQvU5gal+FpYZYZJ3RQH5RxPqaWG82qmuw02uGyoHcuyB9anfowZ6el+I2jITellkOu9gWH5UwJbupvwvimWZDgVzdeWLohyqpAlF2zE7dWfEUiKMPBkGwNxt6QmjwEKik+Ltnz9ZvpTCITcA4AGnqA1EUreFkgrm+fwSEsuO3spfCIDYB0gRIi9gtlVsWSVRSAOzaMSOw4zVSDbGp4nZGIPxXg6TWXo39xarsjMV6LtuXLmiz2cx6QUNMuqAZSvxqtbJW4hHLVOKVFvpDSZK8HPmjt6C+vn9OcAz4S4FA3hcejEasoyKmlnFUVK+DklsFAl2c9vDMuE6EYbhR1wn0bV8nlEAtLKvLvXK62smeK8RwbVzC21IpAyCF77f8twQlR+onEkLow8aN9x+oYk85YNJqYQAAAABJRU5ErkJggg==");
390390
}
391391

392-
#djDebug .panelContent .djDebugClose.djDebugBack:hover {
392+
#djDebug .djdt-panelContent .djDebugClose.djDebugBack:hover {
393393
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAACLElEQVR4Ad2YT8sSURTG/RCzbdWX8DMIs23XMrBlTLiTSIKKIqgP4C6KQAuKsLCycqGLRHNsXqck2giStIiiRdDtPtABuz0zNw+XkAYe3vHce57zY/7cOfetaI/VahVZHbOKIZz/ilU02jcBBW9YZVaGC2OYg7nhQU5ZrVlhj9bIDQFSs5ooAFzN4KUFSWASWMm+INe8pvnSvJ1PzaLfg3COmB8G3n8Jcq7MKH14z4yvXjCD0yepMIY5HpiGDyQuSj56+cSMrrQ4ABHmZi/6ZTC1MpCUJb3u3oa5SsjlIKjFQeosYda5JaZ6mLt3OAxquiBsncieP4ZRCMGLrjMuyAlG7D4To2Yi5/44eWZYDdTeBWmzt8M1W95sm09Z+kd8dv0S4maY1EthCt6m9i5ITq8GAcHx+cN7KSogEqdXx3NVcgGJ3MF3R29+MCMpiOPbx40Uxd/f4q8uNgth4E1gIoBU3YHleOgYcJjvX78AQuL4LfFCGHgTkCpAau7A4umj0nuNIlIUALtxXBEcuI0kF950cTsoEO2tQdGAtyb8w4rfiof1cF5fvqDN73dCL2jwpAuaf4m/fD7UEg8v7xIv2rqTsme9cB+9AX1btuzre0bdBuh7krMMBMr/YWOUaVpF9BP7t4rSg3DFvua5xRJF8wddb/OMOfrmWbGdyKcT2U7gPPh2QgRqE1gN7ZYzZp29Qim8QmzC61YbBcAGuf/hvyW4IqvjKAjhHDGt309H4mp9BS17eAAAAABJRU5ErkJggg==");
394394
}
395395

396-
#djDebug .panelContent dt, #djDebug .panelContent dd {
396+
#djDebug .djdt-panelContent dt, #djDebug .djdt-panelContent dd {
397397
display:block;
398398
}
399399

400-
#djDebug .panelContent dt {
400+
#djDebug .djdt-panelContent dt {
401401
margin-top:0.75em;
402402
}
403403

404-
#djDebug .panelContent dd {
404+
#djDebug .djdt-panelContent dd {
405405
margin-left:10px;
406406
}
407407

@@ -548,45 +548,45 @@
548548
}
549549

550550

551-
#djDebug .panelContent ul.stats {
551+
#djDebug .djdt-panelContent ul.djdt-stats {
552552
position: relative;
553553
list-style-type: none;
554554
}
555-
#djDebug .panelContent ul.stats li {
555+
#djDebug .djdt-panelContent ul.djdt-stats li {
556556
width: 30%;
557557
float: left;
558558
}
559-
#djDebug .panelContent ul.stats li strong.label {
559+
#djDebug .djdt-panelContent ul.djdt-stats li strong.djdt-label {
560560
display: block;
561561
}
562-
#djDebug .panelContent ul.stats li span.color {
562+
#djDebug .djdt-panelContent ul.djdt-stats li span.djdt-color {
563563
height: 12px;
564564
width: 3px;
565565
display: inline-block;
566566
}
567-
#djDebug .panelContent ul.stats li span.info {
567+
#djDebug .djdt-panelContent ul.djdt-stats li span.djdt-info {
568568
display: block;
569569
padding-left: 5px;
570570
}
571571

572-
#djDebug .panelcontent thead th {
572+
#djDebug .djdt-panelContent thead th {
573573
white-space: nowrap;
574574
}
575-
#djDebug .djDebugRowWarning .time {
575+
#djDebug .djDebugRowWarning .djdt-time {
576576
color: red;
577577
}
578-
#djdebug .panelcontent table .toggle {
578+
#djdebug .djdt-panelContent table .djdt-toggle {
579579
width: 14px;
580580
padding-top: 3px;
581581
}
582-
#djDebug .panelContent table .actions {
582+
#djDebug .djdt-panelContent table .djdt-actions {
583583
min-width: 70px;
584584
white-space: nowrap;
585585
}
586-
#djdebug .panelcontent table .color {
586+
#djdebug .djdt-panelContent table .djdt-color {
587587
width: 3px;
588588
}
589-
#djdebug .panelcontent table .color span {
589+
#djdebug .djdt-panelContent table .djdt-color span {
590590
width: 3px;
591591
height: 12px;
592592
overflow: hidden;
@@ -630,15 +630,15 @@
630630
margin-bottom: 3px;
631631
font-family:Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace;
632632
}
633-
#djDebug .stack span {
633+
#djDebug .djdt-stack span {
634634
color: #000;
635635
font-weight: bold;
636636
}
637-
#djDebug .stack span.path {
637+
#djDebug .djdt-stack span.djdt-path {
638638
color: #777;
639639
font-weight: normal;
640640
}
641-
#djDebug .stack span.code {
641+
#djDebug .djdt-stack span.djdt-code {
642642
font-weight: normal;
643643
}
644644

‎debug_toolbar/static/debug_toolbar/js/toolbar.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
current = $('#djDebug #' + this.className);
1616
if (current.is(':visible')) {
1717
$(document).trigger('close.djDebug');
18-
$(this).parent().removeClass('active');
18+
$(this).parent().removeClass('djdt-active');
1919
} else {
20-
$('.panelContent').hide(); // Hide any that are already open
21-
var inner = current.find('.djDebugPanelContent .scroll'),
20+
$('.djdt-panelContent').hide(); // Hide any that are already open
21+
var inner = current.find('.djDebugPanelContent .djdt-scroll'),
2222
store_id = $('#djDebug').data('store-id'),
2323
render_panel_url = $('#djDebug').data('render-panel-url');
2424
if (store_id !== '' && inner.children().length === 0) {
@@ -39,14 +39,14 @@
3939
});
4040
}
4141
current.show();
42-
$('#djDebugToolbar li').removeClass('active');
43-
$(this).parent().addClass('active');
42+
$('#djDebugToolbar li').removeClass('djdt-active');
43+
$(this).parent().addClass('djdt-active');
4444
}
4545
return false;
4646
});
4747
$(document).on('click', '#djDebug a.djDebugClose', function() {
4848
$(document).trigger('close.djDebug');
49-
$('#djDebugToolbar li').removeClass('active');
49+
$('#djDebugToolbar li').removeClass('djdt-active');
5050
return false;
5151
});
5252
$(document).on('click', '#djDebug .djDebugPanelButton input[type=checkbox]', function() {
@@ -168,9 +168,9 @@
168168
return;
169169
}
170170
// If a panel is open, close that
171-
if ($('.panelContent').is(':visible')) {
172-
$('.panelContent').hide();
173-
$('#djDebugToolbar li').removeClass('active');
171+
if ($('.djdt-panelContent').is(':visible')) {
172+
$('.djdt-panelContent').hide();
173+
$('#djDebugToolbar li').removeClass('djdt-active');
174174
return;
175175
}
176176
// Otherwise, just minimize the toolbar
@@ -202,8 +202,8 @@
202202
// close any sub panels
203203
$('#djDebugWindow').hide();
204204
// close all panels
205-
$('.panelContent').hide();
206-
$('#djDebugToolbar li').removeClass('active');
205+
$('.djdt-panelContent').hide();
206+
$('#djDebugToolbar li').removeClass('djdt-active');
207207
// finally close toolbar
208208
$('#djDebugToolbar').hide('fast');
209209
$('#djDebugToolbarHandle').show();

0 commit comments

Comments
 (0)