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

nic pushed a commit to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/document by this push:
     new 8f8ce32  Add content of events and conferences to community page
8f8ce32 is described below

commit 8f8ce327f118e4a79f9f37600a7d74113ff3410c
Author: nichunen <n...@apache.org>
AuthorDate: Mon Jun 24 18:49:20 2019 +0800

    Add content of events and conferences to community page
---
 website/_docs/gettingstarted/events.md |  4 ++-
 website/community/index.cn.md          | 32 ++++++++++++++++++------
 website/community/index.md             | 45 +++++++++++++++++++++++++++-------
 3 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/website/_docs/gettingstarted/events.md 
b/website/_docs/gettingstarted/events.md
index ba6f667..e24a472 100644
--- a/website/_docs/gettingstarted/events.md
+++ b/website/_docs/gettingstarted/events.md
@@ -23,7 +23,7 @@ __Conferences__
 
 __Meetup__
 
-- [Apache Kylin Meetup 
@Chengdu](https://www.huodongxing.com/event/4489409598500), China; 1:00 PM - 
5:00 PM, Saturday, 2019-05-25
+* [Apache Kylin Meetup 
@Chengdu](https://www.huodongxing.com/event/4489409598500), China; 1:00 PM - 
5:00 PM, Saturday, 2019-05-25
 * [Apache Kylin Meetup 
@Beijing](https://www.huodongxing.com/event/7484371439700), China; 1:00 PM - 
5:30 PM, Saturday, 2019-04-13
 * [Apache Kylin Meetup 
@Shanghai](http://www.huodongxing.com/event/4476570217900) 
([Slides](https://kyligence.io/zh/resource/case-study-zh/)), China; 1:00 PM - 
4:30 PM, Saturday, 2019-02-23 
 * [Apache Kylin for Extreme OLAP and Big Data @eBay South 
Campus](https://www.eventbrite.com/e/thursday-nov-29-meetup-apache-kylin-for-extreme-olap-and-big-data-tickets-52275347973?aff=estw),
 Sanjose, CA, US; 6:30 PM - 8:30 PM, Thursday, 2018-11-29 
@@ -35,3 +35,5 @@ __Meetup__
 * [Apache Kylin & Alluxio Meetup 
@Shanghai](http://huiyi.csdn.net/activity/product/goods_list?project_id=3746), 
in Shanghai, China, 1:00PM - 17:30PM, Sunday, 2018-1-21
 * [Apache Kylin Meetup @Bay 
Area](http://www.meetup.com/Cloud-at-ebayinc/events/218914395/), in San Jose, 
US, 6:00PM - 7:30PM, Thursday, 2014-12-04
 
+[__Propose a talk__](http://kyligence-apache-kylin.mikecrm.com/SJFewHC)
+
diff --git a/website/community/index.cn.md b/website/community/index.cn.md
index 25e9eba..264c539 100644
--- a/website/community/index.cn.md
+++ b/website/community/index.cn.md
@@ -59,27 +59,43 @@ permalink: /cn/community/index.html
             </table>
                </div>
 
-               <div class="col-sm-6 col-md-6">
-                   <h2>社区活动报告</h2>
-
-                   <p><a href="https://github.com/apache/kylin/pulse";>Git 
Pulse</a></p>
-                   <p><a href="https://reporter.apache.org/?kylin";>Apache 
委员会报告</a></p>
-               </div>
+        <div class="row">
+            <div class="col-sm-6 col-md-6">
+                <h2> 活动和会议 </h2>
+                <h4> 活动 </h4>
+                <p><a 
href="https://www.huodongxing.com/event/4489409598500";>Apache Kylin Meetup 
@Chengdu</a></p>
+                <p><a 
href="https://www.huodongxing.com/event/7484371439700";>Apache Kylin Meetup 
@Beijing</a></p>
+                <h4> 会议 </h4>
+                <p><a 
href="https://berlinbuzzwords.de/19/session/accelerate-big-data-analytics-apache-kylin";>Accelerate
 big data analytics with Apache Kylin</a></p>
+                <p><a 
href="https://berlinbuzzwords.de/19/session/accelerate-big-data-analytics-apache-kylin";>Refactor
 your data warehouse with mobile analytics products</a></p>
+                <h4> <a 
href="http://kyligence-apache-kylin.mikecrm.com/SJFewHC";>提交话题</a> </h4>
+                <h4> <a 
href="http://kylin.apache.org/docs/gettingstarted/events.html";>更多活动和会议</a> </h4>
+            </div>
+        </div>
        </div>
 
        <div class="row">
+        <div class="col-sm-6 col-md-6">
+            <h2>社区活动报告</h2>
+
+            <p><a href="https://github.com/apache/kylin/pulse";>Git 
Pulse</a></p>
+            <p><a href="https://reporter.apache.org/?kylin";>Apache 
委员会报告</a></p>
+        </div>
+        
                <div class="col-sm-6 col-md-6">
                    <h2> 邮件列表档案 </h2>
                    <p>为方便起见,有一个论坛风格的邮件列表存档,它不是官方 Apache 档案的一部分:</p>
 
                    <p><a href="http://apache-kylin.74782.x6.nabble.com";>Nabble 
上的开发者列表档案</a></p>
                </div>
-
+       </div>
+       
+    <div class="row">
                <div class="col-sm-6 col-md-6">
                    <h2>Apache Kylin 开发团队</h2>
                    
<p>一个成功的项目需要很多人扮演不同的角色。一些成员编写代码,提供项目指导或写文档。其他人作为有价值的测试人员,提交补丁和建议。</p>
                </div>
-       </div>
+       </div>  
 </div>
 
 <div class="kylin-member">
diff --git a/website/community/index.md b/website/community/index.md
index c999ee1..fe0ec99 100644
--- a/website/community/index.md
+++ b/website/community/index.md
@@ -54,28 +54,55 @@ permalink: /community/index.html
                    </table>
 
                </div>
-
-               <div class="col-sm-6 col-md-6">
-                   <h2>Community Activity Report</h2>
-
-                   <p><a href="https://github.com/apache/kylin/pulse";>Git 
Pulse</a></p>
-                   <p><a href="https://reporter.apache.org/?kylin";>Apache 
Committee Report</a></p>
-               </div>
+       
+        <div class="row">
+            <div class="col-sm-6 col-md-6">
+                <h2> Events and Conferences </h2>
+                <h4> Events </h4>
+                <p><a 
href="https://www.huodongxing.com/event/4489409598500";>Apache Kylin Meetup 
@Chengdu</a></p>
+                <p><a 
href="https://www.huodongxing.com/event/7484371439700";>Apache Kylin Meetup 
@Beijing</a></p>
+                <h4> Conferences </h4>
+                <p><a 
href="https://berlinbuzzwords.de/19/session/accelerate-big-data-analytics-apache-kylin";>Accelerate
 big data analytics with Apache Kylin</a></p>
+                <p><a 
href="https://berlinbuzzwords.de/19/session/accelerate-big-data-analytics-apache-kylin";>Refactor
 your data warehouse with mobile analytics products</a></p>
+                <h4> <a 
href="http://kyligence-apache-kylin.mikecrm.com/SJFewHC";>Propose a talk</a> 
</h4>
+            </div>
+    
+            <div class="col-sm-6 col-md-6">
+                <h2> More Events and Conferences </h2>
+                <h4> Events </h4>
+                <p><a 
href="https://www.huodongxing.com/event/4489409598500";>Apache Kylin Meetup 
@Chengdu</a></p>
+                <p><a 
href="https://www.huodongxing.com/event/7484371439700";>Apache Kylin Meetup 
@Beijing</a></p>
+                <h4> Conferences </h4>
+                <p><a 
href="https://berlinbuzzwords.de/19/session/accelerate-big-data-analytics-apache-kylin";>Accelerate
 big data analytics with Apache Kylin</a></p>
+                <p><a 
href="https://berlinbuzzwords.de/19/session/accelerate-big-data-analytics-apache-kylin";>Refactor
 your data warehouse with mobile analytics products</a></p>
+                <h4> <a 
href="http://kyligence-apache-kylin.mikecrm.com/SJFewHC";>Propose a talk</a> 
</h4>
+                <h4> <a 
href="http://kylin.apache.org/docs/gettingstarted/events.html";>More Events and 
Conferences</a> </h4>
+            </div>
+        </div>
        </div>
 
        <div class="row">
+        <div class="col-sm-6 col-md-6">
+            <h2>Community Activity Report</h2>
+
+            <p><a href="https://github.com/apache/kylin/pulse";>Git 
Pulse</a></p>
+            <p><a href="https://reporter.apache.org/?kylin";>Apache Committee 
Report</a></p>
+        </div>
+               
                <div class="col-sm-6 col-md-6">
                    <h2> Mailing List Archives </h2>
                    <p>For convenience, there's a forum style mailing list 
archives which not part of offical Apache archives:</p>
 
                    <p><a 
href="http://apache-kylin.74782.x6.nabble.com";>Developer List archive on 
Nabble</a></p>
                </div>
-
+       </div>
+       
+    <div class="row">
                <div class="col-sm-6 col-md-6">
                    <h2>Apache Kylin Team</h2>
                    <p>A successful project requires many people to play many 
roles. Some members write code, provide project mentorship, or author 
documentation. Others are valuable as testers, submitting patches and 
suggestions.</p>
                </div>
-       </div>
+    </div>
 </div>
 
 <div class="kylin-member">

Reply via email to