update branding
* add incubation disclaimer to all pages
* add (incubating) to first occurrence of "Apache AsterixDB" on every page
* add (tm) to the logo and to "Apache AsterixDB"
* add required links to www.apache.org
* also ordered committers alphabetically (not a requirement ...)
Change-Id: I645e5b3474de203ee62e9c0cf34317d02722bc69
Reviewed-on: https://asterix-gerrit.ics.uci.edu/717
Reviewed-by: Ian Maxon <imaxon@apache.org>
diff --git a/content/community.html b/content/community.html
index cc7d119..3bb4d25 100644
--- a/content/community.html
+++ b/content/community.html
@@ -27,13 +27,15 @@
</head>
<div class="container theme-showcase" role="main">
- <div class="masthead">
- <p class="lead">
- <a href="index.html"><img src="img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
- </p>
-</div>
+ <div class="masthead">
+ <p class="lead">
+ <a href="index.html">
+ <img src="img/asterixdb_tm.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/>
+ </a>
+ </p>
+ </div>
-<nav class="navbar navbar-default">
+ <nav class="navbar navbar-default">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -71,15 +73,31 @@
</ul>
</li>
</ul>
+ <ul class="nav navbar-nav navbar-right">
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"
+ style="padding-right: 30px">
+ <img src="img/feather.png" style="height:20px"/>Apache Software Foundation<span class="caret"/>
+ </a>
+ <ul class="dropdown-menu dropdown-menu-right" role="menu">
+ <li><a href="http://www.apache.org/"><b>ASF Homepage</b></a></li>
+ <li><a href="http://www.apache.org/licenses/">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html">Donate</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ </ul>
+ </li>
+ </ul>
</div><!--/.nav-collapse -->
</div>
</nav>
- <div class="row">
+ <div class="row">
<div class="col-md-10 col-centered">
<h2>Community</h2>
-<p>Apache AsterixDB strives to support an open and transparent development process. Here are the various places where you can find discussions relating to the day to day development of AsterixDB and related projects, as well as answers to any AsterixDB-related questions.</p>
+<p>Apache AsterixDB™ (incubating) strives to support an open and transparent development process.
+Here are the various places where you can find discussions relating to the day to day development of AsterixDB and related projects, as well as answers to any AsterixDB-related questions.</p>
<ul id="markdown-toc">
<li><a href="#mailing-lists" id="markdown-toc-mailing-lists">Mailing Lists</a></li>
@@ -148,28 +166,16 @@
</thead>
<tbody>
<tr>
- <td><img src="img/team/michael_carey.jpg" width="100" height="100" /></td>
- <td>Michael Carey</td>
- <td>UC Irvine</td>
- <td>dtabass</td>
- </tr>
- <tr>
- <td><img src="img/team/till_westmann.jpg" width="100" height="100" /></td>
- <td>Till Westmann</td>
+ <td><img src="img/team/abdullah_alamoudi.jpg" width="100" height="100" /></td>
+ <td>Abdullah Alamoudi</td>
<td>Couchbase</td>
- <td>tillw</td>
+ <td>amoudi</td>
</tr>
<tr>
- <td><img src="img/team/vinayak_borkar.jpg" width="100" height="100" /></td>
- <td>Vinayak Borkar</td>
- <td>X15 Software</td>
- <td>vborkar</td>
- </tr>
- <tr>
- <td><img src="img/team/vassilis_tsotras.jpg" width="100" height="100" /></td>
- <td>Vassilis Tsotras</td>
- <td>UC Riverside</td>
- <td>tsotras</td>
+ <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
+ <td>Cameron Samak</td>
+ <td>UC Irvine</td>
+ <td>csamak</td>
</tr>
<tr>
<td><img src="img/team/chen_li.jpg" width="100" height="100" /></td>
@@ -178,40 +184,16 @@
<td>chenli</td>
</tr>
<tr>
- <td><img src="img/team/yingyi_bu.jpg" width="100" height="100" /></td>
- <td>Yingyi Bu</td>
+ <td><img src="img/team/chris_hillery.jpg" width="100" height="100" /></td>
+ <td>Chris Hillery</td>
<td>Couchbase</td>
- <td>buyingyi</td>
+ <td>ceej</td>
</tr>
<tr>
- <td><img src="img/team/young_seok_kim.jpg" width="100" height="100" /></td>
- <td>Young-Seok Kim</td>
- <td>UC Irvine</td>
- <td>kisskys</td>
- </tr>
- <tr>
- <td><img src="img/team/inci_cetindil.jpg" width="100" height="100" /></td>
- <td>Inci Cetindil</td>
- <td>UC Irvine</td>
- <td>icetindil</td>
- </tr>
- <tr>
- <td><img src="img/team/raman_grover.jpg" width="100" height="100" /></td>
- <td>Raman Grover</td>
- <td>Microsoft Research</td>
- <td>raman</td>
- </tr>
- <tr>
- <td><img src="img/team/pouria_pirzadeh.jpg" width="100" height="100" /></td>
- <td>Pouria Pirzadeh</td>
- <td>UC Irvine</td>
- <td>pouria</td>
- </tr>
- <tr>
- <td><img src="img/team/murtadha_hubail.jpg" width="100" height="100" /></td>
- <td>Murtadha Hubail</td>
- <td>UC Irvine</td>
- <td>mhubail</td>
+ <td><img src="img/team/heri_ramampiaro.jpg" width="100" height="100" /></td>
+ <td>Heri Ramampiaro</td>
+ <td>NTNU Trondheim</td>
+ <td>heri</td>
</tr>
<tr>
<td><img src="img/team/ian_maxon.jpg" width="100" height="100" /></td>
@@ -220,22 +202,64 @@
<td>imaxon</td>
</tr>
<tr>
+ <td><img src="img/team/ildar_absalyamov.jpg" width="100" height="100" /></td>
+ <td>Ildar Absalyamov</td>
+ <td>UC Riverside</td>
+ <td>ildar</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/inci_cetindil.jpg" width="100" height="100" /></td>
+ <td>Inci Cetindil</td>
+ <td>UC Irvine</td>
+ <td>icetindil</td>
+ </tr>
+ <tr>
<td><img src="img/team/jianfeng_jia.jpg" width="100" height="100" /></td>
<td>Jianfeng Jia</td>
<td>UC Irvine</td>
<td>jianfeng</td>
</tr>
<tr>
- <td><img src="img/team/taewoo_kim.jpg" width="100" height="100" /></td>
- <td>Taewoo Kim</td>
- <td>UC Irvine</td>
- <td>wangsaeu</td>
+ <td><img src="img/team/keren_ouaknine.jpg" width="100" height="100" /></td>
+ <td>Keren Ouaknine</td>
+ <td>Hebrew University</td>
+ <td>kereno</td>
</tr>
<tr>
<td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
- <td>Cameron Samak</td>
+ <td>Markus Dreseler</td>
+ <td>HPI</td>
+ <td>mrks</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/michael_carey.jpg" width="100" height="100" /></td>
+ <td>Michael Carey</td>
<td>UC Irvine</td>
- <td>csamak</td>
+ <td>dtabass</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/murtadha_hubail.jpg" width="100" height="100" /></td>
+ <td>Murtadha Hubail</td>
+ <td>UC Irvine</td>
+ <td>mhubail</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/pouria_pirzadeh.jpg" width="100" height="100" /></td>
+ <td>Pouria Pirzadeh</td>
+ <td>UC Irvine</td>
+ <td>pouria</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
+ <td>Preston Carman</td>
+ <td>UC Riverside</td>
+ <td>prestonc</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/raman_grover.jpg" width="100" height="100" /></td>
+ <td>Raman Grover</td>
+ <td>Microsoft Research</td>
+ <td>raman</td>
</tr>
<tr>
<td><img src="img/team/sattam_alsubaiee.png" width="100" height="100" /></td>
@@ -250,22 +274,40 @@
<td>sjaco002</td>
</tr>
<tr>
- <td><img src="img/team/ildar_absalyamov.jpg" width="100" height="100" /></td>
- <td>Ildar Absalyamov</td>
- <td>UC Riverside</td>
- <td>ildar</td>
+ <td><img src="img/team/taewoo_kim.jpg" width="100" height="100" /></td>
+ <td>Taewoo Kim</td>
+ <td>UC Irvine</td>
+ <td>wangsaeu</td>
</tr>
<tr>
- <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
- <td>Preston Carman</td>
- <td>UC Riverside</td>
- <td>prestonc</td>
- </tr>
- <tr>
- <td><img src="img/team/abdullah_alamoudi.jpg" width="100" height="100" /></td>
- <td>Abdullah Alamoudi</td>
+ <td><img src="img/team/till_westmann.jpg" width="100" height="100" /></td>
+ <td>Till Westmann</td>
<td>Couchbase</td>
- <td>amoudi</td>
+ <td>tillw</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/vassilis_tsotras.jpg" width="100" height="100" /></td>
+ <td>Vassilis Tsotras</td>
+ <td>UC Riverside</td>
+ <td>tsotras</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/vinayak_borkar.jpg" width="100" height="100" /></td>
+ <td>Vinayak Borkar</td>
+ <td>X15 Software</td>
+ <td>vborkar</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/yingyi_bu.jpg" width="100" height="100" /></td>
+ <td>Yingyi Bu</td>
+ <td>Couchbase</td>
+ <td>buyingyi</td>
+ </tr>
+ <tr>
+ <td><img src="img/team/young_seok_kim.jpg" width="100" height="100" /></td>
+ <td>Young-Seok Kim</td>
+ <td>UC Irvine</td>
+ <td>kisskys</td>
</tr>
<tr>
<td><img src="img/team/zachary_heilbron.jpg" width="100" height="100" /></td>
@@ -273,30 +315,6 @@
<td>X15 Software</td>
<td>zheilbron</td>
</tr>
- <tr>
- <td><img src="img/team/anonymous.jpg" width="100" height="100" /></td>
- <td>Markus Dreseler</td>
- <td>HPI</td>
- <td>mrks</td>
- </tr>
- <tr>
- <td><img src="img/team/keren_ouaknine.jpg" width="100" height="100" /></td>
- <td>Keren Ouaknine</td>
- <td>Hebrew University</td>
- <td>kereno</td>
- </tr>
- <tr>
- <td><img src="img/team/chris_hillery.jpg" width="100" height="100" /></td>
- <td>Chris Hillery</td>
- <td>Couchbase</td>
- <td>ceej</td>
- </tr>
- <tr>
- <td><img src="img/team/heri_ramampiaro.jpg" width="100" height="100" /></td>
- <td>Heri Ramampiaro</td>
- <td>NTNU Trondheim</td>
- <td>heri</td>
- </tr>
</tbody>
</table>
@@ -330,21 +348,35 @@
</div>
- <hr />
+ <hr/>
- <footer>
- <div class="row">
- <div class="col-md-6 col-md-offset-3 text-center">
- <p>© Copyright 2016 The Apache Software foundation. All Rights Reserved. </p>
- <p>Apache AsterixDB, Apache, and the Apache feather logo are trademarks of the Apache Software Foundation</p>
+ <footer>
+ <div class="row">
+ <div class="col-md-9 col-centered">
+ <div class="col-md-9 text-left">
+ <p>Apache AsterixDB is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored
+ by the Apache Incubator.
+ Incubation is required of all newly accepted projects until a further review indicates that the
+ infrastructure, communications, and decision making process have stabilized in a manner consistent with
+ other successful ASF projects.
+ While incubation status is not necessarily a reflection of the completeness or stability of the code, it
+ does indicate that the project has yet to be fully endorsed by the ASF.</p>
+ </div>
+ <div class="col-md-3 text-right">
+ <img src="img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-9 col-centered text-center">
+ <p/>
+ <p>© Copyright 2016 The Apache Software foundation. All Rights Reserved. </p>
+ <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the Apache feather logo are trademarks of the
+ Apache Software Foundation</p>
</div>
- <div class="col-md-1 text-right">
- <img src="img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
- </div>
- </div>
- </footer>
- </div> <!-- /container -->
-
+ </div>
+ </footer>
+ </div> <!-- /container -->
<!-- Bootstrap core JavaScript
================================================== -->