utils.py @@ -1,11 +1,13 @@ from django.conf import settings +from yslow import utils + def version(request): """Insert version info into the context. - If DEBUG mode is ON, return empty version string. - If DEBUG mode is OFF, return version string from settings. + If optimization is OFF, return empty version string. + If optimization is ON, return version string from settings. """ - if settings.DEBUG: + if not utils.should_optimize(): return {'VERSION_STRING':''} else: if hasattr(settings, 'VERSION'): context_processors.py @@ -1,6 +1,7 @@ from django.template import Node, NodeList, Template, Context, Variable, Library from django.template import TemplateSyntaxError, VariableDoesNotExist from django.conf import settings +from yslow import utils register = Library() @@ -9,8 +10,8 @@ def ifprod(parser, token): Concatenated file has to be generated prior to this, by running the management command "build". - If settings.DEBUG mode is OFF, replaces enclosed <script> tags with one <script> tag. - If settings.DEBUG mode is ON, does nothing. + If optimization is OFF, replaces enclosed <script> tags with one <script> tag. + If optimization is ON, does nothing. It makes sure to include a script or css stylesheet only once per entire template. """ @@ -36,7 +37,7 @@ class IfProdNode(Node): self.rendered = False def render(self, context): - if settings.DEBUG: + if not utils.should_optimize(): return self.nodelist.render(context) elif not self.rendered: resolved_new_file = Template(self.new_file).render(context) templatetags/yslowtags.py views.py b81445ec726cfeb549677b08bd6dcc82074f34f3 Harish Mallipeddi harish.mallipeddi@gmail.com http://github.com/mallipeddi/django-yslow/commit/8873ff8fa9ea55e6c3c9c026543749a8f12f762e 8873ff8fa9ea55e6c3c9c026543749a8f12f762e 2008-05-21T00:18:52-07:00 2008-05-21T00:18:52-07:00 Added support for a new flag YSLOW_OPTIMIZE ceee08e561e6b4d276ac8f6b9ffcd06d957b5bf7 Harish Mallipeddi harish.mallipeddi@gmail.com