зеркало из https://github.com/mozilla/bedrock.git
Fix Bug 1347752 - Redirect www.mozilla.org/research to research.mozilla.org
This commit is contained in:
Kohei Yoshino
Родитель
7f50251b3c
Коммит
05d643bd51
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
<nav class="breadcrumbs">
|
||||
<a href="{{ url('mozorg.home') }}">{{_('Home')}}</a> >
|
||||
<a href="{{ url('research.research') }}">{{_('Mozilla Research')}}</a> >
|
||||
</nav>
|
||||
{% endblock %}
|
||||
|
||||
{% block email_form %}{% endblock %}
|
||||
|
|
@ -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 %}
|
||||
|
||||
<hgroup id="main-feature" class="large center">
|
||||
<h1>{{_('Mozilla Research') }}</h1>
|
||||
<h2>{{_('Expanding the Foundations of the Open Web') }}</h2>
|
||||
</hgroup>
|
||||
|
||||
<div id="main-content">
|
||||
|
||||
<p class="intro">
|
||||
{% 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 %}
|
||||
</p>
|
||||
|
||||
<ul class="links">
|
||||
<li id="blog" class="odd">
|
||||
<h4><a href="https://blog.mozilla.org/research/">{{_('Blog') }}</a></h4>
|
||||
<p>{{_('Read up on our latest thoughts and news') }}</p>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -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'),
|
||||
)
|
||||
|
|
@ -420,7 +420,6 @@ INSTALLED_APPS = (
|
|||
'bedrock.persona',
|
||||
'bedrock.press',
|
||||
'bedrock.privacy',
|
||||
'bedrock.research',
|
||||
'bedrock.styleguide',
|
||||
'bedrock.tabzilla',
|
||||
'bedrock.teach',
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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/'),
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче