diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2013-09-14 23:05:07 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2013-09-14 23:05:07 +0200 |
| commit | 43459025bcac72318e4ef8a32c2d4455321bc191 (patch) | |
| tree | df364532e6b3526319ff916af7a687e28d89773b /templates | |
| parent | 8a1c2eab6d70bb6b8c3f49cbe49247f6934066ed (diff) | |
| download | kosten-43459025bcac72318e4ef8a32c2d4455321bc191.tar.gz kosten-43459025bcac72318e4ef8a32c2d4455321bc191.tar.bz2 kosten-43459025bcac72318e4ef8a32c2d4455321bc191.zip | |
Draw pies using highcharts JS-lib
Diffstat (limited to '')
| -rw-r--r-- | templates/expenses/show.jinja | 12 | ||||
| -rw-r--r-- | templates/layout.jinja | 14 |
2 files changed, 15 insertions, 11 deletions
diff --git a/templates/expenses/show.jinja b/templates/expenses/show.jinja index 4b6e362..395d1e5 100644 --- a/templates/expenses/show.jinja +++ b/templates/expenses/show.jinja @@ -3,6 +3,11 @@ {% set JSFunction = "showJS" %} +{% block js %} + {{ super() }} + <script type="text/javascript" src="{{ "js/highcharts-3.0.5.js" | static_url }}"></script> +{% endblock %} + {% block heading %} {% if exps | length > 1 %} Aktuelle Kosten @@ -14,8 +19,8 @@ {% block content %} {% for e, p in zip(exps,pies) %} {% if exps | length > 1 %}<h2>{{e|date}}</h2>{% endif %} - <div style="margin-bottom: 10px"> - <div style="display:inline-block; width:270px; vertical-align: top"> + <div> + <div class="month_exp"> {% for c in e.catexps | sort(attribute="cat.name") %} {% call(exp) detail(name=c.cat.name, sum=c.expense, set=c.all) %} <a href="{{ url_for(".edit", id = exp.id) }}">{{exp.day}}.{{exp.month}}. -- {{exp.description}}: {{exp.expense | eur }}</a> @@ -30,8 +35,7 @@ <a href="{{ url_for(".edit", id = exp.id) }}">{{exp.day}}.{{exp.month}}. -- {{exp.description}}: {{exp.expense | eur}}</a> {% endcall %} </div> - <div style="display:inline-block; height:250px; margin-left:50px" data-pie='{{ p | tojson }}'> - </div> + <div class="pie" data-pie='{{ p | tojson }}'></div> </div> {% endfor %} diff --git a/templates/layout.jinja b/templates/layout.jinja index ee082f9..aa923d6 100644 --- a/templates/layout.jinja +++ b/templates/layout.jinja @@ -2,13 +2,6 @@ <html> <head> <meta charset=utf-8" > - {% if not g.is_mobile %} - {% block js %} - <script type="text/javascript" src="{{ "js/jquery-1.10.2.js" | static_url }}"></script> - <script type="text/javascript" src="{{ "js/kosten.js" | static_url }}"></script> - {% if JSFunction %}<script type="text/javascript">{{ JSFunction }}()</script> {% endif %} - {% endblock %} - {% endif %} <link rel="shortcut icon" href="{{ "images/currency.png" | static_url }}" type="image/icon"> <title>{{ title or "Kostenverwaltung" }}</title> {% block style %} @@ -54,5 +47,12 @@ </p> {% endblock %} </div> + {% if not g.is_mobile %} + {% block js %} + <script type="text/javascript" src="{{ "js/jquery-1.10.2.js" | static_url }}"></script> + <script type="text/javascript" src="{{ "js/kosten.js" | static_url }}"></script> + {% endblock %} + {% if JSFunction %}<script type="text/javascript">{{ JSFunction }}()</script> {% endif %} + {% endif %} </body> </html> |