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

fixed player download button

parent df0b42b1
Branches
No related tags found
No related merge requests found
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
{% endmacro %} {% endmacro %}
{% macro player(lecture, videos) %} {% macro player(lecture, videos) %}
<script src="{{url_for('static', filename='/mediaelementjs/mediaelement-and-player.min.js')}}"></script> <script src="{{url_for('static', filename='mediaelementjs/mediaelement-and-player.min.js')}}"></script>
<link rel="stylesheet" href="{{url_for('static', filename='mediaelementjs/mediaelementplayer.css')}}" /> <link rel="stylesheet" href="{{url_for('static', filename='mediaelementjs/mediaelementplayer.css')}}" />
<video class="mejs-player" width="640" height="360" style="width: 100%; height: 100%;"> <video class="mejs-player" width="640" height="360" style="width: 100%; height: 100%;">
{% for v in videos %} {% for v in videos %}
...@@ -93,7 +93,9 @@ ...@@ -93,7 +93,9 @@
<button class="btn btn-primary dropdown-toggle{% if videos|length is equalto 0 %} disabled{% endif %}" type="button" data-toggle="dropdown">Download <span class="caret"></span></button> <button class="btn btn-primary dropdown-toggle{% if videos|length is equalto 0 %} disabled{% endif %}" type="button" data-toggle="dropdown">Download <span class="caret"></span></button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{% for v in videos %} {% for v in videos %}
{% if v.downloadable %} <li><a href="{{ config.VIDEOPREFIX }}/{{v.path}}">{{ valuecheckbox(['videos',v.id,'visible'], v.visible) }} {{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>{% endif %} {% if v.downloadable %}
<li><a href="{{ config.VIDEOPREFIX }}/{{v.path}}">{{ valuecheckbox(['videos',v.id,'visible'], v.visible) }} {{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>
{% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
<noscript> <noscript>
...@@ -147,7 +149,7 @@ $('#embedcodebtn').popover( ...@@ -147,7 +149,7 @@ $('#embedcodebtn').popover(
</span> </span>
<span class="col-sm-3 col-xs-12"> <span class="col-sm-3 col-xs-12">
<span class="pull-right"> <span class="pull-right">
<span class="dropdown"> <span>
{{ video_download_btn(videos) }} {{ video_download_btn(videos) }}
</span> </span>
<a href="{{url_for('play', id=lecture.id)}}" class="btn btn-default {% if videos|length is equalto 0 %}disabled{% endif %}"> <a href="{{url_for('play', id=lecture.id)}}" class="btn btn-default {% if videos|length is equalto 0 %}disabled{% endif %}">
......
...@@ -10,15 +10,19 @@ ...@@ -10,15 +10,19 @@
<h1 class="panel-title"><strong>{{ course.title }}</strong>: {{ lecture.title}}</h1> <h1 class="panel-title"><strong>{{ course.title }}</strong>: {{ lecture.title}}</h1>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p class="col-xs-12" style="padding: 0px;"> <div class="row" style="padding: 0px;">
<span><a href="{{url_for('course_id', numid=course.id)}}#lecture-{{lecture.id}}" class="btn btn-default" >Zur Veranstaltungsseite</a><span> <div class="col-sm-6 col-xs-12" style="padding-bottom: 5px;">
<span class="pull-right"> <span>
<span>{{ video_embed_btn(lecture.id) }}</span> <a href="{{url_for('course_id', numid=course.id)}}#lecture-{{lecture.id}}" class="btn btn-default" >Zur Veranstaltungsseite</a>
<span>{{ video_download_btn(videos) }}</span> <span>
</span> </div>
</p> <div class="col-sm-6 col-xs-12">
<div class="pull-right" style="margin-left: 10px;">{{ video_download_btn(videos) }}</div>
<div class="pull-right">{{ video_embed_btn(lecture.id) }}</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12" style="padding: 0px">
{{ player(lecture, videos) }} {{ player(lecture, videos) }}
</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