Added flashes/alerts and simplified templates

server.py

 #!/bin/python
-from flask import Flask, render_template, g, request, url_for, redirect, session
+from flask import *
 import sqlite3
 import os
 import re
@@ -172,6 +172,8 @@ def login():
 	user, groups = ldapauth(request.form.get('user'), request.form.get('password'))
 	if user and 'users' in groups:
 		session['user'] = ldapget(user)
+	else:
+		flash('Login fehlgeschlagen!')
 	if 'ref' in request.values:
 		return redirect(request.values['ref'])
 	else:

templates/base.html

@@ -93,9 +93,14 @@
 				</div>
 			</div>
 		</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 %}
 			<h1>This is a Heading</h1>
 			<p>This is a paragraph.</p>
 			{% endblock %}
+		</div>
 	</body>
 </html>

templates/course.html

@@ -2,7 +2,6 @@
 {% from 'macros.html' import preview %}
 {% extends "base.html" %}
 {% block content %}
-<div class="container-fluid">
 <div class="col-xs-offset-1 col-xs-10">
 	<div class="panel panel-default">
 		<div class="panel-heading">
@@ -15,5 +14,4 @@
 		</ul>
 	</div>
 </div>
-</div>
 {% endblock %}

templates/faq.html

@@ -2,11 +2,8 @@
 {% extends "base.html" %}
 {% set active_page = "faq" %}
 {% block content %}
-<div class="container">
-	<br />
-	<br />
-	<br />
-
+<div class="row">
+	<div class="col-xs-10 col-xs-offset-1">
 		<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.
 		</div>
@@ -56,6 +53,7 @@
 			</div>
 		</div>
 	</div>
+</div>
 
 <style>
 .faqHeader {

templates/index.html

@@ -2,7 +2,6 @@
 {% extends "base.html" %}
 {% set active_page = "index" %}
 {% block content %}
-<div class="container-fluid">
 <div class="row">
 	<div class="col-md-6 panel-group">
 		<div class="panel panel-default">
@@ -42,5 +41,4 @@
 		</div>
 	</div>
 </div>
-</div>
 {% endblock %}

templates/play.html

 {% from 'macros.html' import player %}
 {% extends "base.html" %}
 {% block content %}
-<div>
 {{ player(lecture, videos) }}
-</div>
 {% endblock %}

templates/search.html

@@ -2,7 +2,6 @@
 {% from 'macros.html' import preview %}
 {% extends "base.html" %}
 {% block content %}
-<div class="container-fluid">
 <div class="col-xs-offset-1 col-xs-10">
 	<div class="panel panel-default">
 		<div class="panel-heading">
@@ -35,5 +34,4 @@
 		</div>
 	</div>
 </div>
-</div>
 {% endblock %}

templates/videos.html

@@ -3,7 +3,6 @@
 
 {% extends "base.html" %}
 {% block content %}
-<div class="container-fluid">
 <div class="row">
 	<div class="col-xs-12 dropdown">
 		<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Grupierung
@@ -36,5 +35,4 @@
 	{% endfor %}
 </div></div>
 
-</div>
 {% endblock %}