From: philipp Date: Wed, 27 Dec 2017 22:31:15 +0000 (+0000) Subject: bericht_list.html now uses jinja2. X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/wradmin.git/commitdiff_plain/a7c8a92286d19341cc33b0d0067cf4d3699c9624 bericht_list.html now uses jinja2. git-svn-id: http://www.winterrodeln.org/svn/wradmin/trunk@2758 7aebc617-e5e2-0310-91dc-80fb5f6d2477 --- diff --git a/wradmin/controllers/bericht.py b/wradmin/controllers/bericht.py index efce362..998dbd8 100644 --- a/wradmin/controllers/bericht.py +++ b/wradmin/controllers/bericht.py @@ -1,5 +1,5 @@ import datetime -from flask import request, abort, redirect, url_for, flash +from flask import request, abort, redirect, url_for, flash, render_template import paginate import sqlalchemy as sa import wradmin.model as model @@ -23,11 +23,10 @@ class BerichtController: """Lists all reports""" q = model.meta.Session.query(model.WrReport) q = q.order_by(sa.sql.expression.desc(model.WrReport.id)) - c = TemplateContext() - c.paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)), - url_maker=lambda page: url_for('bericht_list', page=page), - items_per_page=25) - return render_genshi_template('bericht_list.html', c=c) + paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)), + url_maker=lambda page: url_for('bericht_list', page=page), + items_per_page=25) + return render_template('bericht_list.html', paginator=paginator) def view(self, id): """Displays a report""" diff --git a/wradmin/templates/bericht_list.html b/wradmin/templates/bericht_list.html index 7143503..a02d646 100644 --- a/wradmin/templates/bericht_list.html +++ b/wradmin/templates/bericht_list.html @@ -1,46 +1,37 @@ - - - - +{% extends "master.html" %} +{% block title %}Rodelbahnberichte{% endblock %} - - Rodelbahnberichte - - - +{% block content %}

Rodelbahnberichte

-

${Markup(c.paginator.pager('$link_first $link_previous $first_item bis $last_item von $item_count $link_next $link_last'))}

+

{{paginator.pager('$link_first $link_previous $first_item bis $last_item von $item_count $link_next $link_last') | safe}}

- - + + - + - - - - - - - - - - + {% for r in paginator %} + + + + + + + + + + + {% endfor %}
ID Seite Datum EintragDatum UngültigDatum für BerichtDatum UngültigDatum für Bericht Zustand (1 bis 5) Beschreibung (WikiText) Autor-NameGelöschtGelöscht
${r.id}${r.page_title}${r.date_entry}${r.date_invalid}${r.date_report}${r.condition}${r.description}${r.author_name}${r.delete_date}
{{r.id}}{{r.page_title}}{{r.date_entry}}{{r.date_invalid}}{{r.date_report}}{{r.condition}}{{r.description}}{{r.author_name}}{{r.delete_date}}
-

${Markup(c.paginator.pager('~2~'))}

- - - +

{{paginator.pager('~2~') | safe}}

+{% endblock %}