Skip to content
This repository has been archived by the owner on Jan 19, 2023. It is now read-only.

Move contributors page to community, remove from home page. #2326

Merged
merged 1 commit into from
Apr 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelogs/unreleased/2312-lenriquez
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move contributors page to community, remove from home page.
1 change: 1 addition & 0 deletions site/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ page_gen:
collections:
- contributors
- casestudies
- emeritus

versioning: false
latest: master
Expand Down
4 changes: 2 additions & 2 deletions site/_contributors/01-bryan-liles.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
first_name: Bryan
first_name: Bryan
last_name: Liles
image: /img/contributors/bryan-liles.jpg
github_handle: bryanl
---
Engineer
VMWare
2 changes: 1 addition & 1 deletion site/_contributors/02-sam-foo.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ last_name: Foo
image: /img/contributors/sam-foo.jpg
github_handle: GuessWhoSamFoo
---
Engineer
VMWare
7 changes: 7 additions & 0 deletions site/_contributors/03-luis-enriquez.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
first_name: Luis
last_name: Enriquez
image: /img/contributors/luis-enriquez.jpg
github_handle: lenriquez
---
VMWare
2 changes: 1 addition & 1 deletion site/_contributors/04-milan-klanjsek.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ last_name: Klanjsek
image: /img/contributors/milan-klanjsek.jpg
github_handle: mklanjsek
---
Engineer
VMWare
7 changes: 0 additions & 7 deletions site/_contributors/05-isha-bagha.md

This file was deleted.

7 changes: 7 additions & 0 deletions site/_contributors/05-scott-andrews.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
first_name: Scott
last_name: Andrews
image: /img/contributors/scott-andrews.jpg
github_handle: scothis
---
VMWare
8 changes: 0 additions & 8 deletions site/_contributors/06-pia-chakrabarti.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ last_name: Witzel III
image: /img/contributors/wayne-witzel-iii.jpg
github_handle: wwitzel3
---
Engineer
VMWare
7 changes: 7 additions & 0 deletions site/_emeritus/01-andrew-thorburn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
first_name: Andrew
last_name: Thorburn
image: /img/contributors/andrew-thorburn.jpg
github_handle: ipsi
---
VMWare
6 changes: 6 additions & 0 deletions site/_emeritus/02-mdaverde.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
first_name: Marlon
last_name: Daverde
image: /img/contributors/mdaverde.jpg
github_handle: mdaverde
---
7 changes: 7 additions & 0 deletions site/_emeritus/03-nana-asiedu-ampem.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
first_name: Nana
last_name: Asiedu-Ampem
image: /img/contributors/nana-asiedu-ampem.jpg
github_handle: nanaasiedu
---
VMWare
7 changes: 7 additions & 0 deletions site/_emeritus/04-oren-shomron.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
first_name: Oren
last_name: Shomron
image: /img/contributors/oren-shomron.jpg
github_handle: shomron
---
VMWare
40 changes: 30 additions & 10 deletions site/_includes/contributors.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="row">
<div class="col">
<h2 class="mb-2">The {{ site.title }} Team</h2>
<h2 class="mb-2">{{ page.title }} Members</h2>
</div>
</div>
<div class="row">
Expand All @@ -10,17 +10,37 @@ <h2 class="mb-2">The {{ site.title }} Team</h2>
<p>The {{ site.title }} project team welcomes contributions from the community &mdash; please see our <strong><a href="{{ site.gh_repo }}/blob/master/CONTRIBUTING.md" class="light">contributing documentation</a></strong>.</p>
</div>
</div>

<h2 class="mb-2">Approvers</h2>
<div class="row thumbnail-grid mt-5">
{% for person in site.contributors %}
<div class="col-xs-12 col-sm-6 col-md-4">
<div class="media thumbnail-item">
<img src="{{ person.image }}" class="rounded-circle" alt="Person" />
<div class="media-body align-self-center">
<h6><a href="https://github.com/{{ person.github_handle }}">{{ person.first_name }} {{ person.last_name }}</a></h6>
{{ person.content | markdownify }}
</div>
{% for person in site.contributors %}
<div class="col-xs-12 col-sm-6 col-md-4">
<div class="media thumbnail-item">
<img src="{{ person.image }}" class="rounded-circle" alt="Person" />
<div class="media-body align-self-center">
<h6><a href="https://github.com/{{ person.github_handle }}">{{ person.first_name }} {{ person.last_name }}</a></h6>
{{ person.github_handle }}
{{ person.content | markdownify }}
</div>
</div>
{% endfor %}
</div>
{% endfor %}
</div>

<h2 class="mb-2">Emeritus Approvers</h2>
<div class="row thumbnail-grid mt-5">
{% for person in site.emeritus %}
<div class="col-xs-12 col-sm-6 col-md-4">
<div class="media thumbnail-item">
<img src="{{ person.image }}" class="rounded-circle" alt="Person" />
<div class="media-body align-self-center">
<h6><a href="https://github.com/{{ person.github_handle }}">{{ person.first_name }} {{ person.last_name }}</a></h6>
{{ person.github_handle }}
{{ person.content | markdownify }}
</div>
</div>
</div>
{% endfor %}
</div>


34 changes: 34 additions & 0 deletions site/_layouts/community.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!DOCTYPE html>
<html lang="en">
{% include head.html %}

<body id="{{ page.id }}">
<div class="container-fluid site-outer-container">
<div class="site-container">
{% include site-header.html %}
<div class="post-single-hero bg-color-{{ site.hero.background-color }}">
<div class="section">
<div class="section-content">
<h1>{{ page.title }}</h1>
</div>
</div>
</div>
<div class="post-single-body">
<div class="section section-card">
<div class="section-content pt-4 pb-0">
{{ content }}
</div>
</div>
</div>
<div class="section section-background-{{ page.backgrounds.team }}">
<div class="section-content">
{% include contributors.html %}
</div>
</div>

{% include footer.html %}
</div>
</div>
</body>

</html>
2 changes: 1 addition & 1 deletion site/blog.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ <h1>{{ page.title }}</h1>
{% include blog-posts.html %}
</div>
</div>
</div>
</div>
4 changes: 3 additions & 1 deletion site/community.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
layout: page
layout: community
backgrounds:
team: dark-blue
title: Community
description: Octant Community
id: community
Expand Down
Binary file added site/img/contributors/andrew-thorburn.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed site/img/contributors/isha-bagha.jpg
Binary file not shown.
Binary file added site/img/contributors/luis-enriquez.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/contributors/mdaverde.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/contributors/nana-asiedu-ampem.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/contributors/oren-shomron.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed site/img/contributors/pia-chakrabarti.jpg
Binary file not shown.
Binary file added site/img/contributors/scott-andrews.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,3 @@ <h2>Blog Highlights</h2>
</div>
</div>

<div class="section section-background-{{ page.backgrounds.team }}">
<div class="section-content">
{% include contributors.html %}
</div>
</div>