Customizable flowplayer url

README.upgrade

@@ -19,6 +19,7 @@ DJANGO SETTINGS
     * Removed settings.d/98-ganeti-* due to split of snf-ganeti-tools
     * ~okeanos intro: OKEANOS_VIDEO_URL: Changed from string to dict
     * ~okeanos intro: OKEANOS_VIDEO_POSTER_IMAGE_URL: New setting
+    * ~okeanos intro: OKEANOS_VIDEO_FLOWPLAYER_URL: New setting
 
 DB MIGRATIONS
     * 0018_auto__add_field_virtualmachine_buildpercentage

okeanos_site/90-okeanos.conf.sample

@@ -31,17 +31,19 @@ OKEANOS_APP_URL = "/ui"
 # is the fallback video player for IE)
 #
 # VIDEOS ARE NOT CONTAINED IN PROJECT FILES
-# you can download all files from http://<videos tar.gz download url>
-# and extract the containing directory on okeanos_site/static/okeanos_static/
-#
-# wget http://<videos tar.gz download url>/okeanos_intro_vide.tar.gz
-# tar xzvf okeanos_intro_video.tar.gz -C okeanos_site/static/okeanos_static/
 OKEANOS_VIDEO_URL = {
-    'mp4': {'src': 'http://host:port/okeanos_static/intro_video/intro_video.m4v', 'codecs': 'avc1.42E01E, mp4a.40.2'},
-    'webm': {'src': 'http://host:port/okeanos_static/intro_video/intro_video.webm', 'codecs': 'vp8, vorbis'},
-    'ogg': {'src': 'http://host:port/okeanos_static/intro_video/intro_video.ogv', 'codecs': 'theora, vorbis'}
+    'mp4': {'src': 'http://okeanos.grnet.gr/intro_video/intro_video.m4v', 'codecs': 'avc1.42E01E, mp4a.40.2'},
+    'webm': {'src': 'http://okeanos.grnet.gr/intro_video/intro_video.webm', 'codecs': 'vp8, vorbis'},
+    'ogg': {'src': 'http://okeanos.grnet.gr/intro_video/intro_video.ogv', 'codecs': 'theora, vorbis'}
 }
 
 # The image placeholder url. Image gets displayed above video position
 # as a placeholder when the video is stopped
-OKEANOS_VIDEO_POSTER_IMAGE_URL = "/okeanos_static/intro_video/intro_video.jpg"
+OKEANOS_VIDEO_POSTER_IMAGE_URL = "/intro_video/intro_video.png"
+
+# flowplayer swf url
+# wget http://releases.flowplayer.org/swf/flowplayer-3.2.1.swf
+# wget http://releases.flowplayer.org/swf/flowplayer.controls-3.2.0.swf
+#
+# flowplayer.controls swf should be placed on the same url as flowplayer swf
+OKEANOS_VIDEO_FLOWPLAYER_URL = "http://okeanos.grnet.gr/intro_video/flowplayer-3.2.1.swf"

okeanos_site/README

@@ -52,6 +52,15 @@ Settings
   on IE OKEANOS_VIDEO_URL setting should contain mp4 video source. The url of
   mp4 should be an ABSOLUTE URL for flash player to work.
 
+- OKEANOS_POSTER_URL
+
+  Should contain a url to an image we want to display on top of video
+  while video is loading.
+
+- OKEANOS_FLOWPLAYER_URL
+
+  Should contain url to flowplayer plugin swf
+
 Views
 -----
 The application contains 2 views. 

okeanos_site/templates/okeanos/video_partial.html

@@ -9,9 +9,9 @@
         class="vjs-flash-fallback" 
         width="{{ VIDEO_WIDTH }}" height="{{ VIDEO_HEIGHT }}" 
         type="application/x-shockwave-flash" 
-        data="http://releases.flowplayer.org/swf/flowplayer-3.2.1.swf">
+        data="{{ OKEANOS_VIDEO_FLOWPLAYER_URL }}">
 
-        <param name="movie" value="http://releases.flowplayer.org/swf/flowplayer-3.2.1.swf" />
+        <param name="movie" value="{{ OKEANOS_VIDEO_FLOWPLAYER_URL }}" />
         <param name="allowfullscreen" value="true" />
         <param name="flashvars" value='config={"playlist":["{{ OKEANOS_VIDEO_POSTER_IMAGE_URL }}", {"url": "{{ OKEANOS_MP4_VIDEO_URL }}","autoPlay":false,"autoBuffering":true}]}' />
 

okeanos_site/views.py

@@ -16,6 +16,7 @@ context = {
     'OKEANOS_APP_URL': OKEANOS_APP_URL,
     'OKEANOS_MP4_VIDEO_URL': OKEANOS_MP4_VIDEO_URL,
     'OKEANOS_VIDEO_POSTER_IMAGE_URL': settings.OKEANOS_VIDEO_POSTER_IMAGE_URL,
+    'OKEANOS_VIDEO_FLOWPLAYER_URL': settings.OKEANOS_VIDEO_FLOWPLAYER_URL,
     'VIDEO_WIDTH': 640,
     'VIDEO_HEIGHT': 360
 }