Merge pull request #3265 from craigcook/bug-1198773-leadership-page

Fix bug 1198773 - add Kaykas-Wolff to steering committee
mozilla · Sep 1, 2015 · 6537ef0 · 6537ef0
2 parents 72a9a3c + e9143b3
commit 6537ef0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/bedrock/foundation/templates/foundation/mocosc.html b/bedrock/foundation/templates/foundation/mocosc.html
@@ -45,6 +45,7 @@ <h1 class="page-title">{{ _('About the Mozilla Corporation Steering Committee')
     <li><a href="https://blog.mozilla.org/press/bios/david-bryant/">David Bryant, {{ _('Interim CTO and VP, Platform Engineering') }}</a></li>
     <li><a href="https://blog.mozilla.org/press/bios/jim-cook/">Jim Cook, {{ _('Chief Finance Officer') }}</a></li>
     <li><a href="https://blog.mozilla.org/press/bios/denelle-dixon-thayer/">Denelle Dixon-Thayer, {{ _('Chief Legal and Business Officer') }}</a></li>
+    <li><a href="https://blog.mozilla.org/press/bios/jascha-kaykas-wolff/">Jascha Kaykas-Wolff, {{ _('Chief Marketing Officer') }}</a></li>
     <li><a href="https://blog.mozilla.org/press/bios/mark-mayo/">Mark Mayo, {{_('Senior Vice President, Firefox')}}</a></li>
     <li><a href="https://blog.mozilla.org/press/bios/david-slater/">David Slater, {{ _('Chief of Staff and SVP of Operations') }}</a></li>
   </ul>

diff --git a/bedrock/mozorg/templates/mozorg/about/leadership.html b/bedrock/mozorg/templates/mozorg/about/leadership.html
@@ -100,6 +100,20 @@ <h3 id="mgmt-corp"><a href="{{ url('foundation.moco') }}">{{ _('Mozilla Corporat
         </ul>
       </li>
 
+      <li class="vcard" itemscope itemtype="http://schema.org/Person">
+        <a class="url" itemprop="url" href="https://blog.mozilla.org/press/bios/jascha-kaykas-wolff/">
+          <img class="photo" itemprop="image" alt="" src="{{ static('img/mozorg/about/leadership/jascha-kaykas-wolff.jpg') }}">
+          <span class="fn" itemprop="name">Jascha Kaykas-Wolff</span>
+        </a>
+        <span class="title" itemprop="jobTitle">{{ _('Chief Marketing Officer') }}</span>
+        <span class="note">{{ _('Steering Committee') }}</span>
+
+        <ul class="elsewhere">
+          <li><a class="url twitter" itemprop="url" href="https://twitter.com/kaykas">@kaykas</a></li>
+          <li><a class="url book" itemprop="url" href="https://mozillians.org/u/kaykas/">{{ _('Mozillians profile') }}</a></li>
+        </ul>
+      </li>
+
       <li class="vcard" itemscope itemtype="http://schema.org/Person">
         <a class="url" itemprop="url" href="https://blog.mozilla.org/press/bios/mark-mayo/">
           <img class="photo" itemprop="image" alt="" src="{{ static('img/mozorg/about/leadership/mark-mayo.jpg') }}">
@@ -155,19 +169,6 @@ <h3 id="mgmt-corp"><a href="{{ url('foundation.moco') }}">{{ _('Mozilla Corporat
         </ul>
       </li>
 
-      <li class="vcard" itemscope itemtype="http://schema.org/Person">
-        <a class="url" itemprop="url" href="https://blog.mozilla.org/press/bios/jascha-kaykas-wolff/">
-          <img class="photo" itemprop="image" alt="" src="{{ static('img/mozorg/about/leadership/jascha-kaykas-wolff.jpg') }}">
-          <span class="fn" itemprop="name">Jascha Kaykas-Wolff</span>
-        </a>
-        <span class="title" itemprop="jobTitle">{{ _('Chief Marketing Officer') }}</span>
-
-        <ul class="elsewhere">
-          <li><a class="url twitter" itemprop="url" href="https://twitter.com/kaykas">@kaykas</a></li>
-          <li><a class="url book" itemprop="url" href="https://mozillians.org/u/kaykas/">{{ _('Mozillians profile') }}</a></li>
-        </ul>
-      </li>
-
       <li class="vcard" itemscope itemtype="http://schema.org/Person">
         <a class="url" itemprop="url" href="https://blog.mozilla.org/press/bios/mary-ellen-muckerman/">
           <img class="photo" itemprop="image" alt="" src="{{ static('img/mozorg/about/leadership/mary-ellen-muckerman.jpg') }}">