]> 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: 4518ad4)
Change to jinja2: index.html is now rendered with jinja2 (no styling yet).
authorphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Wed, 27 Dec 2017 22:31:11 +0000 (22:31 +0000)
committerphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Wed, 27 Dec 2017 22:31:11 +0000 (22:31 +0000)
git-svn-id: http://www.winterrodeln.org/svn/wradmin/trunk@2755 7aebc617-e5e2-0310-91dc-80fb5f6d2477

wradmin/__init__.py patch | blob | history
wradmin/templates/index.html patch | blob | history

diff --git a/wradmin/__init__.py b/wradmin/__init__.py
index 0c450c64eb539834c1db78057605403049292186..4a0efa1f624aa177bd44462f140395b79b4ba9dd 100644 (file)
--- a/wradmin/__init__.py
+++ b/wradmin/__init__.py
@@ -1,7 +1,7 @@
 # http://flask.pocoo.org/
 # FLASK_APP=wradmin FLASK_DEBUG=1 WRADMIN_SETTINGS=development.cfg python3 -m flask run
 # FLASK_APP=wradmin WRADMIN_SETTINGS=production.cfg python3 -m flask run
-from flask import Flask, send_from_directory, abort, g
+from flask import Flask, send_from_directory, abort, g, render_template
 from sqlalchemy.engine import create_engine
 import wradmin.model
 from wradmin.genshi import render_genshi_template
@@ -14,6 +14,7 @@ from wradmin.controllers.coordtool import CoordtoolController
 app = Flask(__name__)
 app.config.from_envvar('WRADMIN_SETTINGS')
 wradmin.model.init_model(create_engine(app.config['DATABASE_URI']))
+app.jinja_env.globals.update(h=wradmin.genshi.PylonsHelper())
 
 
 @app.teardown_appcontext
@@ -24,7 +25,7 @@ def remove_db_session(error):
 
 @app.route("/")
 def index():
-    return render_genshi_template('index.html')
+    return render_template('index.html')
 
 
 @app.route("/rodelbahn/list")
diff --git a/wradmin/templates/index.html b/wradmin/templates/index.html
index 82db47b92c6ca58c9f16f01cfe1d5d20309f6f7a..8182ff6b3c6fcae4d5f058b5b707bbe3cc7e15c6 100644 (file)
--- a/wradmin/templates/index.html
+++ b/wradmin/templates/index.html
@@ -1,31 +1,26 @@
-<?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" />
+<!doctype html>
+<html>
 
 <head>
-    <title>Hauptmenü</title>
+    <title>Hauptmenü</title>
 </head>
 
 <body>
-<h2>Hauptmenü</h2>
+<h2>Hauptmenü</h2>
 
 <p>Willkommen auf den Administrationsseiten von Winterrodeln.</p>
 
 <ul>
-    <li><a href="${h.url(controller='rodelbahn', action='list')}">Rodelbahnen</a></li>
-    <li><a href="${h.url(controller='bericht', action='list')}">Rodelbahnberichte</a></li>
-    <li><a href="${h.url(controller='gasthaus', action='list')}">Gasthäuser</a></li>
-    <li><a href="${h.url(controller='coordtool', action='index')}">Koordinaten-Rechner</a></li>
-    <!-- <li><a href="${h.url(controller='wrgpxtool', action='index')}">Winterrodeln-GPX Datei Werkzeuge</a></li> -->
+    <li><a href="{{url_for('rodelbahn_list')}}">Rodelbahnen</a></li>
+    <li><a href="{{url_for('bericht_list')}}">Rodelbahnberichte</a></li>
+    <li><a href="{{url_for('gasthaus_list')}}">Gasthäuser</a></li>
+    <li><a href="{{url_for('coordtool_index')}}">Koordinaten-Rechner</a></li>
+    <!-- <li><a href="url_for('wrgpxtool')">Winterrodeln-GPX Datei Werkzeuge</a></li> -->
 </ul>
 
 <ul>
-    <li><a href="${h.wiki()}">Winterrodeln-Hauptseite</a></li>
-    <li><a href="${h.forum()}">Forum</a></li>
+    <li><a href="{{h.wiki()}}">Winterrodeln-Hauptseite</a></li>
+    <li><a href="{{h.forum()}}">Forum</a></li>
 </ul>
 
 </body>
wradmin flask web app for Winterrodeln