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

renamed videos template to course

parent 11af9c35
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
server.py
+ 3
− 3
View file @ c1838d3e
...@@ -74,7 +74,7 @@ def videos(): ...@@ -74,7 +74,7 @@ def videos():
groupedby = request.args.get('groupedby') groupedby = request.args.get('groupedby')
if groupedby not in ['title','semester','organizer']: if groupedby not in ['title','semester','organizer']:
groupedby = 'semester' groupedby = 'semester'
return render_template('videos.html', courses=courses, groupedby=groupedby) return render_template('course.html', courses=courses, groupedby=groupedby)
@app.route('/faq') @app.route('/faq')
@register_navbar('FAQ', icon='question-sign') @register_navbar('FAQ', icon='question-sign')
...@@ -123,9 +123,9 @@ def course(id): ...@@ -123,9 +123,9 @@ def course(id):
JOIN formats ON (videos.video_format = formats.id) JOIN formats ON (videos.video_format = formats.id)
JOIN courses ON (lectures.course_id = courses.id) JOIN courses ON (lectures.course_id = courses.id)
WHERE lectures.course_id= ? AND (? OR videos.visible) WHERE lectures.course_id= ? AND (? OR videos.visible)
ORDER BY formats.prio DESC ORDER BY lectures.time, formats.prio DESC
''', courses[0]['id'], ismod()) ''', courses[0]['id'], ismod())
return render_template('course.html', course=courses[0], lectures=lectures, videos=videos) return render_template('course_id.html', course=courses[0], lectures=lectures, videos=videos)
@app.route('/login', methods=['GET', 'POST']) @app.route('/login', methods=['GET', 'POST'])
def login(): def login():
......
templates/course.html
+ 32
− 39
View file @ c1838d3e
{% from 'macros.html' import lecture_list_item %} {% from 'macros.html' import course_list_item %}
{% from 'macros.html' import valueeditor %}
{% from 'macros.html' import valuecheckbox %}
{% from 'macros.html' import preview %}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="panel panel-default"> <div class="row">
<div class="panel-heading"> <div class="col-xs-12 dropdown" style="margin-bottom: 10px;">
<h1 class="panel-title">{{ valueeditor(['courses',course.id,'title'], course.title)}}</h1> <span class="pull-right">
</div> {% if ismod() %} <a class="btn btn-default" style="margin-right: 5px;" href="todo">Neue Veranstaltung</a> {% endif %}
<div class="row panel-body">
<div class="col-xs-12"> <button class="btn btn-primary dropdown-toggle pull-right" type="button" data-toggle="dropdown">Gruppierung
<table class="table-condensed"> <span class="caret"></span></button>
<tbody> <ul class="dropdown-menu dropdown-menu-right">
<tr><td>Semester:</td><td>{{ valueeditor(['courses',course.id,'semester'], course.semester) }}</td></tr> <li><a href="?groupedby=semester">Semester</a></li>
<tr><td>Veranstalter:</td><td>{{ valueeditor(['courses',course.id,'organizer'], course.organizer) }}</td></tr> <li><a href="?groupedby=title">Veranstaltungen</a></li>
<tr><td>Bemerkungen:</td><td>{{ valueeditor(['courses',course.id,'description'], course.description) }}</td></tr> <li><a href="?groupedby=organizer">Dozenten</a></li>
{% if ismod() %} </ul>
<tr><td>Sichtbar:</td><td>{{ valuecheckbox(['courses',course.id,'visible'], course.visible) }}</td></tr> </span>
<tr><td>Gelistet:</td><td>{{ valuecheckbox(['courses',course.id,'listed'], course.listed) }}</td></tr>
<tr><td>Short:</td><td>{{ valueeditor(['courses',course.id,'short'], course.short) }}</td></tr>
<tr><td>Handle:</td><td>{{ valueeditor(['courses',course.id,'handle'], course.handle) }}</td></tr>
<tr><td>Downloadable:</td><td>{{ valuecheckbox(['courses',course.id,'downloadable'], course.downloadable) }}</td></tr>
<tr><td>Thema:</td><td>{{ valueeditor(['courses',course.id,'subject'], course.subject) }}</td></tr>
<tr><td>Zuständig:</td><td>{{ valueeditor(['courses',course.id,'responsible'], course.responsible) }}</td></tr>
{% endif %}
</tbody>
</table>
</div>
</div> </div>
</div> </div>
<div class="panel panel-default"> {% 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"> <div class="panel-heading">
<h1 class="panel-title">Videos</h1> <h1 class="panel-title">{{g.grouper}}</h1>
{% if ismod() %}
<a class="btn btn-default" style="margin-right: 5px;" href="todo">Neuer Termin</a>
{% endif %}
</div> </div>
<ul class="list-group lectureslist"> <ul class="{% if not ismod() %}courses-list {% endif %}list-group">
{% for l in lectures %} {% for i in g.list %}
{{ lecture_list_item(l,videos|selectattr('lecture_id','equalto',l.id)|list) }} {% if groupedby == 'semester' %}
{{ course_list_item(i) }}
{% else %}
{{ course_list_item(i,true) }}
{% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</div></div>
</div> </div>
{% endfor %}
{% endblock %} {% endblock %}
templates/course_id.html 0 → 100644
+ 45
− 0
View file @ c1838d3e
{% from 'macros.html' import lecture_list_item %}
{% from 'macros.html' import valueeditor %}
{% from 'macros.html' import valuecheckbox %}
{% from 'macros.html' import preview %}
{% extends "base.html" %}
{% block content %}
<div class="panel panel-default">
<div class="panel-heading">
<h1 class="panel-title">{{ valueeditor(['courses',course.id,'title'], course.title)}}</h1>
</div>
<div class="row panel-body">
<div class="col-xs-12">
<table class="table-condensed">
<tbody>
<tr><td>Semester:</td><td>{{ valueeditor(['courses',course.id,'semester'], course.semester) }}</td></tr>
<tr><td>Veranstalter:</td><td>{{ valueeditor(['courses',course.id,'organizer'], course.organizer) }}</td></tr>
<tr><td>Bemerkungen:</td><td>{{ valueeditor(['courses',course.id,'description'], course.description) }}</td></tr>
{% if ismod() %}
<tr><td>Sichtbar:</td><td>{{ valuecheckbox(['courses',course.id,'visible'], course.visible) }}</td></tr>
<tr><td>Gelistet:</td><td>{{ valuecheckbox(['courses',course.id,'listed'], course.listed) }}</td></tr>
<tr><td>Short:</td><td>{{ valueeditor(['courses',course.id,'short'], course.short) }}</td></tr>
<tr><td>Handle:</td><td>{{ valueeditor(['courses',course.id,'handle'], course.handle) }}</td></tr>
<tr><td>Downloadable:</td><td>{{ valuecheckbox(['courses',course.id,'downloadable'], course.downloadable) }}</td></tr>
<tr><td>Thema:</td><td>{{ valueeditor(['courses',course.id,'subject'], course.subject) }}</td></tr>
<tr><td>Zuständig:</td><td>{{ valueeditor(['courses',course.id,'responsible'], course.responsible) }}</td></tr>
{% endif %}
</tbody>
</table>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h1 class="panel-title">Videos</h1>
{% if ismod() %}
<a class="btn btn-default" style="margin-right: 5px;" href="todo">Neuer Termin</a>
{% endif %}
</div>
<ul class="list-group lectureslist">
{% for l in lectures %}
{{ lecture_list_item(l,videos|selectattr('lecture_id','equalto',l.id)|list) }}
{% endfor %}
</ul>
</div>
{% endblock %}
templates/videos.html deleted 100644 → 0
+ 0
− 38
View file @ 11af9c35
{% 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">
{% if ismod() %} <a class="btn btn-default" style="margin-right: 5px;" href="todo">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>
</ul>
</span>
</div>
</div>
{% 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="{% if not ismod() %}courses-list {% endif %}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 %}
{% endblock %}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment