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` + + +è¾å ¥ä½ çæå¡å¨å°åã端å£ã项ç®ãç¨æ·ååå¯ç ï¼ç¹å»`Connect`å¯è·åææé访é®çææé¡¹ç®å表ãæå ³æéç详ç»ä¿¡æ¯è¯·åè[Kylin Cube æéæäºæç¨](./acl.html). + + +### æ å°æ°æ®æ¨¡å +å¨å·¦ä¾§çå表ä¸ï¼éæ©æ°æ®åº`defaultCatalog`å¹¶åå»âæç´¢âæé®ï¼å°ååºææå¯æ¥è¯¢ç表ãç¨é¼ æ æè¡¨ææ½å°å³ä¾§åºåï¼å°±å¯ä»¥æ·»å 表ä½ä¸ºæ°æ®æºï¼å¹¶å建好表ä¸è¡¨çè¿æ¥å ³ç³» + + +### Connect Live +Tableau 9.1ä¸æä¸¤ç§æ°æ®æºè¿æ¥ç±»åï¼éæ©ï½å¨çº¿ï½é项以确ä¿ä½¿ç¨'Connect Live'æ¨¡å¼ + + +### èªå®ä¹SQL +妿éè¦ä½¿ç¨èªå®ä¹SQLï¼å¯ä»¥åå»å·¦ä¾§ï½New Custom SQLï½å¹¶å¨å¼¹çªä¸è¾å ¥SQLè¯å¥ï¼å°±å¯æ·»å ä¸ºæ°æ®æº. + + +### å¯è§å +ç°å¨ä½ å¯ä»¥è¿ä¸æ¥ä½¿ç¨Tableauè¿è¡å¯è§ååæï¼ + + +### åå¸å°Tableauæå¡å¨ +妿叿åå¸å°Tableauæå¡å¨, ç¹å»`Server`èåå¹¶éæ©`Publish Workbook` + + +### æ´å¤ + +- 请åè[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. + + +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). + + +### 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. + + +### Connect Live +There are two types of `Connection`, choose the `Live` option to make sure using Connect Live mode. + + +### Custom SQL +To use customized SQL, click `New Custom SQL` in left panel and type SQL statement in pop-up dialog. + + +### Visualization +Now you can start to enjou analyzing with Tableau 9.1. + + +### Publish to Tableau Server +If you want to publish local dashboard to a Tableau Server, just expand `Server` menu and select `Publish Workbook`. + + +### 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 + + + +## 2. Kylinä¸å¯ç¨çHive表 +è½ç¶Kylin使ç¨SQLä½ä¸ºæ¥è¯¢æ¥å£å¹¶å©ç¨Hiveå æ°æ®ï¼Kylinä¸ä¼è®©ç¨æ·æ¥è¯¢ææçhive表ï¼å 为å°ç®å为æ¢å®æ¯ä¸ä¸ªé¢æå»ºOLAP(MOLAP)ç³»ç»ã为äºä½¿è¡¨å¨Kylinä¸å¯ç¨ï¼ä½¿ç¨"Sync"æ¹æ³è½å¤æ¹ä¾¿å°ä»Hiveä¸åæ¥è¡¨ã + + + +## 3. Kylin OLAP Cube +KylinçOLAP Cubeæ¯ä»æå模å¼çHive表ä¸è·åçé¢è®¡ç®æ°æ®éï¼è¿æ¯ä¾ç¨æ·æ¢ç´¢ãç®¡çææcubeçç½é¡µç®¡ç页é¢ãç±èåæ è¿å ¥`Cubes`页é¢ï¼ç³»ç»ä¸ææå¯ç¨çcubeå°è¢«ååºã + + + +æ¢ç´¢æ´å¤å ³äºCubeç详ç»ä¿¡æ¯ + +* è¡¨æ ¼è§å¾: + +  + +* SQL è§å¾ (Hiveæ¥è¯¢è¯»åæ°æ®ä»¥çæcube): + +  + +* å¯è§å (æ¾ç¤ºè¿ä¸ªcubeèåçæå模å¼): + +  + +* è®¿é® (æäºç¨æ·/è§è²æéï¼betaçä¸æäºæéæä½ä» 对管çå弿¾): + +  + +## 4. å¨ç½é¡µä¸ç¼ååè¿è¡SQL +Kelinçç½é¡µçä¸ºç¨æ·æä¾äºä¸ä¸ªç®åçæ¥è¯¢å·¥å ·æ¥è¿è¡SQL以æ¢ç´¢ç°åçcubeï¼éªè¯ç»æå¹¶æ¢ç´¢ä½¿ç¨#5ä¸çPivot analysisä¸å¯è§ååæçç»æéã + +> **æ¥è¯¢éå¶** +> +> 1. ä» æ¯æSELECTæ¥è¯¢ +> +> 2. 为äºé¿å 仿å¡å¨å°å®¢æ·ç«¯äº§ç巨大çç½ç»æµéï¼betaçä¸çæ«æèå´éå¼è¢«è®¾ç½®ä¸º1,000,000ã +> +> 3. betaçä¸ï¼SQLå¨cube䏿 æ³æ¾å°çæ°æ®å°ä¸ä¼éå®åå°Hive + +ç±èåæ è¿å ¥âQueryâ页é¢ï¼ + + + +* æºè¡¨ï¼ + + æµè§å¨å½åå¯ç¨è¡¨ï¼ä¸Hiveç¸åçç»æåå æ°æ®ï¼ï¼ + +  + +* æ°çæ¥è¯¢ï¼ + + ä½ å¯ä»¥ç¼ååè¿è¡ä½ çæ¥è¯¢å¹¶æ¢ç´¢ç»æãè¿éæä¾ä¸ä¸ªæ¥è¯¢ä¾ä½ åèï¼ + +  + +* å·²ä¿åçæ¥è¯¢ï¼ + + ä¸ç¨æ·è´¦å·å ³èï¼ä½ å°è½å¤ä»ä¸åçæµè§å¨çè³æºå¨ä¸è·åå·²ä¿åçæ¥è¯¢ã + å¨ç»æåºåç¹å»âSaveâï¼å°ä¼å¼¹åºåååæè¿°æ¥ä¿åå½åæ¥è¯¢ï¼ + +  + + ç¹å»âSaved Queriesâæ¢ç´¢ææå·²ä¿åçæ¥è¯¢ï¼ä½ å¯ä»¥ç´æ¥éæ°æäº¤å®æ¥è¿è¡æå é¤å®ï¼ + +  + +* æ¥è¯¢åå²ï¼ + + ä» ä¿åå½åç¨æ·å¨å½åæµè§å¨ä¸çæ¥è¯¢åå²ï¼è¿å°éè¦å¯ç¨cookieï¼å¹¶ä¸å¦æä½ æ¸ çæµè§å¨ç¼åå°ä¼ä¸¢å¤±æ°æ®ãç¹å»âQuery Historyâæ ç¾ï¼ä½ å¯ä»¥ç´æ¥éæ°æäº¤å ¶ä¸çä»»ä½ä¸æ¡å¹¶å次è¿è¡ã + +## 5. Pivot Analysisä¸å¯è§å +Kylinçç½é¡µçæä¾ä¸ä¸ªç®åçPivotä¸å¯è§ååæå·¥å ·ä¾ç¨æ·æ¢ç´¢ä»ä»¬çæ¥è¯¢ç»æï¼ + +* ä¸è¬ä¿¡æ¯ï¼ + + 彿¥è¯¢è¿è¡æååï¼å®å°åç°ä¸ä¸ªæåææ ä¸è¢«è®¿é®çcubeååã + åæ¶å®å°ä¼åç°è¿ä¸ªæ¥è¯¢å¨åå°å¼æè¿è¡äºå¤ä¹ ï¼ä¸å æ¬ä»Kylinæå¡å¨å°æµè§å¨çç½ç»éä¿¡ï¼ï¼ + +  + +* æ¥è¯¢ç»æï¼ + + è½å¤æ¹ä¾¿å°å¨ä¸ä¸ªå䏿åºã + +  + +* 导åºå°CSVæä»¶ + + ç¹å»âExportâæé®ä»¥CSVæä»¶æ ¼å¼ä¿åå½åç»æã + +* Pivotè¡¨ï¼ + + å°ä¸ä¸ªæå¤ä¸ªåææ¾å°æ 头ï¼ç»æå°æ ¹æ®è¿äºåçå¼åç»ï¼ + +  + +* å¯è§åï¼ + + åæ¶ï¼ç»æéå°è¢«æ¹ä¾¿å°æ¾ç¤ºå¨âå¯è§åâçä¸åå¾è¡¨ä¸ï¼ + + 注æï¼çº¿å½¢å¾ä» å½è³å°ä¸ä¸ªä»Hive表ä¸è·åç维度æçå®çâDateâæ°æ®ç±»ååæ¶ææ¯å¯ç¨çã + + * æ¡å½¢å¾ï¼ + +  + + * 饼å¾ï¼ + +  + + * 线形å¾ï¼ + +  + 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 + + + +## 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. + + + +## 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: + + + +To explore more detail about the Cube + +* Form View: + +  + +* SQL View (Hive Query to read data to generate the cube): + +  + +* Access (Grant user/role privileges, grant operation only open to Admin): + +  + +## 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: + + + +* Source Tables: + + Browser current available tables (same structure and metadata as Hive): + +  + +* New Query: + + You can write and execute your query and explorer the result. + +  + +* 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: + +  + + 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): + +  + +* Query Result: + + It's easy to order on one column. + +  + +* 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: + +  + +* 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: + +  + + * Pie Chart: + +  + + * Line Chart + +  + 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>