Skip to content
Snippets Groups Projects
Commit 9c1641cc authored by Andreas Valder's avatar Andreas Valder
Browse files

fixed some syntax errors

parent f9c72dd1
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
server.py
+ 1
− 1
View file @ 9c1641cc
...@@ -162,7 +162,7 @@ def index(): ...@@ -162,7 +162,7 @@ def index():
WHERE (? OR (courses.visible AND courses.listed AND lectures.visible AND videos.visible)) WHERE (? OR (courses.visible AND courses.listed AND lectures.visible AND videos.visible))
GROUP BY videos.lecture_id GROUP BY videos.lecture_id
ORDER BY MAX(videos.time_created) DESC 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.* livestreams = query('''SELECT streams.handle AS livehandle, lectures.*, "course" AS sep, courses.*
FROM streams FROM streams
JOIN lectures ON lectures.id = streams.lecture_id JOIN lectures ON lectures.id = streams.lecture_id
......
static/style.css
+ 3
− 0
View file @ 9c1641cc
...@@ -142,5 +142,8 @@ th.rotate > div { ...@@ -142,5 +142,8 @@ th.rotate > div {
.tooltip-inner { .tooltip-inner {
max-width: 500px; max-width: 500px;
}
.navbar {
padding: 0px;
} }
templates/courses.html
+ 2
− 2
View file @ 9c1641cc
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
<div class="card-header"> <div class="card-header">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion-{{ g.grouper|tagid }}" href="#{{g.grouper|tagid}}" style="color: #222;"> <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion-{{ g.grouper|tagid }}" href="#{{g.grouper|tagid}}" style="color: #222;">
{% if groupedby == 'semester' %} {% if groupedby == 'semester' %}
<h1 class="panel-title">{{g.grouper|semester(long=True)}} ({{g.list|length}} Veranstaltungen) <h3 class="panel-title">{{g.grouper|semester(long=True)}} ({{g.list|length}} Veranstaltungen)
</h1> </h3>
{% else %} {% else %}
<h1 class="panel-title">{{g.grouper}}</h1> <h1 class="panel-title">{{g.grouper}}</h1>
{% endif %} {% endif %}
......
templates/index.html
+ 11
− 11
View file @ 9c1641cc
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<ul class="col-xs-12 list-inline float-right"> <ul class="col-xs-12 list-inline float-right">
<li class="list-inline-item"> <li class="list-inline-item">
<div class="btn-group"> <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"> <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='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> <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 @@ ...@@ -62,16 +62,16 @@
</div> </div>
</li> </li>
<li class="list-inline-item"> <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> </li>
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
<div class="col-md-6"> <div class="col-md-6 p-0">
{% for item in featured %} {% for item in featured %}
<div class="card"> <div class="card m-1">
<div class="card-header"> <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) }} {{ moderator_editor(('featured',item.id,'title'), item.title) }} {{ moderator_checkbox(('featured',item.id,'visible'), item.visible) }}
{% if ismod() %} {% if ismod() %}
<span class="btn-group float-right" role="group"> <span class="btn-group float-right" role="group">
...@@ -88,16 +88,16 @@ ...@@ -88,16 +88,16 @@
{{ moderator_delete(['featured',item.id,'deleted']) }} {{ moderator_delete(['featured',item.id,'deleted']) }}
</span> </span>
{% endif %} {% endif %}
</h1> </h3>
</div> </div>
{{ featured_content(item) }} {{ featured_content(item) }}
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="col-md-6"> <div class="col-md-6 p-0">
<div class="card"> <div class="card m-1">
<div class="card-header"> <div class="card-header">
<h1 class="card-title">Nächste Aufnahmen</h1> <h3 class="card-title">Nächste Aufnahmen</h3>
</div> </div>
{% if upcomming|length > 0 %} {% if upcomming|length > 0 %}
<ul class="list-group"> <ul class="list-group">
...@@ -120,9 +120,9 @@ ...@@ -120,9 +120,9 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="card"> <div class="card m-1">
<div class="card-header"> <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> </div>
<ul class="list-group videopreview"> <ul class="list-group videopreview">
{% for i in latestvideos %} {% for i in latestvideos %}
......
templates/lecture.html
+ 3
− 3
View file @ 9c1641cc
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<meta property="og:description" content="{{ lecture.comment }}" /> <meta property="og:description" content="{{ lecture.comment }}" />
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="card"> <div class="card m-1">
<div class="card-header"> <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> <span class="card-title"><strong><a href="{{url_for('course', handle=course.handle)}}#lecture-{{lecture.id}}">{{ course.title }}</a></strong>: {{ lecture.title}}</span>
</div> </div>
...@@ -75,9 +75,9 @@ ...@@ -75,9 +75,9 @@
</div> </div>
{% if ismod() %} {% if ismod() %}
<div class="card"> <div class="card m-1">
<div class="card-header"> <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>
<div class="ard-body collapse out card-collapse" id="statscard"> <div class="ard-body collapse out card-collapse" id="statscard">
<div class="row m-1"> <div class="row m-1">
......
templates/timetable.html
+ 18
− 16
View file @ 9c1641cc
...@@ -3,28 +3,30 @@ ...@@ -3,28 +3,30 @@
<div class="card"> <div class="card">
<div class="hidden-print card-header"> <div class="hidden-print card-header">
{% if user %} {% if user %}
<h1 class="card-title">personalisierter Drehplan für {{ user.realname }} <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> <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>
{% else %} {% else %}
<h1 class="card-title">Drehplan <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> <a class="float-right fa fa-calendar" aria-hidden="true" href="{{ url_for('ical_all') }}" style="text-decoration: none"></a>
</h1> </h3>
{% endif %} {% endif %}
</div> </div>
<div class="hidden-print"> <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 %} {% 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-left btn btn-secondary">{{ "<<" }}</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=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-light mr-auto">today</a> <a href="{{url_for('timetable_user', user=user.id, kw=0) }}" style="width: 80px;" class="btn btn-secondary">today</a>
{% else %} {% 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-left btn btn-secondary">{{ "<<" }}</a>
<a href="{{url_for('timetable', kw=kw+1) }}" class="float-right btn btn-light">{{ ">>" }}</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-light mx-auto">today</a> <a href="{{url_for('timetable', kw=0) }}" style="width: 80px;" class="btn btn-secondary">today</a>
{% endif %} {% endif %}
</div> </div>
<div class="col-12 text-center">
<input id="weeksel" type="week" class="center-block" value="{{ weekofyear }}"/> <input id="weeksel" type="week" class="center-block" value="{{ weekofyear }}"/>
</div>
<script> <script>
$( function () { $( function () {
$("#weeksel").on("change", function() { $("#weeksel").on("change", function() {
...@@ -37,8 +39,8 @@ ...@@ -37,8 +39,8 @@
}); });
</script> </script>
</div> </div>
<div class="card-body row table-responsive"> <div class="card-body row">
<table id="timetable" class="table table-bordered col-xs-12" style="width: auto; min-width: 100%;"> <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> <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 #} {# iterating over each 15 min block #}
{% for t in times %} {% for t in times %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment