updated videos for landing page; (fix bug 800974)

mkt/ecosystem/templates/ecosystem/landing.html

@@ -88,7 +88,7 @@
 
       <div class="videos">
         {% for video in videos %}
-          {{ video_display(video.name, video.path, video.translation) }}
+          {{ video_display(video.name, video.path) }}
         {% endfor %}
 
         <ol class="video-thumbs">

mkt/ecosystem/templates/ecosystem/macros.html

@@ -170,16 +170,14 @@
   </section>
 {% endmacro -%}
 
-{% macro video_display(video_name, video_path, translation_id) -%}
+{% macro video_display(video_name, video_path) -%}
   <div class="{{ video_name }}-content video-item" id="{{ video_name }}">
     <div class="video-control">
       <video width="509" height="278"
         poster="{{ media('img/ecosystem/poster-%s.jpg' % video_name) }}"
         controls="controls">
-        <source src="//videos-cdn.mozilla.net/serv/drafts/{{ video_path }}.webm" type="video/webm">
-        <source src="//videos-cdn.mozilla.net/serv/drafts/{{ video_path }}.theora.ogv"
-                type="video/ogg; codecs=&quot;theora, vorbis&quot;">
-        <source src="//videos-cdn.mozilla.net/serv/drafts/{{ video_path }}.mp4" type="video/mp4">
+        <source src="//videos-cdn.mozilla.net/serv/Marketplace-videos/{{ video_path }}.webm" type="video/webm">
+        <source src="//videos-cdn.mozilla.net/serv/Marketplace-videos/{{ video_path }}.mp4" type="video/mp4">
         {# TODO: Get a version of playerWithControls.swf on the video CDN for addons #}
         <!--
         <object type="application/x-shockwave-flash"
@@ -197,10 +195,13 @@
         -->
       </video>
     </div>
+    {# TODO: Get updated subtitle IDs for the new videos when available #}
+    <!--
     <div class="subtitles">
       <a href="http://www.universalsubtitles.org/videos/{{ translation_id }}/info/">
         {{ _('View with subtitles') }}
       </a>
     </div>
+    -->
   </div>
 {% endmacro -%}

mkt/ecosystem/views.py

@@ -9,34 +9,28 @@ from .tasks import locales
 
 log = commonware.log.getLogger('z.ecosystem')
 
-
 def landing(request):
     """Developer Hub landing page."""
     videos = [
         {
             'name': 'evernote',
-            'path': 'MozMarketplace-Evernote_2ndDraft-RC-SD1%20640',
-            'translation': 'LaXSpZ3FQJps'
+            'path': 'FirefoxMarketplace-Evernote_BR-RC-SD1%20640'
         },
         {
             'name': 'mobbase',
-            'path': 'Moz_Market_Mixmatchmusic',
-            'translation': 'oSJQGUbVgGKj'
+            'path': 'FirefoxMarketplace-MobBase-BR-RC-SD1%20640'
         },
         {
             'name': 'teambox',
-            'path': 'Moz_Market_Teambox',
-            'translation': 'dvmnkd83CJgI'
+            'path': 'FirefoxMarketplace_Teambox-BR-RC-SD1%20640'
         },
         {
-            'name': 'kicksend',
-            'path': 'Moz_Market_kicksend%202',
-            'translation': 'lQ8UVq6KwwEW'
+            'name': 'soundcloud',
+            'path': 'FirefoxMarketplace-Soundcloud-BR-RC-SD1%20640'
         },
         {
             'name': 'box',
-            'path': 'Moz_Market_box_1stDraft-HD%20720p%20Video%20Sharing-640x360%20Video%20Sharing',
-            'translation': 'fxvXQC0H68AU'
+            'path': 'FirefoxMarketplace_box-BR-RC-SD1%20640'
         }
     ]
     return jingo.render(request, 'ecosystem/landing.html',