]> ToastFreeware Gitweb - philipp/winterrodeln/wradmin.git/commitdiff
ToastFreeware / philipp / winterrodeln / wradmin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e78021a)
bericht_list.html now uses jinja2.
authorphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Wed, 27 Dec 2017 22:31:15 +0000 (22:31 +0000)
committerphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Wed, 27 Dec 2017 22:31:15 +0000 (22:31 +0000)
git-svn-id: http://www.winterrodeln.org/svn/wradmin/trunk@2758 7aebc617-e5e2-0310-91dc-80fb5f6d2477

wradmin/controllers/bericht.py patch | blob | history
wradmin/templates/bericht_list.html patch | blob | history

diff --git a/wradmin/controllers/bericht.py b/wradmin/controllers/bericht.py
index efce36211b1276ce9b06d55097dffcd51fa3e46c..998dbd824efa2b90d760cafe937a7eb1ed53dc8a 100644 (file)
--- a/wradmin/controllers/bericht.py
+++ b/wradmin/controllers/bericht.py
@@ -1,5 +1,5 @@
 import datetime
 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
 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))
         """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"""
 
     def view(self, id):
         """Displays a report"""
diff --git a/wradmin/templates/bericht_list.html b/wradmin/templates/bericht_list.html
index 7143503900aab8fdcc10488324ecb1715f3e8e8a..a02d6464508cb4c12ab43bfe119081841d8e0ed3 100644 (file)
--- a/wradmin/templates/bericht_list.html
+++ b/wradmin/templates/bericht_list.html
@@ -1,46 +1,37 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:py="http://genshi.edgewall.org/"
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="master.html" />
+{% extends "master.html" %}
+{% block title %}Rodelbahnberichte{% endblock %}
 
 
-<head>
-    <title>Rodelbahnberichte</title>
-</head>
-
-<body>
+{% block content %}
 <h2>Rodelbahnberichte</h2>
 
 <h2>Rodelbahnberichte</h2>
 
-<p>${Markup(c.paginator.pager('$link_first $link_previous $first_item bis $last_item von $item_count $link_next $link_last'))}</p>
+<p>{{paginator.pager('$link_first $link_previous $first_item bis $last_item von $item_count $link_next $link_last') | safe}}</p>
 
 <table>
     <tr>
         <th>ID</th>
         <th>Seite</th>
         <th>Datum Eintrag</th>
 
 <table>
     <tr>
         <th>ID</th>
         <th>Seite</th>
         <th>Datum Eintrag</th>
-        <th>Datum Ungültig</th>
-        <th>Datum für Bericht</th>
+        <th>Datum Ungültig</th>
+        <th>Datum für Bericht</th>
         <th>Zustand (1 bis 5)</th>
         <th>Beschreibung (WikiText)</th>
         <th>Autor-Name</th>
         <th>Zustand (1 bis 5)</th>
         <th>Beschreibung (WikiText)</th>
         <th>Autor-Name</th>
-        <th>Gelöscht</th>
+        <th>Gelöscht</th>
     </tr>
     </tr>
-    <tr py:for="r in c.paginator">
-        <td><a href="${h.url(controller='bericht', action='view', id=r.id)}">${r.id}</a></td>
-        <td>${r.page_title}</td>
-        <td>${r.date_entry}</td>
-        <td>${r.date_invalid}</td>
-        <td>${r.date_report}</td>
-        <td>${r.condition}</td>
-        <td>${r.description}</td>
-        <td>${r.author_name}</td>
-        <td>${r.delete_date}</td>
+    {% for r in paginator %}
+    <tr>
+        <td><a href="{{url_for('bericht_view', id=r.id)}}">{{r.id}}</a></td>
+        <td>{{r.page_title}}</td>
+        <td>{{r.date_entry}}</td>
+        <td>{{r.date_invalid}}</td>
+        <td>{{r.date_report}}</td>
+        <td>{{r.condition}}</td>
+        <td>{{r.description}}</td>
+        <td>{{r.author_name}}</td>
+        <td>{{r.delete_date}}</td>
     </tr>
     </tr>
+    {% endfor %}
 </table>
 
 </table>
 
-<p>${Markup(c.paginator.pager('~2~'))}</p>
-
-</body>
-</html>
+<p>{{paginator.pager('~2~') | safe}}</p>
+{% endblock %}
wradmin flask web app for Winterrodeln