diff --git a/.gitignore b/.gitignore index 1377554ebea6f98a2c748183bc5a96852af12ac2..1a6ee452eb00420e926f9a4887c7ae55b37a8404 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ *.swp +config.py +__pycache__ diff --git a/server.py b/server.py index 27f095246f484359a8829d6d0e0c900fe0d63496..5fac9fcd6343591a400536ad0b308fb000701401 100755 --- a/server.py +++ b/server.py @@ -15,7 +15,7 @@ def query(operation, *params): @app.route('/') def index(): return render_template('index.html', latestvideos=query(''' - SELECT lectures.*, max(videos.time_updated) AS lastvidtime, courses.downloadable, courses.title AS coursetitle + SELECT lectures.*, max(videos.time_updated) AS lastvidtime, courses.short, courses.downloadable, courses.title AS coursetitle FROM lectures LEFT JOIN videos ON (videos.lecture_id = lectures.id) LEFT JOIN courses on (courses.id = lectures.course_id) diff --git a/templates/macros.html b/templates/macros.html index 6312f7a3bf6c125937f09fd9b804a114da2082c8..8f3e6cb2cf109017369feb04167fdea1441458ab 100644 --- a/templates/macros.html +++ b/templates/macros.html @@ -4,16 +4,16 @@ <a href="?view=player&lectureid={{ lecture['id'] }}#content" title="{{ lecture['coursetitle'] }}"> <img class="col-xs-4" src="https://videoag.fsmpi.rwth-aachen.de/{{ lecture['titlefile'] }}" alt="Vorschaubild"> <div class="col-xs-4"> - <span>{{ lecture['coursetitle'] }}</span> - <span>{{ lecture['time'] }}</span> - <p>{{ lecture['title'] }}</p> - </div> - <div class="col-xs-4"> - <div class="comment">{{ lecture['comment'] }}</div> + <span style="color: #000;"><strong>{{ lecture['short'] }}</strong></span><br> + <span style="color: #000;">{{ lecture['time'] }}</span> {% if lecture['speaker'] %} - <div class="comment">Gehalten von {{ lecture['speaker'] }} </div> + <div class="small" style="color: #000;">Gehalten von {{ lecture['speaker'] }} </div> {% endif %} </div> + <div class="col-xs-4" style="color: #000;"> + <div class="comment" style="color: #000;">{{ lecture['comment'] }}</div> + <p style="font-style: italic; color: #777;">{{ lecture['title'] }}</p> + </div> </a> </div> </li>