From d66ef2928b913b6eccb0ab05c95996dbea922773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sun, 1 May 2016 14:32:19 +0200 Subject: Overhaul js handling --- templates/expenses/add.jinja | 6 +----- templates/expenses/show.jinja | 6 +----- templates/js.jinja | 26 ++++++++++++++++++++++++++ templates/layout.jinja | 9 ++++++--- templates/stats/show.jinja | 7 +------ 5 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 templates/js.jinja (limited to 'templates') diff --git a/templates/expenses/add.jinja b/templates/expenses/add.jinja index 0941c3a..027c845 100644 --- a/templates/expenses/add.jinja +++ b/templates/expenses/add.jinja @@ -6,11 +6,7 @@ {% endblock %} {% set JSFunction = "addJS" %} - -{% block js %} - {{ super() }} - -{% endblock %} +{% set additionalJS = "jqueryui" %} {% block style %} {{ super() }} diff --git a/templates/expenses/show.jinja b/templates/expenses/show.jinja index e6c40de..59da032 100644 --- a/templates/expenses/show.jinja +++ b/templates/expenses/show.jinja @@ -2,11 +2,7 @@ {% from "macros.jinja" import left_arrow, right_arrow, colorize %} {% set JSFunction = "showJS" %} - -{% block js %} - {{ super() }} - -{% endblock %} +{% set additionalJS = "highstock" %} {% block heading %} {% if exps | length > 1 %} diff --git a/templates/js.jinja b/templates/js.jinja new file mode 100644 index 0000000..db26182 --- /dev/null +++ b/templates/js.jinja @@ -0,0 +1,26 @@ +{% set js_lib = { + "kosten" : "js/kosten.js", + "highstock" : "js/highstock-4.2.2.js", + "jquery" : "js/jquery-1.11.2.min.js", + "jqueryui" : "jqueryui/jquery-ui.js" + } +%} + +{% macro script(name) %} + {% if name in js_lib %} + + {% endif %} +{% endmacro %} + +{% macro scripts(names) %} + {% if names is not string %} + {% for name in names %} + {{ script(name) }} + {% endfor %} + {% else %} + {{ script(names) }} + {% for name in varargs %} + {{ script(name) }} + {% endfor %} + {% endif %} +{% endmacro %} diff --git a/templates/layout.jinja b/templates/layout.jinja index a79785f..e215c3c 100644 --- a/templates/layout.jinja +++ b/templates/layout.jinja @@ -1,3 +1,4 @@ +{% from 'js.jinja' import scripts %} @@ -69,10 +70,12 @@ {% if not g.is_mobile %} {% block js %} - - + {{ scripts("jquery", "kosten") }} {% endblock %} - {% if JSFunction %} {% endif %} + {% if additionalJS %}{{ scripts(additionalJS) }}{% endif %} + {% if JSFunction %} + + {% endif %} {% endif %} diff --git a/templates/stats/show.jinja b/templates/stats/show.jinja index 1de1dcc..859a80b 100644 --- a/templates/stats/show.jinja +++ b/templates/stats/show.jinja @@ -1,12 +1,7 @@ {% extends "layout.jinja" %} {% set JSFunction = "statJS" %} - -{% block js %} - {{ super() }} - - -{% endblock %} +{% set additionalJS = ["highstock", "jqueryui"] %} {% block style %} {{ super() }} -- cgit v1.2.3