Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split Leadership onto multiple pages with navigation [fix #11878] #12002

Merged
merged 1 commit into from
Aug 10, 2022
Merged

Split Leadership onto multiple pages with navigation [fix #11878] #12002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bedrock/base/templates/includes/protocol/navigation/menus/whoweare.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-get-involved', fallback='nav
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="{{ url('mozorg.about.leadership') }}" data-link-name="Leadership" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
<a class="c-menu-item-link" href="{{ url('mozorg.about.leadership.index') }}" data-link-name="Leadership" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
<svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M22.7 13.9V2.7H9.3v11.2c0 .5.2.9.7 1.1l5.6 3.3-1.3 3.1-4.5.4 3.5 3-1.1 4.4L16 27l3.9 2.4-1-4.4 3.5-3-4.5-.4-1.3-3.1 5.6-3.3c.2-.4.5-.8.5-1.3zm-5.4 2.4l-1.3.8-1.3-.8V4h2.7v12.3z"></path></svg>
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-leadership', fallback='navigation-leadership') }}</h4>
{% if ftl_has_messages('navigation-v2-meet-the-team-thats-building') %}
Expand Down
10 changes: 5 additions & 5 deletions bedrock/foundation/templates/foundation/moco.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ <h2>Organization</h2>

<h3>Board of Directors</h3>
<ul class="mzp-u-list-styled">
<li><a href="{{ url('mozorg.about.leadership') }}#mitchell-baker">Mitchell Baker</a>, Chair</li>
<li><a href="{{ url('mozorg.about.leadership') }}#laura-chambers">Laura Chambers</a></li>
<li><a href="{{ url('mozorg.about.leadership') }}#karim-lakhani">Karim Lakhani</a></li>
<li><a href="{{ url('mozorg.about.leadership') }}#bob-lisbonne">Bob Lisbonne</a></li>
<li><a href="{{ url('mozorg.about.leadership') }}#hugh-molotsi">Hugh Molotsi</a></li>
<li><a href="{{ url('mozorg.about.leadership.index') }}#mitchell-baker">Mitchell Baker</a>, Chair</li>
<li><a href="{{ url('mozorg.about.leadership.index') }}#laura-chambers">Laura Chambers</a></li>
<li><a href="{{ url('mozorg.about.leadership.index') }}#karim-lakhani">Karim Lakhani</a></li>
<li><a href="{{ url('mozorg.about.leadership.index') }}#bob-lisbonne">Bob Lisbonne</a></li>
<li><a href="{{ url('mozorg.about.leadership.index') }}#hugh-molotsi">Hugh Molotsi</a></li>
</ul>

<h2>Documents</h2>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/mozorg/templates/mozorg/about-base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
(url('mozorg.about.index'), 'about-mozilla', ftl('about-shared-about-mozilla')),
(url('mozorg.mission'), 'about-mission', ftl('about-shared-mission')),
(url('mozorg.about.history'), 'about-history', ftl('about-shared-history')),
(url('mozorg.about.leadership'), 'about-leadership', ftl('about-shared-leadership')),
(url('mozorg.about.leadership.index'), 'about-leadership', ftl('about-shared-leadership')),
(url('mozorg.about.governance.governance'), 'about-governance', ftl('about-shared-governance')),
(url('mozorg.about.forums.forums'), 'about-forums', ftl('about-shared-forums')),
(url('mozorg.about.policy.patents.index'), 'about-patents', ftl('about-shared-patents')),
Expand Down
1,087 changes: 0 additions & 1,087 deletions bedrock/mozorg/templates/mozorg/about/leadership.html
View file
Open in desktop

This file was deleted.

46 changes: 46 additions & 0 deletions bedrock/mozorg/templates/mozorg/about/leadership/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{#
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 https://mozilla.org/MPL/2.0/.
#}

{% from "macros-protocol.html" import sidemenu_lists with context %}

{% extends "base-protocol-mozilla.html" %}

{% block page_title_prefix %}Mozilla Leadership{% endblock %}
{% block body_class %}{{ super() }} about-leadership{% endblock %}

{% block page_css %}
{{ css_bundle('about-leadership') }}
{% endblock %}

{% block js %}
{{ js_bundle('about-leadership') }}
{% endblock %}

{% set navigation_bar = [
(url('mozorg.about.leadership.index'), 'executive-team', 'Leadership'),
(url('mozorg.about.leadership.index'), 'executive-team', 'Executive Team'),
(url('mozorg.about.leadership.senior'), 'senior-leadership', 'Senior Leadership'),
(url('mozorg.about.leadership.mofo'), 'mozilla-foundation', 'Mozilla Foundation'),
(url('mozorg.about.leadership.reps'), 'mozilla-reps', 'Mozilla Reps Council'),
(url('mozorg.about.leadership.boards'), 'boards', 'Boards of Directors'),
] -%}

{% block content %}
<div id="main-content" class="mzp-l-content{% if self.side_nav()|trim|length %} mzp-has-sidebar mzp-l-sidebar-left{% endif %}">
{% block sidebar %}
<aside class="mzp-l-sidebar">
{% block side_nav %}
{{ sidemenu_lists([navigation_bar]) }}
{% endblock %}
</aside>
{% endblock %}

<main class="mzp-l-main">
{% block main_content %}{% endblock %}
</main>
</div>
<div class="mzp-u-modal-content"></div>
{% endblock %}
Loading