Move mentors and members tables into a combined contributors table on…

… community page

.gitignore

@@ -1,7 +1,21 @@
-_site
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 .idea
 .sass-cache
 .jekyll-metadata
-apache-website-template.iml
-podling-site-template.iml
+*.iml
+*~
 

HOWTO.md

@@ -57,3 +57,10 @@ running from within the directory:
 Within a few minutes, svnpubsub should kick in and you'll be able to
 see the results at
 [foo.apache.org](https://foo.apache.org/).
+
+## Adding contributors
+
+To add a contributor to the project, or to modify existing contributors,
+edit `site/_data/contributors.yml`.
+The [project members]([http://localhost:4000/community.html#project-members]
+list will re-generate.

site/_data/mentors.yml → site/_data/contributors.yml

@@ -13,15 +13,39 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-- name: Luciano Resende
-  apache_id: lresende
+# Database of contributors to Apache Foo.
+# Pages such as community.md use this data.
+# Please keep the list in alphabetical order.
+#
+- name: DB Tsai
+  apacheId: dbtsai
+  githubId: dbtsai
+  role: PMC
+  affiliation: Netflix
 
-- name: Patrick Wendell
-  apache_id: pwendell
+- name: Julian Hyde
+  apacheId: jhyde
+  githubId: julianhyde
+  org: Hortonworks
+  role: Contributor
+  homepage: http://people.apache.org/~jhyde
+
+- name: Luciano Resende
+  apacheId: lresende
+  githubId: lresende
+  org: IBM
+  role: Committer
 
 - name: Reynold Xin
-  apache_id: rxin
+  apacheId: rxin
+  githubId: rxin
+  org: Databricks
+  role: Mentor
 
 - name: Rich Bowen
-  apache_id: rbowen
+  apacheId: rbowen
+  githubId: rbowen
+  org:
+  role: Mentor
 
+# End contributors.yml

site/_includes/themes/apache/_navigation.html

@@ -14,13 +14,7 @@
         </div>
         <nav class="navbar-collapse collapse" role="navigation">
           <ul class="nav navbar-nav navbar-right">
-            <li id="community">
-                <a href="#" data-toggle="dropdown" class="dropdown-toggle">Community<b class="caret"></b></a>
-                <ul class="dropdown-menu dropdown-left">
-                    <li><a href="/community.html">Get Involved</a></li>
-                    <li><a href="/community-members">Who we are</a></li>
-                </ul>
-            </li>
+            <li><a href="/community.html">Community</a></li>
             <li><a href="{{ site.data.project.source_repository }}">GitHub</a></li>
             <li id="apache">
               <a href="#" data-toggle="dropdown" class="dropdown-toggle">Apache<b class="caret"></b></a>

site/community.md

@@ -40,6 +40,13 @@ 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: