Merge branch 'staging'

rossbruniges · Oct 15, 2012 · 2fe3766 · 2fe3766
2 parents 5421992 + f569aec
commit 2fe3766
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/make_mozilla/events/templates/events/index.html b/make_mozilla/events/templates/events/index.html
@@ -13,27 +13,27 @@ <h3>What's new?</h3>
 
 <ul class="tri-set">
     <li>
-        <a href="{{ url('events.search') }}" class="thumb"><img src="{{ MEDIA_URL }}/img/events_map.png" alt=""></a>
+        <a href="{{ url('events.search') }}" class="thumb"><img src="{{ MEDIA_URL }}img/events_map.png" alt=""></a>
         <h4>Events are live!</h4>
         <p><a href="{{ url('events.search') }}">Learn with Friends Near You</a></p>
     </li>
     <li>
-        <a href="{{ url('guides_all') }}" class="thumb"><img src="{{ MEDIA_URL }}/img/guides.gif" alt=""></a>
+        <a href="{{ url('guides_all') }}" class="thumb"><img src="{{ MEDIA_URL }}img/guides.gif" alt=""></a>
         <h4>Create your event</h4>
         <p><a href="{{ url('guides_all') }}">Our Handy Guides will Help!</a></p>
     </li>
     <li>
-        <a href="{{ url('about') }}" class="thumb"><img src="{{ MEDIA_URL }}/img/code_party.jpg" alt=""></a>
+        <a href="http://mozillafestival.org" class="thumb"><img src="{{ MEDIA_URL }}/img/mozfest-feature.jpg" alt=""></a>
         <h4>Announcing:</a></h4>
-        <p><a href="{{ url('about') }}">The Mozilla Summer Campaign</a></p>
+        <p><a href="http://mozillafestival.org">The 2012 Mozilla Festival</a></p>
     </li>
 </ul>
 
 {% if event_kinds %}
 <div class="meta-ticker" data-label="Event Type">
     <h3>Event Types</h3>
     <dl>
-        <dt data-label="Get Support"><a href="{{ url('page', 'support')}}">Need Help? <span class="thumb"><img src="{{ MEDIA_URL }}/img/help_stub.png" alt="" width="95" height="95"></span></a></dt>
+        <dt data-label="Get Support"><a href="{{ url('page', 'support')}}">Need Help? <span class="thumb"><img src="{{ MEDIA_URL }}img/help_stub.png" alt="" width="95" height="95"></span></a></dt>
             <dd>Need help with your event?<br /> Visit our handy <a href="{{ url('page', 'support')}}">support page</a>.</dd>
         {% for kind in event_kinds %}
             <dt><a href="{{ url('guides_%s' % kind.slug) }}">{{ kind.name }} <span class="thumb"><img src="{{ MEDIA_URL }}/img/{{ kind.name|lower|replace(' ', '-') }}_stub.jpg" alt="" width="95" height="95"></span></a></dt>

diff --git a/media/css/base.less b/media/css/base.less
@@ -5025,6 +5025,10 @@ a.mozilla-video-control-overlay {
 .mozilla-video-player-content video {
     display: block;
 }
+.mozilla-video-player-content object {
+	width: 100%;
+	height: auto;
+}
 
 .mozilla-video-player-no-flash {
     width: 600px;

diff --git a/media/flash/playerWithControls.swf b/media/flash/playerWithControls.swf
diff --git a/media/img/mozfest-feature.jpg b/media/img/mozfest-feature.jpg