From 3ba8d7b49fb4f52d2ac2a2ae91987a0101e2b55c Mon Sep 17 00:00:00 2001
From: Andreas Valder <andreasv@fsmpi.rwth-aachen.de>
Date: Sun, 28 Aug 2016 19:33:51 +0200
Subject: [PATCH] made courses look better cleaned up macros
---
templates/course.html | 12 +++++++++---
templates/macros.html | 22 +++++++++++++---------
2 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/templates/course.html b/templates/course.html
index c7172a0..6676985 100644
--- a/templates/course.html
+++ b/templates/course.html
@@ -7,9 +7,15 @@
<h1 class="panel-title">{{course.title}}</h1>
</div>
<div class="row panel-body">
- <span class="col-xs-2">Semester:</span><span class="col-xs-10">{{course.semester}}</span>
- <span class="col-xs-2">Veranstalter:</span><span class="col-xs-10">{{course.organizer}}</span>
- <span class="col-xs-2">Bemerkungen::</span><span class="col-xs-10">{{course.description|safe}}</span>
+ <div class="col-xs-12">
+ <table class="table-condensed">
+ <tbody>
+ <tr><td>Semester:</td><td>{{course.semester}}</td></tr>
+ <tr><td>Veranstalter:</td><td>{{course.organizer}}</td></tr>
+ <tr><td>Bemerkungen:</td><td>{{course.description|safe}}</td></tr>
+ </tbody>
+ </table>
+ </div>
</div>
</div>
<div class="panel panel-default">
diff --git a/templates/macros.html b/templates/macros.html
index 6ad4ccf..595969f 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -53,7 +53,9 @@
<script src="static/mediaelementjs/mediaelement-and-player.min.js"></script>
<link rel="stylesheet" href="static/mediaelementjs/mediaelementplayer.css" />
<video class="mejs-player" width="640" height="360" style="width: 100%; height: 100%;">
- <source type="video/mp4" src="https://videoag.fsmpi.rwth-aachen.de/{{ videos[0]['path'] }}" />
+ {% for v in videos %}
+ <source type="video/mp4" src="https://videoag.fsmpi.rwth-aachen.de/{{ v.path }}" />
+ {% endfor %}
</video>
<script>
//$('.mejs-player').mediaelementplayer({
@@ -135,15 +137,17 @@ $('#embedcodebtn').popover(
{{ lecture.comment|safe }}
</span>
<span class="col-sm-3 col-xs-12">
- <span class="dropdown pull-right">
- {{ video_download_btn(videos) }}
+ <span class="pull-right">
+ <span class="dropdown">
+ {{ video_download_btn(videos) }}
+ </span>
+ <a href="/play?lectureid={{lecture.id}}">
+ <button class="btn btn-default" type="button">
+ <span class="glyphicon glyphicon-play"></span>
+ <span>Play</span>
+ </button>
+ </a>
</span>
- <a href="/play?lectureid={{lecture.id}}" class="pull-right">
- <button class="btn btn-default" type="button">
- <span class="glyphicon glyphicon-play"></span>
- <span>Play</span>
- </button>
- </a>
</span>
</div>
</li>
--
GitLab