Skip to content
Snippets Groups Projects
Commit 95ace878 authored by Julian Rother's avatar Julian Rother
Browse files

Added flashes/alerts and simplified templates

parent 71c8570e
No related branches found
No related tags found
No related merge requests found
#!/bin/python #!/bin/python
from flask import Flask, render_template, g, request, url_for, redirect, session from flask import *
import sqlite3 import sqlite3
import os import os
import re import re
...@@ -172,6 +172,8 @@ def login(): ...@@ -172,6 +172,8 @@ def login():
user, groups = ldapauth(request.form.get('user'), request.form.get('password')) user, groups = ldapauth(request.form.get('user'), request.form.get('password'))
if user and 'users' in groups: if user and 'users' in groups:
session['user'] = ldapget(user) session['user'] = ldapget(user)
else:
flash('Login fehlgeschlagen!')
if 'ref' in request.values: if 'ref' in request.values:
return redirect(request.values['ref']) return redirect(request.values['ref'])
else: else:
......
...@@ -93,9 +93,14 @@ ...@@ -93,9 +93,14 @@
</div> </div>
</div> </div>
</nav> </nav>
<div class="container-fluid">
{% for msg in get_flashed_messages() %}
<div class="row"><div class="alert alert-danger col-xs-12" role="alert">{{ msg }}</div></div>
{% endfor %}
{% block content %} {% block content %}
<h1>This is a Heading</h1> <h1>This is a Heading</h1>
<p>This is a paragraph.</p> <p>This is a paragraph.</p>
{% endblock %} {% endblock %}
</div>
</body> </body>
</html> </html>
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{% from 'macros.html' import preview %} {% from 'macros.html' import preview %}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="container-fluid">
<div class="col-xs-offset-1 col-xs-10"> <div class="col-xs-offset-1 col-xs-10">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
...@@ -15,5 +14,4 @@ ...@@ -15,5 +14,4 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}
...@@ -2,11 +2,8 @@ ...@@ -2,11 +2,8 @@
{% extends "base.html" %} {% extends "base.html" %}
{% set active_page = "faq" %} {% set active_page = "faq" %}
{% block content %} {% block content %}
<div class="container"> <div class="row">
<br /> <div class="col-xs-10 col-xs-offset-1">
<br />
<br />
<div class="alert alert-warning alert-dismissible" role="alert" id="kontakt"> <div class="alert alert-warning alert-dismissible" role="alert" id="kontakt">
Unter <a href="mailto:video@fsmpi.rwth-aachen.de">video@fsmpi.rwth-aachen.de</a> stehen wir für alle Fragen bereit. Unter <a href="mailto:video@fsmpi.rwth-aachen.de">video@fsmpi.rwth-aachen.de</a> stehen wir für alle Fragen bereit.
</div> </div>
...@@ -56,6 +53,7 @@ ...@@ -56,6 +53,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<style> <style>
.faqHeader { .faqHeader {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% set active_page = "index" %} {% set active_page = "index" %}
{% block content %} {% block content %}
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-md-6 panel-group"> <div class="col-md-6 panel-group">
<div class="panel panel-default"> <div class="panel panel-default">
...@@ -42,5 +41,4 @@ ...@@ -42,5 +41,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}
{% from 'macros.html' import player %} {% from 'macros.html' import player %}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div>
{{ player(lecture, videos) }} {{ player(lecture, videos) }}
</div>
{% endblock %} {% endblock %}
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{% from 'macros.html' import preview %} {% from 'macros.html' import preview %}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="container-fluid">
<div class="col-xs-offset-1 col-xs-10"> <div class="col-xs-offset-1 col-xs-10">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
...@@ -35,5 +34,4 @@ ...@@ -35,5 +34,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-xs-12 dropdown"> <div class="col-xs-12 dropdown">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Grupierung <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Grupierung
...@@ -36,5 +35,4 @@ ...@@ -36,5 +35,4 @@
{% endfor %} {% endfor %}
</div></div> </div></div>
</div>
{% endblock %} {% endblock %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment