Repository: kylin
Updated Branches:
  refs/heads/document 55b167095 -> 7ea64f38a


http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_docs20/tutorial/tableau_91.cn.md
----------------------------------------------------------------------
diff --git a/website/_docs20/tutorial/tableau_91.cn.md 
b/website/_docs20/tutorial/tableau_91.cn.md
new file mode 100644
index 0000000..40b5aa2
--- /dev/null
+++ b/website/_docs20/tutorial/tableau_91.cn.md
@@ -0,0 +1,51 @@
+---
+layout: docs20-cn
+title:  Tableau 9 教程
+categories: tutorial
+permalink: /cn/docs20/tutorial/tableau_91.html
+version: v1.2
+since: v1.2
+---
+
+Tableau 9已经发布一段时间了,社区有很多用户希望Apache 
Kylin能进一步支持该版本。现在可以通过更新Kylin 
ODBC驱动以使用Tableau 9来与Kylin服务进行交互。
+
+
+### Tableau 8.x 用户
+请参考[Tableau 教程](./tableau.html)以获得更详细帮助。
+
+### Install ODBC Driver
+参考页面[Kylin ODBC 
驱动程序教程](./odbc.html),请确保下载并安装Kylin ODBC Driver 
__v1.5__. 如果你安装有早前版本,请卸载后再安装。 
+
+### Connect to Kylin Server
+在Tableau 9.1创建新的数据连接,单击左侧面板中的`Other 
Database(ODBC)`,并在弹出窗口中选择`KylinODBCDriver` 
+![](/images/tutorial/odbc/tableau_91/1.png)
+
+输入你的服务器地址、端口、项目、用户名和密ç 
ï¼Œç‚¹å‡»`Connect`可获取有权限访问的所有项目列表。有å…
³æƒé™çš„详细信息请参考[Kylin Cube 权限授予教程](./acl.html).
+![](/images/tutorial/odbc/tableau_91/2.png)
+
+### 映射数据模型
+在左侧的列表中,选择数据库`defaultCatalog`并单击”搜索“按钮,将列出所有可查询的表。用é¼
 æ ‡æŠŠè¡¨æ‹–拽到右侧区域,就可以添加
表作为数据源,并创建好表与表的连接关系
+![](/images/tutorial/odbc/tableau_91/3.png)
+
+### Connect Live
+Tableau 
9.1中有两种数据源连接类型,选择`在线`选项以确保使用'Connect
 Live'模式
+![](/images/tutorial/odbc/tableau_91/4.png)
+
+### 自定义SQL
+如果需要使用自定义SQL,可以单击左侧`New Custom 
SQL`并在弹窗中输入SQL语句,就可添加为数据源.
+![](/images/tutorial/odbc/tableau_91/5.png)
+
+### 可视化
+现在你可以进一步使用Tableau进行可视化分析:
+![](/images/tutorial/odbc/tableau_91/6.png)
+
+### 发布到Tableau服务器
+如果希望发布到Tableau服务器, 点击`Server`菜单并选择`Publish 
Workbook`
+![](/images/tutorial/odbc/tableau_91/7.png)
+
+### 更多
+
+- 请参考[Tableau 教程](./tableau.html)以获得更多信息
+- 也可以参考社区用户Alberto Ramon Portoles 
(a.ramonporto...@gmail.com)提供的分享: 
[KylinWithTableau](https://github.com/albertoRamon/Kylin/tree/master/KylinWithTableau)
+
+

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_docs20/tutorial/tableau_91.md
----------------------------------------------------------------------
diff --git a/website/_docs20/tutorial/tableau_91.md 
b/website/_docs20/tutorial/tableau_91.md
new file mode 100644
index 0000000..dd94091
--- /dev/null
+++ b/website/_docs20/tutorial/tableau_91.md
@@ -0,0 +1,50 @@
+---
+layout: docs20
+title:  Tableau 9
+categories: tutorial
+permalink: /docs20/tutorial/tableau_91.html
+---
+
+Tableau 9.x has been released a while, there are many users are asking about 
support this version with Apache Kylin. With updated Kylin ODBC Driver, now 
user could interactive with Kylin service through Tableau 9.x.
+
+
+### For Tableau 8.x User
+Please refer to [Kylin and Tableau Tutorial](./tableau.html) for detail guide.
+
+### Install Kylin ODBC Driver
+Refer to this guide: [Kylin ODBC Driver Tutorial](./odbc.html).
+Please make sure to download and install Kylin ODBC Driver __v1.5__. If you 
already installed ODBC Driver in your system, please uninstall it first. 
+
+### Connect to Kylin Server
+Connect Using Driver: Start Tableau 9.1 desktop, click `Other Database(ODBC)` 
in the left panel and choose KylinODBCDriver in the pop-up window. 
+![](/images/tutorial/odbc/tableau_91/1.png)
+
+Provide your Sever location, credentials and project. Clicking `Connect` 
button, you can get the list of projects that you have permission to access, 
see details at [Kylin Cube Permission Grant Tutorial](./acl.html).
+![](/images/tutorial/odbc/tableau_91/2.png)
+
+### Mapping Data Model
+In left panel, select `defaultCatalog` as Database, click `Search` button in 
Table search box, and all tables get listed. With drag and drop to the right 
region, tables will become data source. Make sure JOINs are configured 
correctly.
+![](/images/tutorial/odbc/tableau_91/3.png)
+
+### Connect Live
+There are two types of `Connection`, choose the `Live` option to make sure 
using Connect Live mode.
+![](/images/tutorial/odbc/tableau_91/4.png)
+
+### Custom SQL
+To use customized SQL, click `New Custom SQL` in left panel and type SQL 
statement in pop-up dialog.
+![](/images/tutorial/odbc/tableau_91/5.png)
+
+### Visualization
+Now you can start to enjou analyzing with Tableau 9.1.
+![](/images/tutorial/odbc/tableau_91/6.png)
+
+### Publish to Tableau Server
+If you want to publish local dashboard to a Tableau Server, just expand 
`Server` menu and select `Publish Workbook`.
+![](/images/tutorial/odbc/tableau_91/7.png)
+
+### More
+
+- You can refer to [Kylin and Tableau Tutorial](./tableau.html) for more 
detail.
+- Here is a good tutorial written by Alberto Ramon Portoles 
(a.ramonporto...@gmail.com): 
[KylinWithTableau](https://github.com/albertoRamon/Kylin/tree/master/KylinWithTableau)
+
+

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_docs20/tutorial/web.cn.md
----------------------------------------------------------------------
diff --git a/website/_docs20/tutorial/web.cn.md 
b/website/_docs20/tutorial/web.cn.md
new file mode 100644
index 0000000..73ffbdd
--- /dev/null
+++ b/website/_docs20/tutorial/web.cn.md
@@ -0,0 +1,134 @@
+---
+layout: docs20-cn
+title:  Kylin网页版教程
+categories: 教程
+permalink: /cn/docs20/tutorial/web.html
+version: v1.2
+---
+
+> **支持的浏览器**
+> 
+> Windows: Google Chrome, FireFox
+> 
+> Mac: Google Chrome, FireFox, Safari
+
+## 1. 访问 & 登陆
+访问主机: http://hostname:7070
+使用用户名/密码登陆:ADMIN/KYLIN
+
+![]( /images/Kylin-Web-Tutorial/1 login.png)
+
+## 2. Kylin中可用的Hive表
+虽然Kylin使用SQL作为查询接口并利用Hiveå…
ƒæ•°æ®ï¼ŒKylin不会让用户查询所有的hive表,因
为到目前为止它是一个预构建OLAP(MOLAP)系统。为了使表在Kylin中可用,使用"Sync"方法能够方便地从Hive中同步表。
+
+![]( /images/Kylin-Web-Tutorial/2 tables.png)
+
+## 3. Kylin OLAP Cube
+Kylin的OLAP 
Cube是从星型模式的Hive表中获取的预计算数据集,这是供用户探索、管理所有cube的网页管理页面。由菜单æ
 è¿›å…¥`Cubes`页面,系统中所有可用的cube将被列出。
+
+![]( /images/Kylin-Web-Tutorial/3 cubes.png)
+
+探索更多关于Cube的详细信息
+
+* 表格视图:
+
+   ![]( /images/Kylin-Web-Tutorial/4 form-view.png)
+
+* SQL 视图 (Hive查询读取数据以生成cube):
+
+   ![]( /images/Kylin-Web-Tutorial/5 sql-view.png)
+
+* 可视化 (显示这个cube背后的星型模式):
+
+   ![]( /images/Kylin-Web-Tutorial/6 visualization.png)
+
+* 访问 (授予用户/角色权限,beta版中授予权限操作仅
对管理员开放):
+
+   ![]( /images/Kylin-Web-Tutorial/7 access.png)
+
+## 4. 在网页上编写和运行SQL
+Kelin的网页版为用户提供了一个简单的查询工å…
·æ¥è¿è¡ŒSQL以探索现存的cube,验证结果并探索使用#5中的Pivot 
analysis与可视化分析的结果集。
+
+> **查询限制**
+> 
+> 1. 仅支持SELECT查询
+> 
+> 2. 为了避å…
ä»ŽæœåŠ¡å™¨åˆ°å®¢æˆ·ç«¯äº§ç”Ÿå·¨å¤§çš„ç½‘ç»œæµé‡ï¼Œbeta版中的扫描范围阀值被设置为1,000,000。
+> 
+> 3. beta版中,SQL在cube中无法找到的数据将不会重定向到Hive
+
+由菜单栏进入“Query”页面:
+
+![]( /images/Kylin-Web-Tutorial/8 query.png)
+
+* 源表:
+
+   浏览器当前可用表(与Hive相同的结构和元数据):
+  
+   ![]( /images/Kylin-Web-Tutorial/9 query-table.png)
+
+* 新的查询:
+
+   你可以编写和运行你
的查询并探索结果。这里提供一个查询供你参考:
+
+   ![]( /images/Kylin-Web-Tutorial/10 query-result.png)
+
+* 已保存的查询:
+
+   与用户账号关联,你
将能够从不同的浏览器甚至机器上获取已保存的查询。
+   
在结果区域点击“Save”,将会弹出名字和描述来保存当前查询:
+
+   ![]( /images/Kylin-Web-Tutorial/11 save-query.png)
+
+   点击“Saved Queries”探索所有已保存的查询,你
可以直接重新提交它来运行或删除它:
+
+   ![]( /images/Kylin-Web-Tutorial/11 save-query-2.png)
+
+* 查询历史:
+
+   仅
保存当前用户在当前浏览器中的查询历史,这将需要启用cookie,并且如果ä½
 æ¸…理浏览器缓存将会丢失数据。点击“Query History”标签,你
可以直接重新提交其中的任何一条并再次运行。
+
+## 5. Pivot Analysis与可视化
+Kylin的网页版提供一个简单的Pivot与可视化分析工å…
·ä¾›ç”¨æˆ·æŽ¢ç´¢ä»–们的查询结果:
+
+* 一般信息:
+
+   当查询运行成功后,它将呈现一个成功指æ 
‡ä¸Žè¢«è®¿é—®çš„cube名字。
+   同时它将会呈现这个查询在后台引擎运行了多久(不包
括从Kylin服务器到浏览器的网络通信):
+
+   ![]( /images/Kylin-Web-Tutorial/12 general.png)
+
+* 查询结果:
+
+   能够方便地在一个列上排序。
+
+   ![]( /images/Kylin-Web-Tutorial/13 results.png)
+
+* 导出到CSV文件
+
+   点击“Export”按钮以CSV文件格式保存当前结果。
+
+* Pivot表:
+
+   将一个或多个列拖放到标头,结果将æ 
¹æ®è¿™äº›åˆ—的值分组:
+
+   ![]( /images/Kylin-Web-Tutorial/14 drag.png)
+
+* 可视化:
+
+   
同时,结果集将被方便地显示在“可视化”的不同图表中:
+
+   注意:线形图仅
当至少一个从Hive表中获取的维度有真实的“Date”数据类型列时才是可用的。
+
+   * 条形图:
+
+   ![]( /images/Kylin-Web-Tutorial/15 bar-chart.png)
+   
+   * 饼图:
+
+   ![]( /images/Kylin-Web-Tutorial/16 pie-chart.png)
+
+   * 线形图:
+
+   ![]( /images/Kylin-Web-Tutorial/17 line-chart.png)
+

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_docs20/tutorial/web.md
----------------------------------------------------------------------
diff --git a/website/_docs20/tutorial/web.md b/website/_docs20/tutorial/web.md
new file mode 100644
index 0000000..b3c29fe
--- /dev/null
+++ b/website/_docs20/tutorial/web.md
@@ -0,0 +1,123 @@
+---
+layout: docs20
+title:  Kylin Web Interface
+categories: tutorial
+permalink: /docs20/tutorial/web.html
+---
+
+> **Supported Browsers**
+> Windows: Google Chrome, FireFox
+> Mac: Google Chrome, FireFox, Safari
+
+## 1. Access & Login
+Host to access: http://hostname:7070
+Login with username/password: ADMIN/KYLIN
+
+![](/images/tutorial/1.5/Kylin-Web-Tutorial/1 login.png)
+
+## 2. Sync Hive Table into Kylin
+Although Kylin will using SQL as query interface and leverage Hive metadata, 
kylin will not enable user to query all hive tables since it's a pre-build OLAP 
(MOLAP) system so far. To enable Table in Kylin, it will be easy to using 
"Sync" function to sync up tables from Hive.
+
+![](/images/tutorial/1.5/Kylin-Web-Tutorial/2 tables.png)
+
+## 3. Kylin OLAP Cube
+Kylin's OLAP Cubes are pre-calculation datasets from star schema tables, 
Here's the web interface for user to explorer, manage all cubes. Go to `Model` 
menu, it will list all cubes available in system:
+
+![](/images/tutorial/1.5/Kylin-Web-Tutorial/3 cubes.png)
+
+To explore more detail about the Cube
+
+* Form View:
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/4 form-view.png)
+
+* SQL View (Hive Query to read data to generate the cube):
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/5 sql-view.png)
+
+* Access (Grant user/role privileges, grant operation only open to Admin):
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/7 access.png)
+
+## 4. Write and Execute SQL on web
+Kylin's web offer a simple query tool for user to run SQL to explorer existing 
cube, verify result and explorer the result set using #5's Pivot analysis and 
visualization
+
+> **Query Limit**
+> 
+> 1. Only SELECT query be supported
+> 
+> 2. SQL will not be redirect to Hive
+
+Go to "Insight" menu:
+
+![](/images/tutorial/1.5/Kylin-Web-Tutorial/8 query.png)
+
+* Source Tables:
+
+   Browser current available tables (same structure and metadata as Hive):
+  
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/9 query-table.png)
+
+* New Query:
+
+   You can write and execute your query and explorer the result.
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/10 query-result.png)
+
+* Saved Query (only work after enable LDAP security):
+
+   Associate with user account, you can get saved query from different 
browsers even machines.
+   Click "Save" in Result area, it will popup for name and description to save 
current query:
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/11 save-query.png)
+
+   Click "Saved Queries" to browser all your saved queries, you could direct 
submit it or remove it.
+
+* Query History:
+
+   Only keep the current user's query history in current bowser, it will 
require cookie enabled and will lost if you clean up bowser's cache. Click 
"Query History" tab, you could directly resubmit any of them to execute again.
+
+## 5. Pivot Analysis and Visualization
+There's one simple pivot and visualization analysis tool in Kylin's web for 
user to explore their query result:
+
+* General Information:
+
+   When the query execute success, it will present a success indictor and also 
a cube's name which be hit. 
+   Also it will present how long this query be executed in backend engine (not 
cover network traffic from Kylin server to browser):
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/12 general.png)
+
+* Query Result:
+
+   It's easy to order on one column.
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/13 results.png)
+
+* Export to CSV File
+
+   Click "Export" button to save current result as CSV file.
+
+* Pivot Table:
+
+   Drag and drop one or more columns into the header, the result will grouping 
by such column's value:
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/14 drag.png)
+
+* Visualization:
+
+   Also, the result set will be easy to show with different charts in 
"Visualization":
+
+   note: line chart only available when there's at least one dimension with 
real "Date" data type of column from Hive Table.
+
+   * Bar Chart:
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/15 bar-chart.png)
+   
+   * Pie Chart:
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/16 pie-chart.png)
+
+   * Line Chart
+
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/17 line-chart.png)
+

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_includes/docs20_nav.cn.html
----------------------------------------------------------------------
diff --git a/website/_includes/docs20_nav.cn.html 
b/website/_includes/docs20_nav.cn.html
new file mode 100644
index 0000000..79f30e1
--- /dev/null
+++ b/website/_includes/docs20_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-3 col-lg-3 col-xs-4 aside1 visible-md visible-lg" 
id="nside1" style=" padding-top: 2em">
+    <ul class="nav nav-pills nav-stacked">    
+    {% for section in site.data.docs20-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 style="list-style-type:disc">
+    {% include docs20_ul.cn.html items=section.docs %}
+        <ul>
+  </div>
+</div>
+    {% endfor %}
+
+    </ul>
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_includes/docs20_nav.html
----------------------------------------------------------------------
diff --git a/website/_includes/docs20_nav.html 
b/website/_includes/docs20_nav.html
new file mode 100644
index 0000000..fbd7aab
--- /dev/null
+++ b/website/_includes/docs20_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-3 col-lg-3 col-xs-4 aside1 visible-md visible-lg" 
id="nside1" style=" padding-top: 2em">
+    <ul class="nav nav-pills nav-stacked">
+    {% for section in site.data.docs20 %}
+    <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 style="list-style-type:disc">
+    {% include docs20_ul.html items=section.docs %}
+        <ul>
+  </div>
+</div>
+    {% endfor %}
+
+    </ul>
+</div>

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_includes/docs20_ul.cn.html
----------------------------------------------------------------------
diff --git a/website/_includes/docs20_ul.cn.html 
b/website/_includes/docs20_ul.cn.html
new file mode 100644
index 0000000..9bc37dc
--- /dev/null
+++ b/website/_includes/docs20_ul.cn.html
@@ -0,0 +1,28 @@
+{% assign items = include.items %}
+
+
+
+{% for item in items %}
+
+  {% assign item_url = item | prepend:"/cn/docs20/" | append:".html" %}
+
+  {% if item_url == page.url %}
+    {% assign c = "current" %}
+  {% else %}
+    {% assign c = "" %}
+  {% endif %}
+
+
+
+  {% for p in site.docs20 %}
+    {% if p.url == item_url %}
+      <li><a href="{{ p.url }}" class="list-group-item-lay pjaxlink" 
id="navlist">{{p.title}}</a></li>      
+      {% break %}
+    {% endif %}
+  {% endfor %}
+
+{% endfor %}
+
+
+
+

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_includes/docs20_ul.html
----------------------------------------------------------------------
diff --git a/website/_includes/docs20_ul.html b/website/_includes/docs20_ul.html
new file mode 100644
index 0000000..a3f83f5
--- /dev/null
+++ b/website/_includes/docs20_ul.html
@@ -0,0 +1,29 @@
+{% assign items = include.items %}
+
+
+
+{% for item in items %}
+
+  {% assign item_url = item | prepend:"/docs20/" | append:".html" %}
+      
+
+  {% if item_url == page.url %}
+    {% assign c = "current" %}
+  {% else %}
+    {% assign c = "" %}
+  {% endif %}
+
+
+
+  {% for p in site.docs20 %}
+    {% if p.url == item_url %}
+      <li><a href="{{ p.url }}" class="list-group-item-lay pjaxlink" 
id="navlist">{{p.title}}</a></li>      
+      {% break %}
+    {% endif %}
+  {% endfor %}
+
+{% endfor %}
+
+
+
+

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_includes/header.cn.html
----------------------------------------------------------------------
diff --git a/website/_includes/header.cn.html b/website/_includes/header.cn.html
index 3f6bdbe..74e7627 100644
--- a/website/_includes/header.cn.html
+++ b/website/_includes/header.cn.html
@@ -40,7 +40,7 @@
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">
      <li><a href="/cn">首页</a></li>
-          <li><a href="/cn/docs15" >文档</a></li>
+          <li><a href="/cn/docs20" >文档</a></li>
           <li><a href="/cn/download">下载</li>
           <li><a href="/community" >社区</a></li>
           <li><a href="/development" >开发</a></li>

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_includes/header.html
----------------------------------------------------------------------
diff --git a/website/_includes/header.html b/website/_includes/header.html
index 97c8776..bca3ada 100644
--- a/website/_includes/header.html
+++ b/website/_includes/header.html
@@ -45,7 +45,7 @@
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">
      <li><a href="/">Home</a></li>
-          <li><a href="/docs16" >Docs</a></li>
+          <li><a href="/docs20" >Docs</a></li>
           <li><a href="/download">Download</li>
           <li><a href="/community" >Community</a></li>
           <li><a href="/development" >Development</a></li>

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_layouts/docs20-cn.html
----------------------------------------------------------------------
diff --git a/website/_layouts/docs20-cn.html b/website/_layouts/docs20-cn.html
new file mode 100644
index 0000000..52fb5ef
--- /dev/null
+++ b/website/_layouts/docs20-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">
+                               {% include docs20_nav.cn.html %}
+                               <div class="col-md-9 col-lg-9 col-xs-14 aside2">
+                                       <div id="container">
+                                               <div id="pjax">
+                                                       <h1 
class="post-title">{{ page.title }}</h1>
+                                                       <article 
class="post-content" >
+                                                       {{ content }}
+                                                       </article>
+                                               </div>
+                                       </div>
+                               </div>
+                       </div>
+               </div>          
+               {% include footer.html %}
+
+       <script src="/assets/js/jquery-1.9.1.min.js"></script> 
+       <script src="/assets/js/bootstrap.min.js"></script> 
+       <script src="/assets/js/main.js"></script>
+       </body>
+</html>

http://git-wip-us.apache.org/repos/asf/kylin/blob/7ea64f38/website/_layouts/docs20.html
----------------------------------------------------------------------
diff --git a/website/_layouts/docs20.html b/website/_layouts/docs20.html
new file mode 100644
index 0000000..7b4ac02
--- /dev/null
+++ b/website/_layouts/docs20.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">
+                               {% include docs20_nav.html %}
+                               <div class="col-md-9 col-lg-9 col-xs-14 aside2">
+                                       <div id="container">
+                                               <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>
+                       </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>

Reply via email to