Fix bug 1148127 - Redirect /products to /firefox/products

Remove the old products page
Update links in Tabzilla

bedrock/base/templates/base-resp.html

@@ -104,7 +104,7 @@
           <ul id="nav-main-menu">
             <li class="first mission-item"><a href="{{ url('mozorg.mission') }}">{{_('Mission')}}</a></li>
             <li class="about-item"><a href="{{ url('mozorg.about') }}">{{_('About')}}</a></li>
-            <li class="products-item"><a href="{{ url('mozorg.products') }}">{{_('Products')}}</a></li>
+            <li class="products-item"><a href="{{ url('firefox.family.index') }}">{{_('Products')}}</a></li>
             <li class="last contribute-item"><a href="{{ url('mozorg.contribute') }}">{{_('Get Involved')}}</a></li>
           </ul>
         </nav>

bedrock/base/templates/base.html

@@ -98,7 +98,7 @@
             <ul>
                 <li><a href="{{ url('mozorg.mission') }}">{{_('Mission')}}</a></li>
                 <li><a href="{{ url('mozorg.about') }}">{{_('About')}}</a></li>
-                <li><a href="{{ url('mozorg.products') }}">{{_('Products')}}</a></li>
+                <li><a href="{{ url('firefox.family.index') }}">{{_('Products')}}</a></li>
                 <li><a href="{{ url('mozorg.contribute') }}">{{_('Get Involved')}}</a></li>
             </ul>
         </nav>

bedrock/foundation/templates/foundation/index.html

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

bedrock/foundation/templates/foundation/trademarks/faq.html

@@ -51,7 +51,7 @@ <h1 class="page-title">{{ _('Mozilla Trademark Policy FAQ') }}</h1>
 
     <dt>{% trans %}Can I distribute any of the Mozilla software from my website, by CD, or to my friends, employees or students?{% endtrans %}</dt>
     <dd>
-      <p>{% trans binaries=url('mozorg.products'), mpl=php_url('/MPL') %}<strong>If you are redistributing unchanged
+      <p>{% trans binaries=url('firefox.family.index'), mpl=php_url('/MPL') %}<strong>If you are redistributing unchanged
         <a href="{{ binaries }}">official stable binaries</a>
         downloaded from mozilla.org, to anyone in any way and for any
         purpose, no further permissions are required from us.</strong>
@@ -140,7 +140,7 @@ <h1 class="page-title">{{ _('Mozilla Trademark Policy FAQ') }}</h1>
 
   <p>{% trans trademarks=url('foundation.trademarks.index'), styleguide=url('styleguide.home') %}
       If your question isn't covered here, time to move on to
-      <a href="{{ trademarks }}">one of the other Trademark Policy documents</a> 
+      <a href="{{ trademarks }}">one of the other Trademark Policy documents</a>
       or the <a href="{{ styleguide }}">Mozilla Style Guide</a>.
   {% endtrans %}</p>
 

bedrock/mozorg/templates/mozorg/about-base.html

@@ -44,7 +44,7 @@
   <div class="reference">
     <h4>{{ _('Our Products') }}</h4>
     <p>{{ _('Software and other innovations designed to advance our mission.') }}</p>
-    <a class="more" href="{{ url('mozorg.products') }}">{{ _('Learn More') }}</a>
+    <a class="more" href="{{ url('firefox.family.index') }}">{{ _('Learn More') }}</a>
   </div>
 
   <div class="reference">

bedrock/mozorg/templates/mozorg/about.html

@@ -94,7 +94,7 @@ <h4><a href="{{ url('mozorg.about.leadership') }}">{{ _('Mozilla leadership') }}
     </li>
     {% endif %}
     <li>
-      <h4><a href="{{ url('mozorg.products') }}">{{ _('Our products') }}</a></h4>
+      <h4><a href="{{ url('firefox.family.index') }}">{{ _('Our products') }}</a></h4>
       <p>{{ _('An overview of what we make and what we’re working on') }}</p>
     </li>
     <li>

bedrock/mozorg/templates/mozorg/about/history-details.html

@@ -42,7 +42,7 @@ <h1 class="title-shadow-box">{{ _('History of the Mozilla Project') }}</h1>
       {% trans mission='http://www-archive.mozilla.org/mission.html',
                browsers='http://www.oreillynet.com/pub/a/mozilla/2002/09/12/mozilla_browsers.html',
                bugzilla='http://www.bugzilla.org',
-               projects=url('mozorg.products')
+               projects=url('firefox.family.index')
       %}
         Community members got involved and expanded the scope of the project’s
         <a href="{{ mission }}">original mission</a> — instead of just working

bedrock/mozorg/templates/mozorg/about/history.html

@@ -286,7 +286,7 @@ <h4><a href="{{ url('mozorg.about.history-details') }}">{{ _('More history') }}<
       <p>{{ _('Where we came from and how we got to where we are') }}</p>
     </li>
     <li>
-      <h4><a href="{{ url('mozorg.products') }}">{{ _('Our products') }}</a></h4>
+      <h4><a href="{{ url('firefox.family.index') }}">{{ _('Our products') }}</a></h4>
       <p>{{ _('An overview of what we make and what we’re working on') }}</p>
     </li>
     <li>

bedrock/mozorg/templates/mozorg/projects/mozilla-based.html

@@ -10,7 +10,7 @@
 {% block breadcrumbs %}
   <nav class="breadcrumbs">
     <a href="{{ url('mozorg.home') }}">{{ _('Home') }}</a> >
-    <a href="{{ url('mozorg.products') }}">{{ _('Products') }}</a> >
+    <a href="{{ url('firefox.family.index') }}">{{ _('Products') }}</a> >
     <span>{{ _('Mozilla-Based Applications') }}</span>
   </nav>
 {% endblock %}

bedrock/mozorg/urls.py

@@ -20,7 +20,6 @@
     page('about/partnerships/distribution', 'mozorg/partnerships-distribution.html'),
     page('about/history', 'mozorg/about/history.html'),
     page('about/history/details', 'mozorg/about/history-details.html'),
-    page('products', 'mozorg/products.html'),
     page('about/mozilla-based', 'mozorg/projects/mozilla-based.html'),
     page('projects/calendar', 'mozorg/projects/calendar.html'),
     url('^projects/calendar/holidays/$', views.holiday_calendars,

bedrock/redirects/urls.py

@@ -40,8 +40,8 @@ def tabzilla_css_redirect(r):
     redirect(r'^contribute/page/?$',
              'https://wiki.mozilla.org/Webdev/GetInvolved/mozilla.org'),
 
-    # Bug 763665
-    redirect(r'^projects/$', 'mozorg.products'),
+    # Bug 763665, 1148127
+    redirect(r'^projects/$', 'firefox.family.index'),
 
     # Bug 792185 Brand Toolkit -> Style Guide
     redirect(r'^firefox/brand/$', 'styleguide.home'),

bedrock/security/templates/security/bug-bounty/faq.html

@@ -132,7 +132,7 @@ <h2>Eligible software</h2>
 
         <dd class="answer">
           <p>In general we mean the releases available for download on the <a
-            href="{{ url('mozorg.products') }}">mozilla.org download pages</a> at the time the
+            href="{{ url('firefox.family.index') }}">mozilla.org download pages</a> at the time the
             bug was reported. However we will also consider paying rewards for
             security bugs as discussed in the questions and answers below.</p>
         </dd>

bedrock/settings/base.py

@@ -915,12 +915,6 @@ def JINJA_CONFIG():
         ),
         'output_filename': 'css/fb_privacy-bundle.css',
     },
-    'products': {
-        'source_filenames': (
-            'css/mozorg/products.less',
-        ),
-        'output_filename': 'css/products-bundle.css',
-    },
     'projects_mozilla_based': {
         'source_filenames': (
             'css/mozorg/projects/mozilla-based.less',

bedrock/tabzilla/templates/tabzilla/tabzilla.js

@@ -738,7 +738,6 @@ var Tabzilla = (function (Tabzilla) {
     + '            <ul>'
     + '              <li><a href="https://www.mozilla.org/mission/?icn=tabz">{{ _('Mission')|js_escape }}</a></li>'
     + '              <li><a href="https://www.mozilla.org/about/?icn=tabz">{{ _('About')|js_escape }}</a></li>'
-    + '              <li><a href="https://www.mozilla.org/projects/?icn=tabz">{{ _('Projects')|js_escape }}</a></li>'
     + '              <li><a href="https://support.mozilla.org/?icn=tabz">{{ _('Support')|js_escape }}</a></li>'
     + '              <li><a href="https://developer.mozilla.org/?icn=tabz">{{ _('Developer Network')|js_escape }}</a></li>'
     + '            </ul>'
@@ -747,7 +746,7 @@ var Tabzilla = (function (Tabzilla) {
     + '        <li><h2>{{ _('Products')|js_escape }}</h2>'
     + '          <div>'
     + '            <ul>'
-    + '              <li><a href="https://www.mozilla.org/firefox/?icn=tabz">Firefox</a></li>'
+    + '              <li><a href="https://www.mozilla.org/firefox/products?icn=tabz">Firefox</a></li>'
     + '              <li><a href="https://www.mozilla.org/thunderbird/?icn=tabz">Thunderbird</a></li>'
     + '              <li><a href="https://www.mozilla.org/firefox/os/?icn=tabz">Firefox OS</a></li>'
     + '            </ul>'

etc/httpd/global.conf

@@ -36,7 +36,6 @@ RewriteRule ^(.*)//(.*)$ $1/$2 [L,R=301]
 RewriteRule ^/zh-TW/$ http://mozilla.com.tw/ [L,R=301]
 RewriteRule ^/zh-TW/mobile/?$ http://mozilla.com.tw/firefox/mobile/ [L,R=301]
 RewriteRule ^/zh-TW/download/?$ http://mozilla.com.tw/firefox/download/ [L,R=301]
-RewriteRule ^/zh-TW/products(/.*)?$ http://mozilla.com.tw/products$1 [L,R=301]
 
 # bug 874913
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?products/download.html$ /$1firefox/new/?#download-fx [NE,L,R=301]
@@ -222,9 +221,6 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/sync(/?)$ /b/$1firefox/sync$2 [PT]
 # bug 1101984
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/hello(/?)$ /b/$1firefox/hello$2 [PT]
 
-# bug 1133004
-RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/products(/?)$ /b/$1firefox/products$2 [PT]
-
 # bug 1071074
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/channel(/?)$ /b/$1firefox/channel$2 [PT]
 
@@ -885,3 +881,9 @@ RewriteRule ^/(contributor-data/[a-z]+.json)$ /b/$1 [L,PT]
 
 # bug 1108828
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/feedback(/?.*)$ /b/$1firefox/feedback$2 [PT]
+
+# bug 1133004
+RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/products(/?)$ /b/$1firefox/products$2 [PT]
+
+# bug 1148127
+RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?products(/?)$ /$1firefox/products/ [L,R=302]