]> ToastFreeware Gitweb - philipp/winterrodeln/wradmin.git/commitdiff
gasthaus_view.html now uses jinja2.
authorphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Wed, 27 Dec 2017 22:31:21 +0000 (22:31 +0000)
committerphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Wed, 27 Dec 2017 22:31:21 +0000 (22:31 +0000)
git-svn-id: http://www.winterrodeln.org/svn/wradmin/trunk@2763 7aebc617-e5e2-0310-91dc-80fb5f6d2477

wradmin/controllers/gasthaus.py
wradmin/templates/gasthaus_view.html

index 7e25f68a492b352b8b65db5189e3ee62fb191a33..4dcf9c3d661df23c3eaae229a3bf87ead2dce513 100644 (file)
@@ -7,7 +7,6 @@ import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
 import wradmin.model as model
-from wradmin.genshi import render_genshi_template, TemplateContext
 
 
 class GasthausController:
@@ -24,11 +23,10 @@ class GasthausController:
     def view(self, id):
         """Displays an inn"""
         q = model.meta.Session.query(model.WrInnCache)
-        c = TemplateContext()
-        c.inn =  q.get(id)
-        if c.inn is None:
+        inn = q.get(id)
+        if inn is None:
             abort(404)
-        return render_genshi_template('gasthaus_view.html', c=c)
+        return render_template('gasthaus_view.html', inn=inn)
 
     def update(self):
         """Updates the wrinncache table from the wiki"""
index 48204fc608d2cb067debba158dad5ec1e6e3a494..410469b1cccd04f4d866b62b149b151be4881d0c 100644 (file)
@@ -1,73 +1,62 @@
-<?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 %}Gasthaus {{inn.page_title}}{% endblock %}
 
-<head>
-    <title>Gasthaus</title>
-</head>
-
-<body>
-<h2>Gasthaus #${c.inn.page_id}: ${c.inn.page_title}</h2>
+{% block content %}
+<h2>Gasthaus #{{inn.page_id}}: {{inn.page_title}}</h2>
 
 <h3>Inhalt der Gasthausbox</h3>
 <table>
     <tr>
         <th>ID</th>
-        <td>${c.inn.page_id}</td>
+        <td>{{inn.page_id}}</td>
     </tr>
     <tr>
         <th>Name</th>
-        <td>${c.inn.page_title}</td>
+        <td>{{inn.page_title}}</td>
     </tr>
     <tr>
-        <th>Höhe</th>
-        <td>${c.inn.position_elevation}</td>
+        <th>Höhe</th>
+        <td>{{inn.position_elevation}}</td>
     </tr>
     <tr>
         <th>Telefon</th>
-        <td>${c.inn.phone_list}</td>
+        <td>{{inn.phone_list}}</td>
     </tr>
     <tr>
         <th>E-Mail</th>
-        <td>${c.inn.email_list}</td>
+        <td>{{inn.email_list}}</td>
     </tr>
     <tr>
         <th>Homepage</th>
-        <td>${c.inn.homepage}</td>
+        <td>{{inn.homepage}}</td>
     </tr>
     <tr>
         <th>Rauchfrei</th>
-        <td>${h.tristate_tuple(c.inn.nonsmoker_area, c.inn.smoker_area)}</td>
+        <td>{{h.tristate_tuple(inn.nonsmoker_area, inn.smoker_area)}}</td>
     </tr>
     <tr>
         <th>Bild</th>
-        <td>${c.inn.image}</td>
+        <td>{{inn.image}}</td>
     </tr>
     <tr>
         <th>Latitude</th>
-        <td>${c.inn.position_latitude}</td>
+        <td>{{inn.position_latitude}}</td>
     </tr>
     <tr>
         <th>Longitude</th>
-        <td>${c.inn.position_longitude}</td>
+        <td>{{inn.position_longitude}}</td>
     </tr>
     <tr>
         <th>In Arbeit</th>
-        <td>${c.inn.under_construction}</td>
+        <td>{{inn.under_construction}}</td>
     </tr>
 </table>
 
 <ul>
-    <li><a href="${h.wiki(c.inn.page_title)}">Zeige bei <tt>www.winterrodeln.org</tt></a></li>
-    <py:if test="c.inn.position_latitude and c.inn.position_longitude">
-    <li><a href="${h.google_maps(c.inn.position_latitude, c.inn.position_longitude)}">Zeige bei Google Maps</a></li>
-    </py:if>
+    <li><a href="{{h.wiki(inn.page_title)}}">Zeige bei <tt>www.winterrodeln.org</tt></a></li>
+    {% if inn.position_latitude and inn.position_longitude %}
+    <li><a href="{{h.google_maps(inn.position_latitude, inn.position_longitude)}}">Zeige bei Google Maps</a></li>
+    {% endif %}
 </ul>
 
-
-</body>
-</html>
+{% endblock %}