diff --git a/server.py b/server.py
index 8f7ab4aec9e4531a44d1ab714723e43da5f6988a..36a523d1ed5dac71af92074753937eef4b1684a3 100644
--- a/server.py
+++ b/server.py
@@ -162,7 +162,7 @@ def index():
WHERE (? OR (courses.visible AND courses.listed AND lectures.visible AND videos.visible))
GROUP BY videos.lecture_id
ORDER BY MAX(videos.time_created) DESC
- LIMIT 6 ''',ismod())
+ LIMIT 4 ''',ismod())
livestreams = query('''SELECT streams.handle AS livehandle, lectures.*, "course" AS sep, courses.*
FROM streams
JOIN lectures ON lectures.id = streams.lecture_id
diff --git a/static/style.css b/static/style.css
index c04767f973586ca2266b1582d4067103f9152612..a4bc5d8d33f7063d7f9f167a8130133263fb5a59 100644
--- a/static/style.css
+++ b/static/style.css
@@ -142,5 +142,8 @@ th.rotate > div {
.tooltip-inner {
max-width: 500px;
+}
+.navbar {
+ padding: 0px;
}
diff --git a/templates/courses.html b/templates/courses.html
index 211f3b0df111e83dc03bb2e14cee64405166b2e5..5d486d93b74052e1b58866a5ba31d446052e850c 100644
--- a/templates/courses.html
+++ b/templates/courses.html
@@ -58,8 +58,8 @@
<div class="card-header">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion-{{ g.grouper|tagid }}" href="#{{g.grouper|tagid}}" style="color: #222;">
{% if groupedby == 'semester' %}
- <h1 class="panel-title">{{g.grouper|semester(long=True)}} ({{g.list|length}} Veranstaltungen)
- </h1>
+ <h3 class="panel-title">{{g.grouper|semester(long=True)}} ({{g.list|length}} Veranstaltungen)
+ </h3>
{% else %}
<h1 class="panel-title">{{g.grouper}}</h1>
{% endif %}
diff --git a/templates/index.html b/templates/index.html
index 056d5bb00bef7e8418896b39ed8c5ccce20f5bb1..90039757f59c1db18e9eef9c56b930ffa8063283 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -52,7 +52,7 @@
<ul class="col-xs-12 list-inline float-right">
<li class="list-inline-item">
<div class="btn-group">
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Neues Panel </button>
+ <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Neues Panel </button>
<ul class="dropdown-menu">
<li class="dropdown-item"><a href="{{ url_for('create', table='featured', title='Neues Panel', type='plain', ref=request.url) }}">Nur Text</a></li>
<li class="dropdown-item"><a href="{{ url_for('create', table='featured', title='Neues Panel', type='image', ref=request.url) }}">Text mit Bild</a></li>
@@ -62,16 +62,16 @@
</div>
</li>
<li class="list-inline-item">
- <a class="btn btn-default" href="{{ url_for('create', table='announcements', text='Neue Ankündigung', time_publish=datetime.now().replace(hour=0, minute=0, second=0, microsecond=0), time_expire=datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)+timedelta(days=7), ref=request.url) }}">Neue Ankündigung</a>
+ <a class="btn btn-secondary" href="{{ url_for('create', table='announcements', text='Neue Ankündigung', time_publish=datetime.now().replace(hour=0, minute=0, second=0, microsecond=0), time_expire=datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)+timedelta(days=7), ref=request.url) }}">Neue Ankündigung</a>
</li>
</ul>
</div>
{% endif %}
- <div class="col-md-6">
+ <div class="col-md-6 p-0">
{% for item in featured %}
- <div class="card">
+ <div class="card m-1">
<div class="card-header">
- <h1 class="card-title">
+ <h3 class="card-title">
{{ moderator_editor(('featured',item.id,'title'), item.title) }} {{ moderator_checkbox(('featured',item.id,'visible'), item.visible) }}
{% if ismod() %}
<span class="btn-group float-right" role="group">
@@ -88,16 +88,16 @@
{{ moderator_delete(['featured',item.id,'deleted']) }}
</span>
{% endif %}
- </h1>
+ </h3>
</div>
{{ featured_content(item) }}
</div>
{% endfor %}
</div>
- <div class="col-md-6">
- <div class="card">
+ <div class="col-md-6 p-0">
+ <div class="card m-1">
<div class="card-header">
- <h1 class="card-title">Nächste Aufnahmen</h1>
+ <h3 class="card-title">Nächste Aufnahmen</h3>
</div>
{% if upcomming|length > 0 %}
<ul class="list-group">
@@ -120,9 +120,9 @@
</div>
{% endif %}
</div>
- <div class="card">
+ <div class="card m-1">
<div class="card-header">
- <h1 class="card-title">Neueste Videos <a class="fa fa-rss-square float-right" aria-hidden="true" href="{{url_for('feed')}}" style="text-decoration: none"></a></h1>
+ <h3 class="card-title">Neueste Videos <a class="fa fa-rss-square float-right" aria-hidden="true" href="{{url_for('feed')}}" style="text-decoration: none"></a></h3>
</div>
<ul class="list-group videopreview">
{% for i in latestvideos %}
diff --git a/templates/lecture.html b/templates/lecture.html
index e6c43c5bf0d5800b20578e57afbe48b7cb4b6fa4..1f9d58469237bbf66196e46c903c9be0b0951a75 100644
--- a/templates/lecture.html
+++ b/templates/lecture.html
@@ -18,7 +18,7 @@
<meta property="og:description" content="{{ lecture.comment }}" />
{% endblock %}
{% block content %}
-<div class="card">
+<div class="card m-1">
<div class="card-header">
<span class="card-title"><strong><a href="{{url_for('course', handle=course.handle)}}#lecture-{{lecture.id}}">{{ course.title }}</a></strong>: {{ lecture.title}}</span>
</div>
@@ -75,9 +75,9 @@
</div>
{% if ismod() %}
-<div class="card">
+<div class="card m-1">
<div class="card-header">
- <a data-toggle="collapse" href="#statscard" class="plotlyresize"><h1 class="card-title">Statistiken</h1></a>
+ <a data-toggle="collapse" href="#statscard" class="plotlyresize"><h3 class="card-title">Statistiken</h3></a>
</div>
<div class="ard-body collapse out card-collapse" id="statscard">
<div class="row m-1">
diff --git a/templates/timetable.html b/templates/timetable.html
index 90f5bbf4e2dd044f86bc5ea2d83edbde30f3fdc3..dea7ce329cc62cab2784da2a2dd0f5489801d237 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -3,28 +3,30 @@
<div class="card">
<div class="hidden-print card-header">
{% if user %}
- <h1 class="card-title">personalisierter Drehplan für {{ user.realname }}
- <a class="float-right fa fa-calendar" aria-hidden="true" href="{{ url_for('ical_user', user=user.id) }}" style="text-decoration: none"></a>
- </h1>
+ <h3 class="card-title">personalisierter Drehplan für {{ user.realname }}
+ <a class="float-right fa fa-calendar" aria-hidden="true" href="{{ url_for('ical_user', user=user.id) }}" style="text-decoration: none"></a>
+ </h3>
{% else %}
- <h1 class="card-title">Drehplan
- <a class="float-right fa fa-calendar" aria-hidden="true" href="{{ url_for('ical_all') }}" style="text-decoration: none"></a>
- </h1>
+ <h3 class="card-title">Drehplan
+ <a class="float-right fa fa-calendar" aria-hidden="true" href="{{ url_for('ical_all') }}" style="text-decoration: none"></a>
+ </h3>
{% endif %}
</div>
<div class="hidden-print">
- <div style="margin-top: 10px; padding: 15px;" class="col-xs-12">
+ <div style="margin-top: 10px; padding: 15px;" class="col-12 text-center">
{% if user %}
- <a href="{{url_for('timetable_user', user=user.id, kw=kw-1) }}" class="float-left btn btn-light">{{ "<<" }}</a>
- <a href="{{url_for('timetable_user', user=user.id, kw=kw+1) }}" class="float-right btn btn-light">{{ ">>" }}</a>
- <a href="{{url_for('timetable_user', user=user.id, kw=0) }}" style="width: 80px;" class="btn btn-light mr-auto">today</a>
+ <a href="{{url_for('timetable_user', user=user.id, kw=kw-1) }}" class="float-left btn btn-secondary">{{ "<<" }}</a>
+ <a href="{{url_for('timetable_user', user=user.id, kw=kw+1) }}" class="float-right btn btn-secondary">{{ ">>" }}</a>
+ <a href="{{url_for('timetable_user', user=user.id, kw=0) }}" style="width: 80px;" class="btn btn-secondary">today</a>
{% else %}
- <a href="{{url_for('timetable', kw=kw-1) }}" class="float-left btn btn-light">{{ "<<" }}</a>
- <a href="{{url_for('timetable', kw=kw+1) }}" class="float-right btn btn-light">{{ ">>" }}</a>
- <a href="{{url_for('timetable', kw=0) }}" style="width: 80px;" class="btn btn-light mx-auto">today</a>
+ <a href="{{url_for('timetable', kw=kw-1) }}" class="float-left btn btn-secondary">{{ "<<" }}</a>
+ <a href="{{url_for('timetable', kw=kw+1) }}" class="float-right btn btn-secondary">{{ ">>" }}</a>
+ <a href="{{url_for('timetable', kw=0) }}" style="width: 80px;" class="btn btn-secondary">today</a>
{% endif %}
</div>
- <input id="weeksel" type="week" class="center-block" value="{{ weekofyear }}"/>
+ <div class="col-12 text-center">
+ <input id="weeksel" type="week" class="center-block" value="{{ weekofyear }}"/>
+ </div>
<script>
$( function () {
$("#weeksel").on("change", function() {
@@ -37,8 +39,8 @@
});
</script>
</div>
- <div class="card-body row table-responsive">
- <table id="timetable" class="table table-bordered col-xs-12" style="width: auto; min-width: 100%;">
+ <div class="card-body row">
+ <table id="timetable" class="table table-bordered col-12 table-responsive" style="width: auto; min-width: 100%;">
<tr><th style="width: 30px;"></th>{% for d in days if (d.index < 5) or (d.lectures|length) > 0 %}<th style="min-width: 10em;" colspan="{{d.maxcol}}">{{ d.date.strftime("%A (%d.%m.%Y)") }}</th>{% endfor %}</tr>
{# iterating over each 15 min block #}
{% for t in times %}