Skip to content
Snippets Groups Projects
Commit ee648b42 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

[ui] Set format_html to simple_tag output to conform to Django 1.9

parent acd8a568
No related branches found
No related tags found
1 merge request!194Scheduler
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
from django import template from django import template
from django.conf import settings from django.conf import settings
from django.utils.html import format_html
from ...common.texts import Messages as Texts from ...common.texts import Messages as Texts
from ... import __version__ from ... import __version__
from collections import OrderedDict from collections import OrderedDict
...@@ -223,7 +224,7 @@ def code_editor_scripts(modes): ...@@ -223,7 +224,7 @@ def code_editor_scripts(modes):
js = ['<script src="%s%s?v%s" type="text/javascript" charset="utf-8"></script>' % (settings.STATIC_URL, k, __version__) for k in js] js = ['<script src="%s%s?v%s" type="text/javascript" charset="utf-8"></script>' % (settings.STATIC_URL, k, __version__) for k in js]
return '\n'.join(js) return format_html('\n'.join(js))
#-------------------------------------------------- #--------------------------------------------------
...@@ -240,8 +241,7 @@ def code_editor_css(): ...@@ -240,8 +241,7 @@ def code_editor_css():
if settings.CODEMIRROR_THEME != 'default': if settings.CODEMIRROR_THEME != 'default':
css.append('%s/theme/%s.css' % (settings.CODEMIRROR_PATH, settings.CODEMIRROR_THEME)) css.append('%s/theme/%s.css' % (settings.CODEMIRROR_PATH, settings.CODEMIRROR_THEME))
return '\n'.join(map(lambda x: '<link rel="stylesheet" href="%s%s?v%s" type="text/css" media="screen" />' % \ return format_html('\n'.join(map(lambda x: '<link rel="stylesheet" href="%s%s?v%s" type="text/css" media="screen" />' % (settings.STATIC_URL, x, __version__), css)))
(settings.STATIC_URL, x, __version__), css))
#-------------------------------------------------- #--------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment