Merge pull request #1915 from retornam/bug-920212

Bug 920212 - Redirect /firefox/fx/ to /firefox/new/

bedrock/firefox/templates/firefox/base-resp.html

@@ -25,7 +25,7 @@
 <nav id="nav-main" role="navigation">
   <span class="toggle" role="button" aria-controls="nav-main-menu" tabindex="0">{{_('Menu')}}</span>
   <ul id="nav-main-menu" class="has-submenus">
-    <li class="first" id="nav-main-features"><a href="{{ url('firefox.fx') }}#desktop" tabindex="0" aria-owns="nav-main-features-submenu" aria-haspopup="true">{{_('Desktop')}}</a>
+    <li class="first" id="nav-main-features"><a href="{{ url('firefox.new') }}#desktop" tabindex="0" aria-owns="nav-main-features-submenu" aria-haspopup="true">{{_('Desktop')}}</a>
       <ul aria-expanded="false" id="nav-main-features-submenu" class="submenu">
         <li class="first"><a href="{{ url('firefox.features') }}" tabindex="-1">{{_('Features')}}</a></li>
         <li><a href="{{ url('firefox.customize') }}" tabindex="-1">{{_('Customize')}}</a></li>
@@ -34,7 +34,7 @@
         <li class="last"><a href="{{ url('firefox.security') }}" tabindex="-1">{{_('Privacy &amp; Security')}}</a></li>
       </ul>
     </li>
-    <li id="nav-main-mobile"><a href="{{ url('firefox.fx') }}" tabindex="0" aria-owns="nav-main-mobile-submenu" aria-haspopup="true">{{_('Mobile')}}</a>
+    <li id="nav-main-mobile"><a href="{{ url('firefox.partners.index') }}#android" tabindex="0" aria-owns="nav-main-mobile-submenu" aria-haspopup="true">{{_('Mobile')}}</a>
       <ul aria-expanded="false" id="nav-main-mobile-submenu" class="submenu">
         <li class="first"><a href="{{ url('firefox.mobile.features') }}" tabindex="-1">{{_('Features')}}</a></li>
         <li><a href="https://addons.mozilla.org/en-US/mobile/?browse=featured" tabindex="-1">{{_('Customize')}}</a></li>

bedrock/firefox/templates/firefox/base.html

@@ -22,7 +22,7 @@
 {% block site_header_nav %}
 <nav role="navigation" id="nav-main">
   <ul class="has-submenus">
-    <li class="first" id="nav-main-features"><a href="{{ url('firefox.fx') }}#desktop" tabindex="0" aria-owns="nav-main-features-submenu" aria-haspopup="true">{{ _('Desktop') }}</a>
+    <li class="first" id="nav-main-features"><a href="{{ url('firefox.new') }}" tabindex="0" aria-owns="nav-main-features-submenu" aria-haspopup="true">{{ _('Desktop') }}</a>
       <ul aria-expanded="false" id="nav-main-features-submenu">
         <li class="first"><a href="{{ url('firefox.features') }}" tabindex="-1">{{ _('Features') }}</a></li>
         <li><a href="{{ url('firefox.customize') }}" tabindex="-1">{{ _('Customize') }}</a></li>
@@ -31,7 +31,7 @@
         <li class="last"><a href="{{ url('firefox.security') }}" tabindex="-1">{{ _('Privacy &amp; Security') }}</a></li>
       </ul>
     </li>
-    <li id="nav-main-mobile"><a href="{{ url('firefox.fx') }}" tabindex="0" aria-owns="nav-main-mobile-submenu" aria-haspopup="true">{{ _('Mobile') }}</a>
+    <li id="nav-main-mobile"><a href="{{ url('firefox.new') }}" tabindex="0" aria-owns="nav-main-mobile-submenu" aria-haspopup="true">{{ _('Mobile') }}</a>
       <ul aria-expanded="false" id="nav-main-mobile-submenu" class="submenu">
         <li class="first"><a href="{{ url('firefox.mobile.features') }}" tabindex="-1">{{ _('Features') }}</a></li>
         <li><a href="https://addons.mozilla.org/en-US/mobile/?browse=featured" tabindex="-1">{{ _('Customize') }}</a></li>

bedrock/firefox/templates/firefox/mobile/faq.html

@@ -15,7 +15,7 @@
 {% block breadcrumbs %}
   <nav class="breadcrumbs">
     <a href="{{ url('mozorg.home') }}">{{_('Home')}}</a> >
-    <a href="{{ url('firefox.fx') }}#mobile">{{_('Mobile')}}</a> >
+    <a href="{{ url('firefox.partners.index') }}#android">{{_('Mobile')}}</a> >
     <span>{{_('FAQ')}}</span>
   </nav>
 {% endblock %}

bedrock/firefox/templates/firefox/whatsnew.html

@@ -18,7 +18,7 @@
 
 {% block content %}
 {% if request.locale.startswith('en') %}
-  {% set mobile_link = url('firefox.fx') + '#mobile' %}
+  {% set mobile_link = url('firefox.partners.index') + '#android' %}
 {% else %}
   {% set mobile_link = php_url('/mobile/') %}
 {% endif %}

bedrock/firefox/urls.py

@@ -30,7 +30,6 @@
     redirect('^firefox/channel/android/$', 'firefox.channel'),
     page('firefox/customize', 'firefox/customize.html'),
     page('firefox/features', 'firefox/features.html'),
-    page('firefox/fx', 'firefox/fx.html'),
     page('firefox/geolocation', 'firefox/geolocation.html'),
     page('firefox/happy', 'firefox/happy.html'),
     url('^(?:%s)/(?:%s/)?notes/$' % (product_re, channel_re),

bedrock/firefox/views.py

@@ -185,7 +185,7 @@ def windows_billboards(req):
 
 
 def fx_home_redirect(request):
-    return HttpResponseRedirect(reverse('firefox.fx'))
+    return HttpResponseRedirect(reverse('firefox.new'))
 
 
 def dnt(request):

bedrock/foundation/templates/foundation/index.html

@@ -26,7 +26,7 @@ <h1 class="page-title">{{ _('The Mozilla Foundation') }}</h1>
 
   <p>
     {% trans
-      firefox=url('firefox.fx'),
+      firefox=url('firefox.new'),
       projects=url('mozorg.products'),
       grants=url('grants'),
       webmaker="https://webmaker.org/"

bedrock/foundation/templates/foundation/openwebfund/thanks.html

@@ -24,7 +24,7 @@ <h1 class="page-title">{{ _('Thank you for supporting the Mozilla Open Web Fund'
   <ul>
     <li>{% trans join="http://www.drumbeat.org/people" %}<a href="{{ join }}">Join</a> Mozilla Drumbeat and start making the web more open and awesome right now{% endtrans %}</li>
     <li>{% trans getinvolved=url('mozorg.contribute') %}<a href="{{ getinvolved }}">Get involved</a> with Mozilla{% endtrans %}</li>
-    <li>{% trans firefox=url('firefox.fx') %}Introduce someone to <a href="{{ firefox }}">Mozilla Firefox</a>{% endtrans %}</li>
+    <li>{% trans firefox=url('firefox.new') %}Introduce someone to <a href="{{ firefox }}">Mozilla Firefox</a>{% endtrans %}</li>
   </ul>
 
 {% endblock article %}

bedrock/settings/base.py

@@ -212,10 +212,6 @@ def JINJA_CONFIG():
             'css/sandstone/video.less',
             'css/firefox/nightly_firstrun.less',
         ),
-        'firefox_fx': (
-            'css/firefox/fx.less',
-            'css/sandstone/video.less',
-        ),
         'firefox_geolocation': (
             'css/base/mozilla-accordion.less',
             'css/base/mozilla-modal.less',
@@ -503,11 +499,6 @@ def JINJA_CONFIG():
             'js/base/mozilla-modal.js',
             'js/firefox/firstrun/firstrun.js',
         ),
-        'firefox_fx': (
-            'js/base/mozilla-pager.js',
-            'js/base/mozilla-video-tools.js',
-            'js/firefox/fx.js',
-        ),
         'firefox_happy': (
             'js/firefox/happy.js',
         ),

etc/httpd/global.conf

@@ -187,7 +187,7 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?contribute/(student|university)ambassadors(.
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?projects(/?)$ /b/$1projects$2 [PT]
 
 RewriteRule ^/en-US/firefox/new(/?)$ /b/en-US/firefox/new$1 [PT]
-RewriteRule ^/en-US/firefox/fx(/?)$ /b/en-US/firefox/fx$1 [PT]
+RewriteRule ^/en-US/firefox/fx(/?)$ /b/en-US/firefox/new$1 [PT,QSA]
 RewriteRule ^/en-US/firefox/features(/?)$ /b/en-US/firefox/features$1 [PT]
 RewriteRule ^/en-US/firefox/customize(/?)$ /b/en-US/firefox/customize$1 [PT]
 RewriteRule ^/en-US/firefox/performance(/?)$ /b/en-US/firefox/performance$1 [PT]