Merge pull request #3262 from kyoshino/bug-1199916-image-helpers

Fix Bug 1199916 - Make image helpers always work without img prefix

bedrock/base/templates/base-resp.html

@@ -112,7 +112,7 @@
         {% endblock %}
 
         {% block site_header_logo %}
-          <h2><a href="{{ url('mozorg.home') }}">{{ high_res_img('img/sandstone/header-mozilla-stone.png', {'alt': 'Mozilla', 'width': '170', 'height': '45'}) }}</a></h2>
+          <h2><a href="{{ url('mozorg.home') }}">{{ high_res_img('sandstone/header-mozilla-stone.png', {'alt': 'Mozilla', 'width': '170', 'height': '45'}) }}</a></h2>
         {% endblock %}
 
         {% block alt_header %}{% endblock %}

bedrock/base/templates/base.html

@@ -107,7 +107,7 @@
         {% endblock %}
 
         {% block site_header_logo %}
-        <h2><a href="{{ url('mozorg.home') }}">{{ high_res_img('img/sandstone/header-mozilla-stone.png', {'alt': 'Mozilla', 'width': '170', 'height': '45'}) }}</a></h2>
+        <h2><a href="{{ url('mozorg.home') }}">{{ high_res_img('sandstone/header-mozilla-stone.png', {'alt': 'Mozilla', 'width': '170', 'height': '45'}) }}</a></h2>
         {% endblock %}
 
         {% block breadcrumbs %}{% endblock %}

bedrock/firefox/templates/firefox/all.html

@@ -36,7 +36,7 @@
 
 {% block site_header_logo %}
   {% if channel == 'alpha' %}
-    <h2><a href="{{ url('firefox.developer') }}">{{ high_res_img('img/firefox/developer/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}</a></h2>
+    <h2><a href="{{ url('firefox.developer') }}">{{ high_res_img('firefox/developer/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}</a></h2>
   {% else %}
     {{ super() }}
   {% endif %}

bedrock/firefox/templates/firefox/android/index.html

@@ -263,12 +263,12 @@ <h3 data-accordion-role="tab" id="screencast-tab">{{ _('Take it to the big scree
 
             <figure>
               <div class="media-desktop">
-                {{ high_res_img('img/firefox/android/customize/desktop-stream1.jpg', { 'alt': 'Send video content from Firefox for Android to any TV with supported streaming capabilities.'}) }}
-                {{ high_res_img('img/firefox/android/customize/desktop-stream2.jpg', { 'alt': 'Tap the screencast icon in the lower left corner of a video to begin playing it on your TV.'}) }}
-                {{ high_res_img('img/firefox/android/customize/desktop-stream3.jpg', { 'alt': 'Watch the content from your phone on your big screen TV.'}) }}
+                {{ high_res_img('firefox/android/customize/desktop-stream1.jpg', { 'alt': 'Send video content from Firefox for Android to any TV with supported streaming capabilities.'}) }}
+                {{ high_res_img('firefox/android/customize/desktop-stream2.jpg', { 'alt': 'Tap the screencast icon in the lower left corner of a video to begin playing it on your TV.'}) }}
+                {{ high_res_img('firefox/android/customize/desktop-stream3.jpg', { 'alt': 'Watch the content from your phone on your big screen TV.'}) }}
               </div>
               <div class="media-mobile">
-                {{ high_res_img('img/firefox/android/customize/mobile-stream.jpg', { 'alt': 'Send video content from Firefox for Android to any TV with supported streaming capabilities.'}) }}
+                {{ high_res_img('firefox/android/customize/mobile-stream.jpg', { 'alt': 'Send video content from Firefox for Android to any TV with supported streaming capabilities.'}) }}
               </div>
             </figure>
 
@@ -391,7 +391,7 @@ <h2 class="heading">{{ _('Don’t leave home without being in Sync') }}</h2>
   <div id="subscribe-download-wrapper" class="ga-section" data-ga-label="Get Firefox news">
     <div class="container">
       <div id="download-wrapper" class="dl-button-wrapper {% if has_widget %}show-widget{% endif %}">
-        {{ high_res_img('img/firefox/android/firefox-logo-footer.png', { 'id': 'footer-logo' }) }}
+        {{ high_res_img('firefox/android/firefox-logo-footer.png', { 'id': 'footer-logo' }) }}
 
         <div id="download-content">
           <h3>{{ _('Choose Firefox') }}</h3>

bedrock/firefox/templates/firefox/australis/firstrun-34-tour.html

@@ -41,7 +41,7 @@ <h2 class="tour-highlight step-target" data-target="appMenu" data-effect="wobble
                 <li><a href="#" role="button" class="more">{{ _('Learn how to customize your Firefox') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-menu-bar.jpg', {'alt': _('The features you use most, all in one place'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-menu-bar.jpg', {'alt': _('The features you use most, all in one place'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step" data-step="2" data-tip-prev="{{ _('<span>Previous:</span> Menu') }}" data-tip-next="{{ _('<span>Next:</span> Search') }}">
             <div class="tour-item">
@@ -55,7 +55,7 @@ <h2 class="tour-highlight step-target" data-target="customize" data-effect="wobb
                 <li><a href="#" role="button" class="more">{{ _('Choose how you want to search') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-customize.jpg', {'alt': _('Learn how to customize your Firefox'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-customize.jpg', {'alt': _('Learn how to customize your Firefox'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step" data-step="3" data-tip-prev="{{ _('<span>Previous:</span> Customize') }}" data-tip-next="{{ _('<span>Next:</span> Bookmarks') }}">
             <div class="tour-item">
@@ -69,7 +69,7 @@ <h2 class="tour-highlight step-target" data-target="searchIcon" data-effect="wob
                 <li><a href="#" role="button" class="more">{{ _('Use the star to create bookmarks') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-search.jpg', {'alt': _('Search suggestions appear as you type'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-search.jpg', {'alt': _('Search suggestions appear as you type'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step" data-step="4" data-tip-prev="{{ _('<span>Previous:</span> Search') }}">
             <div class="tour-item">
@@ -83,7 +83,7 @@ <h2 class="tour-highlight step-target" data-target="bookmarks" data-effect="wobb
                 <li id="sync-link"><a href="#" role="button" class="more">{{ _('Enjoy seamless browsing between devices with Sync') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-bookmarks.jpg', {'alt': _('Use the star to create bookmarks'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-bookmarks.jpg', {'alt': _('Use the star to create bookmarks'), 'width': '300', 'height': '188'}) }}
           </li>
         </ul>
         <div class="compact-title"></div>

bedrock/firefox/templates/firefox/australis/firstrun-tour.html

@@ -75,7 +75,7 @@ <h2 class="tour-highlight step-target" data-target="appMenu" data-effect="wobble
                 <li><a href="#" role="button" class="more">{{ _('Learn how to customize your Firefox') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-menu-bar.jpg', {'alt': _('The features you use most, all in one place'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-menu-bar.jpg', {'alt': _('The features you use most, all in one place'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step" data-step="2" data-tip-prev="{{ _('<span>Previous:</span> Menu') }}" data-tip-next="{{ _('<span>Next:</span> Add-ons') }}">
             <div class="tour-item">
@@ -89,7 +89,7 @@ <h2 class="tour-highlight step-target" data-target="customize" data-effect="wobb
                 <li><a href="#" role="button" class="more">{{ _('Add features and styles with add-ons') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-customize.jpg', {'alt': _('Learn how to customize your Firefox'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-customize.jpg', {'alt': _('Learn how to customize your Firefox'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step" data-step="3" data-tip-prev="{{ _('<span>Previous:</span> Customize') }}" data-tip-next="{{ _('<span>Next:</span> Bookmarks') }}">
             <div class="tour-item">
@@ -103,7 +103,7 @@ <h2 class="tour-highlight step-target" data-target="addons" data-effect="wobble"
                 <li><a href="#" role="button" class="more">{{ _('Use the star to create bookmarks') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-addons.jpg', {'alt': _('Add features and styles with add-ons'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-addons.jpg', {'alt': _('Add features and styles with add-ons'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step" data-step="4" data-tip-prev="{{ _('<span>Previous:</span> Add-ons') }}">
             <div class="tour-item">
@@ -117,7 +117,7 @@ <h2 class="tour-highlight step-target" data-target="bookmarks" data-effect="wobb
                 <li id="sync-link"><a href="#" role="button" class="more">{{ _('Enjoy seamless browsing between devices with Sync') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-bookmarks.jpg', {'alt': _('Use the star to create bookmarks'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-bookmarks.jpg', {'alt': _('Use the star to create bookmarks'), 'width': '300', 'height': '188'}) }}
           </li>
         </ul>
         <div class="compact-title"></div>

bedrock/firefox/templates/firefox/australis/fx36/firstrun-tour.html

@@ -57,7 +57,7 @@ <h1>{{ _('Welcome to Firefox') }}</h1>
       <h2>{{ _('Get to know Hello') }}</h2>
       <p>{{ _('Firefox Hello is the easiest way to connect with friends and family for free over video.') }}</p>
       <a id="learn-more" href="{{ url('firefox.hello') }}" class="button-flat">{{ _('Learn more') }}</a>
-      <p id="powered-by">{{ _('Powered by %s')|format(high_res_img('img/firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}</p>
+      <p id="powered-by">{{ _('Powered by %s')|format(high_res_img('firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}</p>
     </div>
     <div class="promo-media">
       {% include 'firefox/includes/hello-animation.html' %}
@@ -98,7 +98,7 @@ <h2 class="tour-highlight step-target" data-target="appMenu" data-effect="wobble
                 <li><a href="#" role="button" class="more">{{ _('Connect with anyone over video right from Firefox') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-menu-bar.jpg', {'alt': _('The features you use most, all in one place'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-menu-bar.jpg', {'alt': _('The features you use most, all in one place'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step" data-step="2" data-tip-prev="{{ _('<span>Previous:</span> Menu') }}" data-tip-next="{{ _('<span>Next:</span> Search') }}">
             <div class="tour-item">
@@ -111,7 +111,7 @@ <h2 class="tour-show-hello-panel step-target">
                 <li><a href="#" role="button" class="more">{{ _('Choose how you want to search') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/hello-1.png', {'alt': _('Connect with anyone over video right from Firefox'), 'width': '240', 'height': '178', 'id': 'hello-img-1'}) }}
+            {{ high_res_img('firefox/australis/hello-1.png', {'alt': _('Connect with anyone over video right from Firefox'), 'width': '240', 'height': '178', 'id': 'hello-img-1'}) }}
           </li>
           <li class="tour-step" data-step="3" data-tip-prev="{{ _('<span>Previous:</span> Firefox Hello') }}" data-tip-next="{{ _('<span>Next:</span> Bookmarks') }}">
             <div class="tour-item">
@@ -125,7 +125,7 @@ <h2 class="tour-highlight step-target" data-target="searchIcon" data-effect="wob
                 <li><a href="#" role="button" class="more">{{ _('Use the star to create bookmarks') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-search.jpg', {'alt': _('Search suggestions appear as you type'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-search.jpg', {'alt': _('Search suggestions appear as you type'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step" data-step="4" data-tip-prev="{{ _('<span>Previous:</span> Search') }}">
             <div class="tour-item">
@@ -138,7 +138,7 @@ <h2 class="tour-highlight step-target" data-target="bookmarks" data-effect="wobb
                 <li>{{ _('Save sites with a single click') }}</li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-bookmarks.jpg', {'alt': _('Use the star to create bookmarks'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-bookmarks.jpg', {'alt': _('Use the star to create bookmarks'), 'width': '300', 'height': '188'}) }}
           </li>
         </ul>
         <div class="compact-title"></div>

bedrock/firefox/templates/firefox/australis/fx36/whatsnew-tour.html

@@ -52,7 +52,7 @@ <h1>{{ _('Get to know Firefox Hello') }}</h1>
   <article class="promo whatsnew">
     <div class="promo-copy">
       <a id="learn-more" href="{{ url('firefox.hello') }}" class="button-flat">{{ _('Learn more') }}</a>
-      <p id="powered-by">{{ _('Powered by %s')|format(high_res_img('img/firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}</p>
+      <p id="powered-by">{{ _('Powered by %s')|format(high_res_img('firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}</p>
     </div>
     <div class="promo-media">
       {% include 'firefox/includes/hello-animation.html' %}
@@ -96,7 +96,7 @@ <h2 class="tour-show-hello-panel step-target">
               <div class="hello-added-door-hanger" data-title="{{ _('Perfect!') }}" data-text="{{ _('Now using Hello will be even easier. To move or remove the icon, just open the menu and select Customize.') }}" data-try="{{ _('Try it now') }}"></div>
               <div class="hello-later-door-hanger" data-title="{{ _('Want to add it later?') }}" data-text="{{ _('No problem. Just open this menu, select Customize and simply drag the Hello icon into your toolbar.') }}"></div>
             </div>
-            {{ high_res_img('img/firefox/australis/hello-1.png', {'alt': '', 'width': '240', 'height': '178', 'id': 'hello-img-1'}) }}
+            {{ high_res_img('firefox/australis/hello-1.png', {'alt': '', 'width': '240', 'height': '178', 'id': 'hello-img-1'}) }}
           </li>
           <li class="tour-step" data-step="2" data-tip-prev="{{ _('<span>Previous:</span> Firefox Hello') }}">
             <div class="tour-item">
@@ -110,7 +110,7 @@ <h2>
               </ul>
               <div class="hello-reminder-door-hanger step-target" data-title="{{ _('Here when you need it') }}" data-text="{{ _('Start and join conversations right from your toolbar.') }}"></div>
             </div>
-            {{ high_res_img('img/firefox/australis/hello-2.png', {'alt': '', 'width': '240', 'height': '178', 'id': 'hello-img-2'}) }}
+            {{ high_res_img('firefox/australis/hello-2.png', {'alt': '', 'width': '240', 'height': '178', 'id': 'hello-img-2'}) }}
           </li>
         </ul>
         <div class="compact-title"></div>

bedrock/firefox/templates/firefox/australis/fx38_0_5/firstrun.html

@@ -50,7 +50,7 @@
 <section id="intro">
   <div class="container">
     <div id="logo">
-      {{ high_res_img('img/firefox/australis/fx38.0.5/firefox-logo.png', {'alt': 'Firefox', 'width': '142', 'height': '147'}) }}
+      {{ high_res_img('firefox/australis/fx38.0.5/firefox-logo.png', {'alt': 'Firefox', 'width': '142', 'height': '147'}) }}
     </div>
 
     <div class="leftcol">
@@ -69,7 +69,7 @@ <h2>
     </div>
 
     <div class="rightcol">
-      {{ high_res_img('img/firefox/australis/fx38.0.5/sync.png', {'alt': 'Firefox Sync', 'width': '219', 'height': '118'}) }}
+      {{ high_res_img('firefox/australis/fx38.0.5/sync.png', {'alt': 'Firefox Sync', 'width': '219', 'height': '118'}) }}
       <a href="{{ url('firefox.sync') }}" id="cta-signup" class="button-flat-green">{{ _('Create a Firefox Account') }}</a>
       <a id="cta-signin" rel="external" href="https://support.mozilla.org/kb/how-do-i-set-up-firefox-sync">{{ _('Already have one? Sign in.') }}</a>
     </div>

bedrock/firefox/templates/firefox/australis/fx40/firstrun.html

@@ -50,7 +50,7 @@
 <section id="intro" data-fxa-iframe-src="{{ settings.FXA_IFRAME_SRC }}">
   <div class="container">
     <div id="logo">
-      {{ high_res_img('img/firefox/australis/fx38.0.5/firefox-logo.png', {'alt': 'Firefox', 'width': '142', 'height': '147'}) }}
+      {{ high_res_img('firefox/australis/fx38.0.5/firefox-logo.png', {'alt': 'Firefox', 'width': '142', 'height': '147'}) }}
     </div>
 
     <div class="leftcol">

bedrock/firefox/templates/firefox/australis/whatsnew-tour.html

@@ -75,7 +75,7 @@ <h2 class="tour-highlight step-target" data-target="appMenu" data-effect="wobble
                 <li><a href="#" role="button" class="more">{{ _('Learn how to customize your Firefox') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-menu-bar.jpg', {'alt': _('Your favorite features, all in one place'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-menu-bar.jpg', {'alt': _('Your favorite features, all in one place'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step app-menu" data-step="2" data-tip-prev="{{ _('<span>Previous:</span> Menu') }}" data-tip-next="{{ _('<span>Next:</span> Add-ons') }}">
             <div class="tour-item">
@@ -89,7 +89,7 @@ <h2 class="tour-highlight step-target" data-target="customize" data-effect="wobb
                 <li><a href="#" role="button" class="more">{{ _('Add features and styles with add-ons') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-customize.jpg', {'alt': _('Learn how to customize your Firefox'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-customize.jpg', {'alt': _('Learn how to customize your Firefox'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step app-menu" data-step="3" data-tip-prev="{{ _('<span>Previous:</span> Customize') }}" data-tip-next="{{ _('<span>Next:</span> Bookmarks') }}">
             <div class="tour-item">
@@ -103,7 +103,7 @@ <h2 class="tour-highlight step-target" data-target="addons" data-effect="wobble"
                 <li><a href="#" role="button" class="more">{{ _('Use the star to create bookmarks') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-addons.jpg', {'alt': _('Add features and styles with add-ons'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-addons.jpg', {'alt': _('Add features and styles with add-ons'), 'width': '300', 'height': '188'}) }}
           </li>
           <li class="tour-step" data-step="4" data-tip-prev="{{ _('<span>Previous:</span> Add-ons') }}">
             <div class="tour-item">
@@ -117,7 +117,7 @@ <h2 class="tour-highlight step-target" data-target="bookmarks" data-effect="wobb
                 <li id="sync-link"><a href="#" role="button" class="more">{{ _('Enjoy seamless browsing between devices with Sync') }}</a></li>
               </ul>
             </div>
-            {{ high_res_img('img/firefox/australis/diag-bookmarks.jpg', {'alt': _('Use the star to create bookmarks'), 'width': '300', 'height': '188'}) }}
+            {{ high_res_img('firefox/australis/diag-bookmarks.jpg', {'alt': _('Use the star to create bookmarks'), 'width': '300', 'height': '188'}) }}
           </li>
         </ul>
         <div class="compact-title"></div>