diff --git a/bedrock/base/templates/base-resp.html b/bedrock/base/templates/base-resp.html index d524cc9fbfb..5fbb9a60a10 100644 --- a/bedrock/base/templates/base-resp.html +++ b/bedrock/base/templates/base-resp.html @@ -112,7 +112,7 @@ {% endblock %} {% block site_header_logo %} -

{{ high_res_img('img/sandstone/header-mozilla-stone.png', {'alt': 'Mozilla', 'width': '170', 'height': '45'}) }}

+

{{ high_res_img('sandstone/header-mozilla-stone.png', {'alt': 'Mozilla', 'width': '170', 'height': '45'}) }}

{% endblock %} {% block alt_header %}{% endblock %} diff --git a/bedrock/base/templates/base.html b/bedrock/base/templates/base.html index 1568f11023b..422df23ceec 100644 --- a/bedrock/base/templates/base.html +++ b/bedrock/base/templates/base.html @@ -107,7 +107,7 @@ {% endblock %} {% block site_header_logo %} -

{{ high_res_img('img/sandstone/header-mozilla-stone.png', {'alt': 'Mozilla', 'width': '170', 'height': '45'}) }}

+

{{ high_res_img('sandstone/header-mozilla-stone.png', {'alt': 'Mozilla', 'width': '170', 'height': '45'}) }}

{% endblock %} {% block breadcrumbs %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/all.html b/bedrock/firefox/templates/firefox/all.html index 7f129f82080..7091f41be3d 100644 --- a/bedrock/firefox/templates/firefox/all.html +++ b/bedrock/firefox/templates/firefox/all.html @@ -36,7 +36,7 @@ {% block site_header_logo %} {% if channel == 'alpha' %} -

{{ high_res_img('img/firefox/developer/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

+

{{ high_res_img('firefox/developer/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

{% else %} {{ super() }} {% endif %} diff --git a/bedrock/firefox/templates/firefox/android/index.html b/bedrock/firefox/templates/firefox/android/index.html index 79e1e69dfed..4c6c3c8eb06 100644 --- a/bedrock/firefox/templates/firefox/android/index.html +++ b/bedrock/firefox/templates/firefox/android/index.html @@ -263,12 +263,12 @@

{{ _('Take it to the big scree
- {{ 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.'}) }}
- {{ 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.'}) }}
@@ -391,7 +391,7 @@

{{ _('Don’t leave home without being in Sync') }}

- {{ 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' }) }}

{{ _('Choose Firefox') }}

diff --git a/bedrock/firefox/templates/firefox/australis/firstrun-34-tour.html b/bedrock/firefox/templates/firefox/australis/firstrun-34-tour.html index 56cf662008b..67f69004c78 100644 --- a/bedrock/firefox/templates/firefox/australis/firstrun-34-tour.html +++ b/bedrock/firefox/templates/firefox/australis/firstrun-34-tour.html @@ -41,7 +41,7 @@

{{ _('Learn how to customize your Firefox') }}

- {{ 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'}) }}
  • @@ -55,7 +55,7 @@

    {{ _('Choose how you want to search') }}

    • - {{ 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'}) }}
  • @@ -69,7 +69,7 @@

    {{ _('Use the star to create bookmarks') }}

    • - {{ 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'}) }}
  • @@ -83,7 +83,7 @@

    {{ _('Enjoy seamless browsing between devices with Sync') }}

    • - {{ 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'}) }}
    diff --git a/bedrock/firefox/templates/firefox/australis/firstrun-tour.html b/bedrock/firefox/templates/firefox/australis/firstrun-tour.html index c61adf03246..f56116556f7 100644 --- a/bedrock/firefox/templates/firefox/australis/firstrun-tour.html +++ b/bedrock/firefox/templates/firefox/australis/firstrun-tour.html @@ -75,7 +75,7 @@

    {{ _('Learn how to customize your Firefox') }} - {{ 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'}) }}
  • @@ -89,7 +89,7 @@

    {{ _('Add features and styles with add-ons') }}

    • - {{ 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'}) }}
  • @@ -103,7 +103,7 @@

    {{ _('Use the star to create bookmarks') }}

    • - {{ 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'}) }}
  • @@ -117,7 +117,7 @@

    {{ _('Enjoy seamless browsing between devices with Sync') }}

    • - {{ 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'}) }}
    diff --git a/bedrock/firefox/templates/firefox/australis/fx36/firstrun-tour.html b/bedrock/firefox/templates/firefox/australis/fx36/firstrun-tour.html index fe712a5785e..fda80a86b4f 100644 --- a/bedrock/firefox/templates/firefox/australis/fx36/firstrun-tour.html +++ b/bedrock/firefox/templates/firefox/australis/fx36/firstrun-tour.html @@ -57,7 +57,7 @@

    {{ _('Welcome to Firefox') }}

    {{ _('Get to know Hello') }}

    {{ _('Firefox Hello is the easiest way to connect with friends and family for free over video.') }}

    {{ _('Learn more') }} -

    {{ _('Powered by %s')|format(high_res_img('img/firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}

    +

    {{ _('Powered by %s')|format(high_res_img('firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}

    {% include 'firefox/includes/hello-animation.html' %} @@ -98,7 +98,7 @@

    {{ _('Connect with anyone over video right from Firefox') }}

    - {{ 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'}) }}
  • @@ -111,7 +111,7 @@

  • {{ _('Choose how you want to search') }}

    • - {{ 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'}) }}
  • @@ -125,7 +125,7 @@

    {{ _('Use the star to create bookmarks') }}

    • - {{ 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'}) }}
  • @@ -138,7 +138,7 @@

    diff --git a/bedrock/firefox/templates/firefox/australis/fx36/whatsnew-tour.html b/bedrock/firefox/templates/firefox/australis/fx36/whatsnew-tour.html index 67ed2a48bcc..c4049260216 100644 --- a/bedrock/firefox/templates/firefox/australis/fx36/whatsnew-tour.html +++ b/bedrock/firefox/templates/firefox/australis/fx36/whatsnew-tour.html @@ -52,7 +52,7 @@

    {{ _('Get to know Firefox Hello') }}

    {{ _('Learn more') }} -

    {{ _('Powered by %s')|format(high_res_img('img/firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}

    +

    {{ _('Powered by %s')|format(high_res_img('firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}

    {% include 'firefox/includes/hello-animation.html' %} @@ -96,7 +96,7 @@

    - {{ 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'}) }}
  • @@ -110,7 +110,7 @@

    - {{ 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'}) }}
    • diff --git a/bedrock/firefox/templates/firefox/australis/fx38_0_5/firstrun.html b/bedrock/firefox/templates/firefox/australis/fx38_0_5/firstrun.html index 203bfdfab63..3987caeede4 100644 --- a/bedrock/firefox/templates/firefox/australis/fx38_0_5/firstrun.html +++ b/bedrock/firefox/templates/firefox/australis/fx38_0_5/firstrun.html @@ -50,7 +50,7 @@
    @@ -69,7 +69,7 @@

    - {{ 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'}) }} {{ _('Create a Firefox Account') }} {{ _('Already have one? Sign in.') }}
    diff --git a/bedrock/firefox/templates/firefox/australis/fx40/firstrun.html b/bedrock/firefox/templates/firefox/australis/fx40/firstrun.html index 22d39c3e4ae..ab1b6bb4ab0 100644 --- a/bedrock/firefox/templates/firefox/australis/fx40/firstrun.html +++ b/bedrock/firefox/templates/firefox/australis/fx40/firstrun.html @@ -50,7 +50,7 @@
    diff --git a/bedrock/firefox/templates/firefox/australis/whatsnew-tour.html b/bedrock/firefox/templates/firefox/australis/whatsnew-tour.html index d03b6dab64b..b2a44a0413a 100644 --- a/bedrock/firefox/templates/firefox/australis/whatsnew-tour.html +++ b/bedrock/firefox/templates/firefox/australis/whatsnew-tour.html @@ -75,7 +75,7 @@

    {{ _('Learn how to customize your Firefox') }}

    - {{ 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'}) }}
  • @@ -89,7 +89,7 @@

    {{ _('Add features and styles with add-ons') }}

    • - {{ 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'}) }}
  • @@ -103,7 +103,7 @@

    {{ _('Use the star to create bookmarks') }}

    • - {{ 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'}) }}
  • @@ -117,7 +117,7 @@

    {{ _('Enjoy seamless browsing between devices with Sync') }}

    • - {{ 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'}) }}
    diff --git a/bedrock/firefox/templates/firefox/base-resp.html b/bedrock/firefox/templates/firefox/base-resp.html index edb95ce11af..389b660deff 100644 --- a/bedrock/firefox/templates/firefox/base-resp.html +++ b/bedrock/firefox/templates/firefox/base-resp.html @@ -26,7 +26,7 @@ {% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/template/header-logo.png', {'alt': 'Mozilla Firefox', 'width': '185', 'height': '70'}) }}

    +

    {{ high_res_img('firefox/template/header-logo.png', {'alt': 'Mozilla Firefox', 'width': '185', 'height': '70'}) }}

    {% endblock %} {% block site_js %} diff --git a/bedrock/firefox/templates/firefox/base.html b/bedrock/firefox/templates/firefox/base.html index 95260adf931..5c3d0bb7890 100644 --- a/bedrock/firefox/templates/firefox/base.html +++ b/bedrock/firefox/templates/firefox/base.html @@ -24,7 +24,7 @@ {% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/template/header-logo.png', {'alt': 'Mozilla Firefox', 'width': '185', 'height': '70'}) }}

    +

    {{ high_res_img('firefox/template/header-logo.png', {'alt': 'Mozilla Firefox', 'width': '185', 'height': '70'}) }}

    {% endblock %} {% block site_js %} diff --git a/bedrock/firefox/templates/firefox/channel.html b/bedrock/firefox/templates/firefox/channel.html index 932ea2c6a04..e935910e57b 100644 --- a/bedrock/firefox/templates/firefox/channel.html +++ b/bedrock/firefox/templates/firefox/channel.html @@ -29,7 +29,7 @@ {% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/template/header-logo.png', { +

    {{ high_res_img('firefox/template/header-logo.png', { 'alt': 'Mozilla Firefox', 'width': '185', 'height': '70', @@ -54,7 +54,7 @@

    {{ high_res_img('img/firefox/template/header-
    -

    {{ high_res_img('img/firefox/channel/title-beta.png', {'alt': 'Firefox Beta', 'width': '441', 'height': '74'}) }}

    +

    {{ high_res_img('firefox/channel/title-beta.png', {'alt': 'Firefox Beta', 'width': '441', 'height': '74'}) }}

    {# L10n: This description applies to Firefox Beta #}

    {{_('The latest features in a more stable environment')}}

    @@ -78,7 +78,7 @@

    {{_('The latest features in a more stable environment')}}

    -

    {{ high_res_img('img/firefox/channel/title-firefox.png', {'alt': 'Firefox', 'width': '258', 'height': '74'}) }}

    +

    {{ high_res_img('firefox/channel/title-firefox.png', {'alt': 'Firefox', 'width': '258', 'height': '74'}) }}

    {# L10n: This description applies to Firefox on the Release channel #}

    {{_('Tried, tested and used by millions around the world')}}

    @@ -91,7 +91,7 @@

    {{_('Tried, tested and used by millions around the world')}}

    -

    {{ high_res_img('img/firefox/channel/title-dev.png', {'alt': 'Firefox Developer Edition', 'width': '214', 'height': '100'}) }}

    +

    {{ high_res_img('firefox/channel/title-dev.png', {'alt': 'Firefox Developer Edition', 'width': '214', 'height': '100'}) }}

    {# L10n: This description applies to Firefox Developer Edition #} {% if l10n_has_tag('channel_dev_edition') %}

    {{_('Built for those who build the Web')}}

    diff --git a/bedrock/firefox/templates/firefox/desktop/customize.html b/bedrock/firefox/templates/firefox/desktop/customize.html index 6c5c9d0eeaa..e5a42a5d732 100644 --- a/bedrock/firefox/templates/firefox/desktop/customize.html +++ b/bedrock/firefox/templates/firefox/desktop/customize.html @@ -55,7 +55,7 @@

    {{ _('Designed to
    be redesigned') }}

    {{ _('Keep your favorite features — add-ons, private browsing, Sync and more — one quick click away.') }}

    - {{ high_res_img('img/firefox/desktop/customize/designed-redesigned.png', { 'alt': '', 'id': 'designed-mobile'}) }} + {{ high_res_img('firefox/desktop/customize/designed-redesigned.png', { 'alt': '', 'id': 'designed-mobile'}) }}
    diff --git a/bedrock/firefox/templates/firefox/dev-firstrun.html b/bedrock/firefox/templates/firefox/dev-firstrun.html index 9224016fe85..958865f7085 100644 --- a/bedrock/firefox/templates/firefox/dev-firstrun.html +++ b/bedrock/firefox/templates/firefox/dev-firstrun.html @@ -65,7 +65,7 @@ {% block site_header_nav %}{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/firstrun/dev/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

    +

    {{ high_res_img('firefox/firstrun/dev/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

    {% endblock %} {% block content %} diff --git a/bedrock/firefox/templates/firefox/dev-whatsnew.html b/bedrock/firefox/templates/firefox/dev-whatsnew.html index 98f72ed7fe3..d98b2ca9c49 100644 --- a/bedrock/firefox/templates/firefox/dev-whatsnew.html +++ b/bedrock/firefox/templates/firefox/dev-whatsnew.html @@ -31,7 +31,7 @@ {% block site_header_nav %}{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/firstrun/dev/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

    +

    {{ high_res_img('firefox/firstrun/dev/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

    {% endblock %} {% block content %} diff --git a/bedrock/firefox/templates/firefox/developer.html b/bedrock/firefox/templates/firefox/developer.html index a00166eb112..1f3eab38ccf 100644 --- a/bedrock/firefox/templates/firefox/developer.html +++ b/bedrock/firefox/templates/firefox/developer.html @@ -20,7 +20,7 @@ {% block body_class %}blueprint{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/developer/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

    +

    {{ high_res_img('firefox/developer/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

    {% endblock %} diff --git a/bedrock/firefox/templates/firefox/family/index.html b/bedrock/firefox/templates/firefox/family/index.html index f4b811e499f..ddd8d4133e6 100644 --- a/bedrock/firefox/templates/firefox/family/index.html +++ b/bedrock/firefox/templates/firefox/family/index.html @@ -69,9 +69,9 @@

    {% if LANG.startswith('en') %} - Free yourself with {{ high_res_img('img/firefox/family/index/firefox-wordmark.png', {'alt': 'Firefox', 'width': '330', 'height': '95'}) }} + Free yourself with {{ high_res_img('firefox/family/index/firefox-wordmark.png', {'alt': 'Firefox', 'width': '330', 'height': '95'}) }} {% else %} - {{ _('Free yourself with %s')|format(high_res_img('img/firefox/family/index/firefox-wordmark.png', {'alt': 'Firefox', 'width': '330', 'height': '95'})) }} + {{ _('Free yourself with %s')|format(high_res_img('firefox/family/index/firefox-wordmark.png', {'alt': 'Firefox', 'width': '330', 'height': '95'})) }} {% endif %}

    {#-- /.content --#} diff --git a/bedrock/firefox/templates/firefox/hello/index.html b/bedrock/firefox/templates/firefox/hello/index.html index 9e45d0f535c..b5e4fc62030 100644 --- a/bedrock/firefox/templates/firefox/hello/index.html +++ b/bedrock/firefox/templates/firefox/hello/index.html @@ -134,7 +134,7 @@

    {{ share_cta(_('Share'), share_urls, _('Meet Firefox Hello, the easiest way to connect for free over video with anyone, anywhere.'), 'spread-hello', 'sky mini') }} diff --git a/bedrock/firefox/templates/firefox/includes/hello-animation.html b/bedrock/firefox/templates/firefox/includes/hello-animation.html index 900313ecf72..9b6cc350237 100644 --- a/bedrock/firefox/templates/firefox/includes/hello-animation.html +++ b/bedrock/firefox/templates/firefox/includes/hello-animation.html @@ -1,5 +1,5 @@
    - {{ high_res_img('img/firefox/australis/hello-2.png', {'alt': 'Firefox Hello', 'width': '300', 'height': '188', 'id': 'hello-animation-fallback'}) }} + {{ high_res_img('firefox/australis/hello-2.png', {'alt': 'Firefox Hello', 'width': '300', 'height': '188', 'id': 'hello-animation-fallback'}) }}
    diff --git a/bedrock/firefox/templates/firefox/independent.html b/bedrock/firefox/templates/firefox/independent.html index 025d4c43cf3..98f78f6cef2 100644 --- a/bedrock/firefox/templates/firefox/independent.html +++ b/bedrock/firefox/templates/firefox/independent.html @@ -67,7 +67,7 @@

    {{ _('Choose Firefox and stay in control of your online life') }}

    - {{ high_res_img('img/firefox/independent/logo-pcworld.png', {'alt': 'PC World', 'width': '184', 'height': '54'}) }} + {{ high_res_img('firefox/independent/logo-pcworld.png', {'alt': 'PC World', 'width': '184', 'height': '54'}) }} {# L10n: This will be used for image alt text. #}

    {{ _('Four stars') }}

    {{ _('“Magnificent”') }}

    @@ -78,7 +78,7 @@

    {{ _('Choose Firefox and stay in control of your online life') }}

    - {{ high_res_img('img/firefox/independent/logo-cnet.png', {'alt': 'C|Net', 'width': '147', 'height': '147'}) }} + {{ high_res_img('firefox/independent/logo-cnet.png', {'alt': 'C|Net', 'width': '147', 'height': '147'}) }} {# L10n: This will be used for image alt text. #}

    {{ _('Five stars') }}

    {{ _('“Spectacular”') }}

    diff --git a/bedrock/firefox/templates/firefox/new.html b/bedrock/firefox/templates/firefox/new.html index 4ccbd700897..343fbf84350 100644 --- a/bedrock/firefox/templates/firefox/new.html +++ b/bedrock/firefox/templates/firefox/new.html @@ -29,7 +29,7 @@ {% block site_header_nav %}{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/new/header-firefox.png', {'alt': _('Firefox for desktop'), 'width': '223', 'height': '84'}) }}

    +

    {{ high_res_img('firefox/new/header-firefox.png', {'alt': _('Firefox for desktop'), 'width': '223', 'height': '84'}) }}

    {% endblock %} {% block site_css %}{% endblock %} @@ -157,7 +157,7 @@

    - {{ platform_img('img/firefox/new/browser.png', {'alt': _('Firefox screenshot'), 'high-res': True}) }} + {{ platform_img('firefox/new/browser.png', {'alt': _('Firefox screenshot'), 'high-res': True}) }}
    diff --git a/bedrock/firefox/templates/firefox/new2.html b/bedrock/firefox/templates/firefox/new2.html index 715e8a40f4e..3f421bf3763 100644 --- a/bedrock/firefox/templates/firefox/new2.html +++ b/bedrock/firefox/templates/firefox/new2.html @@ -31,7 +31,7 @@ {% block site_header_nav %}{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/new/header-firefox.png', {'alt': _('Firefox for desktop'), 'width': '223', 'height': '84'}) }}

    +

    {{ high_res_img('firefox/new/header-firefox.png', {'alt': _('Firefox for desktop'), 'width': '223', 'height': '84'}) }}

    {% endblock %} {# all CSS must be in extrahead block for old IE #} @@ -160,7 +160,7 @@

    - {{ platform_img('img/firefox/new/2/browser.png', {'alt': _('Firefox screenshot'), 'high-res': True}) }} + {{ platform_img('firefox/new/2/browser.png', {'alt': _('Firefox screenshot'), 'high-res': True}) }}
    diff --git a/bedrock/firefox/templates/firefox/organizations/faq.html b/bedrock/firefox/templates/firefox/organizations/faq.html index 8e5177d7b0b..173e1ba3f8d 100644 --- a/bedrock/firefox/templates/firefox/organizations/faq.html +++ b/bedrock/firefox/templates/firefox/organizations/faq.html @@ -9,7 +9,7 @@ {% block body_id %}organizations-faq{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/organizations/title.png', {'alt': _('Firefox ESR'), 'width': '253', 'height': '70'}) }}

    +

    {{ high_res_img('firefox/organizations/title.png', {'alt': _('Firefox ESR'), 'width': '253', 'height': '70'}) }}

    {% endblock %} {% block main_feature %} @@ -58,7 +58,7 @@

    {{ _('What does the Mozilla Firefox ESR life cycle look like?') }}

    {% endtrans %}

    -

    {{ high_res_img('img/firefox/organizations/release-overview.png', {'alt': _('Firefox ESR Release Overview'), 'width': '832', 'height': '384', 'id': 'release-overview'}) }}

    +

    {{ high_res_img('firefox/organizations/release-overview.png', {'alt': _('Firefox ESR Release Overview'), 'width': '832', 'height': '384', 'id': 'release-overview'}) }}

    {% trans %} diff --git a/bedrock/firefox/templates/firefox/organizations/organizations.html b/bedrock/firefox/templates/firefox/organizations/organizations.html index ad758d3fcc4..bbbadd72f17 100644 --- a/bedrock/firefox/templates/firefox/organizations/organizations.html +++ b/bedrock/firefox/templates/firefox/organizations/organizations.html @@ -17,7 +17,7 @@ {% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/organizations/title.png', {'alt': _('Firefox ESR'), 'width': '253', 'height': '70'}) }}

    +

    {{ high_res_img('firefox/organizations/title.png', {'alt': _('Firefox ESR'), 'width': '253', 'height': '70'}) }}

    {% endblock %} diff --git a/bedrock/firefox/templates/firefox/os/index.html b/bedrock/firefox/templates/firefox/os/index.html index 30c27ce66e1..74e2789b8bc 100644 --- a/bedrock/firefox/templates/firefox/os/index.html +++ b/bedrock/firefox/templates/firefox/os/index.html @@ -129,63 +129,63 @@

    {{_('Apps for all you do')}}

    • - {{ high_res_img('img/firefox/os-new/icons/browser.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/browser.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Browser')}}
    • - {{ high_res_img('img/firefox/os-new/icons/calendar.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/calendar.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Calendar')}}
    • - {{ high_res_img('img/firefox/os-new/icons/camera.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/camera.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Camera')}}
    • - {{ high_res_img('img/firefox/os-new/icons/clock.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/clock.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Clock')}}
    • - {{ high_res_img('img/firefox/os-new/icons/contacts.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/contacts.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Contacts')}}
    • - {{ high_res_img('img/firefox/os-new/icons/email.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/email.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('E-Mail')}}
    • - {{ high_res_img('img/firefox/os-new/icons/fmradio.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/fmradio.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('FM Radio')}}
    • - {{ high_res_img('img/firefox/os-new/icons/gallery.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/gallery.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Gallery')}}
    • - {{ high_res_img('img/firefox/os-new/icons/marketplace.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/marketplace.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Marketplace')}}
    • - {{ high_res_img('img/firefox/os-new/icons/sms.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/sms.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Messages')}}
    • - {{ high_res_img('img/firefox/os-new/icons/music.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/music.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Music')}}
    • - {{ high_res_img('img/firefox/os-new/icons/dialer.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/dialer.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Phone')}}
    • - {{ high_res_img('img/firefox/os-new/icons/settings.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/settings.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Settings')}}
    • - {{ high_res_img('img/firefox/os-new/icons/usage.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/usage.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Usage')}}
    • - {{ high_res_img('img/firefox/os-new/icons/video.png', {'alt': '', 'width': '142', 'height': '142'}) }} + {{ high_res_img('firefox/os-new/icons/video.png', {'alt': '', 'width': '142', 'height': '142'}) }} {{_('Video')}}
    @@ -227,7 +227,7 @@

    {{_('In the news')}}

    - {{ high_res_img('img/firefox/os-new/mozilla-groupshot.png', {'alt': '', 'width': '260', 'height': '260'}) }} + {{ high_res_img('firefox/os-new/mozilla-groupshot.png', {'alt': '', 'width': '260', 'height': '260'}) }}

    {{_('Powered by the Mozilla community')}}

    {{_('Mozilla is a non-profit organization fueled by a passionate global community. Together, we’re able to create and innovate with local interests in mind, while making the Web better and more accessible for everyone everywhere.')}}

    {{_('Learn more about Mozilla')}}

    diff --git a/bedrock/firefox/templates/firefox/os/mwc-2015-preview.html b/bedrock/firefox/templates/firefox/os/mwc-2015-preview.html index 065a385622c..15f5e12d79d 100644 --- a/bedrock/firefox/templates/firefox/os/mwc-2015-preview.html +++ b/bedrock/firefox/templates/firefox/os/mwc-2015-preview.html @@ -49,7 +49,7 @@

    {{ _('Mozilla at Mobile World Congress 2015') }}

    {{ _('Come and partner with Firefox OS — the most exciting new platform in mobile.') }}

    - {{ high_res_img('img/firefox/os/mwc-2015-preview/mwc-logo.png', {'alt': 'Mobile World Congress', 'width': '168', 'height': '68'}) }} + {{ high_res_img('firefox/os/mwc-2015-preview/mwc-logo.png', {'alt': 'Mobile World Congress', 'width': '168', 'height': '68'}) }}
    @@ -91,29 +91,29 @@

    {{ _('In the news') }}

    {{ _('Be part of our growing family of partners') }}

      -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/orange.png', {'alt': 'Orange', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/verizon.png', {'alt': 'Verizon', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/mtn.png', {'alt': 'MTN', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/alcatel.png', {'alt': 'Alcatel OneTouch', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/america-movil.png', {'alt': 'America Movil', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/cherry-mobile.png', {'alt': 'Cherry Mobile', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/deutsche-telekom.png', {'alt': 'Deutsche Telekom', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/grameenphone.png', {'alt': 'GrameenPhone', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/huawei.png', {'alt': 'Huawei', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/intex.png', {'alt': 'Intex', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/kddi.png', {'alt': 'KDDI', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/lg.png', {'alt': 'LG', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/megafon.png', {'alt': 'MegaFon', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/panasonic.png', {'alt': 'Panasonic', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/qualcomm.png', {'alt': 'Qualcomm', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/spice.png', {'alt': 'Spice', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/spreadtrum.png', {'alt': 'Spreadtrum', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/symphony.png', {'alt': 'Symphony', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/telecom-italia.png', {'alt': 'Telecom Italia', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/telefonica.png', {'alt': 'Telefonica', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/telenor.png', {'alt': 'Telenor', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/zen-mobile.png', {'alt': 'ZEN Mobile', 'width': '220', 'height': '100'}) }}
      • -
    • {{ high_res_img('img/firefox/os/mwc-2015-preview/partners/zte.png', {'alt': 'ZTE', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/orange.png', {'alt': 'Orange', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/verizon.png', {'alt': 'Verizon', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/mtn.png', {'alt': 'MTN', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/alcatel.png', {'alt': 'Alcatel OneTouch', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/america-movil.png', {'alt': 'America Movil', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/cherry-mobile.png', {'alt': 'Cherry Mobile', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/deutsche-telekom.png', {'alt': 'Deutsche Telekom', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/grameenphone.png', {'alt': 'GrameenPhone', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/huawei.png', {'alt': 'Huawei', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/intex.png', {'alt': 'Intex', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/kddi.png', {'alt': 'KDDI', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/lg.png', {'alt': 'LG', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/megafon.png', {'alt': 'MegaFon', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/panasonic.png', {'alt': 'Panasonic', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/qualcomm.png', {'alt': 'Qualcomm', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/spice.png', {'alt': 'Spice', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/spreadtrum.png', {'alt': 'Spreadtrum', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/symphony.png', {'alt': 'Symphony', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/telecom-italia.png', {'alt': 'Telecom Italia', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/telefonica.png', {'alt': 'Telefonica', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/telenor.png', {'alt': 'Telenor', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/zen-mobile.png', {'alt': 'ZEN Mobile', 'width': '220', 'height': '100'}) }}
      • +
    • {{ high_res_img('firefox/os/mwc-2015-preview/partners/zte.png', {'alt': 'ZTE', 'width': '220', 'height': '100'}) }}

    {{ _('Here’s how') }}

    @@ -148,7 +148,7 @@

    {{ _('The future is open') }}

    • - {{ high_res_img('img/firefox/os/mwc-2015-preview/platform-firefox-os.png', {'alt': 'Firefox OS', 'width': '262', 'height': '76'}) }} + {{ high_res_img('firefox/os/mwc-2015-preview/platform-firefox-os.png', {'alt': 'Firefox OS', 'width': '262', 'height': '76'}) }}

      @@ -161,7 +161,7 @@

    • - {{ high_res_img('img/firefox/os/mwc-2015-preview/platform-firefox-marketplace.png', {'alt': 'Firefox Marketplace', 'width': '436', 'height': '76'}) }} + {{ high_res_img('firefox/os/mwc-2015-preview/platform-firefox-marketplace.png', {'alt': 'Firefox Marketplace', 'width': '436', 'height': '76'}) }}

      diff --git a/bedrock/firefox/templates/firefox/os/tv.html b/bedrock/firefox/templates/firefox/os/tv.html index 3e535ccbe5b..edf9b23ab51 100644 --- a/bedrock/firefox/templates/firefox/os/tv.html +++ b/bedrock/firefox/templates/firefox/os/tv.html @@ -20,7 +20,7 @@ {% block site_header_logo %}

      - {{ high_res_img('img/firefox/os/devices/tv/logo.png', {'alt': 'Firefox OS', 'width': '221', 'height': '67'}) }}

      + {{ high_res_img('firefox/os/devices/tv/logo.png', {'alt': 'Firefox OS', 'width': '221', 'height': '67'}) }}

    {% endblock %} {% block content %} @@ -37,16 +37,16 @@

    {{ _('We’re bringing the power of the Web to Panasonic televisions later t
    - {{ high_res_img('img/firefox/os/devices/tv/screen1.jpg', {'alt': _('Screenshot'), 'width': '796', 'height': '448'}) }} + {{ high_res_img('firefox/os/devices/tv/screen1.jpg', {'alt': _('Screenshot'), 'width': '796', 'height': '448'}) }}
    - {{ high_res_img('img/firefox/os/devices/tv/screen2.jpg', {'alt': _('Screenshot'), 'width': '796', 'height': '448'}) }} + {{ high_res_img('firefox/os/devices/tv/screen2.jpg', {'alt': _('Screenshot'), 'width': '796', 'height': '448'}) }}
    - {{ high_res_img('img/firefox/os/devices/tv/screen3.jpg', {'alt': _('Screenshot'), 'width': '796', 'height': '448'}) }} + {{ high_res_img('firefox/os/devices/tv/screen3.jpg', {'alt': _('Screenshot'), 'width': '796', 'height': '448'}) }}
    - {{ high_res_img('img/firefox/os/devices/tv/screen4.jpg', {'alt': _('Screenshot'), 'width': '796', 'height': '448'}) }} + {{ high_res_img('firefox/os/devices/tv/screen4.jpg', {'alt': _('Screenshot'), 'width': '796', 'height': '448'}) }}
    diff --git a/bedrock/firefox/templates/firefox/partners/index.html b/bedrock/firefox/templates/firefox/partners/index.html index 563c2e33643..a087bcc76d6 100644 --- a/bedrock/firefox/templates/firefox/partners/index.html +++ b/bedrock/firefox/templates/firefox/partners/index.html @@ -129,49 +129,49 @@

    {{ _('Recent news') }}

      -
    • {{ high_res_img('img/firefox/partners/logos/light/orange.png', {'alt': 'Orange', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/kddi.png', {'alt': 'KDDI', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/telefonica.png', {'alt': 'Telefonica', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/telenor.png', {'alt': 'Telenor', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/deutsche-telekom.png', {'alt': 'Deutsche Telekom', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/verizon.png', {'alt': 'Verizon', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/panasonic.png', {'alt': 'Panasonic', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/alcatel.png', {'alt': 'Alcatel ONETOUCH', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/spreadtrum.png', {'alt': 'Spreadtrum', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/qualcomm.png', {'alt': 'Qualcomm', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/america-movil.png', {'alt': 'America Movil', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/orange.png', {'alt': 'Orange', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/kddi.png', {'alt': 'KDDI', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/telefonica.png', {'alt': 'Telefonica', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/telenor.png', {'alt': 'Telenor', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/deutsche-telekom.png', {'alt': 'Deutsche Telekom', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/verizon.png', {'alt': 'Verizon', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/panasonic.png', {'alt': 'Panasonic', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/alcatel.png', {'alt': 'Alcatel ONETOUCH', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/spreadtrum.png', {'alt': 'Spreadtrum', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/qualcomm.png', {'alt': 'Qualcomm', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/america-movil.png', {'alt': 'America Movil', 'width': '120', 'height': '60'}) }}
      -
    • {{ high_res_img('img/firefox/partners/logos/light/grameenphone.png', {'alt': 'GrameenPhone', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/telecom-italia.png', {'alt': 'Telecom Italia', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/huawei.png', {'alt': 'Huawei', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/zte.png', {'alt': 'ZTE', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/symphony.png', {'alt': 'Symphony', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/mtn.png', {'alt': 'MTN', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/cherry-mobile.png', {'alt': 'Cherry Mobile', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/intex.png', {'alt': 'Intex', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/zen-mobile.png', {'alt': 'ZEN Mobile', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/megafon.png', {'alt': 'MegaFon', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/spice.png', {'alt': 'Spice', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/lg.png', {'alt': 'LG', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/grameenphone.png', {'alt': 'GrameenPhone', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/telecom-italia.png', {'alt': 'Telecom Italia', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/huawei.png', {'alt': 'Huawei', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/zte.png', {'alt': 'ZTE', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/symphony.png', {'alt': 'Symphony', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/mtn.png', {'alt': 'MTN', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/cherry-mobile.png', {'alt': 'Cherry Mobile', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/intex.png', {'alt': 'Intex', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/zen-mobile.png', {'alt': 'ZEN Mobile', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/megafon.png', {'alt': 'MegaFon', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/spice.png', {'alt': 'Spice', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/lg.png', {'alt': 'LG', 'width': '120', 'height': '60'}) }}
      -
    • {{ high_res_img('img/firefox/partners/logos/light/youtube.png', {'alt': 'YouTube', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/twitter.png', {'alt': 'Twitter', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/pinterest.png', {'alt': 'Pinterest', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/disney.png', {'alt': 'Disney', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/wikimedia.png', {'alt': 'Wikimedia', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/soundcloud.png', {'alt': 'SoundCloud', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/line.png', {'alt': 'Line', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/the-weather-channel.png', {'alt': 'The Weather Channel', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/here-maps.png', {'alt': 'Here Maps', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/kobo.png', {'alt': 'Kobo', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/outlook.png', {'alt': 'Outlook', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/ebay-india.png', {'alt': 'eBay India', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/youtube.png', {'alt': 'YouTube', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/twitter.png', {'alt': 'Twitter', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/pinterest.png', {'alt': 'Pinterest', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/disney.png', {'alt': 'Disney', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/wikimedia.png', {'alt': 'Wikimedia', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/soundcloud.png', {'alt': 'SoundCloud', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/line.png', {'alt': 'Line', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/the-weather-channel.png', {'alt': 'The Weather Channel', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/here-maps.png', {'alt': 'Here Maps', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/kobo.png', {'alt': 'Kobo', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/outlook.png', {'alt': 'Outlook', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/ebay-india.png', {'alt': 'eBay India', 'width': '120', 'height': '60'}) }}
    @@ -355,41 +355,41 @@

    {{ _('Marketplace offers:') }}

      -
    • {{ high_res_img('img/firefox/partners/logos/light/disney.png', {'alt': 'Disney', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/box.png', {'alt': 'BOX', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/line.png', {'alt': 'LINE', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/twitter.png', {'alt': 'Twitter', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/yelp.png', {'alt': 'Yelp', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/cut-the-rope.png', {'alt': 'Cut the Rope', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/zedge.png', {'alt': 'Zedge', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/here-maps.png', {'alt': 'HERE Maps', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/the-weather-channel.png', {'alt': 'The Weather Channel', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/khan-academy.png', {'alt': 'Khan Academy', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/wikimedia.png', {'alt': 'Wikimedia', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/8tracks.png', {'alt': '8tracks', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/disney.png', {'alt': 'Disney', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/box.png', {'alt': 'BOX', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/line.png', {'alt': 'LINE', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/twitter.png', {'alt': 'Twitter', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/yelp.png', {'alt': 'Yelp', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/cut-the-rope.png', {'alt': 'Cut the Rope', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/zedge.png', {'alt': 'Zedge', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/here-maps.png', {'alt': 'HERE Maps', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/the-weather-channel.png', {'alt': 'The Weather Channel', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/khan-academy.png', {'alt': 'Khan Academy', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/wikimedia.png', {'alt': 'Wikimedia', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/8tracks.png', {'alt': '8tracks', 'width': '120', 'height': '60'}) }}
      -
    • {{ high_res_img('img/firefox/partners/logos/light/outlook.png', {'alt': 'Outlook', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/bandai-namco.png', {'alt': 'Bandai Namco', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/pinterest.png', {'alt': 'Pinterest', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/rakuten.png', {'alt': 'Rakuten', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/soundcloud.png', {'alt': 'Soundcloud', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/jalan.png', {'alt': 'Jalan', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/tresensa.png', {'alt': 'Tresensa', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/vuclip.png', {'alt': 'Vuclip', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/kobo.png', {'alt': 'Kobo', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/aviary.png', {'alt': 'Aviary', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/youtube.png', {'alt': 'YouTube', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/easy-taxi.png', {'alt': 'Easy Taxi', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/outlook.png', {'alt': 'Outlook', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/bandai-namco.png', {'alt': 'Bandai Namco', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/pinterest.png', {'alt': 'Pinterest', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/rakuten.png', {'alt': 'Rakuten', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/soundcloud.png', {'alt': 'Soundcloud', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/jalan.png', {'alt': 'Jalan', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/tresensa.png', {'alt': 'Tresensa', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/vuclip.png', {'alt': 'Vuclip', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/kobo.png', {'alt': 'Kobo', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/aviary.png', {'alt': 'Aviary', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/youtube.png', {'alt': 'YouTube', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/easy-taxi.png', {'alt': 'Easy Taxi', 'width': '120', 'height': '60'}) }}
      -
    • {{ high_res_img('img/firefox/partners/logos/light/ebay-india.png', {'alt': 'Ebay India', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/espn-cricinfo.png', {'alt': 'ESPNcricinfo', 'width': '120', 'height': '60'}) }}
      • -
    • {{ high_res_img('img/firefox/partners/logos/light/enclave-games.png', {'alt': 'Enclave Games', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/ebay-india.png', {'alt': 'Ebay India', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/espn-cricinfo.png', {'alt': 'ESPNcricinfo', 'width': '120', 'height': '60'}) }}
      • +
    • {{ high_res_img('firefox/partners/logos/light/enclave-games.png', {'alt': 'Enclave Games', 'width': '120', 'height': '60'}) }}
    diff --git a/bedrock/firefox/templates/firefox/releases/aurora-notes.html b/bedrock/firefox/templates/firefox/releases/aurora-notes.html index 8a3f3fdbb8c..fde2c601d2b 100644 --- a/bedrock/firefox/templates/firefox/releases/aurora-notes.html +++ b/bedrock/firefox/templates/firefox/releases/aurora-notes.html @@ -9,7 +9,7 @@ {% set channel_name = 'Aurora' %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/template/header-logo-inverse.png', {'alt': 'Mozilla Firefox', 'width': '185', 'height': '70'}) }}

    +

    {{ high_res_img('firefox/template/header-logo-inverse.png', {'alt': 'Mozilla Firefox', 'width': '185', 'height': '70'}) }}

    {% endblock %} {% block platform_switch %} diff --git a/bedrock/firefox/templates/firefox/releases/dev-browser-notes.html b/bedrock/firefox/templates/firefox/releases/dev-browser-notes.html index 27622419d43..11b33bd9b2d 100644 --- a/bedrock/firefox/templates/firefox/releases/dev-browser-notes.html +++ b/bedrock/firefox/templates/firefox/releases/dev-browser-notes.html @@ -3,7 +3,7 @@ {% block body_class %}fx-notes blueprint{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/firefox/developer/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

    +

    {{ high_res_img('firefox/developer/title.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}

    {% endblock %} {% block notes_heading_primary %} diff --git a/bedrock/firefox/templates/firefox/tiles.html b/bedrock/firefox/templates/firefox/tiles.html index 5b44bc8e2da..a6bdca17493 100644 --- a/bedrock/firefox/templates/firefox/tiles.html +++ b/bedrock/firefox/templates/firefox/tiles.html @@ -54,7 +54,7 @@

    {{ _('Personalize your New Tab experience') }}

    1. {{ _('Drag a site to exactly where you want it.') }} - {{ high_res_img('img/firefox/tiles/drag-site.png', {'alt': ''}) }} + {{ high_res_img('firefox/tiles/drag-site.png', {'alt': ''}) }}
    2. {{ _('Once you’ve found the perfect spot for your site, pin it to make it stay.') }} @@ -91,7 +91,7 @@

      {{ _('If you’re getting started') }}

      {{ _('If you’re using Firefox for the first time, the New Tab page is already populated with useful and interesting sites and content.') }} {{ _('This includes both referrals to sponsored sites from commercial partners, labeled as “Sponsored,” and content we consider important to our mission of advancing the public benefit of the Internet.') }}

      - {{ high_res_img('img/firefox/tiles/discover-sites.png', {'alt': ''}) }} + {{ high_res_img('firefox/tiles/discover-sites.png', {'alt': ''}) }}

    @@ -117,7 +117,7 @@

    {{ _('Personalization with your privacy in mind') }}

    #} {% block dashboard_sidebar_contents %} - {{ high_res_img('img/firefox/tiles/new-tab-enhanced.png', {'alt': _('Screenshot of the Firefox New Tab page'), 'class': 'tab'}) }} + {{ high_res_img('firefox/tiles/new-tab-enhanced.png', {'alt': _('Screenshot of the Firefox New Tab page'), 'class': 'tab'}) }} {{ _('Screenshot of New Tab preferences') }} {% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew-fx37.html b/bedrock/firefox/templates/firefox/whatsnew-fx37.html index d431ab9ee6c..d831c1047db 100644 --- a/bedrock/firefox/templates/firefox/whatsnew-fx37.html +++ b/bedrock/firefox/templates/firefox/whatsnew-fx37.html @@ -36,7 +36,7 @@ {% block site_header_nav %}{% endblock %} {% block site_header_logo %}

    - {{ high_res_img('img/firefox/whatsnew-fx37/firefox-wordmark.png', {'alt': 'Mozilla Firefox', 'width': '220', 'height': '90'}) }} + {{ high_res_img('firefox/whatsnew-fx37/firefox-wordmark.png', {'alt': 'Mozilla Firefox', 'width': '220', 'height': '90'}) }}

    {% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew-nightly-29.html b/bedrock/firefox/templates/firefox/whatsnew-nightly-29.html index ba4bccbdb18..82e15ae0e0e 100644 --- a/bedrock/firefox/templates/firefox/whatsnew-nightly-29.html +++ b/bedrock/firefox/templates/firefox/whatsnew-nightly-29.html @@ -13,7 +13,7 @@

    {{ _('Now help us make it better.') }}

    {{ _('Start the survey') }}

    - {{ platform_img('img/firefox/whatsnew/australis.png', {'alt': _('New Firefox interface')}) }} + {{ platform_img('firefox/whatsnew/australis.png', {'alt': _('New Firefox interface')}) }}
    {% endblock %} diff --git a/bedrock/mozorg/helpers/misc.py b/bedrock/mozorg/helpers/misc.py index dcd21535a25..5e9ceb193c9 100644 --- a/bedrock/mozorg/helpers/misc.py +++ b/bedrock/mozorg/helpers/misc.py @@ -187,6 +187,8 @@ def platform_img(ctx, url, optional_attributes=None): for platform, image in img_urls.iteritems(): if is_l10n: image = l10n_img_file_name(ctx, image) + else: + image = path.join('img', image) if find_static(image): key = 'data-src-' + platform @@ -217,8 +219,8 @@ def high_res_img(ctx, url, optional_attributes=None): url = l10n_img(ctx, url) url_high_res = l10n_img(ctx, url_high_res) else: - url = static(url) - url_high_res = static(url_high_res) + url = static(path.join('img', url)) + url_high_res = static(path.join('img', url_high_res)) if optional_attributes: class_name = optional_attributes.pop('class', '') diff --git a/bedrock/mozorg/templates/mozorg/contentservices/tiles.html b/bedrock/mozorg/templates/mozorg/contentservices/tiles.html index 1c9e63d5754..97a4e4e952a 100644 --- a/bedrock/mozorg/templates/mozorg/contentservices/tiles.html +++ b/bedrock/mozorg/templates/mozorg/contentservices/tiles.html @@ -35,7 +35,7 @@

    {{ _('Directory Tiles') }}

    - {{ high_res_img('img/contentservices/directory-tiles.jpg', {'alt': 'Directory Tiles screenshot', 'width': '620'}) }} + {{ high_res_img('contentservices/directory-tiles.jpg', {'alt': 'Directory Tiles screenshot', 'width': '620'}) }}

    {{ _('Suggested Tiles') }}

    @@ -49,7 +49,7 @@

    {{ _('Suggested Tiles') }}

    - {{ high_res_img('img/contentservices/suggested-tiles.jpg', {'alt': 'Suggested Tiles screenshot', 'width': '620'}) }} + {{ high_res_img('contentservices/suggested-tiles.jpg', {'alt': 'Suggested Tiles screenshot', 'width': '620'}) }}

    @@ -62,7 +62,7 @@

    {{ _('Suggested Tiles') }}

    - {{ high_res_img('img/contentservices/tiles-settings.jpg', {'alt': 'Tiles settings screenshot', 'width': '620'}) }} + {{ high_res_img('contentservices/tiles-settings.jpg', {'alt': 'Tiles settings screenshot', 'width': '620'}) }}

    {{ _('Partnering with Mozilla') }}

    diff --git a/bedrock/mozorg/templates/mozorg/contribute/studentambassadors/join.html b/bedrock/mozorg/templates/mozorg/contribute/studentambassadors/join.html index df4526ada45..34f049b42cb 100644 --- a/bedrock/mozorg/templates/mozorg/contribute/studentambassadors/join.html +++ b/bedrock/mozorg/templates/mozorg/contribute/studentambassadors/join.html @@ -15,7 +15,7 @@ {% block site_header_nav %}{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/contribute/studentambassadors/logo.png', {'alt': 'Firefox Student Ambassadors', 'width': '323'}) }}

    +

    {{ high_res_img('contribute/studentambassadors/logo.png', {'alt': 'Firefox Student Ambassadors', 'width': '323'}) }}

    {% endblock %} {% block content %} diff --git a/bedrock/mozorg/templates/mozorg/contribute/studentambassadors/landing.html b/bedrock/mozorg/templates/mozorg/contribute/studentambassadors/landing.html index f2f4f29f260..b3ee272653d 100644 --- a/bedrock/mozorg/templates/mozorg/contribute/studentambassadors/landing.html +++ b/bedrock/mozorg/templates/mozorg/contribute/studentambassadors/landing.html @@ -16,7 +16,7 @@ {% block site_header_nav %}{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/contribute/studentambassadors/logo.png', {'alt': 'Firefox Student Ambassadors', 'width': '323'}) }}

    +

    {{ high_res_img('contribute/studentambassadors/logo.png', {'alt': 'Firefox Student Ambassadors', 'width': '323'}) }}

    {% endblock %} {% block content %} diff --git a/bedrock/mozorg/templates/mozorg/home/home.html b/bedrock/mozorg/templates/mozorg/home/home.html index a647ea34d97..f31f6c3c0f4 100644 --- a/bedrock/mozorg/templates/mozorg/home/home.html +++ b/bedrock/mozorg/templates/mozorg/home/home.html @@ -105,7 +105,7 @@
    -

    {{ high_res_img('img/home/voices/mozilla-wordmark-white.png', {'alt': 'Mozilla', 'width': '313', 'height': '82'}) }}

    +

    {{ high_res_img('home/voices/mozilla-wordmark-white.png', {'alt': 'Mozilla', 'width': '313', 'height': '82'}) }}

    @@ -305,7 +305,7 @@

    {{ _('Help millions
    get the most from their
    favorite browser.') }}
    -

    {{ high_res_img('img/home/voices/firefox-logo-wordmark-white.png', {'alt': 'Firefox'}) }}

    +

    {{ high_res_img('home/voices/firefox-logo-wordmark-white.png', {'alt': 'Firefox'}) }}

    {# L10n: tags below are for visual formatting only. #}

    {{_('Committed to you, your privacy and an open Web')}}

     diff --git a/bedrock/mozorg/tests/test_helper_misc.py b/bedrock/mozorg/tests/test_helper_misc.py index 6a1b784707e..664ac977fc1 100644 --- a/bedrock/mozorg/tests/test_helper_misc.py +++ b/bedrock/mozorg/tests/test_helper_misc.py @@ -283,8 +283,8 @@ def _render_l10n(self, url): def test_platform_img_no_optional_attributes(self, find_static): """Should return expected markup without optional attributes""" markup = self._render('test.png') - self.assertIn(u'data-src-windows="/media/test-windows.png"', markup) - self.assertIn(u'data-src-mac="/media/test-mac.png"', markup) + self.assertIn(u'data-src-windows="/media/img/test-windows.png"', markup) + self.assertIn(u'data-src-mac="/media/img/test-mac.png"', markup) def test_platform_img_with_optional_attributes(self, find_static): """Should return expected markup with optional attributes""" @@ -294,8 +294,8 @@ def test_platform_img_with_optional_attributes(self, find_static): def test_platform_img_with_high_res(self, find_static): """Should return expected markup with high resolution image attrs""" markup = self._render('test.png', {'high-res': True}) - self.assertIn(u'data-src-windows-high-res="/media/test-windows-high-res.png"', markup) - self.assertIn(u'data-src-mac-high-res="/media/test-mac-high-res.png"', markup) + self.assertIn(u'data-src-windows-high-res="/media/img/test-windows-high-res.png"', markup) + self.assertIn(u'data-src-mac-high-res="/media/img/test-mac-high-res.png"', markup) self.assertIn(u'data-high-res="true"', markup) def test_platform_img_with_l10n(self, find_static): @@ -462,19 +462,19 @@ def test_high_res_img_no_optional_attributes(self): """Should return expected markup without optional attributes""" markup = self._render('test.png') expected = ( - u'' - u'') + u'' + u'') self.assertEqual(markup, expected) def test_high_res_img_with_optional_attributes(self): """Should return expected markup with optional attributes""" markup = self._render('test.png', {'data-test-attr': 'test', 'class': 'logo'}) expected = ( - u'') + u'') self.assertEqual(markup, expected) def test_high_res_img_with_l10n(self): diff --git a/bedrock/thunderbird/templates/thunderbird/base-resp.html b/bedrock/thunderbird/templates/thunderbird/base-resp.html index 0d46d640702..86370aa02f5 100644 --- a/bedrock/thunderbird/templates/thunderbird/base-resp.html +++ b/bedrock/thunderbird/templates/thunderbird/base-resp.html @@ -76,7 +76,7 @@ {% endblock email_form %} {% block site_header_logo %} -

    {{ high_res_img('img/thunderbird/template/logo-wordmark.png', {'alt': 'Thunderbird', 'width': '260', 'height': '72'}) }}

    +

    {{ high_res_img('thunderbird/template/logo-wordmark.png', {'alt': 'Thunderbird', 'width': '260', 'height': '72'}) }}

    {% endblock %} {% block site_js %} diff --git a/bedrock/thunderbird/templates/thunderbird/index.html b/bedrock/thunderbird/templates/thunderbird/index.html index d2adc97af15..70573304277 100644 --- a/bedrock/thunderbird/templates/thunderbird/index.html +++ b/bedrock/thunderbird/templates/thunderbird/index.html @@ -12,7 +12,7 @@ {% block site_header_nav %}{% endblock %} {% block site_header_logo %} -

    {{ high_res_img('img/thunderbird/landing/wordmark.png', {'alt': _('Thunderbird'), 'width': '304', 'height': '84'}) }}

    +

    {{ high_res_img('thunderbird/landing/wordmark.png', {'alt': _('Thunderbird'), 'width': '304', 'height': '84'}) }}

    {% endblock %} {% block site_css %}{% endblock %} @@ -26,7 +26,7 @@

    {{ high_res_img('img/thunderbird/landing/wordmark.png', {'alt': _('Thunderbi
    - {{ high_res_img('img/thunderbird/landing/logo.png', {'alt': _('Thunderbird'), 'width': '120', 'height': '120'}) }} + {{ high_res_img('thunderbird/landing/logo.png', {'alt': _('Thunderbird'), 'width': '120', 'height': '120'}) }}

    {{ self.page_title() }}

    {{ self.page_desc() }}

    diff --git a/docs/coding.rst b/docs/coding.rst index 3db8f5bc4d4..fa7108cfe01 100644 --- a/docs/coding.rst +++ b/docs/coding.rst @@ -52,13 +52,13 @@ high_res_img() ^^^^^^^^^^^^^^ For images that include a high-resolution alternative for displays with a high pixel density, use the `high_res_img()` function:: - high_res_img('img/firefox/new/firefox-logo.png', {'alt': 'Firefox', 'width': '200', 'height': '100'}) + high_res_img('firefox/new/firefox-logo.png', {'alt': 'Firefox', 'width': '200', 'height': '100'}) -The `high_res_img()` function will automatically look for the image in the URL parameter suffixed with `'-high-res'`, e.g. `img/firefox/new/firefox-logo-high-res.png` and switch to it if the display has high pixel density. +The `high_res_img()` function will automatically look for the image in the URL parameter suffixed with `'-high-res'`, e.g. `firefox/new/firefox-logo-high-res.png` and switch to it if the display has high pixel density. `high_res_img()` supports localized images by setting the `'l10n'` parameter to `True`:: - high_res_img('img/firefox/new/firefox-logo.png', {'l10n': True, 'alt': 'Firefox', 'width': '200', 'height': '100'}) + high_res_img('firefox/new/firefox-logo.png', {'l10n': True, 'alt': 'Firefox', 'width': '200', 'height': '100'}) When using localization, `high_res_img()` will look for images in the appropriate locale folder. In the above example, for the `de` locale, both standard and high-res versions of the image should be located at `media/img/l10n/de/firefox/new/`. @@ -74,13 +74,13 @@ platform_img() ^^^^^^^^^^^^^^ Finally, for outputting an image that differs depending on the platform being used, the `platform_img()` function will automatically display the image for the user's browser:: - platform_img('img/firefox/new/browser.png', {'alt': 'Firefox screenshot'}) + platform_img('firefox/new/browser.png', {'alt': 'Firefox screenshot'}) `platform_img()` will automatically look for the images `browser-mac.png`, `browser-win.png`, `browser-linux.png`, etc. Platform image also supports hi-res images by adding `'high-res': True` to the list of optional attributes. `platform_img()` supports localized images by setting the `'l10n'` parameter to `True`:: - platform_img('img/firefox/new/firefox-logo.png', {'l10n': True, 'alt': 'Firefox screenshot'}) + platform_img('firefox/new/firefox-logo.png', {'l10n': True, 'alt': 'Firefox screenshot'}) When using localization, `platform_img()` will look for images in the appropriate locale folder. In the above example, for the `es-ES` locale, all platform versions of the image should be located at `media/img/l10n/es-ES/firefox/new/`.