incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject [20/23] apache-website-template git commit: Move mentors and members tables into a combined contributors table on community page
Date Sat, 05 Dec 2015 20:24:34 GMT
Move mentors and members tables into a combined contributors table on community page


Project: http://git-wip-us.apache.org/repos/asf/apache-website-template/repo
Commit: http://git-wip-us.apache.org/repos/asf/apache-website-template/commit/e910bd2f
Tree: http://git-wip-us.apache.org/repos/asf/apache-website-template/tree/e910bd2f
Diff: http://git-wip-us.apache.org/repos/asf/apache-website-template/diff/e910bd2f

Branch: refs/heads/master
Commit: e910bd2f75660a8aed34d4d7a488506b66b6b805
Parents: ca4904b
Author: Julian Hyde <jhyde@apache.org>
Authored: Fri Dec 4 10:20:17 2015 -0800
Committer: Luciano Resende <lresende@apache.org>
Committed: Fri Dec 4 11:30:01 2015 -0800

----------------------------------------------------------------------
 .gitignore                                    | 20 ++++-
 HOWTO.md                                      |  7 ++
 site/_data/contributors.yml                   | 51 +++++++++++
 site/_data/members.yml                        | 99 ----------------------
 site/_data/mentors.yml                        | 27 ------
 site/_includes/themes/apache/_navigation.html |  8 +-
 site/community.md                             |  7 ++
 7 files changed, 83 insertions(+), 136 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/apache-website-template/blob/e910bd2f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index e5de398..f1b1333 100644
--- a/.gitignore
+++ b/.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
+*~
 

http://git-wip-us.apache.org/repos/asf/apache-website-template/blob/e910bd2f/HOWTO.md
----------------------------------------------------------------------
diff --git a/HOWTO.md b/HOWTO.md
index e4317b6..78a0ad3 100644
--- a/HOWTO.md
+++ b/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.

http://git-wip-us.apache.org/repos/asf/apache-website-template/blob/e910bd2f/site/_data/contributors.yml
----------------------------------------------------------------------
diff --git a/site/_data/contributors.yml b/site/_data/contributors.yml
new file mode 100644
index 0000000..9496759
--- /dev/null
+++ b/site/_data/contributors.yml
@@ -0,0 +1,51 @@
+# 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.
+#
+# 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: 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
+  apacheId: rxin
+  githubId: rxin
+  org: Databricks
+  role: Mentor
+
+- name: Rich Bowen
+  apacheId: rbowen
+  githubId: rbowen
+  org:
+  role: Mentor
+
+# End contributors.yml

http://git-wip-us.apache.org/repos/asf/apache-website-template/blob/e910bd2f/site/_data/members.yml
----------------------------------------------------------------------
diff --git a/site/_data/members.yml b/site/_data/members.yml
deleted file mode 100644
index db31861..0000000
--- a/site/_data/members.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.
-#
-- name: Alexandre V Evfimievski
-  apache_id: ae2015
-  pmc: true
-  affiliation: IBM
-
-- name: Arvind Surve
-  apache_id: acs_s
-  pmc: true
-  affiliation: IBM
-
-- name: Berthold Reinwald
-  apache_id: reinwald
-  pmc: true
-  affiliation: IBM
-
-- name: DB Tsai
-  apache_id: dbtsai
-  pmc: true
-  affiliation: Netflix
-
-- name: Deron Eriksson
-  apache_id: deron
-  pmc: true
-  affiliation: IBM
-
-- name: Fred Reiss
-  apache_id: freiss
-  pmc: true
-  affiliation: IBM
-
-- name: Holden Karau
-  apache_id: holden
-  pmc: true
-  affiliation: IBM
-
-- name: Joseph Bradley
-  apache_id: jkbradley
-  pmc: true
-  affiliation: Databricks
-
-- name: Luciano Resende
-  apache_id: lresende
-  pmc: true
-  affiliation: IBM
-
-- name: Matthias Boehm
-  apache_id: mboehm7
-  pmc: true
-  affiliation: IBM
-
-- name: Mike Dusenberry
-  apache_id: dusenberrymw
-  pmc: true
-  affiliation: IBM
-
-- name: Niketan Pansare
-  apache_id: niketanpansare
-  pmc: true
-  affiliation: IBM
-
-- name: Patrick WendelL
-  apache_id: pwendell
-  pmc: true
-  affiliation: Databricks
-
-- name: Prithviraj Sen
-  apache_id: prithvi
-  pmc: true
-  affiliation: IBM
-
-- name: Reynold Xin
-  apache_id: rxin
-  pmc: true
-  affiliation: Databricks
-
-- name: Shirish Tatikonda
-  apache_id: shirisht
-  pmc: true
-  affiliation: IBM
-
-- name: Xiangrui Meng
-  apache_id: meng
-  pmc: true
-  affiliation: Databricks
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/apache-website-template/blob/e910bd2f/site/_data/mentors.yml
----------------------------------------------------------------------
diff --git a/site/_data/mentors.yml b/site/_data/mentors.yml
deleted file mode 100644
index 400dc81..0000000
--- a/site/_data/mentors.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.
-#
-- name: Luciano Resende
-  apache_id: lresende
-
-- name: Patrick Wendell
-  apache_id: pwendell
-
-- name: Reynold Xin
-  apache_id: rxin
-
-- name: Rich Bowen
-  apache_id: rbowen
-

http://git-wip-us.apache.org/repos/asf/apache-website-template/blob/e910bd2f/site/_includes/themes/apache/_navigation.html
----------------------------------------------------------------------
diff --git a/site/_includes/themes/apache/_navigation.html b/site/_includes/themes/apache/_navigation.html
index c63a7ec..8e5e114 100644
--- a/site/_includes/themes/apache/_navigation.html
+++ b/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>

http://git-wip-us.apache.org/repos/asf/apache-website-template/blob/e910bd2f/site/community.md
----------------------------------------------------------------------
diff --git a/site/community.md b/site/community.md
index 42139e5..789407d 100644
--- a/site/community.md
+++ b/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:


---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message