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

made video grouping nicer

parent 4b220db7
No related branches found
No related tags found
No related merge requests found
...@@ -90,7 +90,10 @@ def videos(): ...@@ -90,7 +90,10 @@ def videos():
for i in c: for i in c:
if i['semester'] == '': if i['semester'] == '':
i['semester'] = 'zeitlos' i['semester'] = 'zeitlos'
return render_template('videos.html', courses=c, groupedby=request.args.get('groupedby')) groupedby = request.args.get('groupedby')
if groupedby not in ['title','semester','organizer']:
groupedby = 'semester'
return render_template('videos.html', courses=c, groupedby=groupedby)
@app.route('/faq') @app.route('/faq')
def faq(): def faq():
......
{% from 'macros.html' import preview %} {% from 'macros.html' import preview %}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="container"> <div class="container-fluid">
<div class="col-xs-offset-1 col-xs-10">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h1>Veranstaltungen</h1> <h1>Veranstaltungen</h1>
</div> </div>
<div class="panel-body">
{% if courses == [] %} {% if courses == [] %}
Nichts gefunden! <div class="panel-body">Nichts gefunden!</div>
{% else %} {% else %}
<ul class="list-group courselist"> <ul class="list-group courselist">
{% for course in courses %} {% for course in courses %}
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
</ul> </ul>
{% endif %} {% endif %}
</div> </div>
</div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h1>Videos</h1> <h1>Videos</h1>
...@@ -35,4 +34,5 @@ ...@@ -35,4 +34,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}
{% from 'macros.html' import course_list_item %} {% from 'macros.html' import course_list_item %}
{% set active_page = 'videos' -%} {% set active_page = 'videos' -%}
{% set groupedby = groupedby|default('semester', true) -%}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
...@@ -11,14 +10,13 @@ ...@@ -11,14 +10,13 @@
<span class="caret"></span></button> <span class="caret"></span></button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="?groupedby=semester">Semester</a></li> <li><a href="?groupedby=semester">Semester</a></li>
<li><a href="?groupedby=courses">Veranstaltungen</a></li> <li><a href="?groupedby=title">Veranstaltungen</a></li>
<li><a href="?groupedby=organizer">Dozenten</a></li> <li><a href="?groupedby=organizer">Dozenten</a></li>
</ul> </ul>
</div> </div>
</div> </div>
<div class="row"><div class="col-xs-offset-1 col-xs-10"> <div class="row"><div class="col-xs-offset-1 col-xs-10">
{% if groupedby == 'semester' %} {% for g in courses|groupby(groupedby)|reverse %}
{% for g in courses|groupby('semester')|reverse %}
<div class="row panel-group"> <div class="row panel-group">
<div class="col-xs-12"><div class="panel panel-default"> <div class="col-xs-12"><div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
...@@ -26,47 +24,16 @@ ...@@ -26,47 +24,16 @@
</div> </div>
<ul class="courses-list list-group"> <ul class="courses-list list-group">
{% for i in g.list %} {% for i in g.list %}
{% if groupedby == semester %}
{{ course_list_item(i) }} {{ course_list_item(i) }}
{% endfor %} {% else %}
</ul>
</div></div>
</div>
{% endfor %}
{% endif %}
{% if groupedby == 'courses' %}
{% for g in courses|groupby('title')|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="courses-list list-group">
{% for i in g.list|sort(attribute='semester') %}
{{ course_list_item(i,true) }} {{ course_list_item(i,true) }}
{% endfor %}
</ul>
</div></div>
</div>
{% endfor %}
{% endif %} {% endif %}
{% if groupedby == 'organizer' %}
{% for g in courses|groupby('organizer')|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="courses-list list-group">
{% for i in g.list|sort(attribute='semester') %}
{{ course_list_item(i,true) }}
{% endfor %} {% endfor %}
</ul> </ul>
</div></div> </div></div>
</div> </div>
{% endfor %} {% endfor %}
{% endif %}
</div></div> </div></div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment