You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2019/04/14 12:36:58 UTC

[kylin] branch document updated: Add the nav links for 3.0 docs and update the error nav links for docs 2.4

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

shaofengshi 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 ec200c2  Add the nav links for 3.0 docs and update the error nav links for docs 2.4
ec200c2 is described below

commit ec200c2b744b44b2ae06702013123c8c859a12f9
Author: GinaZhai <na...@kyligence.io>
AuthorDate: Sun Apr 14 19:45:45 2019 +0800

    Add the nav links for 3.0 docs and update the error nav links for docs
    2.4
---
 website/_config.yml                                | 14 ++--
 website/_data/docs30-cn.yml                        | 70 ++++++++++++++++++
 website/_data/docs30.yml                           | 85 ++++++++++++++++++++++
 website/_docs24/gettingstarted/best_practices.md   |  2 +-
 website/_docs24/gettingstarted/concepts.md         |  2 +-
 website/_docs24/gettingstarted/events.md           |  2 +-
 website/_docs24/gettingstarted/faq.md              |  2 +-
 website/_docs24/gettingstarted/terminology.md      |  2 +-
 website/_docs24/howto/howto_backup_metadata.cn.md  |  2 +-
 website/_docs24/howto/howto_backup_metadata.md     |  2 +-
 .../howto/howto_build_cube_with_restapi.cn.md      |  2 +-
 .../_docs24/howto/howto_build_cube_with_restapi.md |  2 +-
 website/_docs24/howto/howto_cleanup_storage.cn.md  |  2 +-
 website/_docs24/howto/howto_cleanup_storage.md     |  2 +-
 .../_docs24/howto/howto_enable_zookeeper_acl.md    |  2 +-
 .../howto/howto_install_ranger_kylin_plugin.md     |  2 +-
 website/_docs24/howto/howto_jdbc.cn.md             |  2 +-
 website/_docs24/howto/howto_jdbc.md                |  2 +-
 website/_docs24/howto/howto_ldap_and_sso.md        |  2 +-
 website/_docs24/howto/howto_optimize_build.cn.md   |  2 +-
 website/_docs24/howto/howto_optimize_build.md      |  2 +-
 website/_docs24/howto/howto_optimize_cubes.cn.md   |  2 +-
 website/_docs24/howto/howto_optimize_cubes.md      |  2 +-
 website/_docs24/howto/howto_update_coprocessor.md  |  2 +-
 website/_docs24/howto/howto_upgrade.md             |  2 +-
 website/_docs24/howto/howto_use_beeline.md         |  2 +-
 .../howto/howto_use_distributed_scheduler.md       |  2 +-
 website/_docs24/howto/howto_use_restapi.cn.md      |  2 +-
 website/_docs24/howto/howto_use_restapi.md         |  2 +-
 website/_docs24/howto/howto_use_restapi_in_js.md   |  2 +-
 website/_docs24/index.cn.md                        |  2 +-
 website/_docs24/index.md                           |  2 +-
 website/_docs24/install/advance_settings.cn.md     |  2 +-
 website/_docs24/install/advance_settings.md        |  2 +-
 website/_docs24/install/configuration.cn.md        |  2 +-
 website/_docs24/install/configuration.md           |  2 +-
 website/_docs24/install/hadoop_evn.md              |  2 +-
 website/_docs24/install/index.cn.md                |  2 +-
 website/_docs24/install/index.md                   |  2 +-
 website/_docs24/install/kylin_aws_emr.cn.md        |  2 +-
 website/_docs24/install/kylin_aws_emr.md           |  2 +-
 website/_docs24/install/kylin_cluster.cn.md        |  2 +-
 website/_docs24/install/kylin_cluster.md           |  2 +-
 website/_docs24/install/kylin_docker.cn.md         |  2 +-
 website/_docs24/install/kylin_docker.md            |  2 +-
 website/_docs24/install/manual_install_guide.cn.md |  2 +-
 website/_docs24/release_notes.md                   |  2 +-
 website/_docs24/tutorial/Qlik.cn.md                |  2 +-
 website/_docs24/tutorial/Qlik.md                   |  2 +-
 website/_docs24/tutorial/acl.cn.md                 |  2 +-
 website/_docs24/tutorial/acl.md                    |  2 +-
 website/_docs24/tutorial/create_cube.cn.md         |  2 +-
 website/_docs24/tutorial/create_cube.md            |  2 +-
 website/_docs24/tutorial/cube_build_job.cn.md      |  2 +-
 website/_docs24/tutorial/cube_build_job.md         |  2 +-
 .../_docs24/tutorial/cube_build_performance.cn.md  |  2 +-
 website/_docs24/tutorial/cube_build_performance.md |  2 +-
 website/_docs24/tutorial/cube_spark.cn.md          |  2 +-
 website/_docs24/tutorial/cube_spark.md             |  2 +-
 website/_docs24/tutorial/cube_streaming.cn.md      |  2 +-
 website/_docs24/tutorial/cube_streaming.md         |  2 +-
 website/_docs24/tutorial/flink.md                  |  2 +-
 website/_docs24/tutorial/hue.md                    |  2 +-
 website/_docs24/tutorial/jdbc.cn.md                |  2 +-
 website/_docs24/tutorial/jdbc.md                   |  2 +-
 website/_docs24/tutorial/kylin_client_tool.cn.md   |  2 +-
 website/_docs24/tutorial/kylin_client_tool.md      |  2 +-
 website/_docs24/tutorial/kylin_sample.cn.md        |  2 +-
 website/_docs24/tutorial/kylin_sample.md           |  2 +-
 website/_docs24/tutorial/microstrategy.md          |  2 +-
 website/_docs24/tutorial/odbc.cn.md                |  2 +-
 website/_docs24/tutorial/odbc.md                   |  2 +-
 website/_docs24/tutorial/powerbi.cn.md             |  2 +-
 website/_docs24/tutorial/powerbi.md                |  2 +-
 website/_docs24/tutorial/project_level_acl.cn.md   |  2 +-
 website/_docs24/tutorial/project_level_acl.md      |  2 +-
 website/_docs24/tutorial/query_pushdown.cn.md      |  2 +-
 website/_docs24/tutorial/query_pushdown.md         |  2 +-
 .../_docs24/tutorial/setup_jdbc_datasource.cn.md   |  2 +-
 website/_docs24/tutorial/setup_jdbc_datasource.md  |  2 +-
 website/_docs24/tutorial/setup_systemcube.cn.md    |  2 +-
 website/_docs24/tutorial/setup_systemcube.md       |  2 +-
 website/_docs24/tutorial/spark.cn.md               |  2 +-
 website/_docs24/tutorial/spark.md                  |  2 +-
 website/_docs24/tutorial/squirrel.cn.md            |  2 +-
 website/_docs24/tutorial/squirrel.md               |  2 +-
 website/_docs24/tutorial/superset.cn.md            |  2 +-
 website/_docs24/tutorial/superset.md               |  2 +-
 website/_docs24/tutorial/tableau.cn.md             |  2 +-
 website/_docs24/tutorial/tableau.md                |  2 +-
 website/_docs24/tutorial/tableau_91.cn.md          |  2 +-
 website/_docs24/tutorial/tableau_91.md             |  2 +-
 website/_docs24/tutorial/use_cube_planner.cn.md    |  2 +-
 website/_docs24/tutorial/use_cube_planner.md       |  2 +-
 website/_docs24/tutorial/use_dashboard.cn.md       |  2 +-
 website/_docs24/tutorial/use_dashboard.md          |  2 +-
 website/_docs24/tutorial/web.cn.md                 |  2 +-
 website/_docs24/tutorial/web.md                    |  2 +-
 website/_docs30/gettingstarted/best_practices.md   |  2 +-
 website/_docs30/gettingstarted/concepts.md         |  2 +-
 website/_docs30/gettingstarted/events.md           |  2 +-
 website/_docs30/gettingstarted/faq.cn.md           |  2 +-
 website/_docs30/gettingstarted/faq.md              |  2 +-
 website/_docs30/gettingstarted/terminology.md      |  2 +-
 website/_docs30/howto/howto_backup_metadata.cn.md  |  2 +-
 website/_docs30/howto/howto_backup_metadata.md     |  2 +-
 .../howto/howto_build_cube_with_restapi.cn.md      |  2 +-
 .../_docs30/howto/howto_build_cube_with_restapi.md |  2 +-
 website/_docs30/howto/howto_cleanup_storage.cn.md  |  2 +-
 website/_docs30/howto/howto_cleanup_storage.md     |  2 +-
 .../_docs30/howto/howto_enable_zookeeper_acl.md    |  2 +-
 .../howto/howto_install_ranger_kylin_plugin.md     |  2 +-
 website/_docs30/howto/howto_jdbc.cn.md             |  2 +-
 website/_docs30/howto/howto_jdbc.md                |  2 +-
 website/_docs30/howto/howto_ldap_and_sso.md        |  2 +-
 website/_docs30/howto/howto_optimize_build.cn.md   |  2 +-
 website/_docs30/howto/howto_optimize_build.md      |  2 +-
 website/_docs30/howto/howto_optimize_cubes.cn.md   |  2 +-
 website/_docs30/howto/howto_optimize_cubes.md      |  2 +-
 website/_docs30/howto/howto_update_coprocessor.md  |  2 +-
 website/_docs30/howto/howto_upgrade.md             |  2 +-
 website/_docs30/howto/howto_use_beeline.md         |  2 +-
 website/_docs30/howto/howto_use_cli.cn.md          |  2 +-
 website/_docs30/howto/howto_use_cli.md             |  2 +-
 .../howto/howto_use_distributed_scheduler.md       |  2 +-
 website/_docs30/howto/howto_use_restapi.cn.md      |  2 +-
 website/_docs30/howto/howto_use_restapi.md         |  2 +-
 website/_docs30/howto/howto_use_restapi_in_js.md   |  2 +-
 website/_docs30/index.cn.md                        |  2 +-
 website/_docs30/index.md                           |  2 +-
 website/_docs30/install/advance_settings.cn.md     |  2 +-
 website/_docs30/install/advance_settings.md        |  2 +-
 website/_docs30/install/configuration.cn.md        |  2 +-
 website/_docs30/install/configuration.md           |  2 +-
 website/_docs30/install/index.cn.md                |  2 +-
 website/_docs30/install/index.md                   |  2 +-
 website/_docs30/install/kylin_aws_emr.cn.md        |  2 +-
 website/_docs30/install/kylin_aws_emr.md           |  2 +-
 website/_docs30/install/kylin_cluster.cn.md        |  2 +-
 website/_docs30/install/kylin_cluster.md           |  2 +-
 website/_docs30/install/kylin_docker.cn.md         |  2 +-
 website/_docs30/install/kylin_docker.md            |  2 +-
 website/_docs30/release_notes.md                   |  2 +-
 website/_docs30/tutorial/Qlik.cn.md                |  2 +-
 website/_docs30/tutorial/Qlik.md                   |  2 +-
 website/_docs30/tutorial/acl.cn.md                 |  2 +-
 website/_docs30/tutorial/acl.md                    |  2 +-
 website/_docs30/tutorial/create_cube.cn.md         |  2 +-
 website/_docs30/tutorial/create_cube.md            |  2 +-
 website/_docs30/tutorial/cube_build_job.cn.md      |  2 +-
 website/_docs30/tutorial/cube_build_job.md         |  2 +-
 .../_docs30/tutorial/cube_build_performance.cn.md  |  2 +-
 website/_docs30/tutorial/cube_build_performance.md |  2 +-
 website/_docs30/tutorial/cube_spark.cn.md          |  2 +-
 website/_docs30/tutorial/cube_spark.md             |  2 +-
 website/_docs30/tutorial/cube_streaming.cn.md      |  2 +-
 website/_docs30/tutorial/cube_streaming.md         |  2 +-
 website/_docs30/tutorial/flink.md                  |  2 +-
 website/_docs30/tutorial/hue.md                    |  2 +-
 website/_docs30/tutorial/hybrid.cn.md              |  2 +-
 website/_docs30/tutorial/hybrid.md                 |  2 +-
 website/_docs30/tutorial/jdbc.cn.md                |  2 +-
 website/_docs30/tutorial/jdbc.md                   |  2 +-
 website/_docs30/tutorial/kylin_client_tool.cn.md   |  2 +-
 website/_docs30/tutorial/kylin_client_tool.md      |  2 +-
 website/_docs30/tutorial/kylin_sample.cn.md        |  2 +-
 website/_docs30/tutorial/kylin_sample.md           |  2 +-
 website/_docs30/tutorial/microstrategy.md          |  2 +-
 website/_docs30/tutorial/mysql_metastore.cn.md     |  2 +-
 website/_docs30/tutorial/mysql_metastore.md        |  2 +-
 website/_docs30/tutorial/odbc.cn.md                |  2 +-
 website/_docs30/tutorial/odbc.md                   |  2 +-
 website/_docs30/tutorial/powerbi.cn.md             |  2 +-
 website/_docs30/tutorial/powerbi.md                |  2 +-
 website/_docs30/tutorial/project_level_acl.cn.md   |  2 +-
 website/_docs30/tutorial/project_level_acl.md      |  2 +-
 website/_docs30/tutorial/query_pushdown.cn.md      |  2 +-
 website/_docs30/tutorial/query_pushdown.md         |  2 +-
 website/_docs30/tutorial/real_time_olap.md         |  2 +-
 .../_docs30/tutorial/setup_jdbc_datasource.cn.md   |  2 +-
 website/_docs30/tutorial/setup_jdbc_datasource.md  |  2 +-
 website/_docs30/tutorial/setup_systemcube.cn.md    |  2 +-
 website/_docs30/tutorial/setup_systemcube.md       |  2 +-
 website/_docs30/tutorial/spark.cn.md               |  2 +-
 website/_docs30/tutorial/spark.md                  |  2 +-
 website/_docs30/tutorial/sql_reference.cn.md       |  2 +-
 website/_docs30/tutorial/sql_reference.md          |  2 +-
 website/_docs30/tutorial/squirrel.cn.md            |  2 +-
 website/_docs30/tutorial/squirrel.md               |  2 +-
 website/_docs30/tutorial/superset.cn.md            |  2 +-
 website/_docs30/tutorial/superset.md               |  2 +-
 website/_docs30/tutorial/tableau.cn.md             |  2 +-
 website/_docs30/tutorial/tableau.md                |  2 +-
 website/_docs30/tutorial/tableau_91.cn.md          |  2 +-
 website/_docs30/tutorial/tableau_91.md             |  2 +-
 website/_docs30/tutorial/use_cube_planner.cn.md    |  2 +-
 website/_docs30/tutorial/use_cube_planner.md       |  2 +-
 website/_docs30/tutorial/use_dashboard.cn.md       |  2 +-
 website/_docs30/tutorial/use_dashboard.md          |  2 +-
 website/_docs30/tutorial/web.cn.md                 |  2 +-
 website/_docs30/tutorial/web.md                    |  2 +-
 website/_includes/docs24_nav.cn.html               | 33 +++++++++
 website/_includes/docs24_nav.html                  | 33 +++++++++
 website/_includes/docs24_ul.cn.html                | 30 ++++++++
 website/_includes/docs24_ul.html                   | 31 ++++++++
 website/_includes/docs30_nav.cn.html               | 33 +++++++++
 website/_includes/docs30_nav.html                  | 33 +++++++++
 website/_includes/docs30_ul.cn.html                | 30 ++++++++
 website/_includes/docs30_ul.html                   | 31 ++++++++
 website/_layouts/docs24-cn.html                    | 46 ++++++++++++
 website/_layouts/docs24.html                       | 51 +++++++++++++
 website/_layouts/docs30-cn.html                    | 46 ++++++++++++
 website/_layouts/docs30.html                       | 50 +++++++++++++
 213 files changed, 809 insertions(+), 203 deletions(-)

diff --git a/website/_config.yml b/website/_config.yml
index 5ea233e..c192c19 100644
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -27,7 +27,7 @@ encoding: UTF-8
 timezone: America/Dawson 
 
 exclude: ["README.md", "Rakefile", "*.scss", "*.haml", "*.sh", "Dockerfile", "Makefile"]
-include: [_docs,_docs16,_docs20,_docs21,_docs23,_dev,community]
+include: [_docs,_docs20,_docs21,_docs23,_docs24,_docs30,_dev,community]
 
 # Build settings
 markdown: kramdown
@@ -58,10 +58,6 @@ collections:
     output: true
   docs-cn:
     output: true
-  docs16:
-    output: true
-  docs16-cn:
-    output: true
   docs20:
     output: true
   docs20-cn:
@@ -74,6 +70,14 @@ collections:
     output: true
   docs23-cn:
     output: true
+  docs24:
+    output: true
+  docs24-cn:
+    output: true
+  docs30:
+    output: true
+  docs30-cn:
+    output: true
   dev:
     output: true
   dev-cn:
diff --git a/website/_data/docs30-cn.yml b/website/_data/docs30-cn.yml
new file mode 100644
index 0000000..6d7b085
--- /dev/null
+++ b/website/_data/docs30-cn.yml
@@ -0,0 +1,70 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+- title: 开始
+  docs:
+  - index
+  - gettingstarted/faq
+
+- title: 安装
+  docs:
+  - install/index
+  - install/kylin_cluster
+  - install/configuration
+  - install/kylin_aws_emr
+  - install/kylin_docker
+
+- title: 教程
+  docs:
+  - tutorial/kylin_sample
+  - tutorial/web
+  - tutorial/create_cube
+  - tutorial/cube_build_job
+  - tutorial/sql_reference
+  - tutorial/project_level_acl
+  - tutorial/cube_spark
+  - tutorial/cube_streaming
+  - tutorial/realtime_olap
+  - tutorial/cube_build_performance
+  - tutorial/kylin_client_tool
+  - tutorial/setup_systemcube
+  - tutorial/use_cube_planner
+  - tutorial/use_dashboard
+  - tutorial/setup_jdbc_datasource
+  - tutorial/hybrid
+  - tutorial/mysql_metastore
+
+- title: 工具集成
+  docs:
+  - tutorial/odbc
+  - tutorial/jdbc
+  - tutorial/tableau
+  - tutorial/tableau_91
+  - tutorial/powerbi
+  - tutorial/microstrategy
+  - tutorial/squirrel
+  - tutorial/Qlik
+  - tutorial/superset
+
+
+- title: 帮助
+  docs:  
+  - howto/howto_use_restapi
+  - howto/howto_build_cube_with_restapi
+  - howto/howto_optimize_cubes
+  - howto/howto_optimize_build
+  - howto/howto_backup_metadata
+  - howto/howto_cleanup_storage
+  - howto/howto_use_cli
+
diff --git a/website/_data/docs30.yml b/website/_data/docs30.yml
new file mode 100644
index 0000000..aaeefb6
--- /dev/null
+++ b/website/_data/docs30.yml
@@ -0,0 +1,85 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Docs menu items, for English one, docs20-cn.yml is for Chinese one
+# The docs menu is constructed in docs20_nav.html with these data
+- title: Getting Started
+  docs:
+  - index
+  - release_notes
+  - gettingstarted/concepts
+  - gettingstarted/terminology
+  - gettingstarted/faq
+  - gettingstarted/events
+  - gettingstarted/best_practices
+
+- title: Installation
+  docs:
+  - install/index
+  - install/kylin_cluster
+  - install/configuration
+  - install/kylin_aws_emr
+  - install/kylin_docker
+  
+- title: Tutorial
+  docs:
+  - tutorial/kylin_sample
+  - tutorial/web
+  - tutorial/create_cube
+  - tutorial/cube_build_job
+  - tutorial/sql_reference
+  - tutorial/project_level_acl
+  - tutorial/cube_spark
+  - tutorial/cube_streaming
+  - tutorial/realtime_olap
+  - tutorial/cube_build_performance
+  - tutorial/kylin_client_tool
+  - tutorial/setup_systemcube
+  - tutorial/use_cube_planner
+  - tutorial/use_dashboard
+  - tutorial/setup_jdbc_datasource
+  - tutorial/hybrid
+  - tutorial/mysql_metastore
+
+- title: Integration
+  docs:
+  - tutorial/odbc
+  - tutorial/jdbc
+  - tutorial/tableau
+  - tutorial/tableau_91
+  - tutorial/powerbi
+  - tutorial/microstrategy
+  - tutorial/squirrel
+  - tutorial/flink
+  - tutorial/spark
+  - tutorial/hue
+  - tutorial/Qlik
+  - tutorial/superset
+
+- title: How To
+  docs:
+  - howto/howto_use_restapi
+  - howto/howto_build_cube_with_restapi
+  - howto/howto_optimize_cubes
+  - howto/howto_optimize_build
+  - howto/howto_backup_metadata
+  - howto/howto_cleanup_storage
+  - howto/howto_upgrade
+  - howto/howto_use_cli
+  - howto/howto_ldap_and_sso
+  - howto/howto_use_beeline
+  - howto/howto_update_coprocessor
+  - howto/howto_install_ranger_kylin_plugin
+  - howto/howto_enable_zookeeper_acl
diff --git a/website/_docs24/gettingstarted/best_practices.md b/website/_docs24/gettingstarted/best_practices.md
index 3bde351..18ddc51 100644
--- a/website/_docs24/gettingstarted/best_practices.md
+++ b/website/_docs24/gettingstarted/best_practices.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Community Best Practices"
 categories: gettingstarted
 permalink: /docs24/gettingstarted/best_practices.html
diff --git a/website/_docs24/gettingstarted/concepts.md b/website/_docs24/gettingstarted/concepts.md
index e48ef8a..c218b43 100644
--- a/website/_docs24/gettingstarted/concepts.md
+++ b/website/_docs24/gettingstarted/concepts.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Technical Concepts"
 categories: gettingstarted
 permalink: /docs24/gettingstarted/concepts.html
diff --git a/website/_docs24/gettingstarted/events.md b/website/_docs24/gettingstarted/events.md
index cf96eb2..ef958ef 100644
--- a/website/_docs24/gettingstarted/events.md
+++ b/website/_docs24/gettingstarted/events.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Events and Conferences"
 categories: gettingstarted
 permalink: /docs24/gettingstarted/events.html
diff --git a/website/_docs24/gettingstarted/faq.md b/website/_docs24/gettingstarted/faq.md
index 4976663..3a10800 100644
--- a/website/_docs24/gettingstarted/faq.md
+++ b/website/_docs24/gettingstarted/faq.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "FAQ"
 categories: gettingstarted
 permalink: /docs24/gettingstarted/faq.html
diff --git a/website/_docs24/gettingstarted/terminology.md b/website/_docs24/gettingstarted/terminology.md
index dfe91e9..f4454bf 100644
--- a/website/_docs24/gettingstarted/terminology.md
+++ b/website/_docs24/gettingstarted/terminology.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Terminology"
 categories: gettingstarted
 permalink: /docs24/gettingstarted/terminology.html
diff --git a/website/_docs24/howto/howto_backup_metadata.cn.md b/website/_docs24/howto/howto_backup_metadata.cn.md
index acbf395..05f0288 100644
--- a/website/_docs24/howto/howto_backup_metadata.cn.md
+++ b/website/_docs24/howto/howto_backup_metadata.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  备份元数据
 categories: 帮助
 permalink: /cn/docs24/howto/howto_backup_metadata.html
diff --git a/website/_docs24/howto/howto_backup_metadata.md b/website/_docs24/howto/howto_backup_metadata.md
index f54d9d0..ed32634 100644
--- a/website/_docs24/howto/howto_backup_metadata.md
+++ b/website/_docs24/howto/howto_backup_metadata.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Backup Metadata
 categories: howto
 permalink: /docs24/howto/howto_backup_metadata.html
diff --git a/website/_docs24/howto/howto_build_cube_with_restapi.cn.md b/website/_docs24/howto/howto_build_cube_with_restapi.cn.md
index 401e12b..3e1d0c2 100644
--- a/website/_docs24/howto/howto_build_cube_with_restapi.cn.md
+++ b/website/_docs24/howto/howto_build_cube_with_restapi.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  用 API 构建 Cube
 categories: 帮助
 permalink: /cn/docs24/howto/howto_build_cube_with_restapi.html
diff --git a/website/_docs24/howto/howto_build_cube_with_restapi.md b/website/_docs24/howto/howto_build_cube_with_restapi.md
index 4fa2642..f5c37ca 100644
--- a/website/_docs24/howto/howto_build_cube_with_restapi.md
+++ b/website/_docs24/howto/howto_build_cube_with_restapi.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Build Cube with API
 categories: howto
 permalink: /docs24/howto/howto_build_cube_with_restapi.html
diff --git a/website/_docs24/howto/howto_cleanup_storage.cn.md b/website/_docs24/howto/howto_cleanup_storage.cn.md
index aea9be4..881a9ec 100644
--- a/website/_docs24/howto/howto_cleanup_storage.cn.md
+++ b/website/_docs24/howto/howto_cleanup_storage.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  清理存储
 categories: 帮助
 permalink: /cn/docs24/howto/howto_cleanup_storage.html
diff --git a/website/_docs24/howto/howto_cleanup_storage.md b/website/_docs24/howto/howto_cleanup_storage.md
index 4b76934..bffc088 100644
--- a/website/_docs24/howto/howto_cleanup_storage.md
+++ b/website/_docs24/howto/howto_cleanup_storage.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Cleanup Storage
 categories: howto
 permalink: /docs24/howto/howto_cleanup_storage.html
diff --git a/website/_docs24/howto/howto_enable_zookeeper_acl.md b/website/_docs24/howto/howto_enable_zookeeper_acl.md
index 34fc1d4..e9aa6a1 100644
--- a/website/_docs24/howto/howto_enable_zookeeper_acl.md
+++ b/website/_docs24/howto/howto_enable_zookeeper_acl.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Enable Zookeeper ACL
 categories: howto
 permalink: /docs24/howto/howto_enable_zookeeper_acl.html
diff --git a/website/_docs24/howto/howto_install_ranger_kylin_plugin.md b/website/_docs24/howto/howto_install_ranger_kylin_plugin.md
index a8fa3a3..8ee1eda 100644
--- a/website/_docs24/howto/howto_install_ranger_kylin_plugin.md
+++ b/website/_docs24/howto/howto_install_ranger_kylin_plugin.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Install Ranger Plugin
 categories: howto
 permalink: /docs24/howto/howto_install_ranger_kylin_plugin.html
diff --git a/website/_docs24/howto/howto_jdbc.cn.md b/website/_docs24/howto/howto_jdbc.cn.md
index 61d1420..06e5bfb 100644
--- a/website/_docs24/howto/howto_jdbc.cn.md
+++ b/website/_docs24/howto/howto_jdbc.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  Kylin JDBC Driver
 categories: 帮助
 permalink: /cn/docs24/howto/howto_jdbc.html
diff --git a/website/_docs24/howto/howto_jdbc.md b/website/_docs24/howto/howto_jdbc.md
index dfcfaea..14352c0 100644
--- a/website/_docs24/howto/howto_jdbc.md
+++ b/website/_docs24/howto/howto_jdbc.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  JDBC Driver
 categories: howto
 permalink: /docs24/howto/howto_jdbc.html
diff --git a/website/_docs24/howto/howto_ldap_and_sso.md b/website/_docs24/howto/howto_ldap_and_sso.md
index 409177e..438991e 100644
--- a/website/_docs24/howto/howto_ldap_and_sso.md
+++ b/website/_docs24/howto/howto_ldap_and_sso.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title: Secure with LDAP and SSO
 categories: howto
 permalink: /docs24/howto/howto_ldap_and_sso.html
diff --git a/website/_docs24/howto/howto_optimize_build.cn.md b/website/_docs24/howto/howto_optimize_build.cn.md
index 6acf034..a622c36 100644
--- a/website/_docs24/howto/howto_optimize_build.cn.md
+++ b/website/_docs24/howto/howto_optimize_build.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  优化 Cube 构建
 categories: 帮助
 permalink: /cn/docs24/howto/howto_optimize_build.html
diff --git a/website/_docs24/howto/howto_optimize_build.md b/website/_docs24/howto/howto_optimize_build.md
index af130ae..ce5394d 100644
--- a/website/_docs24/howto/howto_optimize_build.md
+++ b/website/_docs24/howto/howto_optimize_build.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Optimize Cube Build
 categories: howto
 permalink: /docs24/howto/howto_optimize_build.html
diff --git a/website/_docs24/howto/howto_optimize_cubes.cn.md b/website/_docs24/howto/howto_optimize_cubes.cn.md
index 8d76f5d..31b228d 100644
--- a/website/_docs24/howto/howto_optimize_cubes.cn.md
+++ b/website/_docs24/howto/howto_optimize_cubes.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  优化 Cube 设计
 categories: howto
 permalink: /cn/docs24/howto/howto_optimize_cubes.html
diff --git a/website/_docs24/howto/howto_optimize_cubes.md b/website/_docs24/howto/howto_optimize_cubes.md
index 170c9d4..d08a49e 100644
--- a/website/_docs24/howto/howto_optimize_cubes.md
+++ b/website/_docs24/howto/howto_optimize_cubes.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Optimize Cube Design
 categories: howto
 permalink: /docs24/howto/howto_optimize_cubes.html
diff --git a/website/_docs24/howto/howto_update_coprocessor.md b/website/_docs24/howto/howto_update_coprocessor.md
index d61c8db..c283657 100644
--- a/website/_docs24/howto/howto_update_coprocessor.md
+++ b/website/_docs24/howto/howto_update_coprocessor.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Update Coprocessor
 categories: howto
 permalink: /docs24/howto/howto_update_coprocessor.html
diff --git a/website/_docs24/howto/howto_upgrade.md b/website/_docs24/howto/howto_upgrade.md
index 55a4ffe..f770682 100644
--- a/website/_docs24/howto/howto_upgrade.md
+++ b/website/_docs24/howto/howto_upgrade.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Upgrade From Old Versions
 categories: howto
 permalink: /docs24/howto/howto_upgrade.html
diff --git a/website/_docs24/howto/howto_use_beeline.md b/website/_docs24/howto/howto_use_beeline.md
index eca2875..c3c8de8 100644
--- a/website/_docs24/howto/howto_use_beeline.md
+++ b/website/_docs24/howto/howto_use_beeline.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Use Beeline for Hive
 categories: howto
 permalink: /docs24/howto/howto_use_beeline.html
diff --git a/website/_docs24/howto/howto_use_distributed_scheduler.md b/website/_docs24/howto/howto_use_distributed_scheduler.md
index 789e176..d01074b 100644
--- a/website/_docs24/howto/howto_use_distributed_scheduler.md
+++ b/website/_docs24/howto/howto_use_distributed_scheduler.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Use distributed job scheduler
 categories: howto
 permalink: /docs24/howto/howto_use_distributed_scheduler.html
diff --git a/website/_docs24/howto/howto_use_restapi.cn.md b/website/_docs24/howto/howto_use_restapi.cn.md
index 8cf8c29..93cb332 100644
--- a/website/_docs24/howto/howto_use_restapi.cn.md
+++ b/website/_docs24/howto/howto_use_restapi.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  RESTful API
 categories: howto
 permalink: /cn/docs24/howto/howto_use_restapi.html
diff --git a/website/_docs24/howto/howto_use_restapi.md b/website/_docs24/howto/howto_use_restapi.md
index 1a6b861..17d9fb3 100644
--- a/website/_docs24/howto/howto_use_restapi.md
+++ b/website/_docs24/howto/howto_use_restapi.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Use RESTful API
 categories: howto
 permalink: /docs24/howto/howto_use_restapi.html
diff --git a/website/_docs24/howto/howto_use_restapi_in_js.md b/website/_docs24/howto/howto_use_restapi_in_js.md
index fbe2f1f..4c19346 100644
--- a/website/_docs24/howto/howto_use_restapi_in_js.md
+++ b/website/_docs24/howto/howto_use_restapi_in_js.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Use RESTful API in Javascript
 categories: howto
 permalink: /docs24/howto/howto_use_restapi_in_js.html
diff --git a/website/_docs24/index.cn.md b/website/_docs24/index.cn.md
index 6bec14c..d2bf1cb 100644
--- a/website/_docs24/index.cn.md
+++ b/website/_docs24/index.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title: 概述
 categories: docs
 permalink: /cn/docs24/index.html
diff --git a/website/_docs24/index.md b/website/_docs24/index.md
index 22a75cd..c4cacc8 100644
--- a/website/_docs24/index.md
+++ b/website/_docs24/index.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title: Overview
 categories: docs
 permalink: /docs24/index.html
diff --git a/website/_docs24/install/advance_settings.cn.md b/website/_docs24/install/advance_settings.cn.md
index 13c406e..c317a3d 100644
--- a/website/_docs24/install/advance_settings.cn.md
+++ b/website/_docs24/install/advance_settings.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title: "高级设置"
 categories: install
 permalink: /cn/docs24/install/advance_settings.html
diff --git a/website/_docs24/install/advance_settings.md b/website/_docs24/install/advance_settings.md
index fd394b8..c882cb4 100644
--- a/website/_docs24/install/advance_settings.md
+++ b/website/_docs24/install/advance_settings.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Advanced Settings"
 categories: install
 permalink: /docs24/install/advance_settings.html
diff --git a/website/_docs24/install/configuration.cn.md b/website/_docs24/install/configuration.cn.md
index 9baa005..658d3af 100644
--- a/website/_docs24/install/configuration.cn.md
+++ b/website/_docs24/install/configuration.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "Kylin 配置"
 categories: install
 permalink: /cn/docs24/install/configuration.html
diff --git a/website/_docs24/install/configuration.md b/website/_docs24/install/configuration.md
index e26a07c..9fe4937 100644
--- a/website/_docs24/install/configuration.md
+++ b/website/_docs24/install/configuration.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Kylin Configuration"
 categories: install
 permalink: /docs24/install/configuration.html
diff --git a/website/_docs24/install/hadoop_evn.md b/website/_docs24/install/hadoop_evn.md
index 845b500..f53711a 100644
--- a/website/_docs24/install/hadoop_evn.md
+++ b/website/_docs24/install/hadoop_evn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Hadoop Environment"
 categories: install
 permalink: /docs24/install/hadoop_env.html
diff --git a/website/_docs24/install/index.cn.md b/website/_docs24/install/index.cn.md
index de05618..06e94cd 100644
--- a/website/_docs24/install/index.cn.md
+++ b/website/_docs24/install/index.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "安装指南"
 categories: install
 permalink: /cn/docs24/install/index.html
diff --git a/website/_docs24/install/index.md b/website/_docs24/install/index.md
index 49af8c8..759cb2f 100644
--- a/website/_docs24/install/index.md
+++ b/website/_docs24/install/index.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Installation Guide"
 categories: install
 permalink: /docs24/install/index.html
diff --git a/website/_docs24/install/kylin_aws_emr.cn.md b/website/_docs24/install/kylin_aws_emr.cn.md
index 0414f74..83fa0bf 100644
--- a/website/_docs24/install/kylin_aws_emr.cn.md
+++ b/website/_docs24/install/kylin_aws_emr.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "在 AWS EMR 上安装 Kylin"
 categories: install
 permalink: /cn/docs24/install/kylin_aws_emr.html
diff --git a/website/_docs24/install/kylin_aws_emr.md b/website/_docs24/install/kylin_aws_emr.md
index f6d2e86..0d8dee6 100644
--- a/website/_docs24/install/kylin_aws_emr.md
+++ b/website/_docs24/install/kylin_aws_emr.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Install Kylin on AWS EMR"
 categories: install
 permalink: /docs24/install/kylin_aws_emr.html
diff --git a/website/_docs24/install/kylin_cluster.cn.md b/website/_docs24/install/kylin_cluster.cn.md
index d6e43c0..bb81b16 100644
--- a/website/_docs24/install/kylin_cluster.cn.md
+++ b/website/_docs24/install/kylin_cluster.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "集群模式部署"
 categories: install
 permalink: /cn/docs24/install/kylin_cluster.html
diff --git a/website/_docs24/install/kylin_cluster.md b/website/_docs24/install/kylin_cluster.md
index 22270ed..7b8bbc0 100644
--- a/website/_docs24/install/kylin_cluster.md
+++ b/website/_docs24/install/kylin_cluster.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Deploy in Cluster Mode"
 categories: install
 permalink: /docs24/install/kylin_cluster.html
diff --git a/website/_docs24/install/kylin_docker.cn.md b/website/_docs24/install/kylin_docker.cn.md
index 474694e..c096a19 100644
--- a/website/_docs24/install/kylin_docker.cn.md
+++ b/website/_docs24/install/kylin_docker.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "用 Docker 运行 Kylin"
 categories: install
 permalink: /cn/docs24/install/kylin_docker.html
diff --git a/website/_docs24/install/kylin_docker.md b/website/_docs24/install/kylin_docker.md
index 248e27d..c9c0163 100644
--- a/website/_docs24/install/kylin_docker.md
+++ b/website/_docs24/install/kylin_docker.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Run Kylin with Docker"
 categories: install
 permalink: /docs24/install/kylin_docker.html
diff --git a/website/_docs24/install/manual_install_guide.cn.md b/website/_docs24/install/manual_install_guide.cn.md
index d6db50f..1174b55 100644
--- a/website/_docs24/install/manual_install_guide.cn.md
+++ b/website/_docs24/install/manual_install_guide.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "手动安装指南"
 categories: 安装
 permalink: /cn/docs24/install/manual_install_guide.html
diff --git a/website/_docs24/release_notes.md b/website/_docs24/release_notes.md
index b990892..28f3e90 100644
--- a/website/_docs24/release_notes.md
+++ b/website/_docs24/release_notes.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Release Notes
 categories: gettingstarted
 permalink: /docs24/release_notes.html
diff --git a/website/_docs24/tutorial/Qlik.cn.md b/website/_docs24/tutorial/Qlik.cn.md
index 71e8fee..5d5c98d 100644
--- a/website/_docs24/tutorial/Qlik.cn.md
+++ b/website/_docs24/tutorial/Qlik.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  Qlik Sense 集成
 categories: tutorial
 permalink: /cn/docs24/tutorial/Qlik.html
diff --git a/website/_docs24/tutorial/Qlik.md b/website/_docs24/tutorial/Qlik.md
index 527eb7c..9be31a4 100644
--- a/website/_docs24/tutorial/Qlik.md
+++ b/website/_docs24/tutorial/Qlik.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title: Qlik Sense
 categories: tutorial
 permalink: /docs24/tutorial/Qlik.html
diff --git a/website/_docs24/tutorial/acl.cn.md b/website/_docs24/tutorial/acl.cn.md
index 6f89299..ebfbb8a 100644
--- a/website/_docs24/tutorial/acl.cn.md
+++ b/website/_docs24/tutorial/acl.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  Cube 权限授予(v2.1)
 categories: 教程
 permalink: /cn/docs24/tutorial/acl.html
diff --git a/website/_docs24/tutorial/acl.md b/website/_docs24/tutorial/acl.md
index cf4ac55..6cde2e4 100644
--- a/website/_docs24/tutorial/acl.md
+++ b/website/_docs24/tutorial/acl.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title: Cube Permission (v2.1)
 categories: tutorial
 permalink: /docs24/tutorial/acl.html
diff --git a/website/_docs24/tutorial/create_cube.cn.md b/website/_docs24/tutorial/create_cube.cn.md
index be13162..2ba8dc8 100644
--- a/website/_docs24/tutorial/create_cube.cn.md
+++ b/website/_docs24/tutorial/create_cube.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  Cube 创建
 categories: 教程
 permalink: /cn/docs24/tutorial/create_cube.html
diff --git a/website/_docs24/tutorial/create_cube.md b/website/_docs24/tutorial/create_cube.md
index 588b1e5..381b68b 100644
--- a/website/_docs24/tutorial/create_cube.md
+++ b/website/_docs24/tutorial/create_cube.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Cube Wizard
 categories: tutorial
 permalink: /docs24/tutorial/create_cube.html
diff --git a/website/_docs24/tutorial/cube_build_job.cn.md b/website/_docs24/tutorial/cube_build_job.cn.md
index 8af1343..1fdc134 100644
--- a/website/_docs24/tutorial/cube_build_job.cn.md
+++ b/website/_docs24/tutorial/cube_build_job.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title: "Cube 构建和 Job 监控"
 categories: 教程
 permalink: /cn/docs24/tutorial/cube_build_job.html
diff --git a/website/_docs24/tutorial/cube_build_job.md b/website/_docs24/tutorial/cube_build_job.md
index 453a772..7825c50 100644
--- a/website/_docs24/tutorial/cube_build_job.md
+++ b/website/_docs24/tutorial/cube_build_job.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Cube Build and Job Monitoring
 categories: tutorial
 permalink: /docs24/tutorial/cube_build_job.html
diff --git a/website/_docs24/tutorial/cube_build_performance.cn.md b/website/_docs24/tutorial/cube_build_performance.cn.md
index b5eff35..d2d6b75 100644
--- a/website/_docs24/tutorial/cube_build_performance.cn.md
+++ b/website/_docs24/tutorial/cube_build_performance.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title: "优化 Cube 构建"
 categories: tutorial
 permalink: /cn/docs24/tutorial/cube_build_performance.html
diff --git a/website/_docs24/tutorial/cube_build_performance.md b/website/_docs24/tutorial/cube_build_performance.md
index e8e4e99..9152595 100644
--- a/website/_docs24/tutorial/cube_build_performance.md
+++ b/website/_docs24/tutorial/cube_build_performance.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title: Cube Build Tuning
 categories: tutorial
 permalink: /docs24/tutorial/cube_build_performance.html
diff --git a/website/_docs24/tutorial/cube_spark.cn.md b/website/_docs24/tutorial/cube_spark.cn.md
index 64c9095..c73c55d 100644
--- a/website/_docs24/tutorial/cube_spark.cn.md
+++ b/website/_docs24/tutorial/cube_spark.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "用 Spark 构建 Cube"
 categories: tutorial
 permalink: /cn/docs24/tutorial/cube_spark.html
diff --git a/website/_docs24/tutorial/cube_spark.md b/website/_docs24/tutorial/cube_spark.md
index 8b8459a..8bf8788 100644
--- a/website/_docs24/tutorial/cube_spark.md
+++ b/website/_docs24/tutorial/cube_spark.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Build Cube with Spark
 categories: tutorial
 permalink: /docs24/tutorial/cube_spark.html
diff --git a/website/_docs24/tutorial/cube_streaming.cn.md b/website/_docs24/tutorial/cube_streaming.cn.md
index e913364..df2bc1f 100644
--- a/website/_docs24/tutorial/cube_streaming.cn.md
+++ b/website/_docs24/tutorial/cube_streaming.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "从 Kafka 流构建 Cube"
 categories: tutorial
 permalink: /cn/docs24/tutorial/cube_streaming.html
diff --git a/website/_docs24/tutorial/cube_streaming.md b/website/_docs24/tutorial/cube_streaming.md
index 4eaf76b..a1685e2 100644
--- a/website/_docs24/tutorial/cube_streaming.md
+++ b/website/_docs24/tutorial/cube_streaming.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Scalable Cubing from Kafka
 categories: tutorial
 permalink: /docs24/tutorial/cube_streaming.html
diff --git a/website/_docs24/tutorial/flink.md b/website/_docs24/tutorial/flink.md
index 7e964e9..cd1daf2 100644
--- a/website/_docs24/tutorial/flink.md
+++ b/website/_docs24/tutorial/flink.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Apache Flink
 categories: tutorial
 permalink: /docs24/tutorial/flink.html
diff --git a/website/_docs24/tutorial/hue.md b/website/_docs24/tutorial/hue.md
index dd4b4a5..3134d89 100644
--- a/website/_docs24/tutorial/hue.md
+++ b/website/_docs24/tutorial/hue.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title: Hue
 categories: tutorial
 permalink: /docs24/tutorial/hue.html
diff --git a/website/_docs24/tutorial/jdbc.cn.md b/website/_docs24/tutorial/jdbc.cn.md
index d00e44f..4eda359 100644
--- a/website/_docs24/tutorial/jdbc.cn.md
+++ b/website/_docs24/tutorial/jdbc.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "JDBC 驱动"
 categories: 教程
 permalink: /cn/docs24/tutorial/jdbc.html
diff --git a/website/_docs24/tutorial/jdbc.md b/website/_docs24/tutorial/jdbc.md
index eb9bb63..2c032be 100644
--- a/website/_docs24/tutorial/jdbc.md
+++ b/website/_docs24/tutorial/jdbc.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Kylin JDBC Driver
 categories: tutorial
 permalink: /docs24/tutorial/jdbc.html
diff --git a/website/_docs24/tutorial/kylin_client_tool.cn.md b/website/_docs24/tutorial/kylin_client_tool.cn.md
index 9725db9..90ad7b7 100644
--- a/website/_docs24/tutorial/kylin_client_tool.cn.md
+++ b/website/_docs24/tutorial/kylin_client_tool.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "Python 客户端"
 categories: 教程
 permalink: /cn/docs24/tutorial/kylin_client_tool.html
diff --git a/website/_docs24/tutorial/kylin_client_tool.md b/website/_docs24/tutorial/kylin_client_tool.md
index af90644..2730d79 100644
--- a/website/_docs24/tutorial/kylin_client_tool.md
+++ b/website/_docs24/tutorial/kylin_client_tool.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Kylin Python Client
 categories: tutorial
 permalink: /docs24/tutorial/kylin_client_tool.html
diff --git a/website/_docs24/tutorial/kylin_sample.cn.md b/website/_docs24/tutorial/kylin_sample.cn.md
index 86b0060..a1717ae 100644
--- a/website/_docs24/tutorial/kylin_sample.cn.md
+++ b/website/_docs24/tutorial/kylin_sample.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "样例 Cube 快速入门"
 categories: tutorial
 permalink: /cn/docs24/tutorial/kylin_sample.html
diff --git a/website/_docs24/tutorial/kylin_sample.md b/website/_docs24/tutorial/kylin_sample.md
index db8607a..9ea3be3 100644
--- a/website/_docs24/tutorial/kylin_sample.md
+++ b/website/_docs24/tutorial/kylin_sample.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Quick Start with Sample Cube
 categories: tutorial
 permalink: /docs24/tutorial/kylin_sample.html
diff --git a/website/_docs24/tutorial/microstrategy.md b/website/_docs24/tutorial/microstrategy.md
index deff988..bda1d47 100644
--- a/website/_docs24/tutorial/microstrategy.md
+++ b/website/_docs24/tutorial/microstrategy.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  MicroStrategy
 categories: tutorial
 permalink: /docs24/tutorial/microstrategy.html
diff --git a/website/_docs24/tutorial/odbc.cn.md b/website/_docs24/tutorial/odbc.cn.md
index bab5331..f584fea 100644
--- a/website/_docs24/tutorial/odbc.cn.md
+++ b/website/_docs24/tutorial/odbc.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "ODBC 驱动"
 categories: 教程
 permalink: /cn/docs24/tutorial/odbc.html
diff --git a/website/_docs24/tutorial/odbc.md b/website/_docs24/tutorial/odbc.md
index 826aff9..9234851 100644
--- a/website/_docs24/tutorial/odbc.md
+++ b/website/_docs24/tutorial/odbc.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Kylin ODBC Driver
 categories: tutorial
 permalink: /docs24/tutorial/odbc.html
diff --git a/website/_docs24/tutorial/powerbi.cn.md b/website/_docs24/tutorial/powerbi.cn.md
index 404808c..5fcc6e7 100644
--- a/website/_docs24/tutorial/powerbi.cn.md
+++ b/website/_docs24/tutorial/powerbi.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "Excel 及 Power BI 教程"
 categories: tutorial
 permalink: /cn/docs24/tutorial/powerbi.html
diff --git a/website/_docs24/tutorial/powerbi.md b/website/_docs24/tutorial/powerbi.md
index 0d470a3..c2cc8d3 100644
--- a/website/_docs24/tutorial/powerbi.md
+++ b/website/_docs24/tutorial/powerbi.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  MS Excel and Power BI
 categories: tutorial
 permalink: /docs24/tutorial/powerbi.html
diff --git a/website/_docs24/tutorial/project_level_acl.cn.md b/website/_docs24/tutorial/project_level_acl.cn.md
index bb9b457..3d653d3 100644
--- a/website/_docs24/tutorial/project_level_acl.cn.md
+++ b/website/_docs24/tutorial/project_level_acl.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title: Project Level ACL
 categories: tutorial
 permalink: /cn/docs24/tutorial/project_level_acl.html
diff --git a/website/_docs24/tutorial/project_level_acl.md b/website/_docs24/tutorial/project_level_acl.md
index e2f4a79..83e6712 100644
--- a/website/_docs24/tutorial/project_level_acl.md
+++ b/website/_docs24/tutorial/project_level_acl.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title: Project Level ACL
 categories: tutorial
 permalink: /docs24/tutorial/project_level_acl.html
diff --git a/website/_docs24/tutorial/query_pushdown.cn.md b/website/_docs24/tutorial/query_pushdown.cn.md
index 2aee730..c8b5a46 100644
--- a/website/_docs24/tutorial/query_pushdown.cn.md
+++ b/website/_docs24/tutorial/query_pushdown.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  查询下压
 categories: tutorial
 permalink: /cn/docs24/tutorial/query_pushdown.html
diff --git a/website/_docs24/tutorial/query_pushdown.md b/website/_docs24/tutorial/query_pushdown.md
index 480b38e..6e7a066 100644
--- a/website/_docs24/tutorial/query_pushdown.md
+++ b/website/_docs24/tutorial/query_pushdown.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Enable Query Pushdown
 categories: tutorial
 permalink: /docs24/tutorial/query_pushdown.html
diff --git a/website/_docs24/tutorial/setup_jdbc_datasource.cn.md b/website/_docs24/tutorial/setup_jdbc_datasource.cn.md
index 918b0d0..c1afe04 100644
--- a/website/_docs24/tutorial/setup_jdbc_datasource.cn.md
+++ b/website/_docs24/tutorial/setup_jdbc_datasource.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  建立 JDBC 数据源
 categories: howto
 permalink: /cn/docs24/tutorial/setup_jdbc_datasource.html
diff --git a/website/_docs24/tutorial/setup_jdbc_datasource.md b/website/_docs24/tutorial/setup_jdbc_datasource.md
index 6cc4f0b..9c6d511 100644
--- a/website/_docs24/tutorial/setup_jdbc_datasource.md
+++ b/website/_docs24/tutorial/setup_jdbc_datasource.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Setup JDBC Data Source
 categories: howto
 permalink: /docs24/tutorial/setup_jdbc_datasource.html
diff --git a/website/_docs24/tutorial/setup_systemcube.cn.md b/website/_docs24/tutorial/setup_systemcube.cn.md
index 8f681a2..6c3b782 100644
--- a/website/_docs24/tutorial/setup_systemcube.cn.md
+++ b/website/_docs24/tutorial/setup_systemcube.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  建立系统 Cube
 categories: tutorial
 permalink: /cn/docs24/tutorial/setup_systemcube.html
diff --git a/website/_docs24/tutorial/setup_systemcube.md b/website/_docs24/tutorial/setup_systemcube.md
index 09df52d..8c3e364 100644
--- a/website/_docs24/tutorial/setup_systemcube.md
+++ b/website/_docs24/tutorial/setup_systemcube.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Set Up System Cube
 categories: tutorial
 permalink: /docs24/tutorial/setup_systemcube.html
diff --git a/website/_docs24/tutorial/spark.cn.md b/website/_docs24/tutorial/spark.cn.md
index 1bd1b27..0147cc5 100644
--- a/website/_docs24/tutorial/spark.cn.md
+++ b/website/_docs24/tutorial/spark.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  Apache Spark
 categories: tutorial
 permalink: /cn/docs24/tutorial/spark.html
diff --git a/website/_docs24/tutorial/spark.md b/website/_docs24/tutorial/spark.md
index 1ddff02..2742244 100644
--- a/website/_docs24/tutorial/spark.md
+++ b/website/_docs24/tutorial/spark.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Apache Spark
 categories: tutorial
 permalink: /docs24/tutorial/spark.html
diff --git a/website/_docs24/tutorial/squirrel.cn.md b/website/_docs24/tutorial/squirrel.cn.md
index dc89138..b43422f 100644
--- a/website/_docs24/tutorial/squirrel.cn.md
+++ b/website/_docs24/tutorial/squirrel.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  SQuirreL
 categories: tutorial
 permalink: /cn/docs24/tutorial/squirrel.html
diff --git a/website/_docs24/tutorial/squirrel.md b/website/_docs24/tutorial/squirrel.md
index e9ebeaf..65c8041 100644
--- a/website/_docs24/tutorial/squirrel.md
+++ b/website/_docs24/tutorial/squirrel.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  SQuirreL
 categories: tutorial
 permalink: /docs24/tutorial/squirrel.html
diff --git a/website/_docs24/tutorial/superset.cn.md b/website/_docs24/tutorial/superset.cn.md
index c2f403d..b1dd81f 100644
--- a/website/_docs24/tutorial/superset.cn.md
+++ b/website/_docs24/tutorial/superset.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  "Superset"
 categories: tutorial
 permalink: /cn/docs24/tutorial/superset.html
diff --git a/website/_docs24/tutorial/superset.md b/website/_docs24/tutorial/superset.md
index 7903944..00138c4 100644
--- a/website/_docs24/tutorial/superset.md
+++ b/website/_docs24/tutorial/superset.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  "Superset"
 categories: tutorial
 permalink: /docs24/tutorial/superset.html
diff --git a/website/_docs24/tutorial/tableau.cn.md b/website/_docs24/tutorial/tableau.cn.md
index f13043a..881152a 100644
--- a/website/_docs24/tutorial/tableau.cn.md
+++ b/website/_docs24/tutorial/tableau.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  Tableau 8
 categories: 教程
 permalink: /cn/docs24/tutorial/tableau.html
diff --git a/website/_docs24/tutorial/tableau.md b/website/_docs24/tutorial/tableau.md
index ad49c38..e10d3ee 100644
--- a/website/_docs24/tutorial/tableau.md
+++ b/website/_docs24/tutorial/tableau.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Tableau 8
 categories: tutorial
 permalink: /docs24/tutorial/tableau.html
diff --git a/website/_docs24/tutorial/tableau_91.cn.md b/website/_docs24/tutorial/tableau_91.cn.md
index 0850cec..015b6a2 100644
--- a/website/_docs24/tutorial/tableau_91.cn.md
+++ b/website/_docs24/tutorial/tableau_91.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  Tableau 9 
 categories: tutorial
 permalink: /cn/docs24/tutorial/tableau_91.html
diff --git a/website/_docs24/tutorial/tableau_91.md b/website/_docs24/tutorial/tableau_91.md
index e3f4708..445bb19 100644
--- a/website/_docs24/tutorial/tableau_91.md
+++ b/website/_docs24/tutorial/tableau_91.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Tableau 9
 categories: tutorial
 permalink: /docs24/tutorial/tableau_91.html
diff --git a/website/_docs24/tutorial/use_cube_planner.cn.md b/website/_docs24/tutorial/use_cube_planner.cn.md
index 9e4bc97..e9662b1 100644
--- a/website/_docs24/tutorial/use_cube_planner.cn.md
+++ b/website/_docs24/tutorial/use_cube_planner.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  使用 Cube Planner
 categories: tutorial
 permalink: /cn/docs24/tutorial/use_cube_planner.html
diff --git a/website/_docs24/tutorial/use_cube_planner.md b/website/_docs24/tutorial/use_cube_planner.md
index 2b05495..a28067e 100644
--- a/website/_docs24/tutorial/use_cube_planner.md
+++ b/website/_docs24/tutorial/use_cube_planner.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Use Cube Planner
 categories: tutorial
 permalink: /docs24/tutorial/use_cube_planner.html
diff --git a/website/_docs24/tutorial/use_dashboard.cn.md b/website/_docs24/tutorial/use_dashboard.cn.md
index e4d1a17..32d044c 100644
--- a/website/_docs24/tutorial/use_dashboard.cn.md
+++ b/website/_docs24/tutorial/use_dashboard.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  使用 Dashboard
 categories: tutorial
 permalink: /cn/docs24/tutorial/use_dashboard.html
diff --git a/website/_docs24/tutorial/use_dashboard.md b/website/_docs24/tutorial/use_dashboard.md
index 54acbd4..6a6d962 100644
--- a/website/_docs24/tutorial/use_dashboard.md
+++ b/website/_docs24/tutorial/use_dashboard.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Use Dashboard
 categories: tutorial
 permalink: /docs24/tutorial/use_dashboard.html
diff --git a/website/_docs24/tutorial/web.cn.md b/website/_docs24/tutorial/web.cn.md
index d2e44a0..e4a3a53 100644
--- a/website/_docs24/tutorial/web.cn.md
+++ b/website/_docs24/tutorial/web.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs24-cn
 title:  Web 界面
 categories: 教程
 permalink: /cn/docs24/tutorial/web.html
diff --git a/website/_docs24/tutorial/web.md b/website/_docs24/tutorial/web.md
index d0a5599..bc60acf 100644
--- a/website/_docs24/tutorial/web.md
+++ b/website/_docs24/tutorial/web.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs24
 title:  Web Interface
 categories: tutorial
 permalink: /docs24/tutorial/web.html
diff --git a/website/_docs30/gettingstarted/best_practices.md b/website/_docs30/gettingstarted/best_practices.md
index 82bc3ac..09dcdb7 100644
--- a/website/_docs30/gettingstarted/best_practices.md
+++ b/website/_docs30/gettingstarted/best_practices.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Community Best Practices"
 categories: gettingstarted
 permalink: /docs30/gettingstarted/best_practices.html
diff --git a/website/_docs30/gettingstarted/concepts.md b/website/_docs30/gettingstarted/concepts.md
index 66df244..6cbb7ee 100644
--- a/website/_docs30/gettingstarted/concepts.md
+++ b/website/_docs30/gettingstarted/concepts.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Technical Concepts"
 categories: gettingstarted
 permalink: /docs30/gettingstarted/concepts.html
diff --git a/website/_docs30/gettingstarted/events.md b/website/_docs30/gettingstarted/events.md
index 186a6d3..7c151a8 100644
--- a/website/_docs30/gettingstarted/events.md
+++ b/website/_docs30/gettingstarted/events.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Events and Conferences"
 categories: gettingstarted
 permalink: /docs30/gettingstarted/events.html
diff --git a/website/_docs30/gettingstarted/faq.cn.md b/website/_docs30/gettingstarted/faq.cn.md
index 32d5b99..293050f 100644
--- a/website/_docs30/gettingstarted/faq.cn.md
+++ b/website/_docs30/gettingstarted/faq.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  常见问题
 categories: 开始
 permalink: /cn/docs30/gettingstarted/faq.html
diff --git a/website/_docs30/gettingstarted/faq.md b/website/_docs30/gettingstarted/faq.md
index 1d6d4da..feced26 100644
--- a/website/_docs30/gettingstarted/faq.md
+++ b/website/_docs30/gettingstarted/faq.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "FAQ"
 categories: gettingstarted
 permalink: /docs30/gettingstarted/faq.html
diff --git a/website/_docs30/gettingstarted/terminology.md b/website/_docs30/gettingstarted/terminology.md
index 7354899..aa6b0f1 100644
--- a/website/_docs30/gettingstarted/terminology.md
+++ b/website/_docs30/gettingstarted/terminology.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Terminology"
 categories: gettingstarted
 permalink: /docs30/gettingstarted/terminology.html
diff --git a/website/_docs30/howto/howto_backup_metadata.cn.md b/website/_docs30/howto/howto_backup_metadata.cn.md
index 2dd1557..2405ba0 100644
--- a/website/_docs30/howto/howto_backup_metadata.cn.md
+++ b/website/_docs30/howto/howto_backup_metadata.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  备份元数据
 categories: 帮助
 permalink: /cn/docs30/howto/howto_backup_metadata.html
diff --git a/website/_docs30/howto/howto_backup_metadata.md b/website/_docs30/howto/howto_backup_metadata.md
index 8224ff3..20d8a3e 100644
--- a/website/_docs30/howto/howto_backup_metadata.md
+++ b/website/_docs30/howto/howto_backup_metadata.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Backup Metadata
 categories: howto
 permalink: /docs30/howto/howto_backup_metadata.html
diff --git a/website/_docs30/howto/howto_build_cube_with_restapi.cn.md b/website/_docs30/howto/howto_build_cube_with_restapi.cn.md
index e216b97..f8428ba 100644
--- a/website/_docs30/howto/howto_build_cube_with_restapi.cn.md
+++ b/website/_docs30/howto/howto_build_cube_with_restapi.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  用 API 构建 Cube
 categories: 帮助
 permalink: /cn/docs30/howto/howto_build_cube_with_restapi.html
diff --git a/website/_docs30/howto/howto_build_cube_with_restapi.md b/website/_docs30/howto/howto_build_cube_with_restapi.md
index 8996fd8..9e1f7a6 100644
--- a/website/_docs30/howto/howto_build_cube_with_restapi.md
+++ b/website/_docs30/howto/howto_build_cube_with_restapi.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Build Cube with API
 categories: howto
 permalink: /docs30/howto/howto_build_cube_with_restapi.html
diff --git a/website/_docs30/howto/howto_cleanup_storage.cn.md b/website/_docs30/howto/howto_cleanup_storage.cn.md
index 96661b4..c05ea63 100644
--- a/website/_docs30/howto/howto_cleanup_storage.cn.md
+++ b/website/_docs30/howto/howto_cleanup_storage.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  清理存储
 categories: 帮助
 permalink: /cn/docs30/howto/howto_cleanup_storage.html
diff --git a/website/_docs30/howto/howto_cleanup_storage.md b/website/_docs30/howto/howto_cleanup_storage.md
index 01c9713..68db6d8 100644
--- a/website/_docs30/howto/howto_cleanup_storage.md
+++ b/website/_docs30/howto/howto_cleanup_storage.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Cleanup Storage
 categories: howto
 permalink: /docs30/howto/howto_cleanup_storage.html
diff --git a/website/_docs30/howto/howto_enable_zookeeper_acl.md b/website/_docs30/howto/howto_enable_zookeeper_acl.md
index a2b035d..8aece8b 100644
--- a/website/_docs30/howto/howto_enable_zookeeper_acl.md
+++ b/website/_docs30/howto/howto_enable_zookeeper_acl.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Enable Zookeeper ACL
 categories: howto
 permalink: /docs30/howto/howto_enable_zookeeper_acl.html
diff --git a/website/_docs30/howto/howto_install_ranger_kylin_plugin.md b/website/_docs30/howto/howto_install_ranger_kylin_plugin.md
index 538a385..3405282 100644
--- a/website/_docs30/howto/howto_install_ranger_kylin_plugin.md
+++ b/website/_docs30/howto/howto_install_ranger_kylin_plugin.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Install Ranger Plugin
 categories: howto
 permalink: /docs30/howto/howto_install_ranger_kylin_plugin.html
diff --git a/website/_docs30/howto/howto_jdbc.cn.md b/website/_docs30/howto/howto_jdbc.cn.md
index ebe5496..51602c5 100644
--- a/website/_docs30/howto/howto_jdbc.cn.md
+++ b/website/_docs30/howto/howto_jdbc.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  Kylin JDBC Driver
 categories: 帮助
 permalink: /cn/docs30/howto/howto_jdbc.html
diff --git a/website/_docs30/howto/howto_jdbc.md b/website/_docs30/howto/howto_jdbc.md
index 7a84bc7..8734c31 100644
--- a/website/_docs30/howto/howto_jdbc.md
+++ b/website/_docs30/howto/howto_jdbc.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  JDBC Driver
 categories: howto
 permalink: /docs30/howto/howto_jdbc.html
diff --git a/website/_docs30/howto/howto_ldap_and_sso.md b/website/_docs30/howto/howto_ldap_and_sso.md
index facb65d..8f2efcb 100644
--- a/website/_docs30/howto/howto_ldap_and_sso.md
+++ b/website/_docs30/howto/howto_ldap_and_sso.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title: Secure with LDAP and SSO
 categories: howto
 permalink: /docs30/howto/howto_ldap_and_sso.html
diff --git a/website/_docs30/howto/howto_optimize_build.cn.md b/website/_docs30/howto/howto_optimize_build.cn.md
index 3d5028b..b027a0e 100644
--- a/website/_docs30/howto/howto_optimize_build.cn.md
+++ b/website/_docs30/howto/howto_optimize_build.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  优化 Cube 构建
 categories: 帮助
 permalink: /cn/docs30/howto/howto_optimize_build.html
diff --git a/website/_docs30/howto/howto_optimize_build.md b/website/_docs30/howto/howto_optimize_build.md
index 231fe34..3029033 100644
--- a/website/_docs30/howto/howto_optimize_build.md
+++ b/website/_docs30/howto/howto_optimize_build.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Optimize Cube Build
 categories: howto
 permalink: /docs30/howto/howto_optimize_build.html
diff --git a/website/_docs30/howto/howto_optimize_cubes.cn.md b/website/_docs30/howto/howto_optimize_cubes.cn.md
index c40ad67..ea3800a 100644
--- a/website/_docs30/howto/howto_optimize_cubes.cn.md
+++ b/website/_docs30/howto/howto_optimize_cubes.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  优化 Cube 设计
 categories: howto
 permalink: /cn/docs30/howto/howto_optimize_cubes.html
diff --git a/website/_docs30/howto/howto_optimize_cubes.md b/website/_docs30/howto/howto_optimize_cubes.md
index 1cd2742..9bcd47a 100644
--- a/website/_docs30/howto/howto_optimize_cubes.md
+++ b/website/_docs30/howto/howto_optimize_cubes.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Optimize Cube Design
 categories: howto
 permalink: /docs30/howto/howto_optimize_cubes.html
diff --git a/website/_docs30/howto/howto_update_coprocessor.md b/website/_docs30/howto/howto_update_coprocessor.md
index 7b880fd..9121fec 100644
--- a/website/_docs30/howto/howto_update_coprocessor.md
+++ b/website/_docs30/howto/howto_update_coprocessor.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Update Coprocessor
 categories: howto
 permalink: /docs30/howto/howto_update_coprocessor.html
diff --git a/website/_docs30/howto/howto_upgrade.md b/website/_docs30/howto/howto_upgrade.md
index ba25b98..d5cd273 100644
--- a/website/_docs30/howto/howto_upgrade.md
+++ b/website/_docs30/howto/howto_upgrade.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Upgrade From Old Versions
 categories: howto
 permalink: /docs30/howto/howto_upgrade.html
diff --git a/website/_docs30/howto/howto_use_beeline.md b/website/_docs30/howto/howto_use_beeline.md
index 854e8ab..4ff1d93 100644
--- a/website/_docs30/howto/howto_use_beeline.md
+++ b/website/_docs30/howto/howto_use_beeline.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Use Beeline for Hive
 categories: howto
 permalink: /docs30/howto/howto_use_beeline.html
diff --git a/website/_docs30/howto/howto_use_cli.cn.md b/website/_docs30/howto/howto_use_cli.cn.md
index fa66e40..3afbbfa 100644
--- a/website/_docs30/howto/howto_use_cli.cn.md
+++ b/website/_docs30/howto/howto_use_cli.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "实用 CLI 工具"
 categories: howto
 permalink: /cn/docs30/howto/howto_use_cli.html
diff --git a/website/_docs30/howto/howto_use_cli.md b/website/_docs30/howto/howto_use_cli.md
index 56310da..1b5deb0 100644
--- a/website/_docs30/howto/howto_use_cli.md
+++ b/website/_docs30/howto/howto_use_cli.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Use Utility CLIs
 categories: howto
 permalink: /docs30/howto/howto_use_cli.html
diff --git a/website/_docs30/howto/howto_use_distributed_scheduler.md b/website/_docs30/howto/howto_use_distributed_scheduler.md
index 89af65e..a24eb25 100644
--- a/website/_docs30/howto/howto_use_distributed_scheduler.md
+++ b/website/_docs30/howto/howto_use_distributed_scheduler.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Use distributed job scheduler
 categories: howto
 permalink: /docs30/howto/howto_use_distributed_scheduler.html
diff --git a/website/_docs30/howto/howto_use_restapi.cn.md b/website/_docs30/howto/howto_use_restapi.cn.md
index 52f6587..a3a36e7 100644
--- a/website/_docs30/howto/howto_use_restapi.cn.md
+++ b/website/_docs30/howto/howto_use_restapi.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  RESTful API
 categories: howto
 permalink: /cn/docs30/howto/howto_use_restapi.html
diff --git a/website/_docs30/howto/howto_use_restapi.md b/website/_docs30/howto/howto_use_restapi.md
index f924ca0..a8d12cf 100644
--- a/website/_docs30/howto/howto_use_restapi.md
+++ b/website/_docs30/howto/howto_use_restapi.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Use RESTful API
 categories: howto
 permalink: /docs30/howto/howto_use_restapi.html
diff --git a/website/_docs30/howto/howto_use_restapi_in_js.md b/website/_docs30/howto/howto_use_restapi_in_js.md
index d38670f..76bc898 100644
--- a/website/_docs30/howto/howto_use_restapi_in_js.md
+++ b/website/_docs30/howto/howto_use_restapi_in_js.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Use RESTful API in Javascript
 categories: howto
 permalink: /docs30/howto/howto_use_restapi_in_js.html
diff --git a/website/_docs30/index.cn.md b/website/_docs30/index.cn.md
index 4a1e1ea..eb28ac3 100644
--- a/website/_docs30/index.cn.md
+++ b/website/_docs30/index.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title: 概述
 categories: docs
 permalink: /cn/docs30/index.html
diff --git a/website/_docs30/index.md b/website/_docs30/index.md
index 2e65a32..86b3e5a 100644
--- a/website/_docs30/index.md
+++ b/website/_docs30/index.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title: Overview
 categories: docs
 permalink: /docs30/index.html
diff --git a/website/_docs30/install/advance_settings.cn.md b/website/_docs30/install/advance_settings.cn.md
index 0adc4f0..c5e1451 100644
--- a/website/_docs30/install/advance_settings.cn.md
+++ b/website/_docs30/install/advance_settings.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title: "高级设置"
 categories: install
 permalink: /cn/docs30/install/advance_settings.html
diff --git a/website/_docs30/install/advance_settings.md b/website/_docs30/install/advance_settings.md
index f86328d..8398de8 100644
--- a/website/_docs30/install/advance_settings.md
+++ b/website/_docs30/install/advance_settings.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Advanced Settings"
 categories: install
 permalink: /docs30/install/advance_settings.html
diff --git a/website/_docs30/install/configuration.cn.md b/website/_docs30/install/configuration.cn.md
index 499d685..2102fcd 100644
--- a/website/_docs30/install/configuration.cn.md
+++ b/website/_docs30/install/configuration.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "Kylin 配置"
 categories: install
 permalink: /cn/docs30/install/configuration.html
diff --git a/website/_docs30/install/configuration.md b/website/_docs30/install/configuration.md
index e03f531..66ea445 100644
--- a/website/_docs30/install/configuration.md
+++ b/website/_docs30/install/configuration.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Kylin Configuration"
 categories: install
 permalink: /docs30/install/configuration.html
diff --git a/website/_docs30/install/index.cn.md b/website/_docs30/install/index.cn.md
index 6db36bb..15d278f 100644
--- a/website/_docs30/install/index.cn.md
+++ b/website/_docs30/install/index.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "安装指南"
 categories: install
 permalink: /cn/docs30/install/index.html
diff --git a/website/_docs30/install/index.md b/website/_docs30/install/index.md
index 5b81fb5..d968ce1 100644
--- a/website/_docs30/install/index.md
+++ b/website/_docs30/install/index.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Installation Guide"
 categories: install
 permalink: /docs30/install/index.html
diff --git a/website/_docs30/install/kylin_aws_emr.cn.md b/website/_docs30/install/kylin_aws_emr.cn.md
index 1839f98..65ba9ba 100644
--- a/website/_docs30/install/kylin_aws_emr.cn.md
+++ b/website/_docs30/install/kylin_aws_emr.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "在 AWS EMR 上安装 Kylin"
 categories: install
 permalink: /cn/docs30/install/kylin_aws_emr.html
diff --git a/website/_docs30/install/kylin_aws_emr.md b/website/_docs30/install/kylin_aws_emr.md
index eff20da..bcf9ac9 100644
--- a/website/_docs30/install/kylin_aws_emr.md
+++ b/website/_docs30/install/kylin_aws_emr.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Install Kylin on AWS EMR"
 categories: install
 permalink: /docs30/install/kylin_aws_emr.html
diff --git a/website/_docs30/install/kylin_cluster.cn.md b/website/_docs30/install/kylin_cluster.cn.md
index 62219c0..1b44094 100644
--- a/website/_docs30/install/kylin_cluster.cn.md
+++ b/website/_docs30/install/kylin_cluster.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "集群模式部署"
 categories: install
 permalink: /cn/docs30/install/kylin_cluster.html
diff --git a/website/_docs30/install/kylin_cluster.md b/website/_docs30/install/kylin_cluster.md
index 1363c18..98fb55b 100644
--- a/website/_docs30/install/kylin_cluster.md
+++ b/website/_docs30/install/kylin_cluster.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Deploy in Cluster Mode"
 categories: install
 permalink: /docs30/install/kylin_cluster.html
diff --git a/website/_docs30/install/kylin_docker.cn.md b/website/_docs30/install/kylin_docker.cn.md
index 5939bd6..662b269 100644
--- a/website/_docs30/install/kylin_docker.cn.md
+++ b/website/_docs30/install/kylin_docker.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "用 Docker 运行 Kylin"
 categories: install
 permalink: /cn/docs30/install/kylin_docker.html
diff --git a/website/_docs30/install/kylin_docker.md b/website/_docs30/install/kylin_docker.md
index 6a3c7c6..b61e43a 100644
--- a/website/_docs30/install/kylin_docker.md
+++ b/website/_docs30/install/kylin_docker.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Run Kylin with Docker"
 categories: install
 permalink: /docs30/install/kylin_docker.html
diff --git a/website/_docs30/release_notes.md b/website/_docs30/release_notes.md
index 441cf15..3f0bdd1 100644
--- a/website/_docs30/release_notes.md
+++ b/website/_docs30/release_notes.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Release Notes
 categories: gettingstarted
 permalink: /docs30/release_notes.html
diff --git a/website/_docs30/tutorial/Qlik.cn.md b/website/_docs30/tutorial/Qlik.cn.md
index c6fef70..b8237b0 100644
--- a/website/_docs30/tutorial/Qlik.cn.md
+++ b/website/_docs30/tutorial/Qlik.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  Qlik Sense 集成
 categories: tutorial
 permalink: /cn/docs30/tutorial/Qlik.html
diff --git a/website/_docs30/tutorial/Qlik.md b/website/_docs30/tutorial/Qlik.md
index 3163ef2..ef172e3 100644
--- a/website/_docs30/tutorial/Qlik.md
+++ b/website/_docs30/tutorial/Qlik.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title: Qlik Sense
 categories: tutorial
 permalink: /docs30/tutorial/Qlik.html
diff --git a/website/_docs30/tutorial/acl.cn.md b/website/_docs30/tutorial/acl.cn.md
index 3730d6e..e8012c4 100644
--- a/website/_docs30/tutorial/acl.cn.md
+++ b/website/_docs30/tutorial/acl.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  Cube 权限授予(v2.1)
 categories: 教程
 permalink: /cn/docs30/tutorial/acl.html
diff --git a/website/_docs30/tutorial/acl.md b/website/_docs30/tutorial/acl.md
index c1792e2..599e0a0 100644
--- a/website/_docs30/tutorial/acl.md
+++ b/website/_docs30/tutorial/acl.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title: Cube Permission (v2.1)
 categories: tutorial
 permalink: /docs30/tutorial/acl.html
diff --git a/website/_docs30/tutorial/create_cube.cn.md b/website/_docs30/tutorial/create_cube.cn.md
index e0d3e8a..f3faa77 100644
--- a/website/_docs30/tutorial/create_cube.cn.md
+++ b/website/_docs30/tutorial/create_cube.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  Cube 创建
 categories: 教程
 permalink: /cn/docs30/tutorial/create_cube.html
diff --git a/website/_docs30/tutorial/create_cube.md b/website/_docs30/tutorial/create_cube.md
index f78c1b9..14ed2e2 100644
--- a/website/_docs30/tutorial/create_cube.md
+++ b/website/_docs30/tutorial/create_cube.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Cube Wizard
 categories: tutorial
 permalink: /docs30/tutorial/create_cube.html
diff --git a/website/_docs30/tutorial/cube_build_job.cn.md b/website/_docs30/tutorial/cube_build_job.cn.md
index 54ac43c..d4d8e8e 100644
--- a/website/_docs30/tutorial/cube_build_job.cn.md
+++ b/website/_docs30/tutorial/cube_build_job.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title: "Cube 构建和 Job 监控"
 categories: 教程
 permalink: /cn/docs30/tutorial/cube_build_job.html
diff --git a/website/_docs30/tutorial/cube_build_job.md b/website/_docs30/tutorial/cube_build_job.md
index 791a2a3..44a2975 100644
--- a/website/_docs30/tutorial/cube_build_job.md
+++ b/website/_docs30/tutorial/cube_build_job.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Cube Build and Job Monitoring
 categories: tutorial
 permalink: /docs30/tutorial/cube_build_job.html
diff --git a/website/_docs30/tutorial/cube_build_performance.cn.md b/website/_docs30/tutorial/cube_build_performance.cn.md
index e5a13d2..61766bc 100644
--- a/website/_docs30/tutorial/cube_build_performance.cn.md
+++ b/website/_docs30/tutorial/cube_build_performance.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title: "优化 Cube 构建"
 categories: tutorial
 permalink: /cn/docs30/tutorial/cube_build_performance.html
diff --git a/website/_docs30/tutorial/cube_build_performance.md b/website/_docs30/tutorial/cube_build_performance.md
index 7cbfdb2..a910e3d 100755
--- a/website/_docs30/tutorial/cube_build_performance.md
+++ b/website/_docs30/tutorial/cube_build_performance.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title: Cube Build Tuning
 categories: tutorial
 permalink: /docs30/tutorial/cube_build_performance.html
diff --git a/website/_docs30/tutorial/cube_spark.cn.md b/website/_docs30/tutorial/cube_spark.cn.md
index 2a95367..7379887 100644
--- a/website/_docs30/tutorial/cube_spark.cn.md
+++ b/website/_docs30/tutorial/cube_spark.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "用 Spark 构建 Cube"
 categories: tutorial
 permalink: /cn/docs30/tutorial/cube_spark.html
diff --git a/website/_docs30/tutorial/cube_spark.md b/website/_docs30/tutorial/cube_spark.md
index 44ea19c..da785b1 100644
--- a/website/_docs30/tutorial/cube_spark.md
+++ b/website/_docs30/tutorial/cube_spark.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Build Cube with Spark
 categories: tutorial
 permalink: /docs30/tutorial/cube_spark.html
diff --git a/website/_docs30/tutorial/cube_streaming.cn.md b/website/_docs30/tutorial/cube_streaming.cn.md
index e76b310..1a0863a 100644
--- a/website/_docs30/tutorial/cube_streaming.cn.md
+++ b/website/_docs30/tutorial/cube_streaming.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "从 Kafka 流构建 Cube"
 categories: tutorial
 permalink: /cn/docs30/tutorial/cube_streaming.html
diff --git a/website/_docs30/tutorial/cube_streaming.md b/website/_docs30/tutorial/cube_streaming.md
index 1b79c6e..b135139 100644
--- a/website/_docs30/tutorial/cube_streaming.md
+++ b/website/_docs30/tutorial/cube_streaming.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Scalable Cubing from Kafka
 categories: tutorial
 permalink: /docs30/tutorial/cube_streaming.html
diff --git a/website/_docs30/tutorial/flink.md b/website/_docs30/tutorial/flink.md
index 9002c0b..e2bee24 100644
--- a/website/_docs30/tutorial/flink.md
+++ b/website/_docs30/tutorial/flink.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Apache Flink
 categories: tutorial
 permalink: /docs30/tutorial/flink.html
diff --git a/website/_docs30/tutorial/hue.md b/website/_docs30/tutorial/hue.md
index 1ebd624..3c6b88b 100755
--- a/website/_docs30/tutorial/hue.md
+++ b/website/_docs30/tutorial/hue.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title: Hue
 categories: tutorial
 permalink: /docs30/tutorial/hue.html
diff --git a/website/_docs30/tutorial/hybrid.cn.md b/website/_docs30/tutorial/hybrid.cn.md
index 4836531..38a5034 100644
--- a/website/_docs30/tutorial/hybrid.cn.md
+++ b/website/_docs30/tutorial/hybrid.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  Hybrid 模型
 categories: 教程
 permalink: /cn/docs30/tutorial/hybrid.html
diff --git a/website/_docs30/tutorial/hybrid.md b/website/_docs30/tutorial/hybrid.md
index 1767318..4b0ef3a 100644
--- a/website/_docs30/tutorial/hybrid.md
+++ b/website/_docs30/tutorial/hybrid.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title: Hybrid Model
 categories: tutorial
 permalink: /docs30/tutorial/hybrid.html
diff --git a/website/_docs30/tutorial/jdbc.cn.md b/website/_docs30/tutorial/jdbc.cn.md
index 3687e18..2460cd2 100644
--- a/website/_docs30/tutorial/jdbc.cn.md
+++ b/website/_docs30/tutorial/jdbc.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "JDBC 驱动"
 categories: 教程
 permalink: /cn/docs30/tutorial/jdbc.html
diff --git a/website/_docs30/tutorial/jdbc.md b/website/_docs30/tutorial/jdbc.md
index 436eec1..74f4e5f 100644
--- a/website/_docs30/tutorial/jdbc.md
+++ b/website/_docs30/tutorial/jdbc.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Kylin JDBC Driver
 categories: tutorial
 permalink: /docs30/tutorial/jdbc.html
diff --git a/website/_docs30/tutorial/kylin_client_tool.cn.md b/website/_docs30/tutorial/kylin_client_tool.cn.md
index 9b39310..444243c 100644
--- a/website/_docs30/tutorial/kylin_client_tool.cn.md
+++ b/website/_docs30/tutorial/kylin_client_tool.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "Python 客户端"
 categories: 教程
 permalink: /cn/docs30/tutorial/kylin_client_tool.html
diff --git a/website/_docs30/tutorial/kylin_client_tool.md b/website/_docs30/tutorial/kylin_client_tool.md
index 6a4eb3d..63b2fc4 100644
--- a/website/_docs30/tutorial/kylin_client_tool.md
+++ b/website/_docs30/tutorial/kylin_client_tool.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Kylin Python Client
 categories: tutorial
 permalink: /docs30/tutorial/kylin_client_tool.html
diff --git a/website/_docs30/tutorial/kylin_sample.cn.md b/website/_docs30/tutorial/kylin_sample.cn.md
index 474ba56..996b68f 100644
--- a/website/_docs30/tutorial/kylin_sample.cn.md
+++ b/website/_docs30/tutorial/kylin_sample.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "样例 Cube 快速入门"
 categories: tutorial
 permalink: /cn/docs30/tutorial/kylin_sample.html
diff --git a/website/_docs30/tutorial/kylin_sample.md b/website/_docs30/tutorial/kylin_sample.md
index c31f0be..acbf04b 100644
--- a/website/_docs30/tutorial/kylin_sample.md
+++ b/website/_docs30/tutorial/kylin_sample.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Quick Start with Sample Cube
 categories: tutorial
 permalink: /docs30/tutorial/kylin_sample.html
diff --git a/website/_docs30/tutorial/microstrategy.md b/website/_docs30/tutorial/microstrategy.md
index eee6e84..2408daf 100644
--- a/website/_docs30/tutorial/microstrategy.md
+++ b/website/_docs30/tutorial/microstrategy.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  MicroStrategy
 categories: tutorial
 permalink: /docs30/tutorial/microstrategy.html
diff --git a/website/_docs30/tutorial/mysql_metastore.cn.md b/website/_docs30/tutorial/mysql_metastore.cn.md
index 6901396..7a536e5 100644
--- a/website/_docs30/tutorial/mysql_metastore.cn.md
+++ b/website/_docs30/tutorial/mysql_metastore.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  基于 MySQL 的 Metastore 配置
 categories: 教程
 permalink: /cn/docs30/tutorial/mysql_metastore.html
diff --git a/website/_docs30/tutorial/mysql_metastore.md b/website/_docs30/tutorial/mysql_metastore.md
index 7a26000..7bf8eb0 100644
--- a/website/_docs30/tutorial/mysql_metastore.md
+++ b/website/_docs30/tutorial/mysql_metastore.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Use MySQL as Metastore
 categories: tutorial
 permalink: /docs30/tutorial/mysql_metastore.html
diff --git a/website/_docs30/tutorial/odbc.cn.md b/website/_docs30/tutorial/odbc.cn.md
index 4539d07..e3f129d 100644
--- a/website/_docs30/tutorial/odbc.cn.md
+++ b/website/_docs30/tutorial/odbc.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "ODBC 驱动"
 categories: 教程
 permalink: /cn/docs30/tutorial/odbc.html
diff --git a/website/_docs30/tutorial/odbc.md b/website/_docs30/tutorial/odbc.md
index 1972c70..69acdef 100644
--- a/website/_docs30/tutorial/odbc.md
+++ b/website/_docs30/tutorial/odbc.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Kylin ODBC Driver
 categories: tutorial
 permalink: /docs30/tutorial/odbc.html
diff --git a/website/_docs30/tutorial/powerbi.cn.md b/website/_docs30/tutorial/powerbi.cn.md
index 5c4da7e..0e9bc0c 100644
--- a/website/_docs30/tutorial/powerbi.cn.md
+++ b/website/_docs30/tutorial/powerbi.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "Excel 及 Power BI 教程"
 categories: tutorial
 permalink: /cn/docs30/tutorial/powerbi.html
diff --git a/website/_docs30/tutorial/powerbi.md b/website/_docs30/tutorial/powerbi.md
index 1bfa6b4..da508fd 100644
--- a/website/_docs30/tutorial/powerbi.md
+++ b/website/_docs30/tutorial/powerbi.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  MS Excel and Power BI
 categories: tutorial
 permalink: /docs30/tutorial/powerbi.html
diff --git a/website/_docs30/tutorial/project_level_acl.cn.md b/website/_docs30/tutorial/project_level_acl.cn.md
index 002c1b9..eb06a6a 100644
--- a/website/_docs30/tutorial/project_level_acl.cn.md
+++ b/website/_docs30/tutorial/project_level_acl.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title: Project Level ACL
 categories: tutorial
 permalink: /cn/docs30/tutorial/project_level_acl.html
diff --git a/website/_docs30/tutorial/project_level_acl.md b/website/_docs30/tutorial/project_level_acl.md
index bf73961..805c2fe 100644
--- a/website/_docs30/tutorial/project_level_acl.md
+++ b/website/_docs30/tutorial/project_level_acl.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title: Project Level ACL
 categories: tutorial
 permalink: /docs30/tutorial/project_level_acl.html
diff --git a/website/_docs30/tutorial/query_pushdown.cn.md b/website/_docs30/tutorial/query_pushdown.cn.md
index 57903c4..38f6c39 100644
--- a/website/_docs30/tutorial/query_pushdown.cn.md
+++ b/website/_docs30/tutorial/query_pushdown.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  查询下压
 categories: tutorial
 permalink: /cn/docs30/tutorial/query_pushdown.html
diff --git a/website/_docs30/tutorial/query_pushdown.md b/website/_docs30/tutorial/query_pushdown.md
index 28ac2d6..66b0555 100644
--- a/website/_docs30/tutorial/query_pushdown.md
+++ b/website/_docs30/tutorial/query_pushdown.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Enable Query Pushdown
 categories: tutorial
 permalink: /docs30/tutorial/query_pushdown.html
diff --git a/website/_docs30/tutorial/real_time_olap.md b/website/_docs30/tutorial/real_time_olap.md
index fbd7634..21a79db 100644
--- a/website/_docs30/tutorial/real_time_olap.md
+++ b/website/_docs30/tutorial/real_time_olap.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Real-time OLAP
 categories: tutorial
 permalink: /docs30/tutorial/realtime_olap.html
diff --git a/website/_docs30/tutorial/setup_jdbc_datasource.cn.md b/website/_docs30/tutorial/setup_jdbc_datasource.cn.md
index c902515..0ab669c 100644
--- a/website/_docs30/tutorial/setup_jdbc_datasource.cn.md
+++ b/website/_docs30/tutorial/setup_jdbc_datasource.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  建立 JDBC 数据源
 categories: howto
 permalink: /cn/docs30/tutorial/setup_jdbc_datasource.html
diff --git a/website/_docs30/tutorial/setup_jdbc_datasource.md b/website/_docs30/tutorial/setup_jdbc_datasource.md
index 575e968..d800c53 100644
--- a/website/_docs30/tutorial/setup_jdbc_datasource.md
+++ b/website/_docs30/tutorial/setup_jdbc_datasource.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Setup JDBC Data Source
 categories: howto
 permalink: /docs30/tutorial/setup_jdbc_datasource.html
diff --git a/website/_docs30/tutorial/setup_systemcube.cn.md b/website/_docs30/tutorial/setup_systemcube.cn.md
index 6ff4b21..ad3dcd6 100644
--- a/website/_docs30/tutorial/setup_systemcube.cn.md
+++ b/website/_docs30/tutorial/setup_systemcube.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  建立系统 Cube
 categories: tutorial
 permalink: /cn/docs30/tutorial/setup_systemcube.html
diff --git a/website/_docs30/tutorial/setup_systemcube.md b/website/_docs30/tutorial/setup_systemcube.md
index 0670556..a8ffd4e 100644
--- a/website/_docs30/tutorial/setup_systemcube.md
+++ b/website/_docs30/tutorial/setup_systemcube.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Set Up System Cube
 categories: tutorial
 permalink: /docs30/tutorial/setup_systemcube.html
diff --git a/website/_docs30/tutorial/spark.cn.md b/website/_docs30/tutorial/spark.cn.md
index 755f977..dc46288 100644
--- a/website/_docs30/tutorial/spark.cn.md
+++ b/website/_docs30/tutorial/spark.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  Apache Spark
 categories: tutorial
 permalink: /cn/docs30/tutorial/spark.html
diff --git a/website/_docs30/tutorial/spark.md b/website/_docs30/tutorial/spark.md
index 0da34c3..3a89102 100644
--- a/website/_docs30/tutorial/spark.md
+++ b/website/_docs30/tutorial/spark.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Apache Spark
 categories: tutorial
 permalink: /docs30/tutorial/spark.html
diff --git a/website/_docs30/tutorial/sql_reference.cn.md b/website/_docs30/tutorial/sql_reference.cn.md
index 162493a..149523f 100644
--- a/website/_docs30/tutorial/sql_reference.cn.md
+++ b/website/_docs30/tutorial/sql_reference.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "SQL 快速参考"
 categories: tutorial
 permalink: /cn/docs30/tutorial/sql_reference.html
diff --git a/website/_docs30/tutorial/sql_reference.md b/website/_docs30/tutorial/sql_reference.md
index 96516f2..72143be 100644
--- a/website/_docs30/tutorial/sql_reference.md
+++ b/website/_docs30/tutorial/sql_reference.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  SQL Reference
 categories: tutorial
 permalink: /docs30/tutorial/sql_reference.html
diff --git a/website/_docs30/tutorial/squirrel.cn.md b/website/_docs30/tutorial/squirrel.cn.md
index fc015ef..5fb20d1 100644
--- a/website/_docs30/tutorial/squirrel.cn.md
+++ b/website/_docs30/tutorial/squirrel.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  SQuirreL
 categories: tutorial
 permalink: /cn/docs30/tutorial/squirrel.html
diff --git a/website/_docs30/tutorial/squirrel.md b/website/_docs30/tutorial/squirrel.md
index 2acb7e7..8eeb227 100644
--- a/website/_docs30/tutorial/squirrel.md
+++ b/website/_docs30/tutorial/squirrel.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  SQuirreL
 categories: tutorial
 permalink: /docs30/tutorial/squirrel.html
diff --git a/website/_docs30/tutorial/superset.cn.md b/website/_docs30/tutorial/superset.cn.md
index 334fb8d..eeb7dc8 100644
--- a/website/_docs30/tutorial/superset.cn.md
+++ b/website/_docs30/tutorial/superset.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  "Superset"
 categories: tutorial
 permalink: /cn/docs30/tutorial/superset.html
diff --git a/website/_docs30/tutorial/superset.md b/website/_docs30/tutorial/superset.md
index 0738350..e526e70 100644
--- a/website/_docs30/tutorial/superset.md
+++ b/website/_docs30/tutorial/superset.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  "Superset"
 categories: tutorial
 permalink: /docs30/tutorial/superset.html
diff --git a/website/_docs30/tutorial/tableau.cn.md b/website/_docs30/tutorial/tableau.cn.md
index bf4f070..d8f9a53 100644
--- a/website/_docs30/tutorial/tableau.cn.md
+++ b/website/_docs30/tutorial/tableau.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  Tableau 8
 categories: 教程
 permalink: /cn/docs30/tutorial/tableau.html
diff --git a/website/_docs30/tutorial/tableau.md b/website/_docs30/tutorial/tableau.md
index c2870a4..e4c465d 100644
--- a/website/_docs30/tutorial/tableau.md
+++ b/website/_docs30/tutorial/tableau.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Tableau 8
 categories: tutorial
 permalink: /docs30/tutorial/tableau.html
diff --git a/website/_docs30/tutorial/tableau_91.cn.md b/website/_docs30/tutorial/tableau_91.cn.md
index 7180142..348a2c0 100644
--- a/website/_docs30/tutorial/tableau_91.cn.md
+++ b/website/_docs30/tutorial/tableau_91.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  Tableau 9 
 categories: tutorial
 permalink: /cn/docs30/tutorial/tableau_91.html
diff --git a/website/_docs30/tutorial/tableau_91.md b/website/_docs30/tutorial/tableau_91.md
index de5750b..76a6395 100644
--- a/website/_docs30/tutorial/tableau_91.md
+++ b/website/_docs30/tutorial/tableau_91.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Tableau 9
 categories: tutorial
 permalink: /docs30/tutorial/tableau_91.html
diff --git a/website/_docs30/tutorial/use_cube_planner.cn.md b/website/_docs30/tutorial/use_cube_planner.cn.md
index bc1eae1..aacc640 100644
--- a/website/_docs30/tutorial/use_cube_planner.cn.md
+++ b/website/_docs30/tutorial/use_cube_planner.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  使用 Cube Planner
 categories: tutorial
 permalink: /cn/docs30/tutorial/use_cube_planner.html
diff --git a/website/_docs30/tutorial/use_cube_planner.md b/website/_docs30/tutorial/use_cube_planner.md
index dfe135f..ffea1ce 100644
--- a/website/_docs30/tutorial/use_cube_planner.md
+++ b/website/_docs30/tutorial/use_cube_planner.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Use Cube Planner
 categories: tutorial
 permalink: /docs30/tutorial/use_cube_planner.html
diff --git a/website/_docs30/tutorial/use_dashboard.cn.md b/website/_docs30/tutorial/use_dashboard.cn.md
index a4cc37e..b511787 100644
--- a/website/_docs30/tutorial/use_dashboard.cn.md
+++ b/website/_docs30/tutorial/use_dashboard.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  使用 Dashboard
 categories: tutorial
 permalink: /cn/docs30/tutorial/use_dashboard.html
diff --git a/website/_docs30/tutorial/use_dashboard.md b/website/_docs30/tutorial/use_dashboard.md
index 988830a..8395587 100644
--- a/website/_docs30/tutorial/use_dashboard.md
+++ b/website/_docs30/tutorial/use_dashboard.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Use Dashboard
 categories: tutorial
 permalink: /docs30/tutorial/use_dashboard.html
diff --git a/website/_docs30/tutorial/web.cn.md b/website/_docs30/tutorial/web.cn.md
index df5877f..07454e5 100644
--- a/website/_docs30/tutorial/web.cn.md
+++ b/website/_docs30/tutorial/web.cn.md
@@ -1,5 +1,5 @@
 ---
-layout: docs-cn
+layout: docs30-cn
 title:  Web 界面
 categories: 教程
 permalink: /cn/docs30/tutorial/web.html
diff --git a/website/_docs30/tutorial/web.md b/website/_docs30/tutorial/web.md
index d66d4fb..353d59d 100644
--- a/website/_docs30/tutorial/web.md
+++ b/website/_docs30/tutorial/web.md
@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: docs30
 title:  Web Interface
 categories: tutorial
 permalink: /docs30/tutorial/web.html
diff --git a/website/_includes/docs24_nav.cn.html b/website/_includes/docs24_nav.cn.html
new file mode 100644
index 0000000..aefd778
--- /dev/null
+++ b/website/_includes/docs24_nav.cn.html
@@ -0,0 +1,33 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<div class="col-md-4 col-lg-4 col-xs-12 col-sm-12 aside1 visible-sm visible-xs visible-md visible-lg" id="nside1" style="margin-top: 5em;float:right;">
+    <ul class="nav nav-pills nav-stacked">    
+    {% for section in site.data.docs24-cn %}
+    <li><a href="#{{ section | first }}" data-toggle="collapse" class="navtitle">{{ section.title }}</a></li>
+    <div class="collapse in">
+  	<div class="list-group" id="list1">
+    <ul>
+    {% include docs24_ul.cn.html items=section.docs %}
+        <ul>
+  </div>
+</div>
+    {% endfor %}
+
+    </ul>
+</div>
\ No newline at end of file
diff --git a/website/_includes/docs24_nav.html b/website/_includes/docs24_nav.html
new file mode 100644
index 0000000..9fcfe99
--- /dev/null
+++ b/website/_includes/docs24_nav.html
@@ -0,0 +1,33 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<div class="col-md-4 col-lg-4 col-xs-12 col-sm-12 aside1 visible-sm visible-xs visible-md visible-lg" id="nside1" style="margin-top: 5em;float:right;">
+    <ul class="nav nav-pills nav-stacked">
+    {% for section in site.data.docs24 %}
+    <li><a href="#{{ section | first }}" data-toggle="collapse" class="navtitle">{{ section.title }}</a></li>
+    <div class="collapse in">
+  	<div class="list-group" id="list1">
+    <ul>
+    {% include docs24_ul.html items=section.docs %}
+        <ul>
+  </div>
+</div>
+    {% endfor %}
+
+    </ul>
+</div>
diff --git a/website/_includes/docs24_ul.cn.html b/website/_includes/docs24_ul.cn.html
new file mode 100644
index 0000000..d2d3e8b
--- /dev/null
+++ b/website/_includes/docs24_ul.cn.html
@@ -0,0 +1,30 @@
+{% assign items = include.items %}
+
+
+
+{% for item in items %}
+
+  {% assign item_url = item | prepend:"/cn/docs24/" | append:".html" %}
+
+  {% if item_url == page.url %}
+    {% assign c = "current" %}
+  {% else %}
+    {% assign c = "" %}
+  {% endif %}
+
+
+
+  {% for p in site.docs24 %}
+    {% if p.url == item_url %}
+      <li class="navlist">
+        <a href="{{ p.url }}" class="list-group-item-lay pjaxlink ">{{p.title}}</a>
+      </li>      
+      {% break %}
+    {% endif %}
+  {% endfor %}
+
+{% endfor %}
+
+
+
+
diff --git a/website/_includes/docs24_ul.html b/website/_includes/docs24_ul.html
new file mode 100644
index 0000000..aec4a7e
--- /dev/null
+++ b/website/_includes/docs24_ul.html
@@ -0,0 +1,31 @@
+{% assign items = include.items %}
+
+
+
+{% for item in items %}
+
+  {% assign item_url = item | prepend:"/docs24/" | append:".html" %}
+      
+
+  {% if item_url == page.url %}
+    {% assign c = "current" %}
+  {% else %}
+    {% assign c = "" %}
+  {% endif %}
+
+
+
+  {% for p in site.docs24 %}
+    {% if p.url == item_url %}
+      <li class="navlist">
+        <a href="{{ p.url }}" class="list-group-item-lay pjaxlink">{{p.title}}</a>
+      </li>      
+      {% break %}
+    {% endif %}
+  {% endfor %}
+
+{% endfor %}
+
+
+
+
diff --git a/website/_includes/docs30_nav.cn.html b/website/_includes/docs30_nav.cn.html
new file mode 100644
index 0000000..f411e9b
--- /dev/null
+++ b/website/_includes/docs30_nav.cn.html
@@ -0,0 +1,33 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<div class="col-md-4 col-lg-4 col-xs-12 col-sm-12 aside1 visible-sm visible-xs visible-md visible-lg" id="nside1" style="margin-top: 5em;float:right;">
+    <ul class="nav nav-pills nav-stacked">    
+    {% for section in site.data.docs30-cn %}
+    <li><a href="#{{ section | first }}" data-toggle="collapse" id="navtitle">{{ section.title }}</a></li>
+    <div class="collapse in">
+  	<div class="list-group" id="list1">
+    <ul>
+    {% include docs30_ul.cn.html items=section.docs %}
+        <ul>
+  </div>
+</div>
+    {% endfor %}
+
+    </ul>
+</div>
\ No newline at end of file
diff --git a/website/_includes/docs30_nav.html b/website/_includes/docs30_nav.html
new file mode 100644
index 0000000..2349e02
--- /dev/null
+++ b/website/_includes/docs30_nav.html
@@ -0,0 +1,33 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<div class="col-md-4 col-lg-4 col-xs-12 col-sm-12 aside1 visible-sm visible-xs visible-md visible-lg" id="nside1" style="margin-top: 5em;float:right;">
+    <ul class="nav nav-pills nav-stacked">
+    {% for section in site.data.docs30 %}
+    <li><a href="#{{ section | first }}" data-toggle="collapse" id="navtitle">{{ section.title }}</a></li>
+    <div class="collapse in">
+  	<div class="list-group" id="list1">
+    <ul>
+    {% include docs30_ul.html items=section.docs %}
+        <ul>
+  </div>
+</div>
+    {% endfor %}
+
+    </ul>
+</div>
diff --git a/website/_includes/docs30_ul.cn.html b/website/_includes/docs30_ul.cn.html
new file mode 100644
index 0000000..23624cb
--- /dev/null
+++ b/website/_includes/docs30_ul.cn.html
@@ -0,0 +1,30 @@
+{% assign items = include.items %}
+
+
+
+{% for item in items %}
+
+  {% assign item_url = item | prepend:"/cn/docs30/" | append:".html" %}
+
+  {% if item_url == page.url %}
+    {% assign c = "current" %}
+  {% else %}
+    {% assign c = "" %}
+  {% endif %}
+
+
+
+  {% for p in site.docs30 %}
+    {% if p.url == item_url %}
+      <li class="navlist">
+        <a href="{{ p.url }}" class="list-group-item-lay pjaxlink">{{p.title}}</a>
+      </li>      
+      {% break %}
+    {% endif %}
+  {% endfor %}
+
+{% endfor %}
+
+
+
+
diff --git a/website/_includes/docs30_ul.html b/website/_includes/docs30_ul.html
new file mode 100644
index 0000000..ff54237
--- /dev/null
+++ b/website/_includes/docs30_ul.html
@@ -0,0 +1,31 @@
+{% assign items = include.items %}
+
+
+
+{% for item in items %}
+
+  {% assign item_url = item | prepend:"/docs30/" | append:".html" %}
+      
+
+  {% if item_url == page.url %}
+    {% assign c = "current" %}
+  {% else %}
+    {% assign c = "" %}
+  {% endif %}
+
+
+
+  {% for p in site.docs30 %}
+    {% if p.url == item_url %}
+      <li class="navlist">
+        <a href="{{ p.url }}" class="list-group-item-lay pjaxlink">{{p.title}}</a>
+      </li>      
+      {% break %}
+    {% endif %}
+  {% endfor %}
+
+{% endfor %}
+
+
+
+
diff --git a/website/_layouts/docs24-cn.html b/website/_layouts/docs24-cn.html
new file mode 100644
index 0000000..11007ad
--- /dev/null
+++ b/website/_layouts/docs24-cn.html
@@ -0,0 +1,46 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<!doctype html>
+<html>
+	{% include head.cn.html %}
+	<body>
+		{% include header.cn.html %}
+		
+		<div class="container">
+			<div class="row" style="clear:both;">
+				<div class="col-md-8 col-lg-8 col-xs-12 col-sm-12 aside2" style="float:right;">
+					<div id="container" class="docs">
+						<div id="pjax">
+							<h1 class="post-title">{{ page.title }}</h1>
+							<article class="post-content" >
+							{{ content }}
+							</article>
+						</div>
+					</div>
+				</div>
+				{% include docs24_nav.cn.html %}
+			</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>
diff --git a/website/_layouts/docs24.html b/website/_layouts/docs24.html
new file mode 100644
index 0000000..cff9de0
--- /dev/null
+++ b/website/_layouts/docs24.html
@@ -0,0 +1,51 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<!doctype html>
+<html>
+	{% include head.html %}
+	<body>
+		{% include header.html %}
+		
+		<div class="container">
+			<div class="row">
+
+				<div class="col-md-8 col-lg-8 col-xs-12 col-sm-12 aside2" style="float:right;">
+					<div id="container" class="docs">
+						<div id="pjax">
+							<h1 class="post-title">{{ page.title }}</h1>
+							{% if page.version == NULL %}
+							{% else %}							
+								<p>version: {{page.version}}, since: {{page.since}}</p>
+							{% endif %}
+							<article class="post-content" >	
+							{{ content }}
+							</article>
+						</div>
+					</div>
+				</div>
+				{% include docs24_nav.html %}
+			</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>
diff --git a/website/_layouts/docs30-cn.html b/website/_layouts/docs30-cn.html
new file mode 100644
index 0000000..4b38fa1
--- /dev/null
+++ b/website/_layouts/docs30-cn.html
@@ -0,0 +1,46 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<!doctype html>
+<html>
+	{% include head.cn.html %}
+	<body>
+		{% include header.cn.html %}
+		
+		<div class="container">
+			<div class="row" style="clear:both;">
+				<div class="col-md-8 col-lg-8 col-xs-12 col-sm-12 aside2" style="float:right;">
+					<div id="container" class="docs">
+						<div id="pjax">
+							<h1 class="post-title">{{ page.title }}</h1>
+							<article class="post-content" >
+							{{ content }}
+							</article>
+						</div>
+					</div>
+				</div>
+				{% include docs30_nav.cn.html %}
+			</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>
diff --git a/website/_layouts/docs30.html b/website/_layouts/docs30.html
new file mode 100644
index 0000000..3c432e2
--- /dev/null
+++ b/website/_layouts/docs30.html
@@ -0,0 +1,50 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<!doctype html>
+<html>
+	{% include head.html %}
+	<body>
+		{% include header.html %}
+		
+		<div class="container">
+			<div class="row"  style="clear:both;">
+				<div class="col-md-8 col-lg-8 col-xs-12 col-sm-12 aside2" style="float:right;">
+					<div id="container" class="docs">
+						<div id="pjax">
+							<h1 class="post-title">{{ page.title }}</h1>
+							{% if page.version == NULL %}
+							{% else %}							
+								<p>version: {{page.version}}, since: {{page.since}}</p>
+							{% endif %}
+							<article class="post-content" >	
+							{{ content }}
+							</article>
+						</div>
+					</div>
+				</div>
+				{% include docs30_nav.html %}
+			</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>