From c2fec69968daaedb37674b8e028d1dbda6f2448f Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Fri, 26 Aug 2016 05:03:29 +0200
Subject: [PATCH] Fixed alert layout and moved page border in base template
---
templates/base.html | 24 +++++++++----
templates/course.html | 18 +++++-----
templates/faq.html | 84 +++++++++++++++++++++----------------------
templates/index.html | 1 +
templates/login.html | 30 +++++++---------
templates/search.html | 54 ++++++++++++++--------------
templates/videos.html | 58 +++++++++++++++---------------
7 files changed, 133 insertions(+), 136 deletions(-)
diff --git a/templates/base.html b/templates/base.html
index 03d2ad1..db02b7e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -5,6 +5,8 @@
] -%}
{% set active_page = active_page|default('none') -%}
+{% set page_border = page_border|default(1) -%}
+
<!DOCTYPE html>
<html>
<head>
@@ -94,13 +96,21 @@
</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 class="row">
+ {% if page_border == 0 %}
+ <div class="col-xs-12">
+ {% else %}
+ <div class="col-xs-12 col-md-offset-{{ page_border }} col-md-{{ 12-(2*page_border) }}">
+ {% endif %}
+ {% for msg in get_flashed_messages() %}
+ <div class="alert alert-danger" role="alert">{{ msg }}</div>
+ {% endfor %}
+ {% block content %}
+ <h1>This is a Heading</h1>
+ <p>This is a paragraph.</p>
+ {% endblock %}
+ </div>
+ </div>
</div>
</body>
</html>
diff --git a/templates/course.html b/templates/course.html
index d69eb81..3088df1 100644
--- a/templates/course.html
+++ b/templates/course.html
@@ -2,16 +2,14 @@
{% from 'macros.html' import preview %}
{% extends "base.html" %}
{% block content %}
-<div class="col-xs-offset-1 col-xs-10">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h1 class="panel-title">Veranstaltungen</h1>
- </div>
- <ul class="list-group lectureslist">
- {% for l in lectures %}
- {{ lecture_list_item(l,videos|selectattr('lecture_id','equalto',l.id)|list) }}
- {% endfor %}
- </ul>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h1 class="panel-title">Veranstaltungen</h1>
</div>
+ <ul class="list-group lectureslist">
+ {% for l in lectures %}
+ {{ lecture_list_item(l,videos|selectattr('lecture_id','equalto',l.id)|list) }}
+ {% endfor %}
+ </ul>
</div>
{% endblock %}
diff --git a/templates/faq.html b/templates/faq.html
index ee7582c..737585a 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -2,54 +2,50 @@
{% extends "base.html" %}
{% set active_page = "faq" %}
{% block content %}
-<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>
+<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>
- <br/>
+<br/>
- <div class="panel-group" id="accordion">
- <div class="faqHeader">Allgemein</div>
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#speed">Der Download ist zu langsam.</a>
- </h4>
- </div>
- <div id="speed" class="panel-collapse collapse in">
- <div class="panel-body">
- <p>Wir beschränken die Downloadgeschwindigkeit nicht! Eventuell hast du im Uninetz eine bessere Anbindung.</p>
- <p>Falls du unbedingt einen <strong>Download-Manager</strong> benutzen willst/musst, stelle diesen bitte so ein, dass er maximal <strong>5 gleichzeitige Verbindungen</strong> (oder auch weniger) zu unserem Videoserver benutzt.</p>
- <p>Unser Server hat keine (nein, absolut keine!) Bandbreitenbegrenzung, also bekommst du schon für einen einzigen Download die volle Geschwindigkeit und wirst selbst mit solchen Programmen keine schnelleren Downloads erfahren. Zu viele Verbindungen sorgen nur für exzessive Systemlast und damit langsamere Downloads für alle, dich eingeschlossen.</p>
- </div>
- </div>
+<div class="panel-group" id="accordion">
+ <div class="faqHeader">Allgemein</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#speed">Der Download ist zu langsam.</a>
+ </h4>
+ </div>
+ <div id="speed" class="panel-collapse collapse in">
+ <div class="panel-body">
+ <p>Wir beschränken die Downloadgeschwindigkeit nicht! Eventuell hast du im Uninetz eine bessere Anbindung.</p>
+ <p>Falls du unbedingt einen <strong>Download-Manager</strong> benutzen willst/musst, stelle diesen bitte so ein, dass er maximal <strong>5 gleichzeitige Verbindungen</strong> (oder auch weniger) zu unserem Videoserver benutzt.</p>
+ <p>Unser Server hat keine (nein, absolut keine!) Bandbreitenbegrenzung, also bekommst du schon für einen einzigen Download die volle Geschwindigkeit und wirst selbst mit solchen Programmen keine schnelleren Downloads erfahren. Zu viele Verbindungen sorgen nur für exzessive Systemlast und damit langsamere Downloads für alle, dich eingeschlossen.</p>
</div>
- <div class="faqHeader">Abspielprobleme</div>
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#playbackfile">Ich kann ein heruntergeladenes Video nicht abspielen.</a>
- </h4>
- </div>
- <div id="playbackfile" class="panel-collapse collapse">
- <div class="panel-body">
- <p>Ein beliebter Videoplayer ist VLC, denn er kann so ziemlich alle üblichen Audio- und Videoformate abspielen. VLC gibt es unter <a href="https://www.videolan.org">https://www.videolan.org</a> zum Download.</p>
- </div>
- </div>
+ </div>
+ </div>
+ <div class="faqHeader">Abspielprobleme</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#playbackfile">Ich kann ein heruntergeladenes Video nicht abspielen.</a>
+ </h4>
+ </div>
+ <div id="playbackfile" class="panel-collapse collapse">
+ <div class="panel-body">
+ <p>Ein beliebter Videoplayer ist VLC, denn er kann so ziemlich alle üblichen Audio- und Videoformate abspielen. VLC gibt es unter <a href="https://www.videolan.org">https://www.videolan.org</a> zum Download.</p>
</div>
- <div class="faqHeader">Technisches</div>
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#encoding">Wie encoded ihr eurere Videos?</a>
- </h4>
- </div>
- <div id="encoding" class="panel-collapse collapse">
- <div class="panel-body">
- </div>
- </div>
+ </div>
+ </div>
+ <div class="faqHeader">Technisches</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#encoding">Wie encoded ihr eurere Videos?</a>
+ </h4>
+ </div>
+ <div id="encoding" class="panel-collapse collapse">
+ <div class="panel-body">
</div>
</div>
</div>
diff --git a/templates/index.html b/templates/index.html
index d15fe03..32134c5 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,6 +1,7 @@
{% from 'macros.html' import preview %}
{% extends "base.html" %}
{% set active_page = "index" %}
+{% set page_border = 0 %}
{% block content %}
<div class="row">
<div class="col-md-6 panel-group">
diff --git a/templates/login.html b/templates/login.html
index ea3a4d4..c885172 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,22 +1,18 @@
{% extends "base.html" %}
{% block content %}
-<div class="row">
- <div class="col-xs-offset-1 col-xs-10">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h1 class="panel-title">Login für Moderatoren</h1>
- </div>
- <div class="panel-body">
- <form method="post" action="login">
- <input placeholder="User" name="user" type="text"><br>
- <input placeholder="Password" name="password" type="password"><br>
- {% if 'ref' in request.values %}
- <input type="hidden" name="ref" value="{{ request.values.ref|e }}">
- {% endif %}
- <input type="submit" value="Login">
- </form>
- </div>
- </div>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h1 class="panel-title">Login für Moderatoren</h1>
+ </div>
+ <div class="panel-body">
+ <form method="post" action="login">
+ <input placeholder="User" name="user" type="text"><br>
+ <input placeholder="Password" name="password" type="password"><br>
+ {% if 'ref' in request.values %}
+ <input type="hidden" name="ref" value="{{ request.values.ref|e }}">
+ {% endif %}
+ <input type="submit" value="Login">
+ </form>
</div>
</div>
{% endblock %}
diff --git a/templates/search.html b/templates/search.html
index d2df745..fd35fd7 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -2,36 +2,34 @@
{% from 'macros.html' import preview %}
{% extends "base.html" %}
{% block content %}
-<div class="col-xs-offset-1 col-xs-10">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h1 class="panel-title">Veranstaltungen</h1>
- </div>
- {% if courses == [] %}
- <div class="panel-body">Nichts gefunden!</div>
- {% else %}
- <ul class="list-group courselist">
- {% for course in courses %}
- {{ course_list_item(course,true) }}
- {% endfor %}
- </ul>
- {% endif %}
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h1 class="panel-title">Veranstaltungen</h1>
</div>
- <div class="panel panel-default">
- <div class="panel-heading">
- <h1 class="panel-title">Videos</h1>
- </div>
- <div class="panel-body">
- {% if lectures == [] %}
- Nichts gefunden!
- {% else %}
- <ul class="list-group videopreview">
- {% for lecture in lectures %}
- {{ preview(lecture) }}
+ {% if courses == [] %}
+ <div class="panel-body">Nichts gefunden!</div>
+ {% else %}
+ <ul class="list-group courselist">
+ {% for course in courses %}
+ {{ course_list_item(course,true) }}
{% endfor %}
- </ul>
- {% endif %}
- </div>
+ </ul>
+ {% endif %}
+</div>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h1 class="panel-title">Videos</h1>
+ </div>
+ <div class="panel-body">
+ {% if lectures == [] %}
+ Nichts gefunden!
+ {% else %}
+ <ul class="list-group videopreview">
+ {% for lecture in lectures %}
+ {{ preview(lecture) }}
+ {% endfor %}
+ </ul>
+ {% endif %}
</div>
</div>
{% endblock %}
diff --git a/templates/videos.html b/templates/videos.html
index be80991..931c1d6 100644
--- a/templates/videos.html
+++ b/templates/videos.html
@@ -3,36 +3,34 @@
{% extends "base.html" %}
{% block content %}
-<div class="row"><div class="col-xs-offset-1 col-xs-10">
- <div class="row">
- <div class="col-xs-12 dropdown" style="margin-bottom: 10px;">
- <button class="btn btn-primary dropdown-toggle pull-right" type="button" data-toggle="dropdown">Gruppierung
- <span class="caret"></span></button>
- <ul class="dropdown-menu dropdown-menu-right">
- <li><a href="?groupedby=semester">Semester</a></li>
- <li><a href="?groupedby=title">Veranstaltungen</a></li>
- <li><a href="?groupedby=organizer">Dozenten</a></li>
- </ul>
- </div>
+<div class="row">
+ <div class="col-xs-12 dropdown" style="margin-bottom: 10px;">
+ <button class="btn btn-primary dropdown-toggle pull-right" type="button" data-toggle="dropdown">Gruppierung
+ <span class="caret"></span></button>
+ <ul class="dropdown-menu dropdown-menu-right">
+ <li><a href="?groupedby=semester">Semester</a></li>
+ <li><a href="?groupedby=title">Veranstaltungen</a></li>
+ <li><a href="?groupedby=organizer">Dozenten</a></li>
+ </ul>
+ </div>
+</div>
+{% for g in courses|groupby(groupedby)|reverse %}
+<div class="row panel-group">
+ <div class="col-xs-12"><div class="panel panel-default">
+ <div class="panel-heading">
+ <h1 class="panel-title">{{g.grouper}}</h1>
</div>
- {% for g in courses|groupby(groupedby)|reverse %}
- <div class="row panel-group">
- <div class="col-xs-12"><div class="panel panel-default">
- <div class="panel-heading">
- <h1 class="panel-title">{{g.grouper}}</h1>
- </div>
- <ul class="courses-list list-group">
- {% for i in g.list %}
- {% if groupedby == 'semester' %}
- {{ course_list_item(i) }}
- {% else %}
- {{ course_list_item(i,true) }}
- {% endif %}
- {% endfor %}
- </ul>
- </div></div>
- </div>
- {% endfor %}
-</div></div>
+ <ul class="courses-list list-group">
+ {% for i in g.list %}
+ {% if groupedby == 'semester' %}
+ {{ course_list_item(i) }}
+ {% else %}
+ {{ course_list_item(i,true) }}
+ {% endif %}
+ {% endfor %}
+ </ul>
+ </div></div>
+</div>
+{% endfor %}
{% endblock %}
--
GitLab