]> 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: a7c8a92)
gasthaus_list.html now uses jinja2.
authorphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Wed, 27 Dec 2017 22:31:16 +0000 (22:31 +0000)
committerphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Wed, 27 Dec 2017 22:31:16 +0000 (22:31 +0000)
git-svn-id: http://www.winterrodeln.org/svn/wradmin/trunk@2759 7aebc617-e5e2-0310-91dc-80fb5f6d2477

wradmin/controllers/gasthaus.py patch | blob | history
wradmin/templates/gasthaus_list.html patch | blob | history

diff --git a/wradmin/controllers/gasthaus.py b/wradmin/controllers/gasthaus.py
index b1e9d2586ae8b7f547650a155c636571a86e3f9e..7e25f68a492b352b8b65db5189e3ee62fb191a33 100644 (file)
--- a/wradmin/controllers/gasthaus.py
+++ b/wradmin/controllers/gasthaus.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3.4
 #!/usr/bin/python3.4
-from flask import request, abort, redirect, url_for, flash
+from flask import request, abort, redirect, url_for, flash, render_template
 import paginate
 
 import wrpylib.wrmwmarkup
 import paginate
 
 import wrpylib.wrmwmarkup
@@ -16,11 +16,10 @@ class GasthausController:
         """Lists all inns"""
         q = model.meta.Session.query(model.WrInnCache)
         q = q.order_by(model.WrInnCache.page_title)
         """Lists all inns"""
         q = model.meta.Session.query(model.WrInnCache)
         q = q.order_by(model.WrInnCache.page_title)
-        c = TemplateContext()
-        c.paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)),
-                                    url_maker=lambda page: url_for('gasthaus_list', page=page),
-                                    items_per_page=25)
-        return render_genshi_template('gasthaus_list.html', c=c)
+        paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)),
+                                  url_maker=lambda page: url_for('gasthaus_list', page=page),
+                                  items_per_page=25)
+        return render_template('gasthaus_list.html', paginator=paginator)
 
     def view(self, id):
         """Displays an inn"""
 
     def view(self, id):
         """Displays an inn"""
diff --git a/wradmin/templates/gasthaus_list.html b/wradmin/templates/gasthaus_list.html
index 1fe0517f696905fea5478797c06d5fc544152a53..9448994f552b93f9e4821e4fcaf0b3d369c00412 100644 (file)
--- a/wradmin/templates/gasthaus_list.html
+++ b/wradmin/templates/gasthaus_list.html
@@ -1,30 +1,21 @@
-<?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 %}Gasthäuser{% endblock %}
 
 
-<head>
-    <title>Gasthäuser</title>
-</head>
+{% block content %}
+<h2>Gasthäuser</h2>
 
 
-<body>
-<h2>Gasthäuser</h2>
+<p>Die folgende Lise wurde automatisiert von den Gasthausboxen gesammelt. Da dies nicht automatisch passiert, kann es sein, dass die Liste "veraltete" Information enthält.</p>
 
 
-<p>Die folgende Lise wurde automatisiert von den Gasthausboxen gesammelt. Da dies nicht automatisch passiert, kann es sein, dass die Liste "veraltete" Information enthält.</p>
+<p><a href="{{url_for('gasthaus_update')}}" class="button">Gasthausboxen auslesen und DB aktualisieren</a></p>
 
 
-<p><a href="${h.url(controller='gasthaus', action='update')}" class="button">Gasthausboxen auslesen und DB aktualisieren</a></p>
 
 
-
-<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>Name</th>
 
 <table>
     <tr>
         <th>ID</th>
         <th>Name</th>
-        <th>Höhe</th>
+        <th>Höhe</th>
         <th>Telefon</th>
         <th>E-Mail</th>
         <th>Homepage</th>
         <th>Telefon</th>
         <th>E-Mail</th>
         <th>Homepage</th>
@@ -34,22 +25,23 @@
         <th>Longitude</th>
         <th>In Arbeit</th>
     </tr>
         <th>Longitude</th>
         <th>In Arbeit</th>
     </tr>
-    <tr py:for="s in c.paginator">
-        <td><a href="${h.url(controller='gasthaus', action='view', id=s.page_id)}">${s.page_id}</a></td>
-        <td>${s.page_title}</td>
-        <td>${s.position_elevation}</td>
-        <td>${s.phone_list}</td>
-        <td>${s.email_list}</td>
-        <td>${s.homepage}</td>
-        <td>${h.tristate_tuple(s.nonsmoker_area, s.smoker_area)}</td>
-        <td><small>${s.image}</small></td>
-        <td>${s.position_latitude}</td>
-        <td>${s.position_longitude}</td>
-        <td>${h.bool(s.under_construction)}</td>
+    {% for s in paginator %}
+    <tr>
+        <td><a href="{{url_for('gasthaus_view', id=s.page_id)}}">{{s.page_id}}</a></td>
+        <td>{{s.page_title}}</td>
+        <td>{{s.position_elevation}}</td>
+        <td>{{s.phone_list}}</td>
+        <td>{{s.email_list}}</td>
+        <td>{{s.homepage}}</td>
+        <td>{{h.tristate_tuple(s.nonsmoker_area, s.smoker_area)}}</td>
+        <td><small>{{s.image}}</small></td>
+        <td>{{s.position_latitude}}</td>
+        <td>{{s.position_longitude}}</td>
+        <td>{{h.bool(s.under_construction)}}</td>
     </tr>
     </tr>
+    {% endfor %}
 </table>
 
 </table>
 
-<p>${Markup(c.paginator.pager('~2~'))}</p>
+<p>{{paginator.pager('~2~') | safe}}</p>
 
 
-</body>
-</html>
+{% endblock %}
wradmin flask web app for Winterrodeln