Move current /firefox to 'quantum' namespace (mozilla#7696)

bedrock/firefox/templates/firefox/home/index.html → bedrock/firefox/templates/firefox/home/index-quantum.html

@@ -18,11 +18,10 @@
 {% block page_desc %}{{ _('Responsive engine, less memory usage and packed with features. Download for desktop now.') }}{% endblock %}
 
 {% block page_css %}
-  {{ css_bundle('firefox-home') }}
+  {{ css_bundle('firefox-quantum') }}
 {% endblock %}
 
 {% block body_id %}firefox-home{% endblock %}
-{% block body_attrs %}{% if variation %}data-variant="{{ variation }}"{% endif %}{% endblock %}
 
 {% block content %}
 {% with current='desktop' %}
@@ -43,7 +42,7 @@ <h3>{{ _('Fast for good.') }}</h3>
       {{ download_firefox(dom_id='download-intro', alt_copy=_('Download now'), download_location='primary cta') }}
       </div>
       <div class="header-image">
-        {{ high_res_img('firefox/home/hero-laptop.png', {'alt': '', 'width': '903', 'height': '509'}) }}
+        {{ high_res_img('firefox/home/quantum/hero-laptop.png', {'alt': '', 'width': '903', 'height': '509'}) }}
       </div>
     </div>
   </header>
@@ -86,8 +85,8 @@ <h3>{{ _('Faster Page Loading') }}</h3>
       </ul>
 
       <div class="privacy-section-media">
-        {{ lazy_img(image_url='firefox/home/private-browsing.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'alt': '', 'width': '502', 'height': '325'}) }}
-        {{ lazy_img(image_url='firefox/home/tracking-protection.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'alt': '', 'width': '503', 'height': '305'}) }}
+        {{ lazy_img(image_url='firefox/home/quantum/private-browsing.png', placeholder_url='firefox/home/quantum/spacer.gif', include_highres_image=True, optional_attributes={'alt': '', 'width': '502', 'height': '325'}) }}
+        {{ lazy_img(image_url='firefox/home/quantum/tracking-protection.png', placeholder_url='firefox/home/quantum/spacer.gif', include_highres_image=True, optional_attributes={'alt': '', 'width': '503', 'height': '305'}) }}
       </div>
     </div>
   </section>
@@ -113,7 +112,7 @@ <h2 class="section-title"><a href="{{ url('firefox.accounts') }}">{{ _('Sync you
       </div>
 
       <div class="sync-section-image">
-        {{ lazy_img(image_url='firefox/home/sync.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'alt': _('Image of Gif shared from desktop to mobile using the Send Tab feature.'), 'width': '788', 'height': '571'}) }}
+        {{ lazy_img(image_url='firefox/home/quantum/sync.png', placeholder_url='firefox/home/quantum/spacer.gif', include_highres_image=True, optional_attributes={'alt': _('Image of Gif shared from desktop to mobile using the Send Tab feature.'), 'width': '788', 'height': '571'}) }}
       </div>
     </div>
   </section>
@@ -179,12 +178,12 @@ <h2 class="section-title">{{ _('2x Faster') }}</h2>
           {% endif %}
           </div>
           <div class="key-feature-media video">
-            <video preload="none" controls playsinline poster="{{ static('img/firefox/home/quantum-vs-chrome-poster.png') }}" data-ga-label="Quantum vs Chrome Video">
+            <video preload="none" controls playsinline poster="{{ static('img/firefox/home/quantum/quantum-vs-chrome-poster.png') }}" data-ga-label="Quantum vs Chrome Video">
               <source src="https://assets.mozilla.net/video/firefox-home/quantum-vs-chrome.webm" type="video/webm">
               <source src="https://assets.mozilla.net/video/firefox-home/quantum-vs-chrome.ogv" type="video/ogg; codecs='theora, vorbis'">
               <source src="https://assets.mozilla.net/video/firefox-home/quantum-vs-chrome.mp4" type="video/mp4">
               <a href="https://www.youtube.com/watch?v=YIywpvHewc0">
-                <img src="{{ static('img/firefox/home/quantum-vs-chrome-poster.png') }}" alt="">
+                <img src="{{ static('img/firefox/home/quantum/quantum-vs-chrome-poster.png') }}" alt="">
               </a>
             </video>
           </div>{#-- /.key-feature-media --#}
@@ -205,7 +204,7 @@ <h2 class="section-title">{{ _('30% lighter than Chrome') }}</h2>
             </p>
           </div>
           <div class="key-feature-media image">
-            {{ lazy_img(image_url='firefox/home/less-memory.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'alt': '', 'width': '645', 'height': '400'}) }}
+            {{ lazy_img(image_url='firefox/home/quantum/less-memory.png', placeholder_url='firefox/home/quantum/spacer.gif', include_highres_image=True, optional_attributes={'alt': '', 'width': '645', 'height': '400'}) }}
           </div>
         </div>
       </div>
@@ -228,7 +227,7 @@ <h2 class="section-title"><a href="{{ url('firefox.switch') }}">{{ _('Moving bro
       </div>
       <div class="section-media">
         <a href="{{ url('firefox.switch') }}">
-          {{ lazy_img(image_url='firefox/home/switch-to-firefox.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'width': '643', 'height': '377'}) }}
+          {{ lazy_img(image_url='firefox/home/quantum/switch-to-firefox.png', placeholder_url='firefox/home/quantum/spacer.gif', include_highres_image=True, optional_attributes={'width': '643', 'height': '377'}) }}
         </a>
       </div>
     </div>
@@ -251,5 +250,5 @@ <h2><a href="{{ url('firefox.new') }}">{{ _('The New Firefox') }}</a></h2>
 {% endblock %}
 
 {% block js %}
-  {{ js_bundle('firefox-home') }}
+  {{ js_bundle('firefox-quantum') }}
 {% endblock %}

bedrock/firefox/tests/test_views.py

@@ -981,7 +981,7 @@ def test_firefox_home(self, render_mock):
         req = RequestFactory().get('/firefox/')
         req.locale = 'en-US'
         views.firefox_home(req)
-        render_mock.assert_called_once_with(req, 'firefox/home/index.html')
+        render_mock.assert_called_once_with(req, 'firefox/home/index-quantum.html')
 
 
 class TestAccountsPage(TestCase):

bedrock/firefox/views.py

@@ -886,7 +886,7 @@ class FeaturesPrivateBrowsingView(BlogPostsView):
 
 
 def firefox_home(request):
-    return l10n_utils.render(request, 'firefox/home/index.html')
+    return l10n_utils.render(request, 'firefox/home/index-quantum.html')
 
 
 def firefox_concerts(request):

media/css/firefox/home/home.scss → media/css/firefox/home/quantum.scss

@@ -221,7 +221,7 @@ html[dir="rtl"] .main-header-section {
     .key-feature-media {
 
         &.video {
-            background: #000 url('/media/img/firefox/home/quantum-vs-chrome-poster.png') top left no-repeat;
+            background: #000 url('/media/img/firefox/home/quantum/quantum-vs-chrome-poster.png') top left no-repeat;
             @include background-size(cover);
             box-shadow: 2px 3px 8px 0 rgba(0, 0, 0, .2);
             margin: 0 auto;
@@ -533,7 +533,7 @@ html[dir="rtl"] .switch-section {
         padding: 0 0 20px;
 
         h3 {
-            background: url('/media/img/firefox/home/icon-sprite.svg') no-repeat;
+            background: url('/media/img/firefox/home/quantum/icon-sprite.svg') no-repeat;
         }
 
         &.private-browsing h3 {
@@ -743,8 +743,8 @@ html[dir="rtl"] .privacy-section {
         position: relative;
 
         &:before {
-            background: #ffe900 url('/media/img/firefox/home/icon-sprite.svg') center 0 no-repeat;
-            background: url('/media/img/firefox/home/icon-sprite.svg') center 0 no-repeat,
+            background: #ffe900 url('/media/img/firefox/home/quantum/icon-sprite.svg') center 0 no-repeat;
+            background: url('/media/img/firefox/home/quantum/icon-sprite.svg') center 0 no-repeat,
                         linear-gradient(to bottom, #ffe900 0%, #ff9400 100%) top left;
             border-radius: 100%;
             content: '';
@@ -880,7 +880,7 @@ html[dir="rtl"] .sync-section {
     position: relative;
 
     &:before {
-        background: transparent url('/media/img/firefox/home/wave.svg') top center no-repeat;
+        background: transparent url('/media/img/firefox/home/quantum/wave.svg') top center no-repeat;
         @include background-size(3000px 151px);
         content: '';
         display: block;

media/static-bundles.json

@@ -662,10 +662,10 @@
     },
     {
       "files": [
-        "css/firefox/home/home.scss",
+        "css/firefox/home/quantum.scss",
         "css/base/mozilla-lazy-image.scss"
       ],
-      "name": "firefox-home"
+      "name": "firefox-quantum"
     },
     {
       "files": [
@@ -1279,9 +1279,9 @@
         "js/libs/jquery.waypoints-sticky.min.js",
         "js/hubs/sub-nav.js",
         "js/base/mozilla-lazy-load.js",
-        "js/firefox/home/main.js"
+        "js/firefox/home/quantum.js"
       ],
-      "name": "firefox-home"
+      "name": "firefox-quantum"
     },
     {
       "files": [