.

server.py

@@ -81,7 +81,7 @@ def index():
 				WHERE (? OR (courses.visible AND courses.listed AND lectures.visible AND videos.visible))
 				GROUP BY videos.lecture_id
 				ORDER BY lastvidtime DESC
-				LIMIT 5
+				LIMIT 6
 			''', False))
 
 @app.route('/videos')

templates/base.html

@@ -24,7 +24,7 @@
 		<nav class="navbar navbar-default navbar-static-top">
 			<div class="container-fluid">
 				<div class="row">
-					<div class="col-xs-1">
+					<div class="col-xs-1 hidden-xs hidden-sm">
 						<a href="/"><img src="/static/logo.png" style="width: 80px; padding: 5px"></a>
 					</div>
 					<div class="col-md-11">
@@ -48,7 +48,7 @@
 							</ul>
 						</div>
 						<div class="row">
-							<div class="col-md-6">
+							<div class="hidden-xs col-xs-9">
 								<ul class="nav nav-pills">
 									{% for href, id, caption, gly in navigation_bar %}
 									 <li{% if id == active_page %} class="active"{% endif %}>
@@ -57,31 +57,29 @@
 									 {% endfor %}
 								</ul>
 							</div>
-							<form action="search">
-								<div class="col-xs-5">
-										<span class=""><input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}">
+							<div class="visible-xs col-xs-12">
+								<ul class="nav nav-pills">
+									{% for href, id, caption, gly in navigation_bar %}
+									 <li{% if id == active_page %} class="active"{% endif %}>
+										 <a href="{{ href|e }}">{% if gly != '' %}<span class="glyphicon glyphicon-{{ gly }}"></span> {% endif %}{{ caption }}</a>
+									</li>
+									 {% endfor %}
+								</ul>
 							</div>
-								<div class="col-md-1">
-										<span class=""><button class="btn btn-default" type="submit">Submit</button>
+							<form action="search">
+								<div class="hidden-xs col-xs-3 input-group">
+										<input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}">
+										<span class="input-group-btn"><button class="btn btn-secondary" type="submit"><span class="glyphicon glyphicon-search"></span> </button></span>
 								</div>
 							</form>
 						</div>
-						<div class="row">
-							<div class="col-md-12">
-								<ul class="nav nav-pills">
-									<!--
-									<li>
-										<a href="#">Streams</a>
-									</li>
-									<li>
-										<a href="#">Statistiken</a>
-									</li>
-									<li>
-										<a href="#">Mitmachen</a>
-									</li>
-									!--->
-								</ul>
+						<div class="row visible-xs">
+							<form action="search">
+								<div class="col-xs-12 input-group">
+										<input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}">
+										<span class="input-group-btn"><button class="btn btn-secondary" type="submit"><span class="glyphicon glyphicon-search"></span> </button></span>
 								</div>
+							</form>
 						</div>
 					</div>
 				</div>

templates/macros.html

@@ -12,16 +12,37 @@
 				{% endif %}
 			</div>
 			<div class="col-xs-4" style="color: #000;">
-				<div class="comment" style="color: #000;">{{ lecture['comment']  }}</div>
-				<p style="font-style: italic; color: #777;">{{ lecture['title'] }}</p>
+				<div style="color: #000;">{{ lecture['title']  }}</div>
+				<p style="font-style: italic; color: #777;">{{ lecture['comment'] }}</p>
 			</div>
 		</a>
 		<a  class="visible-xs" href="/play?lectureid={{ lecture['id'] }}" title="{{ lecture['coursetitle'] }}">
+			<div class="row">
 				<img class="col-xs-12" src="https://videoag.fsmpi.rwth-aachen.de/{{ lecture['titlefile'] }}" alt="Vorschaubild">
+			</div>
+			<div class="row">
 				<div class="col-xs-12">
 					<span style="color: #000;"><strong>{{ lecture['short'] }}</strong></span>
 					<span style="color: #000;">{{ lecture['time'] }}</span>
 				</div>
+			</div>
+			{% if lecture['speaker'] %}
+			<div class="row">
+				<div class="col-xs-12">
+					<div class="small" style="color: #000;">Gehalten von {{ lecture['speaker'] }} </div>
+				</div>
+			</div>
+			{% endif %}
+			<div class="row">
+				<div class="col-xs-12">
+					<div style="color: #000;">{{ lecture['title']  }}</div>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-xs-12">
+					<p style="font-style: italic; color: #777;">{{ lecture['comment'] }}</p>
+				</div>
+			</div>
 		</a>
 	</div>
 </li>