Bug 1388914 - Delete thunderbird content

- Removed thunderbird app
  - Removed image, CSS, and JS assets for thunderbird app
  - Remove associated tests
- Remove /projects/calendar and /projects/calendar/holidays
  - Remove associated image, CSS, and JS assets
- Remove release notes
  - Remove associated tests
- Moved redirects from thunderbird app to bedrock redirects
  - Updated to point to thunderbird.net where appropriate
- Added redirects to thunderbird.net

bedrock/mozorg/redirects.py

@@ -234,9 +234,6 @@ def decider(request, **kwargs):
     # bug 957664
     redirect(r'^press/awards(?:/|\.html)?$', 'https://blog.mozilla.org/press/awards/'),
 
-    # bug 885799, 952429
-    redirect(r'^projects/calendar/holidays\.html$', 'mozorg.projects.holiday_calendars'),
-
     # bug 876810
     redirect(r'^hacking/commit-access-policy/?$',
              'mozorg.about.governance.policies.commit.access-policy'),

bedrock/mozorg/templates/mozorg/powered-by.html

@@ -69,7 +69,7 @@ <h2>{{ _("Applications and Products that are Powered by Mozilla") }}</h2>
 			<li><a href="http://www.smartreport.eu">{{ _("SmartReport")}}</a></li>
 			<li><a href="http://www.surfeasy.com">{{ _("SurfEasy")}}</a></li>
 			<li><a href="http://www.telasocial.com/">{{ _("Tela Social")}}</a></li>
-			<li><a href="{{ url('thunderbird.index') }}">{{ _("Thunderbird")}}</a></li>
+			<li><a href="https://www.thunderbird.net/">{{ _("Thunderbird")}}</a></li>
 			<li><a href="http://topstyle4.com">{{ _("TopStyle")}}</a></li>
 			<li><a href="http://waterfoxproj.sourceforge.net">{{ _("Waterfox")}}</a></li>
 			<li><a href="http://www.wyzo.com">{{ _("Wyzo")}}</a></li>

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

@@ -28,7 +28,7 @@ <h3><a href="http://www.seamonkey-project.org/"><img src="{{ static('img/project
   <p>{{ _('The all-in-one application formerly known as the “Mozilla Application Suite”, containing a web browser, a mail and newsgroups client, an HTML editor, web development tools, and an IRC chat client.') }}</p>
   </li>
   <li>
-  <h3><a href="/projects/calendar/"><img src="{{ static('img/projects/calendar/calendar-logo.png') }}" width="64" height="64" alt="" /><span>{{ _('Lightning') }}</span></a></h3>
+  <h3><a href="https://www.thunderbird.net/calendar/"><img src="{{ static('img/projects/mozilla-based/calendar-logo.png') }}" width="64" height="64" alt="" /><span>{{ _('Lightning') }}</span></a></h3>
   <p>{{ _('Lightning is a popular calendaring, scheduling and task management extension. Sunbird® is a cross-platform application that brings Mozilla-style ease-of-use to your calendar.') }}</p>
   </li>
   <li>

bedrock/mozorg/urls.py

@@ -32,12 +32,9 @@
     page('about/history', 'mozorg/about/history.html'),
     page('about/history/details', 'mozorg/about/history-details.html'),
     page('about/mozilla-based', 'mozorg/projects/mozilla-based.html'),
-    page('projects/calendar', 'mozorg/projects/calendar.html'),
-    url('^projects/calendar/holidays/$', views.holiday_calendars,
-        name='mozorg.projects.holiday_calendars'),
     # Bug 981063, catch all for old calendar urls.
     # must be here to avoid overriding the above
-    redirect(r'^projects/calendar/', 'mozorg.projects.calendar', locale_prefix=False),
+    redirect(r'^projects/calendar/', 'https://www.thunderbird.net/calendar/', locale_prefix=False),
     page('mission', 'mozorg/mission.html'),
     page('ITU', 'mozorg/itu.html'),
     page('about/powered-by', 'mozorg/powered-by.html'),

bedrock/mozorg/views.py

@@ -2,9 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import json
 
-from django.contrib.staticfiles.finders import find as find_static
 from django.http import Http404
 from django.shortcuts import render as django_render
 from django.views.decorators.cache import cache_page
@@ -13,7 +11,6 @@
 
 from commonware.decorators import xframe_allow
 
-from bedrock.base.templatetags.helpers import static
 from bedrock.mozorg.credits import CreditsFile
 from bedrock.mozorg.forums import ForumsFile
 from bedrock.mozorg.models import ContributorActivity, TwitterCache
@@ -69,26 +66,6 @@ def contribute_studentambassadors_landing(request):
                              {'tweets': tweets})
 
 
-def holiday_calendars(request, template='mozorg/projects/holiday-calendars.html'):
-    """Generate the table of holiday calendars from JSON."""
-    calendars = []
-    json_file = find_static('caldata/calendars.json')
-    with open(json_file) as calendar_data:
-        calendars = json.load(calendar_data)
-
-    letters = set()
-    for calendar in calendars:
-        letters.add(calendar['country'][:1])
-
-    data = {
-        'calendars': sorted(calendars, key=lambda k: k['country']),
-        'letters': sorted(letters),
-        'CALDATA_URL': static('caldata/')
-    }
-
-    return l10n_utils.render(request, template, data)
-
-
 @require_safe
 def credits_view(request):
     """Display the names of our contributors."""

bedrock/redirects/redirects.py

@@ -1645,6 +1645,10 @@
     redirect('^performance/leak-brownbag\.html$',
              'http://wiki.mozilla.org/Performance:Leak_Tools'),
     redirect('^privacy-policy(\.html|/.*)?$', '/privacy/websites/'),
+    redirect('^projects/calendar/$', 'https://www.thunderbird.net/calendar/'),
+    redirect('^projects/calendar/holidays/$', 'https://www.thunderbird.net/calendar/holidays/'),
+    # bug 885799, 952429
+    redirect(r'^projects/calendar/holidays\.html$', 'https://www.thunderbird.net/calendar/holidays/'),
     redirect('^products/camino/badges/$', 'http://caminobrowser.org/community/promotion/'),
     redirect('^products/camino/features/searchCustomization\.html$',
              'http://caminobrowser.org/help/'),
@@ -2005,6 +2009,59 @@
     redirect('^status/minutes\.html$', 'https://wiki.mozilla.org/WeeklyUpdates'),
     redirect('^store$', 'https://store.mozilla.org'),
     redirect('^testdrivers$', 'http://wiki.mozilla.org/B2G_Testdrivers_Program'),
+    # bug 1124038
+    redirect(r'^thunderbird/organizations/(?:all-esr\.html|faq/?)$', 'https://www.thunderbird.net/organizations/'),
+    # bug 1123399, 1150649
+    redirect(r'^thunderbird/all\.html?$', 'https://www.thunderbird.net/thunderbird/all/'),
+    redirect(r'^thunderbird/all-beta\.html?$', 'https://www.thunderbird.net/thunderbird/beta/all/'),
+    redirect(r'^thunderbird/early_releases/?$', 'https://www.thunderbird.net/thunderbird/beta/all/'),
+    redirect(r'^thunderbird/early_releases/downloads/?$', 'https://www.thunderbird.net/thunderbird/beta/all/'),
+    # bug 1124042
+    redirect(r'^thunderbird/features/email_providers\.html$', 'https://www.thunderbird.net/email-providers/'),
+    # bug 1081917, 1029829, 1029838
+    redirect(r'^thunderbird/releases/(?P<version>0\.\d)\.html$',
+             'http://website-archive.mozilla.org/www.mozilla.org/thunderbird_releasenotes'
+             '/en-US/thunderbird/releases/{version}.html'),
+    # should catch everything 1.* to 29.*
+    redirect(r'^thunderbird/(?P<version>(?:\d|[12]\d)\.[^/]+)/'
+             '(?P<page>firstrun|releasenotes|start|system-requirements|whatsnew)/$',
+             'http://website-archive.mozilla.org/www.mozilla.org/thunderbird_releasenotes'
+             '/en-US/thunderbird/{version}/{page}/'),
+    # bug 1209720
+    redirect(r'^thunderbird/releasenotes/?$', 'https://www.thunderbird.net/thunderbird/releases/'),
+    # bug 1211007
+    redirect(r'^thunderbird/download/?', 'https://www.thunderbird.net/'),
+    # bug 1133266
+    redirect(r'^thunderbird/legal/privacy/?$', 'privacy.notices.thunderbird'),
+    redirect(r'^thunderbird/about/privacy-policy/?$',
+             'privacy.archive.thunderbird-2010-06'),
+    # bug 1196578
+    redirect(r'^thunderbird/about/legal/eula/?$', 'legal.eula'),
+    redirect(r'^thunderbird/about/legal/eula/thunderbird2',
+             'legal.eula.thunderbird-2-eula'),
+    redirect(r'^thunderbird/about/legal/eula/thunderbird',
+             'legal.eula.thunderbird-1.5-eula'),
+    # bug 1204579
+    redirect(r'^thunderbird/2.0.0.0/eula/?$', 'legal.eula.thunderbird-2-eula'),
+    redirect(r'^thunderbird/about/legal/?$', 'legal.terms.mozilla'),
+    redirect(r'^thunderbird/about(/mission)?/?$',
+             'https://wiki.mozilla.org/Thunderbird'),
+    redirect(r'^thunderbird/(about/(careers|contact|get-involved)|community)/?$',
+             'https://wiki.mozilla.org/Thunderbird#Contributing'),
+    redirect(r'^thunderbird/(?P<version>\d\.\d(?:a|b|rc)\d|[6-9]\.0beta)/?$',
+             'http://website-archive.mozilla.org/www.mozilla.org/thunderbird'
+             '/thunderbird/{version}/'),
+    redirect(r'^thunderbird/about/(?P<page>board|press|staff)/',
+             'http://website-archive.mozilla.org/www.mozilla.org/thunderbird'
+             '/thunderbird/about/{page}/'),
+    # bug 1388914
+    redirect(r'^thunderbird/all/$', 'https://www.thunderbird.net/thunderbird/all/'),
+    redirect(r'^thunderbird/beta/(?P<path>.*)$', 'https://www.thunderbird.net/thunderbird/beta/{path}'),
+    redirect(r'^thunderbird/(?P<version>[^/]+)/releasenotes/$',
+             'https://www.thunderbird.net/thunderbird/{version}/releasenotes/'),
+    redirect(r'^thunderbird/(?P<version>[^/]+)/system-requirements/$',
+             'https://www.thunderbird.net/thunderbird/{version}/system-requirements/'),
+    redirect(r'^thunderbird/(?P<path>.*)', 'https://www.thunderbird.net/{path}'),
     redirect('^tinderbox\.html$', 'http://developer.mozilla.org/en/Tinderbox'),
     redirect('^tools\.html$', 'http://developer.mozilla.org/en/Mozilla_Development_Tools'),
     redirect('^university/courses\.html$', 'http://education.mozilla.org'),

bedrock/releasenotes/models.py

@@ -187,9 +187,6 @@ def version_obj(self):
         return Version(self.version)
 
     def get_absolute_url(self):
-        if self.product == 'Thunderbird':
-            return reverse('thunderbird.notes', args=[self.version])
-
         if self.product == 'Firefox for Android':
             urlname = 'firefox.android.releasenotes'
         elif self.product == 'Firefox for iOS':
@@ -201,9 +198,7 @@ def get_absolute_url(self):
         return reverse(urlname, args=[self.version, prefix])
 
     def get_sysreq_url(self):
-        if self.product == 'Thunderbird':
-            urlname = 'thunderbird.sysreq'
-        elif self.product == 'Firefox for Android':
+        if self.product == 'Firefox for Android':
             urlname = 'firefox.android.system_requirements'
         elif self.product == 'Firefox for iOS':
             urlname = 'firefox.ios.system_requirements'
@@ -215,16 +210,6 @@ def get_sysreq_url(self):
     def get_bug_search_url(self):
         if self.bug_search_url:
             return self.bug_search_url
-
-        if self.product == 'Thunderbird':
-            return (
-                'https://bugzilla.mozilla.org/buglist.cgi?'
-                'classification=Client%20Software&query_format=advanced&'
-                'bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&'
-                'target_milestone=Thunderbird%20{version}.0&product=Thunderbird'
-                '&resolution=FIXED'
-            ).format(version=self.major_version)
-
         return (
             'https://bugzilla.mozilla.org/buglist.cgi?'
             'j_top=OR&f1=target_milestone&o3=equals&v3=Firefox%20{version}&'