Merge remote branch 'upstream/master'

apps/b2g/templates/b2g/b2g.html

@@ -69,12 +69,25 @@
 </section>
 
 <aside class="container" id="more-info">
-  <h3>More Information</h3>
-  <ul>
-    <li><a href="{{ url('b2g.about') }}">About the project</a></li>
-    <li><a href="{{ url('b2g.faq') }}">FAQ</a></li>
-    <li><a href="http://brendaneich.com/2012/02/mobile-web-api-evolution/">Brendan Eich on the Mobile Web API Evolution</a></li>
-  </ul>
+<div class="row">
+  <div class="span5">
+    <h3>More Information</h3>
+    <ul>
+      <li><a href="{{ url('b2g.about') }}">About the project</a></li>
+      <li><a href="{{ url('b2g.faq') }}">FAQ</a></li>
+      <li><a href="http://brendaneich.com/2012/02/mobile-web-api-evolution/">Brendan Eich on the Mobile Web API Evolution</a></li>
+      <li><a href="http://blog.mozilla.com/blog/2012/02/27/mozilla-in-mobile-the-web-is-the-platform/">Mozilla Announcement: The Web is the Platform</a>
+      <li><a href="http://pressoffice.telefonica.com/jsp/base.jsp?contenido=/jsp/notasdeprensa/notadetalle.jsp&selectNumReg=5&pagina=1&id=66&origen=notapres&idm=eng&pais=1&elem=17874">Telefónica and Mozilla pioneer first Open Web Devices</a></li>
+    </ul>
+  </div>
+  <div class="span5">
+    <h3>Press</h3>
+    <ul>
+      <li><a href="http://reviews.cnet.com/8301-13970_7-57385412-78/telefonica-signs-up-for-mozillas-mobile-web-os/">cNet: Telefónica signs up for Mozilla's mobile Web OS</a></li>
+      <li><a href="http://www.reuters.com/article/2012/02/27/mobile-fair-internet-idUSL5E8DQ1WK20120227">Reuters: Alliance forms web-based rival to Android, Apple</a></li>
+    </ul>
+  </div>
+</div>
 </aside>
 
 &nbsp;

apps/marketplace/templates/marketplace/marketplace.html

@@ -12,6 +12,11 @@
 
 {% block extrahead %}
   {{ css('marketplace') }}
+  {{ css('video') }}
+{% endblock %}
+
+{% block js %}
+  {{ js('video') }}
 {% endblock %}
 
 {% block content %}
@@ -38,6 +43,31 @@
   </div>
 </article>
 
+<section class="container">
+    <div id="intro-video" class="mozilla-video-control">
+      <video
+        width="640"
+        height="360"
+        poster="/media/img/marketplace/poster-intro.jpg"
+        controls="controls">
+        <source src="//videos-cdn.mozilla.net/serv/flux/apps/marketplace.webm" type="video/webm" />
+        <source src="//videos-cdn.mozilla.net/serv/flux/apps/marketplace.theora.ogv" type="video/ogg; codecs=&quot;theora, vorbis&quot;" />
+        <source src="//http://videos-cdn.mozilla.net/serv/flux/apps/marketplace.mp4" type="video/mp4" />
+        <object type="application/x-shockwave-flash"
+          style="width: 640px; height: 388px;"
+          data="/media/flash/playerWithControls.swf?flv=serv/flux/apps/marketplace.mp4&amp;autoplay=false&amp;msg=Play%20Video">
+          <param name="movie" value="/media/flash/playerWithControls.swf?flv=serv/flux/apps/marketplace.mp4&amp;autoplay=false&amp;msg=Play%20Video" />
+          <param name="wmode" value="transparent" />
+
+          <div class="video-player-no-flash">
+          This video requires a browser with support for open video
+          or the <a href="http://www.adobe.com/go/getflashplayer">Adobe Flash Player</a>.
+          </div>
+        </object>
+      </video>
+    </div>
+</section>
+
 {% if not submitted %}
 <form class="container" id="apps-email-form" action="#apps-email-form" method="post">
 

lib/bedrock_util.py

@@ -5,7 +5,7 @@ def secure_required(view_func):
     """Decorator makes sure URL is accessed over https."""
     def _wrapped_view_func(request, *args, **kwargs):
         if not request.is_secure():
-            if not getattr(settings, 'DEV', True):
+            if not getattr(settings, 'DEBUG', True):
                 request_url = request.build_absolute_uri(request.get_full_path())
                 secure_url = request_url.replace('http://', 'https://')
                 return HttpResponseRedirect(secure_url)

media/css/marketplace.less

@@ -25,7 +25,8 @@ hgroup {
 #apps-email-form {
     padding-top: @baseLine * 2;
     padding-bottom: @baseLine * 2;
-    margin-bottom: @baseLine * 3;
+    margin-bottom: @baseLine * 2;
+    margin-top: @baseLine * 2;
     @shadow: 0 1px 1px rgba(0,0,0,0.1), 0 0 0 1px #fff;
     .box-shadow(@shadow);
     background: #fff;
@@ -50,3 +51,21 @@ hgroup {
     }
 
 }
+
+
+#intro-video {
+    max-width: 640px;
+    margin: 0 auto;
+    background-image: url(/media/img/sandstone/video/shadow.png);
+    background-repeat: no-repeat;
+    background-position: 50% 100%;
+    background-size: 100% 15px;
+    padding-bottom: 15px;
+    video {
+        max-width: 640px;
+        width: 100%;
+        height: auto;
+        background: #fff;
+    }
+}
+