From: philipp Date: Wed, 27 Dec 2017 22:31:21 +0000 (+0000) Subject: gasthaus_view.html now uses jinja2. X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/wradmin.git/commitdiff_plain/6f816ea42b84894f897f96c088f8e330361a60f4 gasthaus_view.html now uses jinja2. git-svn-id: http://www.winterrodeln.org/svn/wradmin/trunk@2763 7aebc617-e5e2-0310-91dc-80fb5f6d2477 --- diff --git a/wradmin/controllers/gasthaus.py b/wradmin/controllers/gasthaus.py index 7e25f68..4dcf9c3 100644 --- a/wradmin/controllers/gasthaus.py +++ b/wradmin/controllers/gasthaus.py @@ -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""" diff --git a/wradmin/templates/gasthaus_view.html b/wradmin/templates/gasthaus_view.html index 48204fc..410469b 100644 --- a/wradmin/templates/gasthaus_view.html +++ b/wradmin/templates/gasthaus_view.html @@ -1,73 +1,62 @@ - - - - +{% extends "master.html" %} +{% block title %}Gasthaus {{inn.page_title}}{% endblock %} - - Gasthaus - - - -

Gasthaus #${c.inn.page_id}: ${c.inn.page_title}

+{% block content %} +

Gasthaus #{{inn.page_id}}: {{inn.page_title}}

Inhalt der Gasthausbox

- + - + - - + + - + - + - + - + - + - + - + - +
ID${c.inn.page_id}{{inn.page_id}}
Name${c.inn.page_title}{{inn.page_title}}
Höhe${c.inn.position_elevation}Höhe{{inn.position_elevation}}
Telefon${c.inn.phone_list}{{inn.phone_list}}
E-Mail${c.inn.email_list}{{inn.email_list}}
Homepage${c.inn.homepage}{{inn.homepage}}
Rauchfrei${h.tristate_tuple(c.inn.nonsmoker_area, c.inn.smoker_area)}{{h.tristate_tuple(inn.nonsmoker_area, inn.smoker_area)}}
Bild${c.inn.image}{{inn.image}}
Latitude${c.inn.position_latitude}{{inn.position_latitude}}
Longitude${c.inn.position_longitude}{{inn.position_longitude}}
In Arbeit${c.inn.under_construction}{{inn.under_construction}}
- - - +{% endblock %}