Permalink
Browse files

Implement feedback on Research pages (Bug 614428)

* Larger font for intro paragraph
* Drop the main Rust language promo feature
* Remove email signup in footer
  • Loading branch information...
1 parent e303bf5 commit a9016f0fce6bf6750a1e9fd024e16987bbc109ba @sgarrity sgarrity committed Dec 21, 2012
@@ -17,13 +17,13 @@
{{ css('research') }}
{% endblock %}
-{% block page_title_prefix %}Mozilla Research — {% endblock %}
+{% block page_title_prefix %}{{_('Mozilla Research — ')}}{% endblock %}
{% block page_title %}{% endblock %}
-{% block page_title_suffix %} — mozilla.org{% endblock %}
+{% block page_title_suffix %}{{_(' — mozilla.org')}}{% endblock %}
{% block breadcrumbs %}
<nav class="breadcrumbs">
- <a href="{{ url('mozorg.home') }}">Home</a> >
- <a href="{{ url('research.research') }}">Mozilla Research</a> >
+ <a href="{{ url('mozorg.home') }}">{{_('Home')}}</a> >
+ <a href="{{ url('research.research') }}">{{_('Mozilla Research')}}</a> >
</nav>
{% endblock %}
@@ -47,3 +47,5 @@
{% block site_js %}
{{ js('mozorg-resp') }}
{% endblock %}
+
+{% block email_form %}{% endblock %}
@@ -1,16 +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" %}
-{% set body_id = "collaborations" %}
-
-{% block page_title %}Collaborations{% endblock %}
-
-{% block article %}
-
-<h1>Mozilla Research Collaborations</h1>
-
-<p>Coming soon.</p>
-
-{% endblock %}
Oops, something went wrong.
@@ -1,16 +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" %}
-{% set body_id = "publications" %}
-
-{% block page_title %}Publications{% endblock %}
-
-{% block article %}
-
-<h1>Mozilla Research Publications</h1>
-
-<p>Coming soon.</p>
-
-{% endblock %}
@@ -6,7 +6,7 @@
{% block body_id %}research{% endblock %}
{% block page_title_prefix %}{% endblock %}
-{% block page_title %}Mozilla Research{% endblock %}
+{% block page_title %}{{_('Mozilla Research') }}{% endblock %}
{% block extrahead %}
{{ css('research') }}
@@ -17,37 +17,32 @@
{% block content %}
<hgroup id="main-feature" class="large center">
- <h1>Mozilla Research</h1>
- <h2>Expanding the Foundations of the Open Web</h2>
+ <h1>{{_('Mozilla Research') }}</h1>
+ <h2>{{_('Expanding the Foundations of the Open Web') }}</h2>
</hgroup>
-<div id="rust-promo" class="billboard">
- <a href="{{ url('research.projects') }}#rust">
- <h2>Rust</h2>
- <p>A safe, concurrent, practical language.</p>
- </a>
-</div>
-
<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="projects" class="odd">
- <h4><a href="{{ url('research.projects') }}">Projects</a></h4>
- <p>See what we're working on and building</p>
+ <h4><a href="{{ url('research.projects') }}">{{_('Projects') }}</a></h4>
+ <p>{{_('See what were working on and building') }}</p>
</li>
<li id="researchers">
- <h4><a href="{{ url('research.researchers') }}#">Researchers</a></h4>
- <p>Get to know the Mozilla Research team</p>
+ <h4><a href="{{ url('research.researchers') }}#">{{_('Researchers') }}</a></h4>
+ <p>{{_('Get to know the Mozilla Research team') }}</p>
</li>
<li id="blog" class="odd">
- <h4><a href="http://blog.mozilla.org/research/">Blog</a></h4>
- <p>Read up on our latest thoughts and news</p>
+ <h4><a href="http://blog.mozilla.org/research/">{{_('Blog') }}</a></h4>
+ <p>{{_('Read up on our latest thoughts and news') }}</p>
</li>
</ul>
@@ -5,44 +5,54 @@
{% extends "research/base.html" %}
{% block body_id %}researchers{% endblock %}
-{% block page_title %}Researchers{% endblock %}
+{% block page_title %}{{_('Researchers')}}{% endblock %}
{% block content %}
-<h1 id="main-feature">Mozilla Researchers</h1>
+<h1 id="main-feature">{{_('Mozilla Researchers')}}</h1>
<section id="main-content" class="people">
<ul>
<li>
- <img src="{{ media('/img/research/photo-andreas-gal.jpg') }}" alt="Photo" />
- <h3>Andreas Gal <em>Director of Research</em></h3>
- <p>Andreas is proud to lead an amazing team of researchers and engineers working on various areas of the web stack. Previously, Andreas worked as a project scientist with the <a href="http://www.ssllab.org/">Secure Systems and Languages Laboratory</a> at the <a href="http://www.uci.edu/">University of California, Irvine</a>. Andreas's background is in secure systems, type-safe languages, dynamic compilation, and virtual machines.</p>
+ <img src="{{ media('/img/research/photo-andreas-gal.jpg') }}" alt="{{_('Photo')}}" />
+ <h3>{{_('Andreas Gal')}} <em>{{_('Director of Research')}}</em></h3>
+ {% trans %}
+ <p>Andreas is proud to lead an amazing team of researchers and engineers working on various areas of the web stack. Previously, Andreas worked as a project scientist with the <a href="http://www.ssllab.org/">Secure Systems and Languages Laboratory</a> at the <a href="http://www.uci.edu/">University of California, Irvine</a>. Andreas's background is in secure systems, type-safe languages, dynamic compilation, and virtual machines.</p>
+ {% endtrans %}
</li>
<li>
- <img src="{{ media('/img/research/photo-michael-bebenita.jpg') }}" alt="Photo" />
- <h3>Michael Bebenita <em>Researcher</em></h3>
- <p>Michael received his PhD from the <a href="http://www.uci.edu/">University of California, Irvine</a> in 2011 on trace-based, just-in-time compilation. Michael's primary research interests are in high-performance systems, software architecture, compilers, and virtual machines. Michael has contributed to the Rust programming language and leads the Shumway project.</p>
+ <img src="{{ media('/img/research/photo-michael-bebenita.jpg') }}" alt="{{_('Photo')}}" />
+ <h3>{{_('Michael Bebenita') }} <em>{{_('Researcher') }}</em></h3>
+ {% trans %}
+ <p>Michael received his PhD from the <a href="http://www.uci.edu/">University of California, Irvine</a> in 2011 on trace-based, just-in-time compilation. Michael's primary research interests are in high-performance systems, software architecture, compilers, and virtual machines. Michael has contributed to the Rust programming language and leads the Shumway project.</p>
+ {% endtrans %}
</li>
<li>
- <img src="{{ media('/img/research/photo-dave-herman.jpg') }}" alt="Photo" />
- <h3>Dave Herman <em>Senior Researcher</em></h3>
- <p>Dave received his PhD from <a href="http://www.ccs.neu.edu/">Northeastern University</a> in 2010 in formal semantics of programming languages. Dave's research interests include programming language design, specification, and analysis. Dave coordinates several research programs at Mozilla, including Rust and Servo, and leads the research internship program. Dave participates actively in open standards and has contributed significantly to the JavaScript standard since 2006.</p>
+ <img src="{{ media('/img/research/photo-dave-herman.jpg') }}" alt="{{_('Photo')}}" />
+ <h3>{{_('Dave Herman') }} <em>{{_('Senior Researcher') }}</em></h3>
+ {% trans %}
+ <p>Dave received his PhD from <a href="http://www.ccs.neu.edu/">Northeastern University</a> in 2010 in formal semantics of programming languages. Dave's research interests include programming language design, specification, and analysis. Dave coordinates several research programs at Mozilla, including Rust and Servo, and leads the research internship program. Dave participates actively in open standards and has contributed significantly to the JavaScript standard since 2006.</p>
+ {% endtrans %}
</li>
<li>
- <img src="{{ media('/img/research/photo-chris-jones.jpg') }}" alt="Photo" />
- <h3>Chris Jones <em>Senior Engineer</em></h3>
- <p>Chris serves as Technical Lead to the Boot to Gecko project, building a full-featured mobile operating system with open web technology. Chris's research interests lie in high-performance systems, architecture, and parallel algorithms.</p>
+ <img src="{{ media('/img/research/photo-chris-jones.jpg') }}" alt="{{_('Photo')}}" />
+ <h3>{{_('Chris Jones') }} <em>{{_('Senior Engineer') }}</em></h3>
+ {% trans %}
+ <p>Chris serves as Technical Lead to the Boot to Gecko project, building a full-featured mobile operating system with open web technology. Chris's research interests lie in high-performance systems, architecture, and parallel algorithms.</p>
+ {% endtrans %}
</li>
<li>
- <img src="{{ media('/img/research/photo-allen-wirfs-brock.jpg') }}" alt="Photo" />
- <h3>Allen Wirfs-Brock <em>Research Fellow</em></h3>
- <p>Allen is an expert in all aspects of dynamic, object-oriented languages and their implementation. As a software architect and entrepeneur, Allen has made numerous contributions to the industrialization and commercialization of object-oriented technology, serving as a strategic technologist, software architect, product developer, and manager. Allen has founded two successful companies and made major contributions to both the Smalltalk and JavaScript language standards. In 2009, Allen was recognized as an <a href="http://www.acm.org/press-room/news-releases/distinguished-09">ACM Distinguished Engineer</a>.</p>
+ <img src="{{ media('/img/research/photo-allen-wirfs-brock.jpg') }}" alt="{{_('Photo')}}" />
+ <h3>{{_('Allen Wirfs-Brock') }} <em>{{_('Research Fellow') }}</em></h3>
+ {% trans %}
+ <p>Allen is an expert in all aspects of dynamic, object-oriented languages and their implementation. As a software architect and entrepeneur, Allen has made numerous contributions to the industrialization and commercialization of object-oriented technology, serving as a strategic technologist, software architect, product developer, and manager. Allen has founded two successful companies and made major contributions to both the Smalltalk and JavaScript language standards. In 2009, Allen was recognized as an <a href="http://www.acm.org/press-room/news-releases/distinguished-09">ACM Distinguished Engineer</a>.</p>
+ {% endtrans %}
</li>
</ul>
@@ -34,14 +34,16 @@
#research {
#main-feature {
- padding-bottom: @baseLine * 2;
+ padding-bottom: @baseLine;
}
}
#main-content {
.intro {
.span(6);
padding-top: @baseLine;
+ font-size: 18px;
+ .open-sans-light;
}
ul.links {
@@ -109,31 +111,11 @@
}
}
-#rust-promo {
- background: #fff url(/media/img/research/promo-rust.jpg) top right no-repeat;
- padding: 0;
- a {
- display: block;
- padding: @baseLine (@baseLine * 2);
- color: @textColorSecondary;
- &:hover,
- &:active {
- text-decoration: none;
- }
- }
- p {
- margin-bottom: 0;
- }
-}
-
/* Tablet Layout: 760px */
@media only screen and (min-width: @breakTablet) and (max-width: @breakDesktop) {
.large h2 {
font-size: 36px;
}
- #rust-promo {
- background-position: 100px 0;
- }
#main-content {
.intro {
.span_narrow(6);
@@ -173,18 +155,17 @@
#research #main-feature {
padding-bottom: @baseLine;
}
- #rust-promo {
- display: none;
- background-position: 90px 0;
- background-size: auto 100%;
- }
#main-content {
.intro,
ul.links {
.span_narrow(5);
width: auto;
float: none;
}
+ .intro {
+ font-size: @baseFontSize;
+ .open-sans;
+ }
}
#projects {
section {
Deleted file not rendered

0 comments on commit a9016f0

Please sign in to comment.