Bug 826937: Change references to /media/ to use MEDIA_URL setting.

Also fix image 404 on fx/geolocation page.

apps/collusion/templates/collusion/demo.html

@@ -50,12 +50,12 @@ $(window).ready(function() {
   $("#domain-infos").hide();
 
   // get list of known trackers from trackers.json file hosted on website:
-  jQuery.getJSON("/media/js/collusion/trackers.json", function(trackers) {
+  jQuery.getJSON("{{ MEDIA_URL }}js/collusion/trackers.json", function(trackers) {
     var runner = GraphRunner.Runner({
       width: 640,
       height: 480,
       trackers: trackers,
-      hideFavicons: false 
+      hideFavicons: false
     });
     var graph = runner.graph;
 
@@ -84,7 +84,7 @@ $(window).ready(function() {
       if (graphUrl == "opener") {
         updateGraphViaPostMessage(graph, window.opener);
       } else if (graphUrl == "parent") {
-        
+
         updateGraphViaPostMessage(graph, window.parent);
       } else
         jQuery.getJSON(graphUrl, function(data) {
@@ -93,7 +93,7 @@ $(window).ready(function() {
       return;
     }
 
-    
+
     Demo.show(graph);
 
     // Display the footer now the page is rendered
@@ -196,6 +196,6 @@ $(window).ready(function() {
     </div>
   </div>
 </div>
-</section>    
+</section>
 
 {% endblock %}

apps/firefox/templates/firefox/geolocation.html

@@ -120,7 +120,7 @@
 <div id="geo-demo" style="display:none">
   <div id="map_canvas"></div>
   <button id="locateButton" type="button">Where am I?</button>
-  <img id="geo-busy" src="/media/img/ajax_loading.gif" alt="busy"/>
+  <img id="geo-busy" src="{{ MEDIA_URL }}img/ajax_loading.gif" alt="busy"/>
   <p id="geodemo-error">Oops! An error occurred while trying to determine your position.</p>
 </div>
 

apps/firefox/templates/firefox/new-b.html

@@ -5,7 +5,7 @@
 
 {% block site_header_nav %}{% endblock %}
 {% block site_header_logo %}
-  <h2><a href="{{ url('mozorg.home') }}"><img src="/media/img/firefox/new/header-firefox.png" alt="{{_('Firefox for desktop')}}" /></a></h2>
+  <h2><a href="{{ url('mozorg.home') }}"><img src="{{ MEDIA_URL }}img/firefox/new/header-firefox.png" alt="{{_('Firefox for desktop')}}" /></a></h2>
 {% endblock %}
 
 {% block webtrends %}{% endblock %}

apps/firefox/templates/firefox/whatsnew.html

@@ -29,7 +29,7 @@
   {% if request.locale == 'ru' %}
   {% l10n whatsnew_feature, 20120712 %}
   <p id="ru-search">
-    <img src="/media/img/firefox/whatsnew/ru-search.png">
+    <img src="{{ MEDIA_URL }}img/firefox/whatsnew/ru-search.png">
     Also new in this release: Google is now your default search engine. To change the active search engine, click the down arrow next to the search engine's icon, and select a new search engine.
     <a href="http://support.mozilla.org/ru/kb/stroka-poiska?e=es&redirectlocale=en-US&as=s&s=manage+search&r=3&redirectslug=Search+bar#w_managing-search-engines">Learn more.</a>
   </p>

apps/mozorg/templates/mozorg/contribute.html

@@ -24,15 +24,15 @@
     <video
       width="640"
       height="360"
-      poster="/media/img/contribute/poster-brand.jpg"
+      poster="{{ MEDIA_URL }}img/contribute/poster-brand.jpg"
       controls="controls">
       <source src="//videos-cdn.mozilla.net/brand/Mozilla_Firefox_Manifesto_v0.2_640.webm" type="video/webm" />
       <source src="//videos-cdn.mozilla.net/brand/Mozilla_Firefox_Manifesto_v0.2_640.theora.ogv" type="video/ogg; codecs=&quot;theora, vorbis&quot;" />
       <source src="//videos-cdn.mozilla.net/brand/Mozilla_Firefox_Manifesto_v0.2_640.mp4" type="video/mp4" />
       <object type="application/x-shockwave-flash"
         style="width: 640px; height: 388px;"
-        data="/media/flash/playerWithControls.swf?flv=brand/Mozilla_Firefox_Manifesto_v0.2_640.mp4&amp;autoplay=false&amp;msg=Play%20Video">
-        <param name="movie" value="/media/flash/playerWithControls.swf?flv=brand/Mozilla_Firefox_Manifesto_v0.2_640.mp4&amp;autoplay=false&amp;msg=Play%20Video" />
+        data="{{ MEDIA_URL }}flash/playerWithControls.swf?flv=brand/Mozilla_Firefox_Manifesto_v0.2_640.mp4&amp;autoplay=false&amp;msg=Play%20Video">
+        <param name="movie" value="{{ MEDIA_URL }}flash/playerWithControls.swf?flv=brand/Mozilla_Firefox_Manifesto_v0.2_640.mp4&amp;autoplay=false&amp;msg=Play%20Video" />
         <param name="wmode" value="transparent" />
 
         <div class="video-player-no-flash">
@@ -73,7 +73,7 @@
 
             <ul class="contribute-options">
               <li class="row">
-                <img src="/media/img/contribute/sumo.png" alt="" />
+                <img src="{{ MEDIA_URL }}img/contribute/sumo.png" alt="" />
                 <h3 id="support">{{_('Helping Users')}}</h3>
                 <div class="content">
                   <p>
@@ -84,7 +84,7 @@ Our support process relies on enthusiastic contributors like you to help others
                 </div>
               </li>
               <li class="row">
-                <img src="/media/img/contribute/qmo.png" alt="" />
+                <img src="{{ MEDIA_URL }}img/contribute/qmo.png" alt="" />
                 <h3 id="qa">{{_('Quality Assurance')}}</h3>
                 <div class="content">
                   <p>
@@ -95,7 +95,7 @@ Quality assurance testing is one of the easiest ways to get started with Mozilla
                 </div>
               </li>
               <li class="row">
-                <img src="/media/img/contribute/dinohead.png" alt="" />
+                <img src="{{ MEDIA_URL }}img/contribute/dinohead.png" alt="" />
                 <h3 id="coding">{{_('Coding')}}</h3>
                 <div class="content">
                   <p>
@@ -106,7 +106,7 @@ Quality assurance testing is one of the easiest ways to get started with Mozilla
                 </div>
               </li>
               <li class="row">
-                <img src="/media/img/contribute/firefox.png" alt="" />
+                <img src="{{ MEDIA_URL }}img/contribute/firefox.png" alt="" />
                 <h3 id="marketing">{{_('Spread the Word')}}</h3>
                 <div class="content">
                   <p>
@@ -194,37 +194,37 @@ Help build a generation of webmakers by teaching others how the web works. <a hr
             <ul>
               <li class="row">
                 <a href="/contribute/local/northamerica.html">
-                  <img src="/media/img/contribute/local/map-th-northamerica.png" alt="">
+                  <img src="{{ MEDIA_URL }}img/contribute/local/map-th-northamerica.png" alt="">
                   <h3>{{_('US and Canada')}}</h3>
                 </a>
               </li>
               <li class="row">
                 <a href="/contribute/local/europe.html">
-                  <img src="/media/img/contribute/local/map-th-europe.png" alt="">
+                  <img src="{{ MEDIA_URL }}img/contribute/local/map-th-europe.png" alt="">
                   <h3>{{_('Europe')}}</h3>
                 </a>
               </li>
               <li class="row">
                 <a href="/contribute/local/latinamerica.html">
-                  <img src="/media/img/contribute/local/map-th-latinamerica.png" alt="">
+                  <img src="{{ MEDIA_URL }}img/contribute/local/map-th-latinamerica.png" alt="">
                   <h3>{{_('Latin America')}}</h3>
                 </a>
               </li>
               <li class="row">
                 <a href="/contribute/local/africamideast.html">
-                  <img src="/media/img/contribute/local/map-th-africamideast.png" alt="">
+                  <img src="{{ MEDIA_URL }}img/contribute/local/map-th-africamideast.png" alt="">
                   <h3>{{_('Africa and the Middle East')}}</h3>
                 </a>
               </li>
               <li class="row">
                 <a href="/contribute/local/asia.html">
-                  <img src="/media/img/contribute/local/map-th-asia.png" alt="">
+                  <img src="{{ MEDIA_URL }}img/contribute/local/map-th-asia.png" alt="">
                   <h3>{{_('Asia and the South Pacific')}}</h3>
                 </a>
               </li>
               <li class="row">
                 <a href="/contribute/local/southpole.html">
-                  <img src="/media/img/contribute/local/map-th-southpole.png" alt="">
+                  <img src="{{ MEDIA_URL }}img/contribute/local/map-th-southpole.png" alt="">
                   <h3>{{_('Antarctica')}}</h3>
                 </a>
               </li>

apps/mozorg/templates/mozorg/mission.html

@@ -30,10 +30,10 @@
     <p>Mozilla is a proudly non-profit organization dedicated to keeping the power of the Web in people’s hands. We’re a global community of users, contributors and developers working to innovate on your behalf. When you use Firefox, or any Mozilla product, you become a part of that community, helping us build a brighter future for the Web.</p>
     <p>Read the <a href="/about/manifesto.html">Mozilla Manifesto</a> to learn even more about the values and principles that guide the pursuit of our mission.</p>
   </div>
-  
+
   <div class="video">
     <div id="welcome-video" class="mozilla-video-control mozilla-video-shadow">
-      <video 
+      <video
         width="460"
         height="259"
         poster="{{ media('img/mission/poster-mission.jpg') }}"
@@ -43,10 +43,10 @@
         <source src="//videos-cdn.mozilla.net/brand/Mozilla_2011_Story.mp4" type="video/mp4">
         <object type="application/x-shockwave-flash"
           style="width: 460px; height: 259px;"
-          data="/media/flash/playerWithControls.swf?flv=brand/Mozilla_2011_Story.mp4&amp;autoplay=false&amp;msg=Play%20Video">
-          <param name="movie" value="/media/flash/playerWithControls.swf?flv=brand/Mozilla_2011_Story.mp4&amp;autoplay=false&amp;msg=Play%20Video">
+          data="{{ MEDIA_URL }}flash/playerWithControls.swf?flv=brand/Mozilla_2011_Story.mp4&amp;autoplay=false&amp;msg=Play%20Video">
+          <param name="movie" value="{{ MEDIA_URL }}flash/playerWithControls.swf?flv=brand/Mozilla_2011_Story.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>.
@@ -56,12 +56,12 @@
     </div>
     <p class="caption">Watch the video above to learn more about who we are, where we came from and how we're making the Web better for you.</p>
   </div>
-  
+
   <ul class="links">
     <li>
       <h4><a href="{{ url('mozorg.contribute') }}">Get involved</a></h4>
       <p>Volunteer opportunities in a number of different areas</p>
-    </li>    
+    </li>
     <li>
       <h4><a href="/about/history.html">History</a></h4>
       <p>Where we come from and how we got to where we are</p>
@@ -75,6 +75,6 @@
       <p>Our structure, organization, and the broader Mozilla community</p>
     </li>
   </ul>
-  
+
 </article>
 {% endblock %}

apps/persona/templates/persona/about.html

@@ -9,7 +9,7 @@
 {% block body_id %}persona-about{% endblock %}
 
 {% block site_header_logo %}
-  <h2><a href="/persona/"><img src="/media/img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
+  <h2><a href="/persona/"><img src="{{ MEDIA_URL }}img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
 {% endblock %}
 
 {% block site_header_nav %}

apps/persona/templates/persona/developer-faq.html

@@ -9,7 +9,7 @@
 {% block body_id %}persona-developer-faq{% endblock %}
 
 {% block site_header_logo %}
-  <h2><a href="/persona/"><img src="/media/img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
+  <h2><a href="/persona/"><img src="{{ MEDIA_URL }}img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
 {% endblock %}
 
 {% block site_header_nav %}

apps/persona/templates/persona/persona.html

@@ -9,7 +9,7 @@
 {% block body_id %}persona{% endblock %}
 
 {% block site_header_logo %}
-  <h2><a href="/persona/"><img src="/media/img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
+  <h2><a href="/persona/"><img src="{{ MEDIA_URL }}img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
 {% endblock %}
 
 {% block site_header_nav %}
@@ -52,7 +52,7 @@
     <aside id="signin">
 
       <figure id="signin-example">
-        <img src="/media/img/persona/signin.png" alt="Persona sign-in example" />
+        <img src="{{ MEDIA_URL }}img/persona/signin.png" alt="Persona sign-in example" />
         <figcaption>It’s simple: just click the sign in button, enter your preferred email and you’re ready to go.</figcaption>
       </figure>
 

apps/persona/templates/persona/privacy-policy.html

@@ -9,7 +9,7 @@
 {% block body_id %}persona-tos{% endblock %}
 
 {% block site_header_logo %}
-  <h2><a href="/persona/"><img src="/media/img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
+  <h2><a href="/persona/"><img src="{{ MEDIA_URL }}img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
 {% endblock %}
 
 {% block site_header_nav %}

apps/persona/templates/persona/terms-of-service.html

@@ -5,7 +5,7 @@
 {% block body_id %}persona-tos{% endblock %}
 
 {% block site_header_logo %}
-  <h2><a href="/persona/"><img src="/media/img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
+  <h2><a href="/persona/"><img src="{{ MEDIA_URL }}img/persona/title.png" height="66" width="180" alt="mozilla Persona"></a></h2>
 {% endblock %}
 
 {% block site_header_nav %}

templates/base-resp.html

@@ -51,7 +51,7 @@
         {% endblock %}
 
         {% block site_header_logo %}
-        <h2><a href="{{ url('mozorg.home') }}"><img src="/media/img/sandstone/header-mozilla-stone.png" alt="mozilla"></a></h2>
+        <h2><a href="{{ url('mozorg.home') }}"><img src="{{ MEDIA_URL }}img/sandstone/header-mozilla-stone.png" alt="mozilla"></a></h2>
         {% endblock %}
 
         {% block breadcrumbs %}{% endblock %}

templates/base.html

@@ -14,7 +14,7 @@
     <link href="/tabzilla/media/css/tabzilla.css" rel="stylesheet">
 
     <!--[if lt IE 9]>
-      <script src="/media/js/libs/html5shiv.js"></script>
+      <script src="{{ MEDIA_URL }}js/libs/html5shiv.js"></script>
     <![endif]-->
 
     {% block site_css %}
@@ -50,7 +50,7 @@
         {% endblock %}
 
         {% block site_header_logo %}
-        <h2><a href="{{ url('mozorg.home') }}"><img src="/media/img/sandstone/header-mozilla-stone.png" alt="mozilla"></a></h2>
+        <h2><a href="{{ url('mozorg.home') }}"><img src="{{ MEDIA_URL }}img/sandstone/header-mozilla-stone.png" alt="mozilla"></a></h2>
         {% endblock %}
 
         {% block breadcrumbs %}{% endblock %}

templates/includes/webtrends-fx.html

@@ -2,7 +2,7 @@
  # License, v. 2.0. If a copy of the MPL was not distributed with this
  # file, You can obtain one at http://mozilla.org/MPL/2.0/. #}
 
-<script src="/media/js/webtrends.js" type="text/javascript"></script>
+<script src="{{ MEDIA_URL }}js/webtrends.js" type="text/javascript"></script>
 <!-- Warning: The two script blocks below must remain inline. Moving them to an external -->
 <!-- JavaScript include file can cause serious problems with cross-domain tracking.      -->
 <script type="text/javascript">

templates/includes/webtrends.html

@@ -3,7 +3,7 @@
 <!-- Version: 8.6.2 -->
 <!-- Tag Builder Version: 3.0  -->
 <!-- Created: 5/10/2010 6:56:34 PM -->
-<script src="/media/js/webtrends.js" type="text/javascript"></script>
+<script src="{{ MEDIA_URL }}js/webtrends.js" type="text/javascript"></script>
 <!-- Warning: The two script blocks below must remain inline. Moving them to an external -->
 <!-- JavaScript include file can cause serious problems with cross-domain tracking.      -->
 <script type="text/javascript">