summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-11-15 23:10:26 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-11-15 23:10:26 +0100
commit6891645614426aab6fae1561ba925f81b214e993 (patch)
tree20cd3963d4e05af10fa0eae2b899181b699bc128 /module/web
parentimproved plugin loader, import hook to always use newest plugin versions (diff)
downloadpyload-6891645614426aab6fae1561ba925f81b214e993.tar.xz
closed #420
Diffstat (limited to 'module/web')
-rw-r--r--module/web/templates/default/queue.html2
-rw-r--r--module/web/webinterface.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index b11910bac..c88fa3568 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -28,6 +28,7 @@ document.addEvent("domready", function(){
{% endblock %}
{% block content %}
+{% autoescape true %}
<ul id="package-list" style="list-style: none; padding-left: 0; margin-top: -10px;">
{% for package in content %}
@@ -69,6 +70,7 @@ document.addEvent("domready", function(){
</li>
{% endfor %}
</ul>
+{% endautoescape %}
{% endblock %}
{% block hidden %}
diff --git a/module/web/webinterface.py b/module/web/webinterface.py
index b531d0583..68724e3f6 100644
--- a/module/web/webinterface.py
+++ b/module/web/webinterface.py
@@ -79,7 +79,7 @@ loader = PrefixLoader({
'js': FileSystemLoader(join(PROJECT_DIR, 'media', 'js'))
})
-env = Environment(loader=loader, extensions=['jinja2.ext.i18n'], trim_blocks=True, auto_reload=False,
+env = Environment(loader=loader, extensions=['jinja2.ext.i18n', 'jinja2.ext.autoescape'], trim_blocks=True, auto_reload=False,
bytecode_cache=bcc)
from filters import quotepath, path_make_relative, path_make_absolute, truncate, date
@@ -118,8 +118,6 @@ web = GZipMiddleWare(web)
if PREFIX:
web = PrefixMiddleware(web, prefix=PREFIX)
-#TODO: compress plugin, install(otfcompress)
-
import pyload_app
import json_app
import cnl_app