Skip to content
Browse files

Merge branch 'master' of github.com:hasgeek/hasgeek.tv

  • Loading branch information...
2 parents 59350d1 + 8f61519 commit 2da0a9ac6ff4db82916e7058f5697e4be6398efd @kracekumar kracekumar committed Nov 20, 2012
Showing with 8 additions and 6 deletions.
  1. +2 −2 hgtv/models/video.py
  2. +6 −4 hgtv/templates/video.html
View
4 hgtv/models/video.py
@@ -103,9 +103,9 @@ def url_for(self, action='view', channel=None, playlist=None, _external=False):
def embed_video_for(self, action='view'):
if self.video_source == u'youtube':
if action == 'edit':
- return Markup('<iframe src="http://www.youtube.com/embed/%s?wmode=transparent&autoplay=0" frameborder="0" allowfullscreen></iframe>' % self.video_sourceid)
+ return Markup('<iframe src="http://www.youtube.com/embed/%s?wmode=transparent&showinfo=0&rel=0&autohide=1&autoplay=0" frameborder="0" allowfullscreen></iframe>' % self.video_sourceid)
elif action == 'view':
- return Markup('<iframe src="http://www.youtube.com/embed/%s?wmode=transparent&autoplay=1" frameborder="0" allowfullscreen></iframe>' % self.video_sourceid)
+ return Markup('<iframe src="http://www.youtube.com/embed/%s?wmode=transparent&showinfo=0&rel=0&autohide=1&autoplay=1" frameborder="0" allowfullscreen></iframe>' % self.video_sourceid)
return u''
def embed_slides_for(self, action=None):
View
10 hgtv/templates/video.html
@@ -20,9 +20,9 @@
{{ form.csrf_token() }}
<div class="btn-toolbar pull-left">
<div class="btn-group" data-toggle="buttons-checkbox">
- <button class="btn {%- if flags['starred'] %} active{% endif %}" title="Star" name="action" value="star"> <i class="icon-star"></i>
+ <button class="btn {%- if flags['starred'] %} active{% endif %}" title="Add to favourites" name="action" value="star"> <i class="icon-star"></i>
</button>
- <button class="btn {%- if flags['queued'] %} active{% endif %}" title="Add to Queue" name="action" value="queue"> <i class="icon-time"></i>
+ <button class="btn {%- if flags['queued'] %} active{% endif %}" title="Watch this later" name="action" value="queue"> <i class="icon-time"></i>
</button>
</div>
<div class="btn-group" data-toggle="buttons-radio">
@@ -69,7 +69,7 @@
{% block content %}
<div class="row">
<div class="span6">
- <div class="video169 {{ video.video_source }}">{{ video.embed_video_for(config.get('VIDEO_VIEW_MODE', 'view')) }}</div>
+ <div class="video169">{{ video.embed_video_for(config.get('VIDEO_VIEW_MODE', 'view')) }}</div>
{{ videoactions() }}
{% set next_video, prev_video = playlist.next(video=video), playlist.prev(video=video) %}
{% if prev_video -%}
@@ -97,7 +97,7 @@
<label for="sync-slides">Sync slides with video</label>
</div>
{%- else -%}
- <div class="video169 {{ video.video_source }}"><div class="placeholder"><div><span>No slides available</span></div></div></div>
+ <div class="video169"><div class="placeholder"><div><span>No slides available</span></div></div></div>
{%- endif %}
{% endwith %}
</div>
@@ -113,6 +113,8 @@
{% if g.user %}
<script type="text/javascript">
$(function() {
+ $(".btn-toolbar button, .btn-toolbar a").tooltip({placement: 'bottom'});
+
var playlist_action = function(url, data, type) {
$.ajax({
type: type,

0 comments on commit 2da0a9a

Please sign in to comment.
Something went wrong with that request. Please try again.