Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Video AG Infrastruktur
website
Commits
614d4e44
Commit
614d4e44
authored
Sep 03, 2016
by
Andreas Valder
Browse files
fixed player download button
parent
df0b42b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
templates/macros.html
View file @
614d4e44
...
...
@@ -49,7 +49,7 @@
{% endmacro %}
{% 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')}}"
/>
<video
class=
"mejs-player"
width=
"640"
height=
"360"
style=
"width: 100%; height: 100%;"
>
{% for v in videos %}
...
...
@@ -90,10 +90,12 @@
{% endmacro %}
{% macro video_download_btn(videos) %}
<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"
>
{% 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 %}
</ul>
<noscript>
...
...
@@ -147,7 +149,7 @@ $('#embedcodebtn').popover(
</span>
<span
class=
"col-sm-3 col-xs-12"
>
<span
class=
"pull-right"
>
<span
class=
"dropdown"
>
<span>
{{ video_download_btn(videos) }}
</span>
<a
href=
"{{url_for('play', id=lecture.id)}}"
class=
"btn btn-default {% if videos|length is equalto 0 %}disabled{% endif %}"
>
...
...
templates/play.html
View file @
614d4e44
...
...
@@ -10,15 +10,19 @@
<h1
class=
"panel-title"
><strong>
{{ course.title }}
</strong>
: {{ lecture.title}}
</h1>
</div>
<div
class=
"panel-body"
>
<p
class=
"col-xs-12"
style=
"padding: 0px;"
>
<span><a
href=
"{{url_for('course_id', numid=course.id)}}#lecture-{{lecture.id}}"
class=
"btn btn-default"
>
Zur Veranstaltungsseite
</a><span>
<span
class=
"pull-right"
>
<span>
{{ video_embed_btn(lecture.id) }}
</span>
<span>
{{ video_download_btn(videos) }}
</span>
</span>
</p>
<div
class=
"row"
style=
"padding: 0px;"
>
<div
class=
"col-sm-6 col-xs-12"
style=
"padding-bottom: 5px;"
>
<span>
<a
href=
"{{url_for('course_id', numid=course.id)}}#lecture-{{lecture.id}}"
class=
"btn btn-default"
>
Zur Veranstaltungsseite
</a>
<span>
</div>
<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=
"col-xs-12"
>
<div
class=
"col-xs-12"
style=
"padding: 0px"
>
{{ player(lecture, videos) }}
</div>
</div>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment