diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-10 14:50:24 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-10 14:50:24 +0200 |
| commit | c12cb8adcc0eef5ffc11762d85cae9f5ff8c2921 (patch) | |
| tree | 3d2b5a37c18414714f68e721b52ca393dd7e75a9 /pyload/webui | |
| parent | [README] Update (2) (diff) | |
| parent | added: configdata of deleted or outdated plugins are deletedfrom config (diff) | |
| download | pyload-c12cb8adcc0eef5ffc11762d85cae9f5ff8c2921.tar.xz | |
Merge pull request #2 from ardi69/0.4.10
makes the plugins runable
Diffstat (limited to 'pyload/webui')
| -rw-r--r-- | pyload/webui/app/pyloadweb.py | 4 | ||||
| -rw-r--r-- | pyload/webui/app/utils.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pyload/webui/app/pyloadweb.py b/pyload/webui/app/pyloadweb.py index d7604918b..d71d0d306 100644 --- a/pyload/webui/app/pyloadweb.py +++ b/pyload/webui/app/pyloadweb.py @@ -94,12 +94,12 @@ def server_min(theme, file): def server_js(theme, file): response.headers['Content-Type'] = "text/javascript; charset=UTF-8" - if "/render/" in file or ".render." in file: + if "/render/" in file or ".render." in file or True: response.headers['Expires'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime(time.time() + 24 * 7 * 60 * 60)) response.headers['Cache-control'] = "public" - path = join(theme, file) + path = "/".join((theme, file)) return env.get_template(path).render() else: return server_static(theme, file) diff --git a/pyload/webui/app/utils.py b/pyload/webui/app/utils.py index fd0e14cfa..4a431493b 100644 --- a/pyload/webui/app/utils.py +++ b/pyload/webui/app/utils.py @@ -12,7 +12,7 @@ from pyload.api import has_permission, PERMS, ROLE def render_to_response(file, args={}, proc=[]): for p in proc: args.update(p()) - path = join(THEME, "tml", file) + path = "tml/" + file return env.get_template(path).render(**args) |