Skip to content

Commit

Permalink
Merge pull request #3248 from schalkneethling/bug1198773-update-leade…
Browse files Browse the repository at this point in the history
…rship-and-steering-committee-page

Fix Bug 1198773, Add Mark Mayo to steering committee page, and update titles on leadership page
  • Loading branch information
jgmize committed Aug 28, 2015
2 parents 4eee582 + 6ba417d commit a9370f3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions bedrock/foundation/templates/foundation/mocosc.html
Expand Up @@ -46,5 +46,6 @@ <h1 class="page-title">{{ _('About the Mozilla Corporation Steering Committee')
<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, {{ _('Senior Vice President Business and Legal Affairs') }}</a></li>

This comment has been minimized.

Copy link
@reedloden

reedloden Aug 28, 2015

Member

Doesn't her title need to be updated here as well?

This comment has been minimized.

Copy link
@jgmize

jgmize Aug 28, 2015

Author Contributor

Good catch, @reedloden. Thanks, I'll submit a new PR to fix.

<li><a href="https://blog.mozilla.org/press/bios/david-slater/">David Slater, {{ _('Chief of Staff and SVP of Operations') }}</a></li>
<li><a href="https://blog.mozilla.org/press/bios/mark-mayo/">Mark Mayo, {{_('Senior Vice President, Firefox')}}</a></li>
</ul>
{% endblock %}
6 changes: 3 additions & 3 deletions bedrock/mozorg/templates/mozorg/about/leadership.html
Expand Up @@ -92,7 +92,7 @@ <h3 id="mgmt-corp"><a href="{{ url('foundation.moco') }}">{{ _('Mozilla Corporat
<img class="photo" itemprop="image" alt="" src="{{ static('img/mozorg/about/leadership/denelle-dixon-thayer.jpg') }}">
<span class="fn" itemprop="name">Denelle Dixon-Thayer</span>
</a>
<span class="title" itemprop="jobTitle">{{ _('SVP, Business and Legal Affairs') }}</span>
<span class="title" itemprop="jobTitle">{{ _('Chief Legal and Business Officer') }}</span>
<span class="note">{{ _('Steering Committee') }}</span>

<ul class="elsewhere">
Expand Down Expand Up @@ -159,7 +159,7 @@ <h3 id="mgmt-corp"><a href="{{ url('foundation.moco') }}">{{ _('Mozilla Corporat
<img class="photo" itemprop="image" alt="" src="{{ static('img/mozorg/about/leadership/mark-mayo.jpg') }}">
<span class="fn" itemprop="name">Mark Mayo</span>
</a>
<span class="title" itemprop="jobTitle">{{ _('VP and General Manager, Firefox') }}</span>
<span class="title" itemprop="jobTitle">{{ _('Senior Vice President, Firefox') }}</span>

<ul class="elsewhere">
<li><a class="url twitter" itemprop="url" href="https://twitter.com/mmayo">@mmayo</a></li>
Expand All @@ -184,7 +184,7 @@ <h3 id="mgmt-corp"><a href="{{ url('foundation.moco') }}">{{ _('Mozilla Corporat
<img class="photo" itemprop="image" alt="" src="{{ static('img/mozorg/about/leadership/nick-nguyen.jpg') }}">
<span class="fn" itemprop="name">Nick Nguyen</span>
</a>
<span class="title" itemprop="jobTitle">{{ _('VP, Product Strategy') }}</span>
<span class="title" itemprop="jobTitle">{{ _('VP of Product, Firefox') }}</span>

<ul class="elsewhere">
<li><a class="url twitter" itemprop="url" href="https://twitter.com/osunick">@osunick</a></li>
Expand Down

0 comments on commit a9370f3

Please sign in to comment.