Download as
Browse Code »

Commit 428ed258e9e231b26367a9dd6c04b19fce7cb727

Authored by Felipe Henrique de Almeida Bormann
2 parents 5830037b 7decfab7
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

solved conflict

Showing 5 changed files with 17 additions and 5 deletions   Show diff stats
topics/templates/resources/list.html
  Diff comments   View file @428ed25
@@ -14,7 +14,9 @@ @@ -14,7 +14,9 @@
14 <input type="hidden" class="url_order" value="{% url 'topics:update_resource_order' %}" /> 14 <input type="hidden" class="url_order" value="{% url 'topics:update_resource_order' %}" />
15 15
16 <h4 class="pull-left list-group-item-heading"> 16 <h4 class="pull-left list-group-item-heading">
17 - <a href="{% url resource.access_link resource.slug %}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %} > 17 +
  18 + <a href="{% url resource.access_link resource.slug %}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
  19 +
18 {{ resource.name }} 20 {{ resource.name }}
19 </a> 21 </a>
20 </h4> 22 </h4>
youtube_video/forms.py
  Diff comments   View file @428ed25
@@ -63,8 +63,8 @@ class YTVideoForm(forms.ModelForm): @@ -63,8 +63,8 @@ class YTVideoForm(forms.ModelForm):
63 def clean_url(self): 63 def clean_url(self):
64 url = self.cleaned_data.get('url', '') 64 url = self.cleaned_data.get('url', '')
65 65
66 - if not 'youtube' in url or not 'embed' in url:  
67 - self._errors['url'] = [_('Invalid URL. It should be an embed YouTube link.')] 66 + if not 'youtube' in url:
  67 + self._errors['url'] = [_('Invalid URL. It should be an YouTube link.')]
68 68
69 return ValueError 69 return ValueError
70 70
youtube_video/models.py
  Diff comments   View file @428ed25
@@ -27,3 +27,13 @@ class YTVideo(Resource): @@ -27,3 +27,13 @@ class YTVideo(Resource):
27 27
28 def delete_message(self): 28 def delete_message(self):
29 return _('Are you sure you want delete the YouTube Video') 29 return _('Are you sure you want delete the YouTube Video')
  30 +
  31 + def get_embed_url(self):
  32 + if not "embed" in self.url:
  33 + parts = self.url.split("=")
  34 +
  35 + if parts[1]:
  36 + return "https://www.youtube.com/embed/" + parts[1]
  37 +
  38 + return self.url
  39 +
youtube_video/templates/youtube/view.html
  Diff comments   View file @428ed25
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 <input type="hidden" id="log_finish_url" value="{% url 'youtube:finish' youtube.slug %}" /> 50 <input type="hidden" id="log_finish_url" value="{% url 'youtube:finish' youtube.slug %}" />
51 <input type="hidden" id="log_url" value="{% url 'youtube:watch' youtube.slug %}" /> 51 <input type="hidden" id="log_url" value="{% url 'youtube:watch' youtube.slug %}" />
52 <input type="hidden" id="log_id" value="" /> 52 <input type="hidden" id="log_id" value="" />
53 - <iframe src="{{ youtube.url }}?enablejsapi=1" frameborder="0" allowfullscreen id="video"></iframe> 53 + <iframe src="{{ youtube.get_embed_url }}?enablejsapi=1" frameborder="0" allowfullscreen id="video"></iframe>
54 </div> 54 </div>
55 </div> 55 </div>
56 56
youtube_video/templates/youtube/window_view.html
  Diff comments   View file @428ed25
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <input type="hidden" id="log_finish_url" value="{% url 'youtube:finish' youtube.slug %}" /> 23 <input type="hidden" id="log_finish_url" value="{% url 'youtube:finish' youtube.slug %}" />
24 <input type="hidden" id="log_url" value="{% url 'youtube:watch' youtube.slug %}" /> 24 <input type="hidden" id="log_url" value="{% url 'youtube:watch' youtube.slug %}" />
25 <input type="hidden" id="log_id" value="" /> 25 <input type="hidden" id="log_id" value="" />
26 - <iframe src="{{ youtube.url }}?enablejsapi=1" frameborder="0" allowfullscreen id="video"></iframe> 26 + <iframe src="{{ youtube.get_embed_url }}?enablejsapi=1" frameborder="0" allowfullscreen id="video"></iframe>
27 27
28 <script type="text/javascript" src="{% static 'js/ytvideo.js' %}"></script> 28 <script type="text/javascript" src="{% static 'js/ytvideo.js' %}"></script>
29 <script type="text/javascript"> 29 <script type="text/javascript">