Commit 64ffd1af authored by ale's avatar ale

no need to bounce "config" via jinja env_globals; made the authentication message configurable

parent 58ef73b0
......@@ -26,7 +26,7 @@
<div id="content">
{% block content %}{% endblock %}
{% if footer %}{{ footer | safe }}{% endif %}
{% if config.get('FOOTER') %}{{ config['FOOTER'] | safe }}{% endif %}
</div>
</div>
......
......@@ -20,10 +20,10 @@
</p>
</form>
{% if help_url %}
{% if config.get('HELP_URL') %}
<p>
For any issues, there is
<a href="{{ help_url | safe }}">extensive documentation
<a href="{{ config['HELP_URL'] | safe }}">extensive documentation
available</a>.
</p>
{% endif %}
......
......@@ -2,7 +2,11 @@
{% block content %}
<p>
Enter your authentication credentials:
{% if config.get('AUTH_MESSAGE') %}
{{ config['AUTH_MESSAGE'] | safe }}
{% else %}
Enter your authentication credentials:
{% endif %}
</p>
{% if error %}
......
......@@ -264,8 +264,6 @@ def make_app(config={}):
app.register_blueprint(ca_app.ca_app, url_prefix='/ca')
app.jinja_env.globals['csrf_token'] = generate_csrf_token
app.jinja_env.globals['footer'] = app.config.get('FOOTER')
app.jinja_env.globals['help_url'] = app.config.get('HELP_URL')
return app
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment