Change to jinja2: index.html is now rendered with jinja2 (no styling yet).

[philipp/winterrodeln/wradmin.git] / wradmin / __init__.py

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
 # 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
 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 = 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
 
 
 @app.teardown_appcontext


@@ -24,7 +25,7 @@ def remove_db_session(error):
 
 @app.route("/")
 def index():
 
 @app.route("/")
 def index():

-    return render_genshi_template('index.html')
+    return render_template('index.html')

 
 
 @app.route("/rodelbahn/list")
 
 
 @app.route("/rodelbahn/list")