You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/02/12 06:43:37 UTC

[47/50] incubator-kylin git commit: merge website content from staging

merge website content from staging


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1ce77a52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1ce77a52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1ce77a52

Branch: refs/heads/inverted-index
Commit: 1ce77a52e1ac2fa3cd13c20b53329c2ad89b3ad0
Parents: a864ba2
Author: lukehan <lu...@apache.org>
Authored: Thu Feb 12 13:09:25 2015 +0800
Committer: lukehan <lu...@apache.org>
Committed: Thu Feb 12 13:09:25 2015 +0800

----------------------------------------------------------------------
 docs/website/_includes/footer.html              | 14 +--
 docs/website/_includes/head.cn.html             | 42 +++++++++
 docs/website/_includes/header.cn.html           | 39 +++++++++
 docs/website/_includes/header.html              | 21 +++--
 docs/website/_layouts/default-cn.html           | 23 +++++
 docs/website/_layouts/post.html                 | 11 ++-
 .../_posts/2015-01-25-introduce-data-model.md   | 40 +++++++++
 docs/website/about/index.md                     | 77 +----------------
 docs/website/assets/css/styles.css              | 32 ++++---
 docs/website/blog/index.html                    | 21 ++++-
 docs/website/community/index.html               |  8 +-
 docs/website/css/main.scss                      | 52 +++++++++++
 docs/website/docs/index.html                    |  2 -
 docs/website/index.cn.md                        | 91 ++++++++++++++++++++
 docs/website/index.md                           | 91 ++++++++++++++++++++
 15 files changed, 448 insertions(+), 116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/_includes/footer.html
----------------------------------------------------------------------
diff --git a/docs/website/_includes/footer.html b/docs/website/_includes/footer.html
index b30acb9..8561e95 100644
--- a/docs/website/_includes/footer.html
+++ b/docs/website/_includes/footer.html
@@ -3,16 +3,10 @@
     <div class="row">
       <div class="col-md-12 widget" >
         <div class="widget-body" style="text-align:center">
-          <ul class="icons">
-            <li><a href="https://www.linkedin.com/groups/KylinOLAP-6785709?home=&gid=6785709&trk=anet_ug_hm" target="_blank" class="fa fa-linkedin fa-lg"></a></li>
-            <li><a href="https://twitter.com/debashis_saha/status/519612003443146752" target="_blank" class="fa fa-twitter fa-lg"></a></li>
-            <li><a href="https://www.facebook.com/kylinio?skip_nax_wizard=true&ref_type=logout_gear" target="_blank" class="fa fa-facebook fa-lg"></a></li>
-            <li><a href="https://plus.google.com/communities/101138166999680123468" target="_blank" class="fa fa-google-plus fa-lg"></a></li>
-            <li><a href="https://github.com/KylinOLAP/Kylin" target="_blank" class="fa fa-github-alt fa-lg"></a></li>
-            <!--  <li><a href="#" class="fa fa-weibo fa-lg"></a></li>
-         <li><a href="#" class="fa fa-weixin fa-lg"></a></li>-->
-          </ul>
-          <p style="text-align:center" > Copyright ©2014 <a href="http://kylin.io">Kylin.io</a> All Rights Reserved. | From <a href="http://www.ebayinc.com/">eBay Inc.</a> |<a href="#">back to top</a><br>
+          <div>
+          Apache Kylin 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.
+          </div>
+          <p style="text-align:center" > Apache Kylin is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0. </a>
           </p>
         </div>
       </div>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/_includes/head.cn.html
----------------------------------------------------------------------
diff --git a/docs/website/_includes/head.cn.html b/docs/website/_includes/head.cn.html
new file mode 100644
index 0000000..ae98dee
--- /dev/null
+++ b/docs/website/_includes/head.cn.html
@@ -0,0 +1,42 @@
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <title>Kylin.IO | {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
+  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
+  <meta name="author"      content="Kylin.IO">
+  <link rel="shortcut icon" href="fav.png" type="image/png">
+
+
+
+<link rel="stylesheet" href="{{ "/assets/css/animate.css"| prepend: site.baseurl }}">
+<!-- Bootstrap -->
+<link rel="stylesheet" href="{{ "/assets/css/bootstrap.min.css"| prepend: site.baseurl }}">
+
+<!-- Fonts -->
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Alice|Open+Sans:400,300,700">
+
+<!-- Icons -->
+<link rel="stylesheet" href="{{ "/assets/css/font-awesome.min.css"| prepend: site.baseurl }}">
+
+  <!-- Custom styles -->
+  <link rel="stylesheet" href="{{ "/assets/css/styles.css" | prepend: site.baseurl }}">
+
+  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
+
+<!--[if lt IE 9]> <script src="assets/js/html5shiv.js"></script> <![endif]-->
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-55534813-1', 'auto');
+  ga('send', 'pageview');
+
+
+</script>
+
+</head>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/_includes/header.cn.html
----------------------------------------------------------------------
diff --git a/docs/website/_includes/header.cn.html b/docs/website/_includes/header.cn.html
new file mode 100644
index 0000000..63cd04a
--- /dev/null
+++ b/docs/website/_includes/header.cn.html
@@ -0,0 +1,39 @@
+<header id="header" >
+  <div id="head" class="parallax" parallax-speed="3" >
+    <div id="logo" class="text-center"> <img class="img-circle" id="circlelogo" src="{{ "/assets/images/kylin_logo.jpg"| prepend: site.baseurl }}"> <span class="title" >Apache Kylin</span> <span class="tagline">Extreme OLAP Engine for Big Data</span> 
+    </div>
+  </div>
+
+  <!-- Main Menu -->
+  <nav class="navbar navbar-default" role="navigation" id="nav-wrapper">
+  <div class="container-fluid" id="nav">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+     
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+      <ul class="nav navbar-nav">
+     <li><a href="/cn"><b>首页</b></a></li>
+          <li><a href="/docs" >文档</a></li>
+          <li><a href="/community" >社区</a></li>
+          <li><a href="/blog">博客</li>
+          <li><a href="/about" >关于</a></li>
+          <li><a href="/" >English</a></li>
+          <li><a href="https://twitter.com/apachekylin" target="_blank" class="fa fa-twitter fa-lg" title="Twitter: @ApacheKylin" ></a></li>
+          <li><a href="https://github.com/apache/incubator-kylin" target="_blank" class="fa fa-github-alt fa-lg" title="Github: apache/incubator-kylin" ></a></li>          
+          <li><a href="https://www.facebook.com/kylinio" target="_blank" class="fa fa-facebook fa-lg" title="Facebook: kylin.io" ></a></li>            
+      </ul>
+      
+
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
+ </header>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/_includes/header.html
----------------------------------------------------------------------
diff --git a/docs/website/_includes/header.html b/docs/website/_includes/header.html
index 9e792b5..1745744 100644
--- a/docs/website/_includes/header.html
+++ b/docs/website/_includes/header.html
@@ -1,16 +1,17 @@
 <header id="header" >
+  
   <div id="head" class="parallax" parallax-speed="3" >
-    <div id="logo" class="text-center"> <img class="img-circle" id="circlelogo" src="{{ "/assets/images/kylin_logo.jpg"| prepend: site.baseurl }}"> <span class="title" >Apache Kylin</span> <span class="tagline">Extreme OLAP Engine for Big Data<br>
-      </span> 
-      <!--
-       <div id="download"><a href="https://github.com/KylinOLAP/Kylin/releases">DOWNLOAD</a></div>
-       -->
-       </div>
+    <div id="logo" class="text-center"> <img class="img-circle" id="circlelogo" src="{{ "/assets/images/kylin_logo.jpg"| prepend: site.baseurl }}"> <span class="title" >Apache Kylin</span> <span class="tagline">Extreme OLAP Engine for Big Data</span> 
+    </div>
   </div>
+  
 
   <!-- Main Menu -->
   <nav class="navbar navbar-default" role="navigation" id="nav-wrapper">
   <div class="container-fluid" id="nav">
+    <!--
+    <img class="img-circle" width="40px" height="40px" id="circlelogo" src="{{ "/assets/images/kylin_logo.jpg"| prepend: site.baseurl }}">
+    -->
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -30,9 +31,11 @@
           <li><a href="/community" >Community</a></li>
           <li><a href="/blog">Blog</li>
           <li><a href="/about" >About</a></li>
-      </ul>
-      
-
+          <li><a href="/cn" >中文版</a></li>  
+          <li><a href="https://twitter.com/apachekylin" target="_blank" class="fa fa-twitter fa-lg" title="Twitter: @ApacheKylin" ></a></li>
+          <li><a href="https://github.com/apache/incubator-kylin" target="_blank" class="fa fa-github-alt fa-lg" title="Github: apache/incubator-kylin" ></a></li>          
+          <li><a href="https://www.facebook.com/kylinio" target="_blank" class="fa fa-facebook fa-lg" title="Facebook: kylin.io" ></a></li>   
+      </ul>      
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
 </nav>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/_layouts/default-cn.html
----------------------------------------------------------------------
diff --git a/docs/website/_layouts/default-cn.html b/docs/website/_layouts/default-cn.html
new file mode 100644
index 0000000..1adae5b
--- /dev/null
+++ b/docs/website/_layouts/default-cn.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+
+  {% include head.cn.html %}
+
+  <body>
+
+    {% include header.cn.html %}
+
+    <div class="page-content">
+      <div class="wrapper">
+        {{ content }}
+      </div>
+    </div>
+
+    {% include footer.html %}
+
+  <script src="/assets/js/jquery-1.9.1.min.js"></script> 
+  <script src="/assets/js/bootstrap.min.js"></script> 
+  <script src="/assets/js/main.js"></script>
+  </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/_layouts/post.html
----------------------------------------------------------------------
diff --git a/docs/website/_layouts/post.html b/docs/website/_layouts/post.html
index a2b4e52..0574e66 100644
--- a/docs/website/_layouts/post.html
+++ b/docs/website/_layouts/post.html
@@ -1,15 +1,20 @@
 ---
 layout: default
 ---
-<div class="post">
+
+<div class="post" style=" padding:2em 4em 4em 4em">
 
   <header class="post-header">
     <h1 class="post-title">{{ page.title }}</h1>
-    <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+    <p class="post-meta" >{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
   </header>
 
-  <article class="post-content">
+  <article class="post-content" >
     {{ content }}
   </article>
 
 </div>
+
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/_posts/2015-01-25-introduce-data-model.md
----------------------------------------------------------------------
diff --git a/docs/website/_posts/2015-01-25-introduce-data-model.md b/docs/website/_posts/2015-01-25-introduce-data-model.md
new file mode 100644
index 0000000..2016207
--- /dev/null
+++ b/docs/website/_posts/2015-01-25-introduce-data-model.md
@@ -0,0 +1,40 @@
+---
+layout: post
+title:  "Introduce Data Model of Cube Designer"
+date:   2015-01-25 22:28:00
+author: Luke Han
+categories: blog
+---
+
+### Background
+In previous version (before v0.6.4), Kylin introduced a GUI tool called Cube Designer for user (we called this role as __Cube Modeler__) to architect OLAP Cube with dimensions, measures and other settings. It works well for most of the features but still not user friendly yet: 
+
+1. A user has to add dimension one by one, considering there are 20+ even 50+ dimensions, the entire process is really boring. 
+2. Each dimension requires define join condition between fact table and lookup table which even already be defined in previous dimensions many times.
+3. Less validation check, especially for Hierarchy and Derived dimension, there are many exceptions in further steps which blocked many people to save the cube definition without any idea about the issue.
+4. Save/Next buttons are confusing user to click which one for real next step or just save current dimension settings
+
+### Data Model of Cube Designer
+With the feedback from our internal users and external community, we have came up one idea and would like to introduce a new concept (widely known in Data Warehouse and Business Intelligence domain): Data Model: a data model organises data elements and standardises how the data elements relate to one another.[Wikipedia](http://en.wikipedia.org/wiki/Data_model). In Kylin, it using [Star Schema](http://en.wikipedia.org/wiki/Star_schema) as Data Model, which is the simplest style of data warehouse schema. The star schema consists of a few "fact tables" (possibly only one, justifying the name) referencing any number of "dimension tables". It actually already there behind dimensions and measures and now just come to first step to define the relationship between different tables before create each dimension. 
+Now (after v0.6.4), to create a cube will follow below steps:
+
+1. Define data model first: pick up one fact table and then add other lookup tables (with their join conditions). The data mode must be presents as Star Schema.
+2. Then add dimensions, since all join conditions already presented in data model, each dimension could be more easy to create, just need to know what's kind of type: normal, hierarchy and derived (will have another blog to introduce them). There's also one helper called _Auto Generator_ to help generate many dimensions within simple clicks.
+3. Then define measures and others as previous cube designer did
+
+### Benefits
+1. A data model is very easy to communicate between different roles and teams. Most of cases it just mapping to real database table relationship, like from Hive tables
+2. More easy to create dimensions and measures based on the data model
+3. Friendly error message with enhanced validation check when save cube
+
+
+### What's Next
+After this refactor, Kylin is now be able to introduce more powerful features, the major idea is to using different storages to serve same data model:
+
+* __Logical Model__: A Data Model presents logical data structure like Star Schema beyond data tables with more business meaning
+* __Physical Model__: define how the underlying data to be stored in persistent system, like HBase. There are already two of them: MOLAP (current Kylin version) and InvertedIndex (coming with 0.7.x release). And it also easy to extend to support others without change the Logical Model.
+* A new GUI of Cube Designer to support above is on the way.
+
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/about/index.md
----------------------------------------------------------------------
diff --git a/docs/website/about/index.md b/docs/website/about/index.md
index d165f1f..100a57b 100644
--- a/docs/website/about/index.md
+++ b/docs/website/about/index.md
@@ -13,7 +13,9 @@ title: About
   <div class="row">
           <div class="col-sm-12 col-md-12">
             <div >
-            <p class="aboutkylin" style="font-size:1.2em">Kylin, which is an OLAP Engine for Hadoop, has been developed by eBay. Now it becomes available to all as an open source project.</p>
+            <p class="aboutkylin" style="font-size:1.2em">Apache Kylin, which is a distributed and scalable OLAP engine built on Hadoop to support
+extremely large datasets, developed and contributed by <a href="http://www.ebayinc.com/" target="_blank">eBay Inc</a> to open source community on Oct 1, 2014 and has been Apache Incubator Project since Nov 25, 2014. Refer to announcement on eBay Tech Blog for more detail: <a href="http://www.ebaytechblog.com/2014/10/20/announcing-kylin-extreme-olap-engine-for-big-data" target="_blank">Announcing Kylin: Extreme OLAP Engine for Big Data</a> </p>
+            
            
           </div>
         </div>
@@ -23,79 +25,6 @@ title: About
       
     </header>
   </section>
-
-  
-    <div id="second" class=" main" style="background-color:#efefef;" >
-      <header style="background-color:#efefef;" >
-        <div class="container">
-          <h4 class="section-title"><span>Kylin Contributors</span></h4>
-          <div class="row" style="margin-top:-20px;" id="contributors">
-          <p class="core_team">Kylin is an open source project from eBay, migrated from internal github repo into Github repo without history information:-(</p>
-            <div class="col-sm-4 col-md-4">
-              <p class="normal_text people_name">Luke Han <a href="https://github.com/lukehan" target="_blank">(lukehan)</a></p>
-              <p><span class="people_intro">Full-Time eBay Employee (Project Lead)</span><br/><span class="maintain">Maintains:</span><br/>
-<span class="maintains">- Releases</span><br/>
-<span class="maintains">- Roadmap</span></p>
-        
-            </div>
-       
-            <div class="col-sm-4 col-md-4">
-              <p class="normal_text people_name">Jiang Xu <a href="https://github.com/jiangxuchina" target="_blank">(jiangxuchina)</a></p>
-              <p><span class="people_intro">Full-Time eBay Employee (Cheif Architect)</span><br/><span class="maintain">Maintains:</span><br/>
-<span class="maintains">- Architecture & Design</span><br/>
-<span class="maintains">- Query Engine</span></p>
-        
-            </div>
-            
-            <div class="col-sm-4 col-md-4">
-              <p class="normal_text people_name">Yang Li <a href="https://github.com/liyang-gmt8" target="_blank">(liyang-gmt8)</a></p>
-              <p><span class="people_intro">Full-Time eBay Employee (Tech Lead)</span><br/><span class="maintain">Maintains:</span><br/>
-<span class="maintains">- Query Engine</span><br/>
-<span class="maintains">- Job Engine</span><br/>
-<span class="maintains">- Storage Engine</span></p>
-        
-            </div>
-          
-          </div>
-          
-          <div class="row"  id="contributors2">
-         
-            <div class="col-sm-4 col-md-4">
-              <p class="normal_text people_name">Yi Song <a href="https://github.com/songyi10011001" target="_blank">(songyi10011001)</a></p>
-              <p><span class="people_intro">Full-Time eBay Employee</span><br/><span class="maintain">Maintains:</span><br/>
-<span class="maintains">- Job Engine</span><br/>
-<span class="maintains">- Build System</span></p>
-        
-            </div>
-       
-            <div class="col-sm-4 col-md-4">
-              <p class="normal_text people_name">Hongbin Ma <a href="https://github.com/binmahone" target="_blank">(binmahone)</a></p>
-              <p><span class="people_intro">Full-Time eBay Employee</span><br/><span class="maintain">Maintains:</span><br/>
-<span class="maintains">- ODBC Driver</span><br/>
-<span class="maintains">- Metadata Engine</span></p>
-        
-            </div>
-            
-            <div class="col-sm-4 col-md-4">
-              <p class="normal_text people_name">Xiaodong Duo <a href="https://github.com/xduo" target="_blank">(xduo)</a></p>
-              <p><span class="people_intro">Full-Time eBay Employee (Tech Lead)</span><br/><span class="maintain">Maintains:</span><br/>
-<span class="maintains">- Job Engine</span><br/>
-<span class="maintains">- REST Server</span><br/>
-<span class="maintains">- JDBC Driver</span></p>
-        
-            </div>
-          
-          </div>
-          
-       
-             <p class="normal_text">Participant: <p>
-             <p class="normal_text participant">Rui Feng <a href="https://github.com/fengrui129" target="_blank">(fengrui129)</a></p>
-          
-        </div>
-        <!-- /container --> 
-        
-      </header>
-    </div>
     <!-- / section --> 
   </div>
   <!-- /container -->

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/assets/css/styles.css
----------------------------------------------------------------------
diff --git a/docs/website/assets/css/styles.css b/docs/website/assets/css/styles.css
index 12ebef4..e2e080e 100644
--- a/docs/website/assets/css/styles.css
+++ b/docs/website/assets/css/styles.css
@@ -118,7 +118,7 @@ a:hover, a:focus {
 	background: #f4f4f4 url(../images/data.png) top center;
 	background-size: cover;
 	color: #7C7C7C;
-	height: 400px
+	height: 200px;	
 }
 #head .title {
 	font-family: 'Open sans';
@@ -136,8 +136,8 @@ a:hover, a:focus {
 }
 #head img.img-circle {
 	display: block;
-	width: 140px;
-	height: 140px;
+	width: 100px;
+	height: 100px;
 	overflow: hidden;
 	border: 9px solid rgba(0, 0, 0, 0.05);
 	margin: 0 auto;
@@ -161,10 +161,11 @@ a:hover, a:focus {
 	color: #5E5E5E;
 }
 #logo {
-	padding-top: 50px;
+	padding-top: 0px;
+	padding-left: 10px;
 }
 .home #head .title {
-	font-size: 36px;
+	font-size: 18px;
 	color: #fb8d08;/*color:#146df3;*/
 	
 }
@@ -203,7 +204,13 @@ a:hover, a:focus {
 
 **********************************************************************/
 .navbar {
-	border-width: 1px 0;
+	/*
+	background: #f4f4f4 url(../images/data.png) top center;
+	background-size: cover;
+	color: #7C7C7C;
+	height: 100px;
+*/
+	 border-width: 1px 0;
 	-webkit-border-radius: 0;
 	-webkit-background-clip: padding-box;
 	-moz-border-radius: 0;
@@ -211,6 +218,7 @@ a:hover, a:focus {
 	border-radius: 0;
 	background-clip: padding-box;
 	width: 100%;
+
 }
 .navbar.stick {
 	position: fixed;
@@ -227,19 +235,19 @@ a:hover, a:focus {
 	background-clip: padding-box;
 	font-family: 'Open sans';
 	font-weight: 400;
-	text-transform: uppercase;
+	/* text-transform: uppercase;*/
 }
 .navbar-nav {
 	float: none;
 	margin: 0 auto;
-	text-align: center;
+	text-align: right;
 }
 .navbar-nav > li {
 	float: none;
 	display: inline-block;
 }
 .navbar-nav > li > a {
-	padding: 20px 30px;
+	padding: 10px 12px;
 }
 .navbar-default {
 	background-color: #ffffff;
@@ -553,9 +561,9 @@ ol.style1 {
 	margin: 0 0 20px;
 }
 #underfooter {
-	background: #191919;
+	background: #696969;
 	padding: 15px 0;
-	color: #777;
+	color: #EEEEEE;
 	font-size: 12px;
 }
 #underfooter a {
@@ -580,7 +588,7 @@ ol.style1 {
 	background-clip: padding-box;
 	font-family: 'Open sans';
 	font-weight: 400;
-	text-transform: uppercase;
+	/* text-transform: uppercase;*/
 	max-height: 340px;
 	padding-right: 15px;
 	padding-left: 15px;

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/blog/index.html
----------------------------------------------------------------------
diff --git a/docs/website/blog/index.html b/docs/website/blog/index.html
index 0fc5a3b..6db414f 100644
--- a/docs/website/blog/index.html
+++ b/docs/website/blog/index.html
@@ -10,14 +10,27 @@ title: Blog
       <div class="container" >
         <h4 class="section-title"><span> Kylin Technical Blog </span></h4>
          <!-- second-->
-  <div class="row">
-          <div class="col-sm-12 col-md-12">
+          <div id="content-container" class="animated fadeIn">
             <div >
+            <!--
             <p class="aboutkylin" style="font-size:1.2em">Comming Soon...</p>
-           
+            -->
+             <ul class="post-list">
+            {% for post in site.posts %}
+            <li>
+            <!--
+            <span align="left" class="content-header">{{ post.date | date: "%b %-d, %Y" }}</span>
+            -->
+        <h2 align="left">
+          <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+        </h2>
+      </li>
+    {% endfor %}
+  </ul>
+
+  <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></p>
           </div>
         </div>
-         </div>
       </div>
       <!-- /container --> 
       

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/community/index.html
----------------------------------------------------------------------
diff --git a/docs/website/community/index.html b/docs/website/community/index.html
index 9b2bbe7..c0452d8 100644
--- a/docs/website/community/index.html
+++ b/docs/website/community/index.html
@@ -16,6 +16,11 @@ title: Community
 
 
 
+
+              <p><a href="http://strataconf.com/big-data-conference-uk-2015/public/schedule/detail/40029" target="_blank">Strata+Hadoop World 2015, London </a> 
+              <br/>Date - Wednesday, May 6, 2015 <br/>
+              Kylin will be present at Strata+Hadooop World</p>
+
               <p><a href="http://bdtc2014.hadooper.cn/m/zone/bdtc_2014" target="_blank">Big Data Technology Conference, Beijing </a> 
               <br/>Date - Sunday, December 14, 2014 <br/>
               Kylin be presented by Luke Han, Sr. Product Manager of Kylin</p>
@@ -33,8 +38,7 @@ title: Community
             
             <div class="col-sm-4 col-md-4">
               <p class="big_text">DISCUSSION</p>
-              <p>Developement and User maililng list: <a href="mailto:dev@kylin.incubator.apache.org" target="_blank"> dev@kylin.incubator.apache.org</a></p>
-              <p>The <a href="https://groups.google.com/forum/#!forum/kylin-olap" target="_blank">Google Group </a> is the place for discussions of Kylin features</p>
+              <p>Developement and User maililng list: <a href="mailto:dev@kylin.incubator.apache.org" target="_blank"> dev@kylin.incubator.apache.org</a></p>              
               <p>The official Kylin Twitter account: <a href="https://twitter.com/ApacheKylin" target="_blank"> @ApacheKylin</a></p>
             </div>
             <div class="col-sm-4 col-md-4">

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/css/main.scss
----------------------------------------------------------------------
diff --git a/docs/website/css/main.scss b/docs/website/css/main.scss
new file mode 100755
index 0000000..beee4e3
--- /dev/null
+++ b/docs/website/css/main.scss
@@ -0,0 +1,52 @@
+---
+# Only the main Sass file needs front matter (the dashes are enough)
+---
+@charset "utf-8";
+
+
+
+// Our variables
+$base-font-family: Helvetica, Arial, sans-serif;
+$base-font-size:   16px;
+$small-font-size:  $base-font-size * 0.875;
+$base-line-height: 1.5;
+
+$spacing-unit:     30px;
+
+$text-color:       #111;
+$background-color: #fdfdfd;
+$brand-color:      #2a7ae2;
+
+$grey-color:       #828282;
+$grey-color-light: lighten($grey-color, 40%);
+$grey-color-dark:  darken($grey-color, 25%);
+
+// Width of the content area
+$content-width:    800px;
+
+$on-palm:          600px;
+$on-laptop:        800px;
+
+
+
+// Using media queries with like this:
+// @include media-query($on-palm) {
+//     .wrapper {
+//         padding-right: $spacing-unit / 2;
+//         padding-left: $spacing-unit / 2;
+//     }
+// }
+@mixin media-query($device) {
+    @media screen and (max-width: $device) {
+        @content;
+    }
+}
+
+
+
+// Import partials from `sass_dir` (defaults to `_sass`)
+@import
+        "base",
+        "layout",
+        "syntax-highlighting"
+;

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/docs/index.html
----------------------------------------------------------------------
diff --git a/docs/website/docs/index.html b/docs/website/docs/index.html
index 5057a13..599fd75 100644
--- a/docs/website/docs/index.html
+++ b/docs/website/docs/index.html
@@ -2,8 +2,6 @@
 layout: default
 title: Docs
 ---
-
-
   
 <main id="main" >
   <div class="container" >

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/index.cn.md
----------------------------------------------------------------------
diff --git a/docs/website/index.cn.md b/docs/website/index.cn.md
new file mode 100644
index 0000000..b0d19ee
--- /dev/null
+++ b/docs/website/index.cn.md
@@ -0,0 +1,91 @@
+---
+layout: default-cn
+title: 首页
+---
+
+
+<main id="main" >
+  <div class="container" >
+    <div id="zero" class=" main" >
+      <header style=" padding:2em 0 4em 0">
+        <div class="container" >
+
+          <h4 class="section-title"><span>Apache Kylin 概览</span></h4>
+          <div class="row" style="margin-top:-20px;">
+            <div class="col-sm-12 col-md-12">
+              <p class="title_text"> Kylin 于2014年11月25日被接受会Apache孵化器项目</p>
+              <p class="title_text"> Apache Kylin 是由eBay开源的分布式分析引擎,提供Hadoop之上的SQL查询接口及多维分析(OLAP)能力以支持超大规模数据</p>
+              <img id="diagram" src="{{ "/assets/images/kylin_diagram.png"| prepend: site.baseurl }}"> </div>
+          </div>
+        </div>
+        <!-- /container --> 
+        
+      </header>
+    </div>
+    <!-- / section --> 
+  </div>
+  <!-- /container -->
+  
+  <section id="second" class="main">
+    <header style="background-color:#efefef;">
+      <div class="container"  >
+        <h4 class="section-title"><span> Kylin是什么? </span></h4>
+        <!-- second-->
+        <div class="row">
+          <div class="col-sm-12 col-md-12">
+            <div align="left">
+              <p> <b>- 可扩展超快OLAP引擎: </b><br/>
+              <div class="indent">Kylin是为减少在Hadoop上百亿规模数据查询延迟而设计</div>
+              </p>
+              <p> <b>- Hadoop ANSI SQL 接口: </b><br/>
+              <div class="indent">Kylin为Hadoop提供标准SQL支持大部分查询功能</div>
+              </p>
+              <p> <b>- 交互式查询能力: </b><br/>
+              <div class="indent">通过Kylin,用户可以与Hadoop数据进行亚秒级交互,在同样的数据集上提供比Hive更好的性能</div>
+              </p>
+              <p> <b>- 多维立方体(MOLAP Cube):</b><br/>
+              <div class="indent">用户能够在Kylin里为百亿以上数据集定义数据模型并构建立方体</div>
+              </p>
+              <p> <b>- 与BI工具无缝整合:</b><br/>
+              <div class="indent">Kylin提供与BI工具,如Tableau,的整合能力,即将提供对其他工具的整合</div>
+              </p>
+              <p> <b>- 其他特性:</b> <br/>
+              <div class="indent">- Job管理与监控 <br/>
+                - 压缩与编码 <br/>
+                - 增量更新 <br/>
+                - 利用HBase Coprocessor<br/>
+                - 基于HyperLogLog的Dinstinc Count近似算法 <br/>
+                - 友好的web界面以管理,监控和使用立方体 <br/>
+                - 项目及立方体级别的访问控制安全<br/>
+                - 支持LDAP </div>
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- /container --> 
+      
+    </header>
+  </section>
+  
+  <!-- second -->
+  <section id="first" class="main">
+    <header>
+      <div class="container" >
+        <h4 class="section-title"><span>Kylin 生态圈</span></h4>
+        <div class="row">
+          <div class="col-sm-7 col-md-7">
+            <p> </p>
+            <p><b>Kylin 核心:</b> Kylin OLAP引擎基础框架,包括元数据(Metadata)引擎,查询引擎,Job引擎及存储引擎等,同时包括REST服务器以响应客户端请求</p>
+            <p><b>扩展:</b> 支持额外功能和特性的插件</p>
+            <p><b>整合:</b> 与调度系统,ETL,监控等生命周期管理系统的整合</p>
+            <p><b>用户界面:</b> 在Kylin核心之上扩展的第三方用户界面</p>
+            <p><b>驱动:</b> ODBC 和 JDBC 驱动以支持不同的工具和产品,比如Tableau</p>
+          </div>
+          <div class="col-sm-5 col-md-5">    </div>
+        </div>
+        <!-- /container --> 
+      </div>
+    </header>
+  </section>  
+</main>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ce77a52/docs/website/index.md
----------------------------------------------------------------------
diff --git a/docs/website/index.md b/docs/website/index.md
new file mode 100644
index 0000000..f18a7c3
--- /dev/null
+++ b/docs/website/index.md
@@ -0,0 +1,91 @@
+---
+layout: default
+title: Home
+---
+
+
+<main id="main" >
+  <div class="container" >
+    <div id="zero" class=" main" >
+      <header style=" padding:2em 0 4em 0">
+        <div class="container" >
+
+          <h4 class="section-title"><span>Apache Kylin Overview</span></h4>
+          <div class="row" style="margin-top:-20px;">
+            <div class="col-sm-12 col-md-12">
+              <p class="title_text"> Kylin has been accepted as Apache Incubator Project on Nov 25, 2014.</p>
+              <p class="title_text"> Apache Kylin is an open source Distributed Analytics Engine from eBay Inc. that provides SQL interface and multi-dimensional analysis (OLAP) on Hadoop supporting extremely large datasets</p>
+              <img id="diagram" src="assets/images/kylin_diagram.png"> </div>
+          </div>
+        </div>
+        <!-- /container --> 
+        
+      </header>
+    </div>
+    <!-- / section --> 
+  </div>
+  <!-- /container -->
+  
+  <section id="second" class="main">
+    <header style="background-color:#efefef;">
+      <div class="container"  >
+        <h4 class="section-title"><span> What is Kylin? </span></h4>
+        <!-- second-->
+        <div class="row">
+          <div class="col-sm-12 col-md-12">
+            <div align="left">
+              <p> <b>- Extremely Fast OLAP Engine at Scale: </b><br/>
+              <div class="indent">Kylin is designed to reduce query latency on Hadoop for 10+ billions of rows of data</div>
+              </p>
+              <p> <b>- ANSI SQL Interface on Hadoop: </b><br/>
+              <div class="indent">Kylin offers ANSI SQL on Hadoop and supports most ANSI SQL query functions</div>
+              </p>
+              <p> <b>- Interactive Query Capability: </b><br/>
+              <div class="indent">Users can interact with Hadoop data via Kylin at sub-second latency, better than Hive queries for the same dataset</div>
+              </p>
+              <p> <b>- MOLAP Cube:</b><br/>
+              <div class="indent">User can define a data model and pre-build in Kylin with more than 10+ billions of raw data records</div>
+              </p>
+              <p> <b>- Seamless Integration with BI Tools:</b><br/>
+              <div class="indent">Kylin currently offers integration capability with BI Tools like Tableau.  Integration with Microstrategy and Excel is coming soon</div>
+              </p>
+              <p> <b>- Other Highlights:</b> <br/>
+              <div class="indent">- Job Management and Monitoring <br/>
+                - Compression and Encoding Support <br/>
+                - Incremental Refresh of Cubes <br/>
+                - Leverage HBase Coprocessor for query latency <br/>
+                - Approximate Query Capability for distinct Count (HyperLogLog) <br/>
+                - Easy Web interface to manage, build, monitor and query cubes <br/>
+                - Security capability to set ACL at Cube/Project Level <br/>
+                - Support LDAP Integration </div>
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- /container --> 
+      
+    </header>
+  </section>
+  
+  <!-- second -->
+  <section id="first" class="main">
+    <header>
+      <div class="container" >
+        <h4 class="section-title"><span>Kylin Ecosystem</span></h4>
+        <div class="row">
+          <div class="col-sm-7 col-md-7">
+            <p> </p>
+            <p><b>Kylin Core:</b> Fundamental framework of Kylin OLAP Engine comprises of Metadata Engine, Query Engine, Job Engine and Storage Engine to run the entire stack. It also includes a REST Server to service client requests</p>
+            <p><b>Extensions:</b> Plugins to support additional functions and features </p>
+            <p><b>Integration:</b> Lifecycle Management Support to integrate with Job Scheduler,  ETL, Monitoring and Alerting Systems </p>
+            <p><b>User Interface:</b> Allows third party users to build customized user-interface atop Kylin core</p>
+            <p><b>Drivers:</b> ODBC and JDBC drivers to support different tools and products, such as Tableau</p>
+          </div>
+          <div class="col-sm-5 col-md-5"> <img id="core" src="assets/images/core.png"> </div>
+        </div>
+        <!-- /container --> 
+      </div>
+    </header>
+  </section>  
+</main>