You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ni...@apache.org on 2019/06/19 12:18:39 UTC

[kylin] branch document updated: Separate Chinese and English blogs

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

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


The following commit(s) were added to refs/heads/document by this push:
     new ddc7dd3  Separate Chinese and English blogs
ddc7dd3 is described below

commit ddc7dd32296fcb888a29f16b4cdc29bdc75e5fe8
Author: GinaZhai <na...@kyligence.io>
AuthorDate: Wed Jun 19 11:07:26 2019 +0800

    Separate Chinese and English blogs
---
 website/_config.yml                                |  6 ++-
 website/_includes/header.cn.html                   |  2 +-
 website/_includes/home_header.cn.html              |  2 +-
 website/_layouts/blog-cn.html                      | 52 ++++++++++++++++++++++
 website/_layouts/blogs-cn.html                     | 48 ++++++++++++++++++++
 .../blog/2015-10-25-release-v1.1-incubating.cn.md  |  2 +-
 website/_posts/blog/2015-12-23-release-v1.2.cn.md  |  2 +-
 .../blog/2015-12-25-support-powerbi-tableau9.cn.md |  2 +-
 .../_posts/blog/2016-03-16-release-v1.3.0.cn.md    |  2 +-
 .../_posts/blog/2016-03-16-release-v1.5.0.cn.md    |  2 +-
 .../_posts/blog/2016-04-12-release-v1.5.1.cn.md    |  2 +-
 .../_posts/blog/2016-05-26-release-v1.5.2.cn.md    |  2 +-
 .../_posts/blog/2016-07-28-release-v1.5.3.cn.md    |  2 +-
 .../_posts/blog/2016-12-04-release-v1.6.0.cn.md    |  2 +-
 .../_posts/blog/2017-02-25-v2.0.0-beta-ready.cn.md |  2 +-
 .../_posts/blog/2018-09-20-release-v2.5.0.cn.md    |  2 +-
 .../_posts/blog/2019-01-18-release-v2.6.0.cn.md    |  2 +-
 .../blog/2019-04-19-release-v3.0.0-alpha.cn.md     |  2 +-
 ...molap.md => 2019-05-23-saiku-kylin-molap.cn.md} |  2 +-
 website/blog/index.cn.md                           | 40 +++++++++++++++++
 20 files changed, 161 insertions(+), 17 deletions(-)

diff --git a/website/_config.yml b/website/_config.yml
index c192c19..2bd8c3f 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,_docs20,_docs21,_docs23,_docs24,_docs30,_dev,community]
+include: [_docs,_docs20,_docs21,_docs23,_docs24,_docs30,_dev,community,blog]
 
 # Build settings
 markdown: kramdown
@@ -83,4 +83,8 @@ collections:
   dev-cn:
     output: true
   community:
+    output: true
+  blog:
+    output: true
+  blog-cn:
     output: true
\ No newline at end of file
diff --git a/website/_includes/header.cn.html b/website/_includes/header.cn.html
index de8002a..ccd2fd7 100644
--- a/website/_includes/header.cn.html
+++ b/website/_includes/header.cn.html
@@ -57,7 +57,7 @@
             <li><a href="/cn/download">下载</a></li>
             <li><a href="/cn/community" >社区</a></li>
             <li><a href="/cn/development" >开发</a></li>
-            <li><a href="/blog">博客</a></li>
+            <li><a href="/cn/blog">博客</a></li>
             <li><a href="/" >English</a></li>           
         </ul>
         
diff --git a/website/_includes/home_header.cn.html b/website/_includes/home_header.cn.html
index d2df25c..ccd6764 100644
--- a/website/_includes/home_header.cn.html
+++ b/website/_includes/home_header.cn.html
@@ -56,7 +56,7 @@
             <li><a href="/cn/download">下载</a></li>
             <li><a href="/cn/community" >社区</a></li>
             <li><a href="/cn/development" >开发</a></li>
-            <li><a href="/blog">博客</a></li>
+            <li><a href="/cn/blog">博客</a></li>
             <li><a href="/" >English</a></li>           
         </ul>
         
diff --git a/website/_layouts/blog-cn.html b/website/_layouts/blog-cn.html
new file mode 100644
index 0000000..1327ffe
--- /dev/null
+++ b/website/_layouts/blog-cn.html
@@ -0,0 +1,52 @@
+<!--
+* 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="page-content main">
+			<header style=" padding:2em 0 0 ">
+			<div class="container" >
+			  <div style=" padding:0 4em">
+                <div class="blog-icon">
+                  <img width="30" src="{{"/assets/images/icon_blog_w.png" | prepend: site.baseurl}}">
+                </div>
+				<h4 class="index-title" style=" float:left;"><span>Apache Kylin™ 技术博客</span></h4>
+			  </div>
+			</div>
+		</div>
+
+		<div class="container blog">
+			<div>
+				<article class="post-content" >	
+				{{ content }}
+				</article>
+			</div>
+		</div>		
+		{% include footer.cn.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/blogs-cn.html b/website/_layouts/blogs-cn.html
new file mode 100644
index 0000000..49de3e6
--- /dev/null
+++ b/website/_layouts/blogs-cn.html
@@ -0,0 +1,48 @@
+<!--
+* 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 %}
+<main id="main" >
+  <div >
+    <div id="zero" class=" main blogs" >
+
+    <div class="page-content">
+      <div class="wrapper">
+        {{ content }}
+      </div>
+    </div>
+
+    </div>
+  </div>
+</main>
+
+    {% include footer.cn.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/_posts/blog/2015-10-25-release-v1.1-incubating.cn.md b/website/_posts/blog/2015-10-25-release-v1.1-incubating.cn.md
index 3f799fb..ed2779f 100644
--- a/website/_posts/blog/2015-10-25-release-v1.1-incubating.cn.md
+++ b/website/_posts/blog/2015-10-25-release-v1.1-incubating.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v1.1 (incubating) 正式发布
 date:   2015-10-25 17:28:00
 author: Luke Han
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区非常高兴宣布Apache Kylin v1.1 (incubating)正式发布.
diff --git a/website/_posts/blog/2015-12-23-release-v1.2.cn.md b/website/_posts/blog/2015-12-23-release-v1.2.cn.md
index 08456a1..300f873 100644
--- a/website/_posts/blog/2015-12-23-release-v1.2.cn.md
+++ b/website/_posts/blog/2015-12-23-release-v1.2.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v1.2 正式发布
 date:   2015-12-23 22:28:00
 author: Luke Han
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区非常高兴宣布Apache Kylin v1.2正式发布,这是自顺利毕业成Apache顶级项目后的第一个发布版本。
diff --git a/website/_posts/blog/2015-12-25-support-powerbi-tableau9.cn.md b/website/_posts/blog/2015-12-25-support-powerbi-tableau9.cn.md
index be26804..2149973 100644
--- a/website/_posts/blog/2015-12-25-support-powerbi-tableau9.cn.md
+++ b/website/_posts/blog/2015-12-25-support-powerbi-tableau9.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin增加对Tableau 9及微软Excel, Power BI的支持
 date:   2015-12-25 23:23:00
 author: Luke Han
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区更新了最新的ODBC Driver(v1.2),增加了对Tableau9.1、Microsoft Excel、Microsoft Power BI 等常用商业分析软件的支持。这次的更新为广大数据分析工作者带来了更多的选择
diff --git a/website/_posts/blog/2016-03-16-release-v1.3.0.cn.md b/website/_posts/blog/2016-03-16-release-v1.3.0.cn.md
index 30e43b8..9038868 100644
--- a/website/_posts/blog/2016-03-16-release-v1.3.0.cn.md
+++ b/website/_posts/blog/2016-03-16-release-v1.3.0.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v1.3.0 正式发布
 date:   2016-03-16 22:00:00
 author: Hongbin Ma
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区非常高兴宣布Apache Kylin v1.3.0正式发布,这是自顺利毕业成Apache顶级项目后的第二个发布版本。
diff --git a/website/_posts/blog/2016-03-16-release-v1.5.0.cn.md b/website/_posts/blog/2016-03-16-release-v1.5.0.cn.md
index f688c9a..bbd9ce9 100644
--- a/website/_posts/blog/2016-03-16-release-v1.5.0.cn.md
+++ b/website/_posts/blog/2016-03-16-release-v1.5.0.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v1.5.0 正式发布
 date:   2016-03-17 22:00:00
 author: Li Yang
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区非常高兴宣布Apache Kylin v1.5.0正式发布。
diff --git a/website/_posts/blog/2016-04-12-release-v1.5.1.cn.md b/website/_posts/blog/2016-04-12-release-v1.5.1.cn.md
index f75d918..e501caa 100644
--- a/website/_posts/blog/2016-04-12-release-v1.5.1.cn.md
+++ b/website/_posts/blog/2016-04-12-release-v1.5.1.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v1.5.1 正式发布
 date:   2016-04-12 11:00:00
 author: Dong Li
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区非常高兴宣布Apache Kylin v1.5.1正式发布。
diff --git a/website/_posts/blog/2016-05-26-release-v1.5.2.cn.md b/website/_posts/blog/2016-05-26-release-v1.5.2.cn.md
index 9e38e81..59927bd 100644
--- a/website/_posts/blog/2016-05-26-release-v1.5.2.cn.md
+++ b/website/_posts/blog/2016-05-26-release-v1.5.2.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v1.5.2 正式发布
 date:   2016-05-26 15:00:00
 author: Dong Li
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区非常高兴宣布Apache Kylin v1.5.2正式发布。
diff --git a/website/_posts/blog/2016-07-28-release-v1.5.3.cn.md b/website/_posts/blog/2016-07-28-release-v1.5.3.cn.md
index 6c65634..abd9352 100644
--- a/website/_posts/blog/2016-07-28-release-v1.5.3.cn.md
+++ b/website/_posts/blog/2016-07-28-release-v1.5.3.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v1.5.3 正式发布
 date:   2016-07-28 21:00:00
 author: Shaofeng Shi
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区非常高兴宣布Apache Kylin v1.5.3正式发布。
diff --git a/website/_posts/blog/2016-12-04-release-v1.6.0.cn.md b/website/_posts/blog/2016-12-04-release-v1.6.0.cn.md
index b5cbe01..6fed7cb 100644
--- a/website/_posts/blog/2016-12-04-release-v1.6.0.cn.md
+++ b/website/_posts/blog/2016-12-04-release-v1.6.0.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v1.6.0 正式发布
 date:   2016-12-04 21:00:00
 author: Shaofeng Shi
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区非常高兴宣布Apache Kylin v1.6.0正式发布。
diff --git a/website/_posts/blog/2017-02-25-v2.0.0-beta-ready.cn.md b/website/_posts/blog/2017-02-25-v2.0.0-beta-ready.cn.md
index 193649f..1a559ba 100644
--- a/website/_posts/blog/2017-02-25-v2.0.0-beta-ready.cn.md
+++ b/website/_posts/blog/2017-02-25-v2.0.0-beta-ready.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v2.0.0 beta 发布
 date:   2017-02-25 20:00:00
 author: Yang Li
-categories: blog
+categories: cn_blog
 ---
 
 Apache Kylin社区非常高兴地宣布 [v2.0.0 beta package](http://kylin.apache.org/cn/download/) 已经可以下载并测试了。
diff --git a/website/_posts/blog/2018-09-20-release-v2.5.0.cn.md b/website/_posts/blog/2018-09-20-release-v2.5.0.cn.md
index ff3cb33..7fdfb5c 100644
--- a/website/_posts/blog/2018-09-20-release-v2.5.0.cn.md
+++ b/website/_posts/blog/2018-09-20-release-v2.5.0.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v2.5.0 正式发布
 date:   2018-09-20 20:00:00
 author: Shaofeng Shi
-categories: blog
+categories: cn_blog
 ---
 
 近日Apache Kylin 社区很高兴地宣布,Apache Kylin 2.5.0 正式发布。
diff --git a/website/_posts/blog/2019-01-18-release-v2.6.0.cn.md b/website/_posts/blog/2019-01-18-release-v2.6.0.cn.md
index 587648c..540596a 100644
--- a/website/_posts/blog/2019-01-18-release-v2.6.0.cn.md
+++ b/website/_posts/blog/2019-01-18-release-v2.6.0.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v2.6.0 正式发布
 date:   2019-01-18 20:00:00
 author: Yanghong Zhong
-categories: blog
+categories: cn_blog
 ---
 
 近日Apache Kylin 社区很高兴地宣布,Apache Kylin 2.6.0 正式发布。
diff --git a/website/_posts/blog/2019-04-19-release-v3.0.0-alpha.cn.md b/website/_posts/blog/2019-04-19-release-v3.0.0-alpha.cn.md
index 4b6733d..ca8e42d 100644
--- a/website/_posts/blog/2019-04-19-release-v3.0.0-alpha.cn.md
+++ b/website/_posts/blog/2019-04-19-release-v3.0.0-alpha.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Apache Kylin v3.0.0-alpha 发布
 date:   2019-04-19 20:00:00
 author: Shaofeng Shi
-categories: blog
+categories: cn_blog
 ---
 
 近日 Apache Kylin 社区很高兴地宣布,Apache Kylin v3.0.0-alpha 正式发布。 
diff --git a/website/_posts/blog/2019-05-23-saiku-kylin-molap.md b/website/_posts/blog/2019-05-23-saiku-kylin-molap.cn.md
similarity index 98%
rename from website/_posts/blog/2019-05-23-saiku-kylin-molap.md
rename to website/_posts/blog/2019-05-23-saiku-kylin-molap.cn.md
index d02cfc6..7e98c30 100644
--- a/website/_posts/blog/2019-05-23-saiku-kylin-molap.md
+++ b/website/_posts/blog/2019-05-23-saiku-kylin-molap.cn.md
@@ -3,7 +3,7 @@ layout: post-blog
 title:  Saiku + Kylin 搭建多维 OLAP 平台
 date:   2019-05-23 15:00:00
 author: Gina Zhai
-categories: blog
+categories: cn_blog
 ---
 
 随着数据量的激增,传统的 OLTP 平台已无法满足用户的分析需求。OLAP 平台应运而生,OLAP 平台通常由 OLAP Engine 与用户操作分析页面组成。本文将会以 Saiku + Kylin 的组合方式讲解多维 OLAP 平台的搭建。
diff --git a/website/blog/index.cn.md b/website/blog/index.cn.md
new file mode 100644
index 0000000..32bf6c0
--- /dev/null
+++ b/website/blog/index.cn.md
@@ -0,0 +1,40 @@
+---
+layout: blogs
+title: Blog
+---
+
+<main id="main" >
+<section id="first" class="main">
+    <header style="padding:2em 0 2em 0;">
+      <div class="container" >
+        <h4 class="index-title"><span>Apache Kylin™ 技术博客 </span></h4>
+         <!-- second-->
+          <div id="content-containe" class="animated fadeIn clearfix">
+            {% for category in site.categories %}   
+            {% if category[0]  == 'cn_blog' %}
+            {% for post in category[1] %}
+            <div class="col-md-6 col-lg-6 col-xs-12">
+              <a class="blog-card" href="{{ post.url | prepend: site.baseurl }}">
+                <div class="blog-pic">
+                  <img width="20" src="/assets/images/icon_blog_w.png">
+                </div>
+                <p class="blog-title">{{ post.title }}</p>
+                <p align="left" class="post-meta" >posted: {{ post.date | date: "%b %-d, %Y" }}</p>
+              </a>
+            </div>
+      {% endfor %}
+      {% endif %}
+      {% endfor %}
+
+        </div>
+
+  <p class="rss-subscribe">通过<a href="{{ "/feed.xml" | prepend: site.baseurl }}"> RSS</a> 订阅</p>
+      </div>
+      <!-- /container --> 
+      
+    </header>
+  </section>
+
+  
+    
+</main>