Commit 1e9e8847 by Calen Pennington

Split the pipeline_mako templates from the namespace used by actual…

Split the pipeline_mako templates from the namespace used by actual django-pipeline django templates
parent 4e59e163
...@@ -27,7 +27,7 @@ def compressed_css(package_name): ...@@ -27,7 +27,7 @@ def compressed_css(package_name):
return render_individual_css(package, paths) return render_individual_css(package, paths)
def render_css(package, path): def render_css(package, path):
template_name = package.template_name or "pipeline/css.html" template_name = package.template_name or "pipeline_mako/css.html"
context = package.extra_context context = package.extra_context
context.update({ context.update({
'type': guess_type(path, 'text/css'), 'type': guess_type(path, 'text/css'),
...@@ -59,7 +59,7 @@ def compressed_js(package_name): ...@@ -59,7 +59,7 @@ def compressed_js(package_name):
return render_individual_js(package, paths, templates) return render_individual_js(package, paths, templates)
def render_js(package, path): def render_js(package, path):
template_name = package.template_name or "pipeline/js.html" template_name = package.template_name or "pipeline_mako/js.html"
context = package.extra_context context = package.extra_context
context.update({ context.update({
'type': guess_type(path, 'text/javascript'), 'type': guess_type(path, 'text/javascript'),
...@@ -72,7 +72,7 @@ def render_inline_js(package, js): ...@@ -72,7 +72,7 @@ def render_inline_js(package, js):
context.update({ context.update({
'source': js 'source': js
}) })
return render_to_string("pipeline/inline_js.html", context) return render_to_string("pipeline_mako/inline_js.html", context)
def render_individual_js(package, paths, templates=None): def render_individual_js(package, paths, templates=None):
tags = [render_js(package, js) for js in paths] tags = [render_js(package, js) for js in paths]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment