[incubator-marvin-website] 21/31: Fix the team members page

[yi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yifeizhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-marvin-website.git

commit 7deabf4a99ecca62477336d68085783806e86636
Author: Luciano Resende <lr...@apache.org>
AuthorDate: Sat Dec 5 10:31:29 2015 -0800

    Fix the team members page
---
 site/_data/contributors.yml |  6 +++---
 site/community-members.md   | 31 ++++++++-----------------------
 site/community.md           |  7 -------
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/site/_data/contributors.yml b/site/_data/contributors.yml
index 9496759..8454a3b 100644
--- a/site/_data/contributors.yml
+++ b/site/_data/contributors.yml
@@ -21,7 +21,7 @@
   apacheId: dbtsai
   githubId: dbtsai
   role: PMC
-  affiliation: Netflix
+  org: Netflix
 
 - name: Julian Hyde
   apacheId: jhyde
@@ -34,13 +34,13 @@
   apacheId: lresende
   githubId: lresende
   org: IBM
-  role: Committer
+  role: Committer and Mentor
 
 - name: Reynold Xin
   apacheId: rxin
   githubId: rxin
   org: Databricks
-  role: Mentor
+  role: Committer and Mentor
 
 - name: Rich Bowen
   apacheId: rbowen
diff --git a/site/community-members.md b/site/community-members.md
index 4e1a2fb..4edf3ae 100644
--- a/site/community-members.md
+++ b/site/community-members.md
@@ -27,36 +27,21 @@ limitations under the License.
 
 <br/><br/><br/>
 
-### {{ site.data.project.short_name }} Mentors
-
-{% if site.data.mentors %}
-<table class="table table-hover">
-    <tr>
-        <th><b>ID</b></th><th><b>Full Name</b></th>
-    </tr>
-    {% for mentor in site.data.mentors %}
-        <tr>
-        <td>{{mentor.apache_id}}</td>
-        <td>{{mentor.name}}</td>
-        </tr>
-    {% endfor %}
-</table>
-{% endif %}
-
-
 ### {{ site.data.project.short_name }} Team Members
 
-{% if site.data.members %}
+{% if site.data.contributors %}
 <table class="table table-hover">
     <tr>
-        <th><b>ID</b></th><th><b>Full Name</b></th><th><b>PMC</b></th><th><b>Affiliation</b></th>
+        <th><b></b></th><th><b>Full Name</b></th><th><b>Apache ID</b></th><th><b>GitHub</b><th><b>Role</b></th><th><b>Affiliation</b></th>
     </tr>
-    {% for member in site.data.members %}
+    {% for member in site.data.contributors %}
         <tr>
-        <td>{{member.apache_id}}</td>
+        <td><a href="http://github.com/{{ member.githubId }}"><img width="64" src="{% unless c.avatar %}http://github.com/{{ member.githubId }}.png{% else %}{{ member.avatar }}{% endunless %}"></a></td>
         <td>{{member.name}}</td>
-        <td>{{member.pmc}}</td>
-        <td>{{member.affiliation}}</td>
+        <td>{{member.apacheId}}</td>
+        <td><a href="http://github.com/{{ member.githubId }}">{{ member.githubId }}</a></td>
+        <td>{{member.role}}</td>
+        <td>{{member.org}}</td>
         </tr>
     {% endfor %}
 </table>
diff --git a/site/community.md b/site/community.md
index 789407d..42139e5 100644
--- a/site/community.md
+++ b/site/community.md
@@ -40,13 +40,6 @@ You can:
 
 Visit the [Contributing] page for more information.
 
-### Project Members
-
-Name (Apache ID) | Github | Org | Role
-:--------------- | :----- | :-- | :---
-{% for c in site.data.contributors %}  {{ c.name }} (<a href="http://people.apache.org/committer-index#{{ c.apacheId }}">{{ c.apacheId }}</a>) | <a href="http://github.com/{{ c.githubId }}"><img width="64" src="{% unless c.avatar %}http://github.com/{{ c.githubId }}.png{% else %}{{ c.avatar }}{% endunless %}"></a> | {{ c.org }} | {{ c.role }}
-{% endfor %}
-
 ### Mailing list
 
 Get help using {{ site.data.project.short_name }} or contribute to the project on our mailing lists: