aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar
diff options
context:
space:
mode:
authorRob Hudson2009-01-17 12:29:51 -0800
committerRob Hudson2009-01-17 12:29:51 -0800
commited520f265d71ea61ff8c04ae3a0aa4246d447ae7 (patch)
tree12f0a5b6246ee53865c50534689c2ac25779a663 /debug_toolbar
parenta51c3a5bba2e0d0e7046cd7eaee86ac01cf097d8 (diff)
downloaddjango-debug-toolbar-ed520f265d71ea61ff8c04ae3a0aa4246d447ae7.tar.bz2
Adjust Makefile to concatenate to jquery.cookie.js onto toolbar.min.js.
Diffstat (limited to 'debug_toolbar')
-rw-r--r--debug_toolbar/media/Makefile2
-rw-r--r--debug_toolbar/templates/debug_toolbar/base.html1
2 files changed, 1 insertions, 2 deletions
diff --git a/debug_toolbar/media/Makefile b/debug_toolbar/media/Makefile
index a7fd227..a2d6abb 100644
--- a/debug_toolbar/media/Makefile
+++ b/debug_toolbar/media/Makefile
@@ -3,7 +3,7 @@ all: compress_js compress_css
compress_js:
java -jar ~/bin/yuicompressor.jar toolbar.js > toolbar.min.js
- java -jar ~/bin/yuicompressor.jar jquery.cookie.js > jquery.cookie.min.js
+ java -jar ~/bin/yuicompressor.jar jquery.cookie.js >> toolbar.min.js
compress_css:
java -jar ~/bin/yuicompressor.jar --type css toolbar.css > toolbar.min.css
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 3b8e92e..7277620 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -4,7 +4,6 @@
document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
}
</script>
-<script type="text/javascript" src="{{ BASE_URL }}/__debug__/m/jquery.cookie.min.js"></script>
<script type="text/javascript" src="{{ BASE_URL }}/__debug__/m/toolbar.min.js"></script>
<style type="text/css">
@import url({{ BASE_URL }}/__debug__/m/toolbar.min.css);