From 05d643bd51837a2e5d1f73df4487305a08a50c04 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Thu, 6 Apr 2017 10:49:19 -0400 Subject: [PATCH] Fix Bug 1347752 - Redirect www.mozilla.org/research to research.mozilla.org --- bedrock/mozorg/redirects.py | 4 +- bedrock/research/__init__.py | 0 bedrock/research/templates/research/base.html | 31 ------- .../research/templates/research/research.html | 40 --------- bedrock/research/urls.py | 9 -- bedrock/settings/base.py | 1 - bedrock/settings/static_media.py | 6 -- bedrock/urls.py | 1 - media/css/research/research.less | 86 ------------------- tests/redirects/map_globalconf.py | 3 + 10 files changed, 5 insertions(+), 176 deletions(-) delete mode 100644 bedrock/research/__init__.py delete mode 100644 bedrock/research/templates/research/base.html delete mode 100644 bedrock/research/templates/research/research.html delete mode 100644 bedrock/research/urls.py delete mode 100644 media/css/research/research.less diff --git a/bedrock/mozorg/redirects.py b/bedrock/mozorg/redirects.py index f5662608c6..7b3e051f64 100644 --- a/bedrock/mozorg/redirects.py +++ b/bedrock/mozorg/redirects.py @@ -184,8 +184,8 @@ redirectpatterns = ( # Bug 784411 /about/mission/ -> /mission/ redirect(r'^about/mission/?$', '/mission/'), - # Bug 1171763 - delete researchers and projects and redirect - redirect(r'^research/.+', '/research/'), + # Bug 1171763, 1347752 - /research/ -> research.m.o + redirect(r'^research(/.*)?$', 'https://research.mozilla.org/'), # Bug 800298 /webmaker/ -> wm.o and /webmaker/videos/ -> # wm.o/videos/ diff --git a/bedrock/research/__init__.py b/bedrock/research/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bedrock/research/templates/research/base.html b/bedrock/research/templates/research/base.html deleted file mode 100644 index 110d099c93..0000000000 --- a/bedrock/research/templates/research/base.html +++ /dev/null @@ -1,31 +0,0 @@ -{# This Source Code Form is subject to the terms of the Mozilla Public - # 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/. -#} - -{% extends "base-resp.html" %} -{% block body_class %}sand{% endblock %} - -{% set navigation_bar = [ - (url('research.research'), 'research', 'Mozilla Research'), - ('https://blog.mozilla.org/research/', 'blog', 'Blog'), -] -%} -{% set active_page = active_page|default('index') -%} - -{% block page_css %} - {% stylesheet 'research' %} -{% endblock %} - -{% block page_title_prefix %}{{_('Mozilla Research โ€” ')}}{% endblock %} -{% block page_title %}{% endblock %} -{% block page_title_suffix %}{{_(' โ€” mozilla.org')}}{% endblock %} - -{% block twitter_id %}MozResearch{% endblock %} - -{% block breadcrumbs %} - -{% endblock %} - -{% block email_form %}{% endblock %} diff --git a/bedrock/research/templates/research/research.html b/bedrock/research/templates/research/research.html deleted file mode 100644 index c82d55e6b7..0000000000 --- a/bedrock/research/templates/research/research.html +++ /dev/null @@ -1,40 +0,0 @@ -{# This Source Code Form is subject to the terms of the Mozilla Public - # 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/. -#} - -{% extends "research/base.html" %} - -{% block body_id %}research{% endblock %} -{% block page_title_prefix %}{% endblock %} -{% block page_title %}{{_('Mozilla Research') }}{% endblock %} - -{% block twitter_id %}MozResearch{% endblock %} - -{% block breadcrumbs %}{% endblock %} - -{% block content %} - -
-

{{_('Mozilla Research') }}

-

{{_('Expanding the Foundations of the Open Web') }}

-
- -
- -

-{% trans %} - At Mozilla Research, our focus is advanced Web platform technology. - Specifically, we're out to prove that there are no limits on open technology and that it has the same capabilities and potential that closed technology does. - We spend our days finding things that are impossible โ€” and then figuring out how to make them possible. -{% endtrans %} -

- - - -
-{% endblock %} diff --git a/bedrock/research/urls.py b/bedrock/research/urls.py deleted file mode 100644 index 06cb63ed03..0000000000 --- a/bedrock/research/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -from bedrock.mozorg.util import page - -urlpatterns = ( - page('research', 'research/research.html'), -) diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py index cf9aa41642..68ab337c73 100644 --- a/bedrock/settings/base.py +++ b/bedrock/settings/base.py @@ -420,7 +420,6 @@ INSTALLED_APPS = ( 'bedrock.persona', 'bedrock.press', 'bedrock.privacy', - 'bedrock.research', 'bedrock.styleguide', 'bedrock.tabzilla', 'bedrock.teach', diff --git a/bedrock/settings/static_media.py b/bedrock/settings/static_media.py index f673c27797..f7e52a9f0d 100644 --- a/bedrock/settings/static_media.py +++ b/bedrock/settings/static_media.py @@ -792,12 +792,6 @@ PIPELINE_CSS = { ), 'output_filename': 'css/projects-calendar-bundle.css', }, - 'research': { - 'source_filenames': ( - 'css/research/research.less', - ), - 'output_filename': 'css/research-bundle.css', - }, 'security': { 'source_filenames': ( 'css/security/security.less', diff --git a/bedrock/urls.py b/bedrock/urls.py index 4c3f9ca42f..61a430dce8 100644 --- a/bedrock/urls.py +++ b/bedrock/urls.py @@ -30,7 +30,6 @@ urlpatterns = ( url(r'', include('bedrock.thunderbird.urls')), url(r'', include('bedrock.mozorg.urls')), url(r'', include('bedrock.newsletter.urls')), - url(r'', include('bedrock.research.urls')), url(r'', include('bedrock.teach.urls')), # L10n example. diff --git a/media/css/research/research.less b/media/css/research/research.less deleted file mode 100644 index 4dfe36550c..0000000000 --- a/media/css/research/research.less +++ /dev/null @@ -1,86 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// 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 "../sandstone/lib.less"; - -.moz-global-nav-drawer + #outer-wrapper { - padding-top: @baseLine * 2; -} - -#research { - #main-feature { - padding-bottom: @baseLine; - } -} - -#main-content { - .intro { - .span(6); - padding-top: @baseLine; - .font-size(18px); - .open-sans-light; - } - - ul.links { - .span(5); - .offset(1); - li { - list-style-type: none; - padding-top: @baseLine; - margin-left: 0; - border-bottom: 1px dotted @borderColor; - } - h4 { - margin-bottom: @baseLine / 6; - a:after { - content: " ยป"; - .open-sans-light; - } - } - p { - margin-bottom: @baseLine / 2; - } - } -} - -/* Tablet Layout: 760px */ -@media only screen and (min-width: @breakTablet) and (max-width: @breakDesktop) { - .large h2 { - .font-size(36px); - } - #main-content { - .intro { - .span_narrow(6); - } - - ul.links { - .span_narrow(6); - } - } -} - -/* Mobile layout: 320px */ -@media only screen and (max-width: @breakTablet) { - .large { - h1 { - .font-size(40px); - margin-bottom: 5px; - } - h2 { - .font-size(24px); - } - } - #main-content { - .intro, - ul.links { - .span_narrow(5); - width: auto; - float: none; - } - .intro { - .font-size(@baseFontSize); - .open-sans; - } - } -} diff --git a/tests/redirects/map_globalconf.py b/tests/redirects/map_globalconf.py index 47ef4669f6..4a72553750 100644 --- a/tests/redirects/map_globalconf.py +++ b/tests/redirects/map_globalconf.py @@ -1065,6 +1065,9 @@ URLS = flatten(( # Bug 784411 url_test('/about/mission/', '/mission/'), + # Bug 1171763, 1347752 - /research/ -> research.m.o + url_test('/research/{,projects/,researchers/}', 'https://research.mozilla.org/'), + # Bug 1260423 url_test('/firefox/choose', '/firefox/new/'),