Repository: incubator-sdap-website Updated Branches: refs/heads/asf-site 0b3f2db8f -> 734abff55
Update tab navigation and team avatars Project: http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/commit/734abff5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/tree/734abff5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/diff/734abff5 Branch: refs/heads/asf-site Commit: 734abff55a88a2ca4060c393f8a06998097669be Parents: 0b3f2db Author: Lewis John McGibbney <[email protected]> Authored: Tue Nov 14 11:51:43 2017 -0800 Committer: Lewis John McGibbney <[email protected]> Committed: Tue Nov 14 11:51:43 2017 -0800 ---------------------------------------------------------------------- 2017/04/30/expo-poster.html | 2 +- 2017/04/30/gdal-envi-rotation-bug-fix.html | 2 +- 2017/05/25/expo.html | 2 +- 2017/06/08/release.html | 2 +- 2017/06/12/xsede.html | 2 +- 2017/08/25/final-report-gis-bundle.html | 2 +- 2017/10/16/coal-fo.html | 2 +- 2017/10/21/hyspiri.html | 2 +- blog.html | 2 +- docs.html | 2 +- images/17786971.png | Bin 0 -> 1536 bytes images/Elya_5700-6249.jpg | Bin 0 -> 3895389 bytes images/profile.png | Bin 0 -> 436245 bytes images/user-avatar.png | Bin 0 -> 30828 bytes index.html | 4 +- publications.html | 2 +- resources.html | 2 +- source/_includes/header.html | 2 +- source/_site/2017/04/30/expo-poster.html | 2 +- .../2017/04/30/gdal-envi-rotation-bug-fix.html | 2 +- source/_site/2017/05/25/expo.html | 2 +- source/_site/2017/06/08/release.html | 2 +- source/_site/2017/06/12/xsede.html | 2 +- .../2017/08/25/final-report-gis-bundle.html | 2 +- source/_site/2017/10/16/coal-fo.html | 2 +- source/_site/2017/10/21/hyspiri.html | 2 +- source/_site/LICENSE.txt | 201 ------------------- source/_site/README.md | 26 --- source/_site/blog.html | 2 +- source/_site/docs.html | 2 +- source/_site/images/17786971.png | Bin 0 -> 1536 bytes source/_site/images/Elya_5700-6249.jpg | Bin 0 -> 3895389 bytes source/_site/images/profile.png | Bin 0 -> 436245 bytes source/_site/images/user-avatar.png | Bin 0 -> 30828 bytes source/_site/index.html | 4 +- source/_site/publications.html | 2 +- source/_site/resources.html | 2 +- source/_site/team.html | 168 ++++++++-------- source/images/17786971.png | Bin 0 -> 1536 bytes source/images/Elya_5700-6249.jpg | Bin 0 -> 3895389 bytes source/images/profile.png | Bin 0 -> 436245 bytes source/images/user-avatar.png | Bin 0 -> 30828 bytes source/index.html | 2 +- source/team.html | 166 ++++++++------- team.html | 168 ++++++++-------- 45 files changed, 272 insertions(+), 517 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/2017/04/30/expo-poster.html ---------------------------------------------------------------------- diff --git a/2017/04/30/expo-poster.html b/2017/04/30/expo-poster.html index 056fd4f..171754d 100644 --- a/2017/04/30/expo-poster.html +++ b/2017/04/30/expo-poster.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/2017/04/30/gdal-envi-rotation-bug-fix.html ---------------------------------------------------------------------- diff --git a/2017/04/30/gdal-envi-rotation-bug-fix.html b/2017/04/30/gdal-envi-rotation-bug-fix.html index ac6ef3d..68b8b82 100644 --- a/2017/04/30/gdal-envi-rotation-bug-fix.html +++ b/2017/04/30/gdal-envi-rotation-bug-fix.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/2017/05/25/expo.html ---------------------------------------------------------------------- diff --git a/2017/05/25/expo.html b/2017/05/25/expo.html index c1b92c4..8b6e2c5 100644 --- a/2017/05/25/expo.html +++ b/2017/05/25/expo.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/2017/06/08/release.html ---------------------------------------------------------------------- diff --git a/2017/06/08/release.html b/2017/06/08/release.html index 4c8a87a..3f8177e 100644 --- a/2017/06/08/release.html +++ b/2017/06/08/release.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/2017/06/12/xsede.html ---------------------------------------------------------------------- diff --git a/2017/06/12/xsede.html b/2017/06/12/xsede.html index e4f4b9a..fd827c4 100644 --- a/2017/06/12/xsede.html +++ b/2017/06/12/xsede.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/2017/08/25/final-report-gis-bundle.html ---------------------------------------------------------------------- diff --git a/2017/08/25/final-report-gis-bundle.html b/2017/08/25/final-report-gis-bundle.html index 9249a95..6f1ed38 100644 --- a/2017/08/25/final-report-gis-bundle.html +++ b/2017/08/25/final-report-gis-bundle.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/2017/10/16/coal-fo.html ---------------------------------------------------------------------- diff --git a/2017/10/16/coal-fo.html b/2017/10/16/coal-fo.html index e150ba8..e34595e 100644 --- a/2017/10/16/coal-fo.html +++ b/2017/10/16/coal-fo.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/2017/10/21/hyspiri.html ---------------------------------------------------------------------- diff --git a/2017/10/21/hyspiri.html b/2017/10/21/hyspiri.html index f7f98c1..3baa69b 100644 --- a/2017/10/21/hyspiri.html +++ b/2017/10/21/hyspiri.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/blog.html ---------------------------------------------------------------------- diff --git a/blog.html b/blog.html index 831ef8f..527f482 100644 --- a/blog.html +++ b/blog.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/docs.html ---------------------------------------------------------------------- diff --git a/docs.html b/docs.html index 0ad11eb..6ef3fe3 100644 --- a/docs.html +++ b/docs.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/images/17786971.png ---------------------------------------------------------------------- diff --git a/images/17786971.png b/images/17786971.png new file mode 100644 index 0000000..844d427 Binary files /dev/null and b/images/17786971.png differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/images/Elya_5700-6249.jpg ---------------------------------------------------------------------- diff --git a/images/Elya_5700-6249.jpg b/images/Elya_5700-6249.jpg new file mode 100644 index 0000000..b7ee0dc Binary files /dev/null and b/images/Elya_5700-6249.jpg differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/images/profile.png ---------------------------------------------------------------------- diff --git a/images/profile.png b/images/profile.png new file mode 100644 index 0000000..12cac0a Binary files /dev/null and b/images/profile.png differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/images/user-avatar.png ---------------------------------------------------------------------- diff --git a/images/user-avatar.png b/images/user-avatar.png new file mode 100644 index 0000000..123f4a9 Binary files /dev/null and b/images/user-avatar.png differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/index.html ---------------------------------------------------------------------- diff --git a/index.html b/index.html index ebae8f5..525a010 100644 --- a/index.html +++ b/index.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> @@ -82,7 +82,7 @@ Courtesy NASA/JPL-Caltech." /> <img src="images/carousel-oceanxtremes.jpg" alt="Computing daily differrences." title="On-the-fly daily differrence computation." /> <div class="container"> <div class="carousel-caption"> - <h1>Analyize Ocean Anomaly</h1> + <h1>Analyze Ocean Anomaly</h1> <p>On-the-fly computation of daily differrences.</p> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/publications.html ---------------------------------------------------------------------- diff --git a/publications.html b/publications.html index de3f3ea..82695ac 100644 --- a/publications.html +++ b/publications.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/resources.html ---------------------------------------------------------------------- diff --git a/resources.html b/resources.html index d941605..7b25b23 100644 --- a/resources.html +++ b/resources.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_includes/header.html ---------------------------------------------------------------------- diff --git a/source/_includes/header.html b/source/_includes/header.html index 3eae6b8..882a26b 100644 --- a/source/_includes/header.html +++ b/source/_includes/header.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="{{ site.baseurl }}/docs">Docs</a></li> <li><a href="{{ site.baseurl }}/blog">Blog</a></li> - <li><a href="{{ site.baseurl }}/team">Team</a></li> + <li><a href="{{ site.baseurl }}/team">Team & Community</a></li> <li><a href="{{ site.baseurl }}/resources">Resources</a></li> <li><a href="{{ site.baseurl }}/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/2017/04/30/expo-poster.html ---------------------------------------------------------------------- diff --git a/source/_site/2017/04/30/expo-poster.html b/source/_site/2017/04/30/expo-poster.html index 056fd4f..171754d 100644 --- a/source/_site/2017/04/30/expo-poster.html +++ b/source/_site/2017/04/30/expo-poster.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/2017/04/30/gdal-envi-rotation-bug-fix.html ---------------------------------------------------------------------- diff --git a/source/_site/2017/04/30/gdal-envi-rotation-bug-fix.html b/source/_site/2017/04/30/gdal-envi-rotation-bug-fix.html index ac6ef3d..68b8b82 100644 --- a/source/_site/2017/04/30/gdal-envi-rotation-bug-fix.html +++ b/source/_site/2017/04/30/gdal-envi-rotation-bug-fix.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/2017/05/25/expo.html ---------------------------------------------------------------------- diff --git a/source/_site/2017/05/25/expo.html b/source/_site/2017/05/25/expo.html index c1b92c4..8b6e2c5 100644 --- a/source/_site/2017/05/25/expo.html +++ b/source/_site/2017/05/25/expo.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/2017/06/08/release.html ---------------------------------------------------------------------- diff --git a/source/_site/2017/06/08/release.html b/source/_site/2017/06/08/release.html index 4c8a87a..3f8177e 100644 --- a/source/_site/2017/06/08/release.html +++ b/source/_site/2017/06/08/release.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/2017/06/12/xsede.html ---------------------------------------------------------------------- diff --git a/source/_site/2017/06/12/xsede.html b/source/_site/2017/06/12/xsede.html index e4f4b9a..fd827c4 100644 --- a/source/_site/2017/06/12/xsede.html +++ b/source/_site/2017/06/12/xsede.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/2017/08/25/final-report-gis-bundle.html ---------------------------------------------------------------------- diff --git a/source/_site/2017/08/25/final-report-gis-bundle.html b/source/_site/2017/08/25/final-report-gis-bundle.html index 9249a95..6f1ed38 100644 --- a/source/_site/2017/08/25/final-report-gis-bundle.html +++ b/source/_site/2017/08/25/final-report-gis-bundle.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/2017/10/16/coal-fo.html ---------------------------------------------------------------------- diff --git a/source/_site/2017/10/16/coal-fo.html b/source/_site/2017/10/16/coal-fo.html index e150ba8..e34595e 100644 --- a/source/_site/2017/10/16/coal-fo.html +++ b/source/_site/2017/10/16/coal-fo.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/2017/10/21/hyspiri.html ---------------------------------------------------------------------- diff --git a/source/_site/2017/10/21/hyspiri.html b/source/_site/2017/10/21/hyspiri.html index f7f98c1..3baa69b 100644 --- a/source/_site/2017/10/21/hyspiri.html +++ b/source/_site/2017/10/21/hyspiri.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/LICENSE.txt ---------------------------------------------------------------------- diff --git a/source/_site/LICENSE.txt b/source/_site/LICENSE.txt deleted file mode 100644 index 8dada3e..0000000 --- a/source/_site/LICENSE.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed 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. http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/README.md ---------------------------------------------------------------------- diff --git a/source/_site/README.md b/source/_site/README.md deleted file mode 100644 index d0aa324..0000000 --- a/source/_site/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# COAL Website - -This repository contains the source code of the Coal and Open-pit surface mining impacts on American Lands (COAL) [website](https://capstone-coal.github.io/). - -## Community and Development -Read [about our team](https://capstone-coal.github.io/team) to contact us or learn more. - -## Issue Tracker -Request improvements to the COAL website on the [issue tracker](https://github.com/capstone-coal/capstone-coal.github.io/issues). - -## License -The COAL website is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0), a copy of which ships with this source code. - -## Development - -The COAL website is developed locally with [Jekyll](https://jekyllrb.com/), "a simple, blog-aware, static site generator." Jekyll depends on Ruby and RubyGems. - -Install Jekyll with `gem install jekyll`. It may be necessary to add to the `$PATH` environment variable like `export PATH=~/.gem/ruby/2.1.0/bin:$PATH`. - -Use `jekyll serve --drafts` to host the site at `http://localhost:4000`, regenerating it whenever files change and displaying drafts. Simply edit the site and reload it in a web browser to view changes. Posts can be drafted in the `_drafts` directory and published in the `_posts` directory. - -Consult the Jekyll [documentation](https://jekyllrb.com/docs/home/) for details on installation, editing, and configuration. - -## Deployment - -Commit changes to the `master` branch [on GitHub](https://github.com/capstone-coal/capstone-coal.github.io/tree/master) to deploy the site to [https://capstone-coal.github.io/](https://capstone-coal.github.io/) using [GitHub Pages](https://pages.github.com/). The site can also be [configured](https://github.com/jekyll/jekyll/issues/332#issuecomment-18952908) for preview on an external repository. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/blog.html ---------------------------------------------------------------------- diff --git a/source/_site/blog.html b/source/_site/blog.html index 831ef8f..527f482 100644 --- a/source/_site/blog.html +++ b/source/_site/blog.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/docs.html ---------------------------------------------------------------------- diff --git a/source/_site/docs.html b/source/_site/docs.html index 0ad11eb..6ef3fe3 100644 --- a/source/_site/docs.html +++ b/source/_site/docs.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/images/17786971.png ---------------------------------------------------------------------- diff --git a/source/_site/images/17786971.png b/source/_site/images/17786971.png new file mode 100644 index 0000000..844d427 Binary files /dev/null and b/source/_site/images/17786971.png differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/images/Elya_5700-6249.jpg ---------------------------------------------------------------------- diff --git a/source/_site/images/Elya_5700-6249.jpg b/source/_site/images/Elya_5700-6249.jpg new file mode 100644 index 0000000..b7ee0dc Binary files /dev/null and b/source/_site/images/Elya_5700-6249.jpg differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/images/profile.png ---------------------------------------------------------------------- diff --git a/source/_site/images/profile.png b/source/_site/images/profile.png new file mode 100644 index 0000000..12cac0a Binary files /dev/null and b/source/_site/images/profile.png differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/images/user-avatar.png ---------------------------------------------------------------------- diff --git a/source/_site/images/user-avatar.png b/source/_site/images/user-avatar.png new file mode 100644 index 0000000..123f4a9 Binary files /dev/null and b/source/_site/images/user-avatar.png differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/index.html ---------------------------------------------------------------------- diff --git a/source/_site/index.html b/source/_site/index.html index ebae8f5..525a010 100644 --- a/source/_site/index.html +++ b/source/_site/index.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> @@ -82,7 +82,7 @@ Courtesy NASA/JPL-Caltech." /> <img src="images/carousel-oceanxtremes.jpg" alt="Computing daily differrences." title="On-the-fly daily differrence computation." /> <div class="container"> <div class="carousel-caption"> - <h1>Analyize Ocean Anomaly</h1> + <h1>Analyze Ocean Anomaly</h1> <p>On-the-fly computation of daily differrences.</p> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/publications.html ---------------------------------------------------------------------- diff --git a/source/_site/publications.html b/source/_site/publications.html index de3f3ea..82695ac 100644 --- a/source/_site/publications.html +++ b/source/_site/publications.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/resources.html ---------------------------------------------------------------------- diff --git a/source/_site/resources.html b/source/_site/resources.html index d941605..7b25b23 100644 --- a/source/_site/resources.html +++ b/source/_site/resources.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/_site/team.html ---------------------------------------------------------------------- diff --git a/source/_site/team.html b/source/_site/team.html index aa3dae5..4e5e133 100644 --- a/source/_site/team.html +++ b/source/_site/team.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> @@ -42,10 +42,12 @@ </nav> -<h1>Team</h1> +<h1>Team & Community</h1> <p>Originally, SDAP represented a collaboration between <a href="https://www.jpl.nasa.gov";>NASA Jet Propulsion Laboratory (JPL)</a>, <a href="https://coaps.fsu.edu";>Center for Ocean-Atmospheric Prediction Studies, Florida State University</a>, the <a href="https://www2.cisl.ucar.edu";>Computational Information Systems Laboratory (CISL) / National Center for Atmospheric Research (NCAR)</a>, and <a href="https://www2.gmu.edu";>George Mason University (GMU)</a>. As the SDAP community expands, so will the happy faces below...</p> +<p>The SDAP team happily welcomes contributors and supporters of our work. Contributions, bug reports, and suggestions are welcome for the core products, website, documentation, and everything else! See below for more information on joining our community, submitting effective contributions and bug reports.</p> + <h2>Members</h2> <h3>Jet Propulsion Laboratory</h3> @@ -53,7 +55,7 @@ <div class="team row"> <div class="team-member col-md-6"> - <img src="/images/" class="team-avatar img-thumbnail" /> + <img src="/images/17786971.png" class="team-avatar img-thumbnail" /> <h4>Ed Armstrong</h4> <dl> <dt>GitHub:</dt> @@ -63,7 +65,7 @@ <div class="team-member col-md-6"> <img src="/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> + <h4>Lewis John McGibbney</h4> <dl> <dt>GitHub:</dt> <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> @@ -72,6 +74,17 @@ </dl> </div> + <div class="team-member col-md-6"> + <img src="/images/user-avatar.png" class="team-avatar img-thumbnail" /> + <h4>Vardis Tsontos</h4> + <dl> + <dt>GitHub:</dt> + <dd><a class="external" href="https://github.com/";></a></dd> + <dt>Email:</dt> + <dd><a href="mailto:";></a></dd> + </dl> + </div> + </div> <h3>Florida State University</h3> @@ -79,34 +92,23 @@ <div class="team row"> <div class="team-member col-md-6"> - <img src="/images/" class="team-avatar img-thumbnail" /> - <h4>Ed Armstrong</h4> + <img src="/images/Elya_5700-6249.jpg" class="team-avatar img-thumbnail" /> + <h4>Jocelyn Elya</h4> <dl> <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/edshred2000";>edshred2000</a></dd> + <dd><a class="external" href="https://github.com/";></a></dd> <dt>ApacheID:</dt> <dd><a class="external" href="mailto:";></a></dd> </dl> </div> - <div class="team-member col-md-6"> - <img src="/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> - <dl> - <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> - <dt>Email:</dt> - <dd><a href="mailto:[email protected]";>lewismc at apache dot org</a></dd> - </dl> - </div> - </div> <h3>National Center for Atmospheric Research</h3> <div class="team row"> - <div class="team-member col-md-6"> + <!--div class="team-member col-md-6"> <img src="/images/" class="team-avatar img-thumbnail" /> <h4>Ed Armstrong</h4> <dl> @@ -115,18 +117,7 @@ <dt>ApacheID:</dt> <dd><a class="external" href="mailto:";></a></dd> </dl> - </div> - - <div class="team-member col-md-6"> - <img src="/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> - <dl> - <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> - <dt>Email:</dt> - <dd><a href="mailto:[email protected]";>lewismc at apache dot org</a></dd> - </dl> - </div> + </div--> </div> @@ -135,71 +126,74 @@ <div class="team row"> <div class="team-member col-md-6"> - <img src="/images/" class="team-avatar img-thumbnail" /> - <h4>Ed Armstrong</h4> + <img src="/images/profile.png" class="team-avatar img-thumbnail" /> + <h4>Yongyao Jiang</h4> <dl> <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/edshred2000";>edshred2000</a></dd> + <dd><a class="external" href="https://github.com/Yongyao";>Yongyao</a></dd> <dt>ApacheID:</dt> - <dd><a class="external" href="mailto:";></a></dd> - </dl> - </div> - - <div class="team-member col-md-6"> - <img src="/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> - <dl> - <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> - <dt>Email:</dt> - <dd><a href="mailto:[email protected]";>lewismc at apache dot org</a></dd> + <dd><a class="external" href="mailto:[email protected]";></a>yongyao at apache dot org</dd> </dl> </div> </div> - <!-- site map --> - <div class="row"> - - <!-- team --> - <div class="col-lg-4"> - <h2>Team</h2> - <p>Jet Propulsion Laboratory:</p> - <ul> - <li>Ed Armstrong</li> - <li>Frank Greguska</li> - <li>Thomas Huang</li> - <li>Joseph C. Jacob, Ph.D.</li> - <li>Lewis John McGibbney, Ph.D.</li> - <li>Nga Quach</li> - <li>Vartis Tsontos</li> - <li>Brian Wilson, Ph.D.</li> - </ul> - <p>George Mason University:</p> - <ul> - <li>Yongyao Jiang</li> - <li>Yun Li</li> - <li>Chaowei (Phil) Yang, Ph.D.</li> - </ul> - <p>Center for Ocean-Atmospheric Prediction Studies, Florida State University:</p> - <ul> - <li>Mark Bourassa, Ph.D.</li> - <li>Jocelyn Elya</li> - <li>Shawn R. Smith</li> - </ul> - <p>Computational Information Systems Laboratory (CISL) / National Center for Atmospheric Research (NCAR):</p> - <ul> - <li>Thomas Cram</li> - <li>Zaihua Ji</li> - <li>Steve Worley</li> - </ul> - </div> - - </div> - -<h2>Contact</h2> +<div class="ui vertical segment"> + <h2 class="ui header">Mailing Lists</h2> + <h3 class="ui header"> + <i class="user icon"></i> + <div class="content">Users</div> + </h3> + <p> + For users of Apache SDAP who want to keep up to date with new releases and community highlights. To subscribe, email <a href="mailto:[email protected]";>[email protected]</a>. + </p> + <h3 class="ui header"> + <i class="code icon"></i> + <div class="content">Dev</div> + </h3> + <p> + For contributors to Apache SDAP or those interested in ongoing design and development efforts. To subscribe, email <a href="mailto:[email protected]";>[email protected]</a>. + </p> + <h3 class="ui header"> + <i class="upload icon"></i> + <div class="content">Commits</div> + </h3> + <p> + For emails-on-commit across all Apache SDAP products. To subscribe, email <a href="mailto:[email protected]";>[email protected]</a>. + </p> +</div> -<p>The best way to reach us is to contact us directly by email or to visit our <a class="external" href="https://github.com/capstone-coal";>GitHub Organization</a>. Our geographically distributed team meets regularly by videoconference and collaborates on research and development primarily through our mailing list. You may view our messages on <a class="external" href="https://groups.google.com/forum/#!forum/coal-capstone";>Google Groups</a> or ask to join, however only invited people will be able to post.</p> +<div class="ui vertical segment"> + <h2 class="ui header">Community Hubs</h2> + <h3 class="ui header"> + <i class="github icon"></i> + <div class="content">GitHub</div> + </h3> + <p> + <a href="https://github.com/apache?q=incubator-sdap";>Find our code on Github</a> to browse and contribute. + </p> + <h3 class="ui header"> + <i class="twitter icon"></i> + <div class="content">Twitter</div> + </h3> + <p> + <a href="https://twitter.com/apachesdap";>Follow us on Twitter</a> to keep up to date on Apache SDAP and related developments. + </p> + <h3 class="ui header"> + <i class="bug icon"></i> + <div class="content">Issues and Bugs</div> + </h3> + <p> + Visit our <a href="https://issues.apache.org/jira/browse/SDAP";>JIRA Issue Tracker</a> for full information on current developments, bugs, etc. + </p> + <h3 class="ui header"> + <i class="sticky note icon"></i> + <div class="content">Wiki</div> + </h3> + <p> + See our <a href="https://cwiki.apache.org/confluence/display/SDAP";>wiki</a> for detailed information on project organization, roadmaps, etc. + </p> +</div> <!-- footer --> <nav class="navbar navbar-default"> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/images/17786971.png ---------------------------------------------------------------------- diff --git a/source/images/17786971.png b/source/images/17786971.png new file mode 100644 index 0000000..844d427 Binary files /dev/null and b/source/images/17786971.png differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/images/Elya_5700-6249.jpg ---------------------------------------------------------------------- diff --git a/source/images/Elya_5700-6249.jpg b/source/images/Elya_5700-6249.jpg new file mode 100644 index 0000000..b7ee0dc Binary files /dev/null and b/source/images/Elya_5700-6249.jpg differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/images/profile.png ---------------------------------------------------------------------- diff --git a/source/images/profile.png b/source/images/profile.png new file mode 100644 index 0000000..12cac0a Binary files /dev/null and b/source/images/profile.png differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/images/user-avatar.png ---------------------------------------------------------------------- diff --git a/source/images/user-avatar.png b/source/images/user-avatar.png new file mode 100644 index 0000000..123f4a9 Binary files /dev/null and b/source/images/user-avatar.png differ http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/index.html ---------------------------------------------------------------------- diff --git a/source/index.html b/source/index.html index 9b3c603..78a1ddb 100644 --- a/source/index.html +++ b/source/index.html @@ -43,7 +43,7 @@ Courtesy NASA/JPL-Caltech." /> <img src="images/carousel-oceanxtremes.jpg" alt="Computing daily differrences." title="On-the-fly daily differrence computation." /> <div class="container"> <div class="carousel-caption"> - <h1>Analyize Ocean Anomaly</h1> + <h1>Analyze Ocean Anomaly</h1> <p>On-the-fly computation of daily differrences.</p> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/source/team.html ---------------------------------------------------------------------- diff --git a/source/team.html b/source/team.html index 5e595b6..180c58d 100644 --- a/source/team.html +++ b/source/team.html @@ -3,10 +3,12 @@ {% include header.html %} -<h1>Team</h1> +<h1>Team & Community</h1> <p>Originally, SDAP represented a collaboration between <a href="https://www.jpl.nasa.gov";>NASA Jet Propulsion Laboratory (JPL)</a>, <a href="https://coaps.fsu.edu";>Center for Ocean-Atmospheric Prediction Studies, Florida State University</a>, the <a href="https://www2.cisl.ucar.edu";>Computational Information Systems Laboratory (CISL) / National Center for Atmospheric Research (NCAR)</a>, and <a href="https://www2.gmu.edu";>George Mason University (GMU)</a>. As the SDAP community expands, so will the happy faces below...</p> +<p>The SDAP team happily welcomes contributors and supporters of our work. Contributions, bug reports, and suggestions are welcome for the core products, website, documentation, and everything else! See below for more information on joining our community, submitting effective contributions and bug reports.</p> + <h2>Members</h2> <h3>Jet Propulsion Laboratory</h3> @@ -14,7 +16,7 @@ <div class="team row"> <div class="team-member col-md-6"> - <img src="{{ site.baseurl }}/images/" class="team-avatar img-thumbnail" /> + <img src="{{ site.baseurl }}/images/17786971.png" class="team-avatar img-thumbnail" /> <h4>Ed Armstrong</h4> <dl> <dt>GitHub:</dt> @@ -24,7 +26,7 @@ <div class="team-member col-md-6"> <img src="{{ site.baseurl }}/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> + <h4>Lewis John McGibbney</h4> <dl> <dt>GitHub:</dt> <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> @@ -33,6 +35,17 @@ </dl> </div> + <div class="team-member col-md-6"> + <img src="{{ site.baseurl }}/images/user-avatar.png" class="team-avatar img-thumbnail" /> + <h4>Vardis Tsontos</h4> + <dl> + <dt>GitHub:</dt> + <dd><a class="external" href="https://github.com/";></a></dd> + <dt>Email:</dt> + <dd><a href="mailto:";></a></dd> + </dl> + </div> + </div> <h3>Florida State University</h3> @@ -40,34 +53,23 @@ <div class="team row"> <div class="team-member col-md-6"> - <img src="{{ site.baseurl }}/images/" class="team-avatar img-thumbnail" /> - <h4>Ed Armstrong</h4> + <img src="{{ site.baseurl }}/images/Elya_5700-6249.jpg" class="team-avatar img-thumbnail" /> + <h4>Jocelyn Elya</h4> <dl> <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/edshred2000";>edshred2000</a></dd> + <dd><a class="external" href="https://github.com/";></a></dd> <dt>ApacheID:</dt> <dd><a class="external" href="mailto:";></a></dd> </dl> </div> - <div class="team-member col-md-6"> - <img src="{{ site.baseurl }}/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> - <dl> - <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> - <dt>Email:</dt> - <dd><a href="mailto:[email protected]";>lewismc at apache dot org</a></dd> - </dl> - </div> - </div> <h3>National Center for Atmospheric Research</h3> <div class="team row"> - <div class="team-member col-md-6"> + <!--div class="team-member col-md-6"> <img src="{{ site.baseurl }}/images/" class="team-avatar img-thumbnail" /> <h4>Ed Armstrong</h4> <dl> @@ -76,18 +78,7 @@ <dt>ApacheID:</dt> <dd><a class="external" href="mailto:";></a></dd> </dl> - </div> - - <div class="team-member col-md-6"> - <img src="{{ site.baseurl }}/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> - <dl> - <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> - <dt>Email:</dt> - <dd><a href="mailto:[email protected]";>lewismc at apache dot org</a></dd> - </dl> - </div> + </div--> </div> @@ -96,70 +87,73 @@ <div class="team row"> <div class="team-member col-md-6"> - <img src="{{ site.baseurl }}/images/" class="team-avatar img-thumbnail" /> - <h4>Ed Armstrong</h4> + <img src="{{ site.baseurl }}/images/profile.png" class="team-avatar img-thumbnail" /> + <h4>Yongyao Jiang</h4> <dl> <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/edshred2000";>edshred2000</a></dd> + <dd><a class="external" href="https://github.com/Yongyao";>Yongyao</a></dd> <dt>ApacheID:</dt> - <dd><a class="external" href="mailto:";></a></dd> + <dd><a class="external" href="mailto:[email protected]";></a>yongyao at apache dot org</dd> </dl> </div> - <div class="team-member col-md-6"> - <img src="{{ site.baseurl }}/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> - <dl> - <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> - <dt>Email:</dt> - <dd><a href="mailto:[email protected]";>lewismc at apache dot org</a></dd> - </dl> - </div> +</div> +<div class="ui vertical segment"> + <h2 class="ui header">Mailing Lists</h2> + <h3 class="ui header"> + <i class="user icon"></i> + <div class="content">Users</div> + </h3> + <p> + For users of Apache SDAP who want to keep up to date with new releases and community highlights. To subscribe, email <a href="mailto:[email protected]";>[email protected]</a>. + </p> + <h3 class="ui header"> + <i class="code icon"></i> + <div class="content">Dev</div> + </h3> + <p> + For contributors to Apache SDAP or those interested in ongoing design and development efforts. To subscribe, email <a href="mailto:[email protected]";>[email protected]</a>. + </p> + <h3 class="ui header"> + <i class="upload icon"></i> + <div class="content">Commits</div> + </h3> + <p> + For emails-on-commit across all Apache SDAP products. To subscribe, email <a href="mailto:[email protected]";>[email protected]</a>. + </p> </div> - <!-- site map --> - <div class="row"> - - <!-- team --> - <div class="col-lg-4"> - <h2>Team</h2> - <p>Jet Propulsion Laboratory:</p> - <ul> - <li>Ed Armstrong</li> - <li>Frank Greguska</li> - <li>Thomas Huang</li> - <li>Joseph C. Jacob, Ph.D.</li> - <li>Lewis John McGibbney, Ph.D.</li> - <li>Nga Quach</li> - <li>Vartis Tsontos</li> - <li>Brian Wilson, Ph.D.</li> - </ul> - <p>George Mason University:</p> - <ul> - <li>Yongyao Jiang</li> - <li>Yun Li</li> - <li>Chaowei (Phil) Yang, Ph.D.</li> - </ul> - <p>Center for Ocean-Atmospheric Prediction Studies, Florida State University:</p> - <ul> - <li>Mark Bourassa, Ph.D.</li> - <li>Jocelyn Elya</li> - <li>Shawn R. Smith</li> - </ul> - <p>Computational Information Systems Laboratory (CISL) / National Center for Atmospheric Research (NCAR):</p> - <ul> - <li>Thomas Cram</li> - <li>Zaihua Ji</li> - <li>Steve Worley</li> - </ul> - </div> - - </div> - -<h2>Contact</h2> - -<p>The best way to reach us is to contact us directly by email or to visit our <a class="external" href="https://github.com/capstone-coal";>GitHub Organization</a>. Our geographically distributed team meets regularly by videoconference and collaborates on research and development primarily through our mailing list. You may view our messages on <a class="external" href="https://groups.google.com/forum/#!forum/coal-capstone";>Google Groups</a> or ask to join, however only invited people will be able to post.</p> +<div class="ui vertical segment"> + <h2 class="ui header">Community Hubs</h2> + <h3 class="ui header"> + <i class="github icon"></i> + <div class="content">GitHub</div> + </h3> + <p> + <a href="https://github.com/apache?q=incubator-sdap";>Find our code on Github</a> to browse and contribute. + </p> + <h3 class="ui header"> + <i class="twitter icon"></i> + <div class="content">Twitter</div> + </h3> + <p> + <a href="https://twitter.com/apachesdap";>Follow us on Twitter</a> to keep up to date on Apache SDAP and related developments. + </p> + <h3 class="ui header"> + <i class="bug icon"></i> + <div class="content">Issues and Bugs</div> + </h3> + <p> + Visit our <a href="https://issues.apache.org/jira/browse/SDAP";>JIRA Issue Tracker</a> for full information on current developments, bugs, etc. + </p> + <h3 class="ui header"> + <i class="sticky note icon"></i> + <div class="content">Wiki</div> + </h3> + <p> + See our <a href="https://cwiki.apache.org/confluence/display/SDAP";>wiki</a> for detailed information on project organization, roadmaps, etc. + </p> +</div> {% include footer.html %} http://git-wip-us.apache.org/repos/asf/incubator-sdap-website/blob/734abff5/team.html ---------------------------------------------------------------------- diff --git a/team.html b/team.html index aa3dae5..4e5e133 100644 --- a/team.html +++ b/team.html @@ -33,7 +33,7 @@ <ul class="nav navbar-nav"> <li><a href="/docs">Docs</a></li> <li><a href="/blog">Blog</a></li> - <li><a href="/team">Team</a></li> + <li><a href="/team">Team & Community</a></li> <li><a href="/resources">Resources</a></li> <li><a href="/publications">Publications</a></li> </ul> @@ -42,10 +42,12 @@ </nav> -<h1>Team</h1> +<h1>Team & Community</h1> <p>Originally, SDAP represented a collaboration between <a href="https://www.jpl.nasa.gov";>NASA Jet Propulsion Laboratory (JPL)</a>, <a href="https://coaps.fsu.edu";>Center for Ocean-Atmospheric Prediction Studies, Florida State University</a>, the <a href="https://www2.cisl.ucar.edu";>Computational Information Systems Laboratory (CISL) / National Center for Atmospheric Research (NCAR)</a>, and <a href="https://www2.gmu.edu";>George Mason University (GMU)</a>. As the SDAP community expands, so will the happy faces below...</p> +<p>The SDAP team happily welcomes contributors and supporters of our work. Contributions, bug reports, and suggestions are welcome for the core products, website, documentation, and everything else! See below for more information on joining our community, submitting effective contributions and bug reports.</p> + <h2>Members</h2> <h3>Jet Propulsion Laboratory</h3> @@ -53,7 +55,7 @@ <div class="team row"> <div class="team-member col-md-6"> - <img src="/images/" class="team-avatar img-thumbnail" /> + <img src="/images/17786971.png" class="team-avatar img-thumbnail" /> <h4>Ed Armstrong</h4> <dl> <dt>GitHub:</dt> @@ -63,7 +65,7 @@ <div class="team-member col-md-6"> <img src="/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> + <h4>Lewis John McGibbney</h4> <dl> <dt>GitHub:</dt> <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> @@ -72,6 +74,17 @@ </dl> </div> + <div class="team-member col-md-6"> + <img src="/images/user-avatar.png" class="team-avatar img-thumbnail" /> + <h4>Vardis Tsontos</h4> + <dl> + <dt>GitHub:</dt> + <dd><a class="external" href="https://github.com/";></a></dd> + <dt>Email:</dt> + <dd><a href="mailto:";></a></dd> + </dl> + </div> + </div> <h3>Florida State University</h3> @@ -79,34 +92,23 @@ <div class="team row"> <div class="team-member col-md-6"> - <img src="/images/" class="team-avatar img-thumbnail" /> - <h4>Ed Armstrong</h4> + <img src="/images/Elya_5700-6249.jpg" class="team-avatar img-thumbnail" /> + <h4>Jocelyn Elya</h4> <dl> <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/edshred2000";>edshred2000</a></dd> + <dd><a class="external" href="https://github.com/";></a></dd> <dt>ApacheID:</dt> <dd><a class="external" href="mailto:";></a></dd> </dl> </div> - <div class="team-member col-md-6"> - <img src="/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> - <dl> - <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> - <dt>Email:</dt> - <dd><a href="mailto:[email protected]";>lewismc at apache dot org</a></dd> - </dl> - </div> - </div> <h3>National Center for Atmospheric Research</h3> <div class="team row"> - <div class="team-member col-md-6"> + <!--div class="team-member col-md-6"> <img src="/images/" class="team-avatar img-thumbnail" /> <h4>Ed Armstrong</h4> <dl> @@ -115,18 +117,7 @@ <dt>ApacheID:</dt> <dd><a class="external" href="mailto:";></a></dd> </dl> - </div> - - <div class="team-member col-md-6"> - <img src="/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> - <dl> - <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> - <dt>Email:</dt> - <dd><a href="mailto:[email protected]";>lewismc at apache dot org</a></dd> - </dl> - </div> + </div--> </div> @@ -135,71 +126,74 @@ <div class="team row"> <div class="team-member col-md-6"> - <img src="/images/" class="team-avatar img-thumbnail" /> - <h4>Ed Armstrong</h4> + <img src="/images/profile.png" class="team-avatar img-thumbnail" /> + <h4>Yongyao Jiang</h4> <dl> <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/edshred2000";>edshred2000</a></dd> + <dd><a class="external" href="https://github.com/Yongyao";>Yongyao</a></dd> <dt>ApacheID:</dt> - <dd><a class="external" href="mailto:";></a></dd> - </dl> - </div> - - <div class="team-member col-md-6"> - <img src="/images/avatar-lewismc.jpeg" class="team-avatar img-thumbnail" /> - <h4>Lewis John McGibbney, Ph.D.</h4> - <dl> - <dt>GitHub:</dt> - <dd><a class="external" href="https://github.com/lewismc";>lewismc</a></dd> - <dt>Email:</dt> - <dd><a href="mailto:[email protected]";>lewismc at apache dot org</a></dd> + <dd><a class="external" href="mailto:[email protected]";></a>yongyao at apache dot org</dd> </dl> </div> </div> - <!-- site map --> - <div class="row"> - - <!-- team --> - <div class="col-lg-4"> - <h2>Team</h2> - <p>Jet Propulsion Laboratory:</p> - <ul> - <li>Ed Armstrong</li> - <li>Frank Greguska</li> - <li>Thomas Huang</li> - <li>Joseph C. Jacob, Ph.D.</li> - <li>Lewis John McGibbney, Ph.D.</li> - <li>Nga Quach</li> - <li>Vartis Tsontos</li> - <li>Brian Wilson, Ph.D.</li> - </ul> - <p>George Mason University:</p> - <ul> - <li>Yongyao Jiang</li> - <li>Yun Li</li> - <li>Chaowei (Phil) Yang, Ph.D.</li> - </ul> - <p>Center for Ocean-Atmospheric Prediction Studies, Florida State University:</p> - <ul> - <li>Mark Bourassa, Ph.D.</li> - <li>Jocelyn Elya</li> - <li>Shawn R. Smith</li> - </ul> - <p>Computational Information Systems Laboratory (CISL) / National Center for Atmospheric Research (NCAR):</p> - <ul> - <li>Thomas Cram</li> - <li>Zaihua Ji</li> - <li>Steve Worley</li> - </ul> - </div> - - </div> - -<h2>Contact</h2> +<div class="ui vertical segment"> + <h2 class="ui header">Mailing Lists</h2> + <h3 class="ui header"> + <i class="user icon"></i> + <div class="content">Users</div> + </h3> + <p> + For users of Apache SDAP who want to keep up to date with new releases and community highlights. To subscribe, email <a href="mailto:[email protected]";>[email protected]</a>. + </p> + <h3 class="ui header"> + <i class="code icon"></i> + <div class="content">Dev</div> + </h3> + <p> + For contributors to Apache SDAP or those interested in ongoing design and development efforts. To subscribe, email <a href="mailto:[email protected]";>[email protected]</a>. + </p> + <h3 class="ui header"> + <i class="upload icon"></i> + <div class="content">Commits</div> + </h3> + <p> + For emails-on-commit across all Apache SDAP products. To subscribe, email <a href="mailto:[email protected]";>[email protected]</a>. + </p> +</div> -<p>The best way to reach us is to contact us directly by email or to visit our <a class="external" href="https://github.com/capstone-coal";>GitHub Organization</a>. Our geographically distributed team meets regularly by videoconference and collaborates on research and development primarily through our mailing list. You may view our messages on <a class="external" href="https://groups.google.com/forum/#!forum/coal-capstone";>Google Groups</a> or ask to join, however only invited people will be able to post.</p> +<div class="ui vertical segment"> + <h2 class="ui header">Community Hubs</h2> + <h3 class="ui header"> + <i class="github icon"></i> + <div class="content">GitHub</div> + </h3> + <p> + <a href="https://github.com/apache?q=incubator-sdap";>Find our code on Github</a> to browse and contribute. + </p> + <h3 class="ui header"> + <i class="twitter icon"></i> + <div class="content">Twitter</div> + </h3> + <p> + <a href="https://twitter.com/apachesdap";>Follow us on Twitter</a> to keep up to date on Apache SDAP and related developments. + </p> + <h3 class="ui header"> + <i class="bug icon"></i> + <div class="content">Issues and Bugs</div> + </h3> + <p> + Visit our <a href="https://issues.apache.org/jira/browse/SDAP";>JIRA Issue Tracker</a> for full information on current developments, bugs, etc. + </p> + <h3 class="ui header"> + <i class="sticky note icon"></i> + <div class="content">Wiki</div> + </h3> + <p> + See our <a href="https://cwiki.apache.org/confluence/display/SDAP";>wiki</a> for detailed information on project organization, roadmaps, etc. + </p> +</div> <!-- footer --> <nav class="navbar navbar-default">
