Merge branch 'master' of git.fsmpi.rwth-aachen.de:julianundandyfrickelnkram/videoagwebsite

server.py

@@ -105,7 +105,14 @@ def index():
 
 @app.route('/videos')
 def videos():
-	return render_template('videos.html')
+	c=query("SELECT * FROM courses")
+	for i in c:
+		if i['semester'] == '':
+			i['semester'] = 'zeitlos'
+	groupedby = request.args.get('groupedby')
+	if groupedby not in ['title','semester','organizer']:
+		groupedby = 'semester'
+	return render_template('videos.html', courses=c, groupedby=groupedby)
 
 @app.route('/faq')
 def faq():

static/style.css

 .videopreview li:nth-child(even) { background: #f5f5f5; }
+.courses-list li:nth-child(even) { background: #fAfAfA; }
 .mejs-container { height: 80% !important; width: 100% !important; position: fixed !important; }

templates/macros.html

 {% macro preview(lecture) %}
 
 <li class="list-group-item">
-	<div class="row">
 	<a class="hidden-xs" href="/play?lectureid={{ lecture['id'] }}" title="{{ lecture['coursetitle'] }}">
+		<div class="row">
 			<img class="col-xs-4" src="https://videoag.fsmpi.rwth-aachen.de/{{ lecture['titlefile'] }}" alt="Vorschaubild">
 			<div class="col-xs-4">
 				<span style="color: #000;"><strong>{{ lecture['short'] }}</strong></span><br>
@@ -15,6 +15,7 @@
 				<div style="color: #000;">{{ lecture['title']  }}</div>
 				<p style="font-style: italic; color: #777;">{{ lecture['comment'] }}</p>
 			</div>
+		</div>
 	</a>
 	<a class="visible-xs" href="/play?lectureid={{ lecture['id'] }}" title="{{ lecture['coursetitle'] }}">
 		<div class="row">
@@ -44,7 +45,6 @@
 			</div>
 		</div>
 	</a>
-	</div>
 </li>
 
 {% endmacro %}
@@ -56,3 +56,26 @@
 	<source type="video/mp4" src="https://videoag.fsmpi.rwth-aachen.de/{{ videos[0]['path'] }}" />
 </video>
 {% endmacro %}
+
+{% macro course_list_item(course,show_semester=False) %}
+<li class="list-group-item">
+	<div class="row">
+		{% if show_semester %}
+			<span class="col-xs-1">
+				{{ course.semester }}
+			</span>
+			<span class="col-xs-6">
+		{% else %}
+			<span class="col-xs-7">
+		{% endif %}
+			{{ course.title }}
+		</span>
+		<span class="col-xs-3">
+			{{ course.organizer }}
+		</span>
+		<span class="col-xs-2">
+			{{ course.subject }}
+		</span>
+	</div>
+</li>
+{% endmacro %}

templates/search.html

 {% from 'macros.html' import preview %}
 {% extends "base.html" %}
 {% block content %}
-<div class="container">
+<div class="container-fluid">
+	<div class="col-xs-offset-1 col-xs-10">
 		<div class="panel panel-default">
 			<div class="panel-heading">
 				<h1>Veranstaltungen</h1>
 			</div>
-		<div class="panel-body">
 				{% if courses == [] %}
-				Nichts gefunden!
+				<div class="panel-body">Nichts gefunden!</div>
 				{% else %}
 					<ul class="list-group courselist">
 						{% for course in courses %}
@@ -17,7 +17,6 @@
 					</ul>
 				{% endif %}
 		</div>
-	</div>
 		<div class="panel panel-default">
 			<div class="panel-heading">
 				<h1>Videos</h1>
@@ -35,4 +34,5 @@
 			</div>
 		</div>
 	</div>
+</div>
 {% endblock %}

templates/videos.html

+{% from 'macros.html' import course_list_item %}
+{% set active_page = 'videos' -%}
+
 {% extends "base.html" %}
-{% set active_page = "videos" %}
 {% 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
+		  <span class="caret"></span></button>
+		  <ul class="dropdown-menu">
+		    <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>
+	<div class="row"><div class="col-xs-offset-1 col-xs-10">
+		{% 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>
+
 </div>
 {% endblock %}