Merge pull request #2127 from alexgibson/bug-1017093-copy-edits-for-research-pages

[fix bug 1017093] copy edits for /research pages

bedrock/research/templates/research/projects.html

@@ -22,6 +22,7 @@
     <li><a href="#servo">{{_('Servo')}}</a></li>
     <li><a href="#shumway">{{_('Shumway')}}</a></li>
     <li><a href="#emscripten">{{_('Emscripten')}}</a></li>
+    <li><a href="#daala">{{_('Daala')}}</a>
     <li><a href="#sweetjs">{{_('sweet.js')}}</a></li>
     <li><a href="#lljs">{{_('LLJS')}}</a></li>
     <li><a href="#broadwayjs">{{_('broadway.js')}}</a></li>
@@ -95,6 +96,23 @@
   </div>
 </section>
 
+<section id="daala">
+  <div class="intro">
+    <h2>{{_('Daala')}}</h2>
+    <ul>
+      <li>
+        <a href="http://xiph.org/daala/">{{_('Daala website')}}</a>
+      </li>
+    </ul>
+  </div>
+  <div class="details">
+    {% trans %}
+      <p>Daala is a next-next-generation video codec. The aim is not only to create a better video codec, but to create one that is a royalty-free open standard that can serve as the backbone technology for video on the internet. Daala’s performance on still images is already on par with H.264, and is rapidly gaining on H.265.</p>
+      <p>Unlike other video and image codecs which divide images into discrete blocks, Daala uses overlapping blocks to eliminate blocking artifacts and does prediction and other operations on frequency values instead of pixels. Instead of simple scalar quantization, Daala uses an energy preserving quantizer inspired by similar techniques in the Opus audio codec.</p>
+    {% endtrans %}
+  </div>
+</section>
+
 <section id="sweetjs">
   <div class="intro">
     <h2>{{_('sweet.js')}}</h2>

bedrock/research/templates/research/research.html

@@ -39,7 +39,7 @@
     <p>{{_('See what we’re working on and building') }}</p>
   </li>
   <li id="researchers">
-    <h4><a href="{{ url('research.researchers') }}#">{{_('Researchers') }}</a></h4>
+    <h4><a href="{{ url('research.researchers') }}">{{_('Researchers') }}</a></h4>
     <p>{{_('Get to know the Mozilla Research team') }}</p>
   </li>
   <li id="blog" class="odd">

bedrock/research/templates/research/researchers.html

@@ -19,25 +19,25 @@
 
     <li>
       <img src="{{ media('/img/research/photo-andreas-gal.jpg') }}" alt="{{_('Photo')}}" />
-      <h3>{{_('Andreas Gal')}} <em>{{_('Director of Research')}}</em></h3>
+      <h3>{{_('Andreas Gal')}} <em>{{_('CTO')}}</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>
+      <img src="{{ media('/img/research/photo-dave-herman.jpg') }}" alt="{{_('Photo')}}" />
+      <h3>{{_('Dave Herman') }} <em>{{_('Principal 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>
+        <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-dave-herman.jpg') }}" alt="{{_('Photo')}}" />
-      <h3>{{_('Dave Herman') }} <em>{{_('Senior Researcher') }}</em></h3>
+      <img src="{{ media('/img/research/photo-michael-bebenita.jpg') }}" alt="{{_('Photo')}}" />
+      <h3>{{_('Michael Bebenita') }} <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>
+        <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>
 

media/css/research/research.less

@@ -9,8 +9,13 @@
     margin-top: @baseLine;
 }
 
+nav.menu-bar ul li a {
+    padding-left: 17px;
+    padding-right: 17px;
+}
+
 #projects {
-    section {
+    > section {
         .clearfix;
         border-bottom: 1px dotted @borderColor;
         margin-bottom: @baseLine * 2;
@@ -135,8 +140,8 @@
         }
     }
     nav.menu-bar ul li a {
-        padding-left: 10px;
-        padding-right: 10px;
+        padding-left: 7px;
+        padding-right: 7px;
     }
 }