Browse Source

Resolvendo erros e melhorias relatados no pr

pull/2838/head
ulyssesBML 7 years ago
parent
commit
5d5a91de55
  1. 11
      sapl/base/templatetags/common_tags.py
  2. 4
      sapl/templates/crud/detail.html

11
sapl/base/templatetags/common_tags.py

@ -223,14 +223,9 @@ def audio_url(value):
@register.filter
def video_url(value):
def is_video_url(value):
video_extensions = ["mp4", "ogg", "webm", "3gp", "ogv"]
has_ext = False
for i in video_extensions:
if value.endswith(i):
has_ext = True
break
has_ext = any([value.endswith(i) for i in video_extensions])
return url(value) and has_ext
@ -249,7 +244,7 @@ def facebook_url(value):
return True if r else False
@register.filter
def get_youtube_id(value):
def youtube_id(value):
from urllib.parse import urlparse, parse_qs
u_pars = urlparse(value)
quer_v = parse_qs(u_pars.query).get('v')[0]

4
sapl/templates/crud/detail.html

@ -72,7 +72,7 @@
<p>Este navegador não suporta o elemento áudio.</p>
</audio>
</div>
{% elif column.text|video_url %}
{% elif column.text|is_video_url %}
<div class="form-control-static">
<video width="420" height="230" controls>
<source src="{{ column.text|safe }}" type="video/{{ column.text|file_extension }}">
@ -81,7 +81,7 @@
</div>
{% elif column.text|youtube_url %}
<iframe id="ytplayer" type="text/html" width="420" height="230"
src="http://www.youtube.com/embed/{{ column.text|get_youtube_id }}"
src="http://www.youtube.com/embed/{{ column.text|youtube_id }}"
frameborder="0"></iframe>
{% elif column.text|facebook_url %}
<div class="fb-video" data-href="{{ column.text|safe }}"

Loading…
Cancel
Save