diff --git a/static/style.css b/static/style.css
index f294f590209b94521d82963e2bb354301ba01617..cfbd5ba9ae6f24aac68a4fda62e1dc3e0a005ef4 100644
--- a/static/style.css
+++ b/static/style.css
@@ -1,2 +1,3 @@
-.videopreview li:nth-child(even) { background: #f5f5f5; }
+.videopreview > li:nth-child(even) { background: #f5f5f5; }
.courses-list li:nth-child(even) { background: #fAfAfA; }
+.list-group-item-condensed { padding: 2px !important; }
diff --git a/templates/courses.html b/templates/courses.html
index 39958dc9e6c43165c9b8d024d4e7fe9804568d11..980bdfd1cab2bd20e419e1ae22cf337919a97bc6 100644
--- a/templates/courses.html
+++ b/templates/courses.html
@@ -1,20 +1,28 @@
{% from 'macros.html' import course_list_item %}
{% extends "base.html" %}
{% block content %}
-<div class="row">
- <div class="col-xs-12 dropdown" style="margin-bottom: 10px;">
- <span class="pull-right">
- <a class="fa fa-rss-square pull-right btn btn-default" aria-hidden="true" href="{{url_for('courses_feed')}}"></a>
- {% if ismod() %} <a class="btn btn-default" style="margin-right: 5px;" href="{{ url_for('new_course', ref=request.url) }}">Neue Veranstaltung</a> {% endif %}
-
- <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>
+<div clss="row">
+ <div class="row-xs-12">
+ <ul class="list-inline pull-right">
+ <li>
+ <a class="fa fa-rss-square btn btn-default" aria-hidden="true" href="{{url_for('courses_feed')}}"></a>
+ </li>
+ {% if ismod() %}
+ <li>
+ <a class="btn btn-default" href="{{ url_for('new_course', ref=request.url) }}">Neue Veranstaltung</a>
+ </li>
+ {% endif %}
+ <li class="dropdown">
+ <button class="btn btn-primary dropdown-toggle" 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>
+ </li>
</ul>
- </span>
</div>
</div>
{% for g in courses|groupby(groupedby)|reverse %}
diff --git a/templates/macros.html b/templates/macros.html
index e77412dfd96f589273515d8adad7d0c18388df06..f3327a2bcca9690f1eef851c43414c8773f87dc0 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -1,48 +1,41 @@
{% macro preview(lecture) %}
<li class="list-group-item">
- <a class="hidden-xs" href="{{url_for('lecture', id=lecture['id'])}}" title="{{ lecture['coursetitle'] }}">
+ <a class="hidden-xs" href="{{url_for('lecture', id=lecture['id'])}}" title="{{ lecture['coursetitle'] }}" style="color: #000">
<div class="row">
<img class="col-xs-4" src="{{ config.VIDEOPREFIX }}/{{ lecture['titlefile'] }}" alt="Vorschaubild">
<div class="col-xs-4">
- <span style="color: #000;"><strong>{{ lecture['short'] }}</strong></span><br>
- <span style="color: #000;">{{ lecture['time'] }}</span>
+ <span><strong>{{ lecture['short'] }}</strong></span><br>
+ <span>{{ lecture['time'] }}</span>
{% if lecture['speaker'] %}
- <div class="small" style="color: #000;">Gehalten von {{ lecture['speaker'] }} </div>
+ <div class="small">Gehalten von {{ lecture['speaker'] }} </div>
{% endif %}
</div>
- <div class="col-xs-4" style="color: #000;">
- <div style="color: #000;">{{ lecture['title'] }}</div>
+ <div class="col-xs-4">
+ <div>{{ lecture['title'] }}</div>
<p style="font-style: italic; color: #777;">{{ lecture['comment'] }}</p>
</div>
</div>
</a>
- <a class="visible-xs" href="{{url_for('lecture', id=lecture['id'])}}" title="{{ lecture['coursetitle'] }}">
- <div class="row">
- <img class="col-xs-12" src="{{ config.VIDEOPREFIX }}/{{ 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">
+ <a class="visible-xs" href="{{url_for('lecture', id=lecture['id'])}}" title="{{ lecture['coursetitle'] }}" style="color: #000">
+ <ul class="list-unstyled">
+ <li>
+ <img src="{{ config.VIDEOPREFIX }}/{{ lecture['titlefile'] }}" alt="Vorschaubild">
+ </li>
+ <li>
+ <strong>{{ lecture['short'] }}</strong> {{ lecture['time'] }}
+ </li>
+ {% if lecture['speaker'] %}
+ <li>
+ <span class="small">Gehalten von {{ lecture['speaker'] }} </span>
+ </li>
+ {% endif %}
+ <li>
+ {{ lecture['title'] }}
+ </li>
+ <li>
<p style="font-style: italic; color: #777;">{{ lecture['comment'] }}</p>
- </div>
- </div>
+ </li>
+ </ul>
</a>
</li>
@@ -70,23 +63,23 @@
{% endmacro %}
{% macro course_list_item(course,show_semester=False) %}
-<li class="list-group-item {% if (not course.visible) or (not course.listed) %}list-group-item-danger{% endif %}">
+<li class="list-group-item list-group-item-condensed {% if (not course.visible) or (not course.listed) %}list-group-item-danger{% endif %}">
<div class="row">
<a href="{{url_for('course', handle=course.handle)}}">
{% if show_semester %}
- <span class="col-xs-1">
+ <span class="col-xs-2 col-md-1">
{{ course.semester }}
</span>
- <span class="col-xs-6">
+ <span class="col-xs-10 col-md-6">
{% else %}
- <span class="col-xs-7">
+ <span class="col-xs-12 col-md-7">
{% endif %}
{{ course.title }}
</span>
- <span class="col-xs-3">
+ <span class="col-xs-8 col-md-3">
{{ course.organizer }}
</span>
- <span class="col-xs-2">
+ <span class="col-xs-4 col-md-2">
{{ course.subject }}
</span>
</a>