add apachecon event and nick as committer
diff --git a/_jade/committer.jade b/_jade/committer.jade
index 4023ab2..c6f2b1f 100644
--- a/_jade/committer.jade
+++ b/_jade/committer.jade
@@ -1,4 +1,4 @@
extends layouts/redirect
block variables
- - var redirectTo = 'committer.html'
+ - var redirectTo = 'committers.html'
diff --git a/_jade/committers.jade b/_jade/committers.jade
new file mode 100644
index 0000000..c6f2b1f
--- /dev/null
+++ b/_jade/committers.jade
@@ -0,0 +1,4 @@
+extends layouts/redirect
+
+block variables
+ - var redirectTo = 'committers.html'
diff --git a/_jade/en/committers.jade b/_jade/en/committers.jade
index defb5f2..51075f7 100644
--- a/_jade/en/committers.jade
+++ b/_jade/en/committers.jade
@@ -158,6 +158,11 @@
.about-desc Beijing, China
.col-md-3.col-sm-4.col-xs-6
.about-person
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/nick.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Nick
+ .about-desc Shenzhen, China
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
a(href='https://github.com/ClemMakesApps', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/clement.jpg?_v_=#{cdnPayVersion}')
h5.about-name Clement Ho
diff --git a/_jade/en/events.jade b/_jade/en/events.jade
index 4d8d9d2..57f1217 100644
--- a/_jade/en/events.jade
+++ b/_jade/en/events.jade
@@ -22,14 +22,20 @@
.page-content
.container
h2 Current Events
+ a.event(href='./events/2021-07-05-apachecon.html')
+ picture
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon-en.webp?_v_=#{cdnPayVersion}", type="image/webp")
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon-en.jpeg?_v_=#{cdnPayVersion}", type="image/jpeg")
+ img.lazy(data-src="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon-en.jpeg?_v_=#{cdnPayVersion}", alt="ApacheCon Asia 2021")
+
+ h2 Previous Events
a.event(href='./events/2021-05-13-iscas.html')
picture
source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210513-iscas-en.webp?_v_=#{cdnPayVersion}", type="image/webp")
source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210513-iscas-en.jpeg?_v_=#{cdnPayVersion}", type="image/jpeg")
img.lazy(data-src="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210513-iscas-en.jpeg?_v_=#{cdnPayVersion}", alt="Summer 2021 of Open Source Promotion Plan")
-
- include ../components/inner-footer
+ include ./footer
block extra_js
script(type='text/javascript').
window.lazyLoadOptions = {
diff --git a/_jade/en/events/2021-05-13-iscas.jade b/_jade/en/events/2021-05-13-iscas.jade
index c2b8d9e..355f185 100644
--- a/_jade/en/events/2021-05-13-iscas.jade
+++ b/_jade/en/events/2021-05-13-iscas.jade
@@ -121,7 +121,7 @@
td TypeScript
- include ../../components/inner-footer
+ include ../footer
block extra_js
script(type='text/javascript').
window.lazyLoadOptions = {
diff --git a/_jade/en/events/2021-07-05-apachecon.jade b/_jade/en/events/2021-07-05-apachecon.jade
new file mode 100644
index 0000000..fdb3af9
--- /dev/null
+++ b/_jade/en/events/2021-07-05-apachecon.jade
@@ -0,0 +1,83 @@
+extends ../../layouts/basic
+
+block variablesLang
+ include ./../_variablesLang.jade
+
+block variables
+ - var pageTitle = 'Events - Apache ECharts'
+
+block extra_head
+ title Events - Apache ECharts
+
+block content
+ nav(class='navbar navbar-default navbar-fixed-top')
+ include ../nav
+
+ .page-main
+ .page-info
+ .container
+ h1 ApacheCon Asia 2021
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
+
+ .page-content
+ .container
+ div
+ a(href="../events.html") Back to the event list
+
+ .event.event-detail-img
+ picture
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon-en.webp?_v_=#{cdnPayVersion}", type="image/webp")
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon-en.jpeg?_v_=#{cdnPayVersion}", type="image/jpeg")
+ img.lazy(data-src="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon-en.jpeg?_v_=#{cdnPayVersion}", alt="ApacheCon Asia 2021")
+
+ h3 Coming to your living room this August!
+ p Join us from the comfort of your own home for three days of Apache project content across dozens of categories, from Big Data to Fintech to Search to Tomcat and more.
+ p The <a href="https://apachecon.com/acasia2021/tracks/datavisualization.html">Data Visualization track</a> is on 2021.08.06 and the topics are:
+ table
+ tr
+ td 13:30 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/sessions/1090.html") Why Apache Superset is Betting on Apache ECharts
+ td English Session
+ td Ville Brofeldt
+ tr
+ td 14:10 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/sessions/1087.html") Dirty-rectangle Rendering with Apache ECharts
+ td English Session
+ td Wenli Zhang
+ tr
+ td 14:50 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/sessions/1093.html") The challenge of 16ms - Charting tool optimization
+ td Chinese Session
+ td Shuang Su
+ tr
+ td 15:30 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/sessions/1094.html") Fun with ECharts! - how we use it in Tesla!
+ td Chinese Session
+ td Fanchao Meng
+ tr
+ td 16:10 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/sessions/1092.html") Rendering charts using echarts to present community activity
+ td Chinese Session
+ td Sun Yi
+ tr
+ td 16:50 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/sessions/1091.html") echarts4r: ECharts integration with the R programming language
+ td English Session
+ td John Coene
+
+ h3 Event Registration
+ p Please go to the <a href="https://hopin.com/events/apachecon-asia-2021">Hopin platform</a> to register or check for more information at <a href="https://apachecon.com/acasia2021/index.html">the official Website</a>.
+ include ../footer
+block extra_js
+ script(type='text/javascript').
+ window.lazyLoadOptions = {
+ elements_selector: ".lazy"
+ };
+ document.getElementById('nav-contribute').className = 'active';
+ script(src='https://cdn.jsdelivr.net/npm/vanilla-lazyload@12.0.0/dist/lazyload.min.js')
diff --git a/_jade/zh/committers.jade b/_jade/zh/committers.jade
index 95a3238..0073470 100644
--- a/_jade/zh/committers.jade
+++ b/_jade/zh/committers.jade
@@ -157,6 +157,11 @@
.about-desc 中国 · 北京
.col-md-3.col-sm-4.col-xs-6
.about-person
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/nick.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Nick
+ .about-desc 中国 · 深圳
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
a(href='https://github.com/ClemMakesApps', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/clement.jpg?_v_=#{cdnPayVersion}')
h5.about-name Clement Ho
diff --git a/_jade/zh/events.jade b/_jade/zh/events.jade
index 5b03b75..4feca4b 100644
--- a/_jade/zh/events.jade
+++ b/_jade/zh/events.jade
@@ -19,13 +19,18 @@
.page-content
.container
h2 进行中的活动
+ a.event(href='./events/2021-07-05-apachecon.html')
+ picture
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon.webp?_v_=#{cdnPayVersion}", type="image/webp")
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon.jpeg?_v_=#{cdnPayVersion}", type="image/jpeg")
+ img.lazy(data-src="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon.jpeg?_v_=#{cdnPayVersion}", alt="ApacheCon Asia 2021")
+
+ h2 过期的活动
a.event(href='./events/2021-05-13-iscas.html')
picture
source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210513-iscas.webp?_v_=#{cdnPayVersion}", type="image/webp")
source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210513-iscas.jpeg?_v_=#{cdnPayVersion}", type="image/jpeg")
img.lazy(data-src="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210513-iscas.jpeg?_v_=#{cdnPayVersion}", alt="开源软件供应链点亮计划 - 暑期 2021")
-
- h2 过期的活动
a.event(href='https://echarts-5-live.bj.bcebos.com/echarts-5-event.html?ref=ec-event')
picture
source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20200128-apache-echarts-5.webp?_v_=#{cdnPayVersion}", type="image/webp")
diff --git a/_jade/zh/events/2021-07-05-apachecon.jade b/_jade/zh/events/2021-07-05-apachecon.jade
new file mode 100644
index 0000000..5031ec8
--- /dev/null
+++ b/_jade/zh/events/2021-07-05-apachecon.jade
@@ -0,0 +1,83 @@
+extends ../../layouts/basic
+
+block variables
+ - var pageTitle = 'Apache ECharts - 活动'
+
+block extra_head
+ title 活动 - Apache ECharts
+
+block content
+ nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
+ include ../../components/nav
+
+ .page-main
+ .page-info
+ .container
+ h1 ApacheCon Asia 2021
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
+
+ .page-content
+ .container
+ div
+ a(href="../events.html") 返回活动列表
+
+ .event.event-detail-img
+ picture
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon.webp?_v_=#{cdnPayVersion}", type="image/webp")
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon.jpeg?_v_=#{cdnPayVersion}", type="image/jpeg")
+ img.lazy(data-src="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon.jpeg?_v_=#{cdnPayVersion}", alt="ApacheCon Asia 2021")
+
+ h3 今年八月 Apache 亚洲峰会来到您的客厅！
+ p 足不出户，就可以参加 Apache 技术盛宴，持续三天的 Apache 项目内容涵盖数十个类别，从大数据到金融科技再到搜索再到大家熟悉的 Tomcat 等。
+ p 其中，<a href="https://apachecon.com/acasia2021/zh/tracks/datavisualization.html">数据可视化论坛</a>在 2021.08.06，演讲主题包括：
+ table
+ tr
+ td 13:30 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/zh/sessions/1090.html") 为什么 Apache Superset 选择使用 Apache ECharts？
+ td 英文演讲
+ td Ville Brofeldt
+ tr
+ td 14:10 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/zh/sessions/1087.html") Apache ECharts 的脏矩形渲染实践
+ td 英文演讲
+ td Wenli Zhang
+ tr
+ td 14:50 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/zh/sessions/1093.html") 16 毫秒的挑战：图表库渲染优化
+ td 中文演讲
+ td Shuang Su
+ tr
+ td 15:30 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/zh/sessions/1094.html") ECharts 的乐趣：我们如何在特斯拉使用它！
+ td 中文演讲
+ td Fanchao Meng
+ tr
+ td 16:10 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/zh/sessions/1092.html") 使用 ECharts 呈现社区活动的渲染图
+ td 中文演讲
+ td Sun Yi
+ tr
+ td 16:50 GMT+8
+ td
+ a(href="https://apachecon.com/acasia2021/zh/sessions/1091.html") echarts4r：ECharts 与 R 编程语言的整合
+ td 英文演讲
+ td John Coene
+
+ h3 免费注册
+ p 请前往<a href="https://hopin.com/events/apachecon-asia-2021">Hopin 平台</a>注册，或在<a href="https://apachecon.com/acasia2021/index.html">官网</a>了解更多关于本次会议的介绍。
+
+ include ../../components/footer
+
+
+block extra_js
+ script.
+ window.lazyLoadOptions = {
+ elements_selector: ".lazy"
+ };
+ document.getElementById('nav-contribute').className = 'active';
+ script(src='https://cdn.jsdelivr.net/npm/vanilla-lazyload@12.0.0/dist/lazyload.min.js')
diff --git a/_jade/zh/index.jade b/_jade/zh/index.jade
index 720b03f..3f90ce6 100644
--- a/_jade/zh/index.jade
+++ b/_jade/zh/index.jade
@@ -34,11 +34,11 @@
section#events-section
.container
- a.event(href='./events/2021-05-13-iscas.html')
+ a.event(href='./events/2021-07-05-apachecon.html')
picture
- source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210513-iscas.webp?_v_=#{cdnPayVersion}", type="image/webp")
- source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210513-iscas.jpeg?_v_=#{cdnPayVersion}", type="image/jpeg")
- img.lazy(data-src="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210513-iscas.jpeg?_v_=#{cdnPayVersion}", alt="开源软件供应链点亮计划 - 暑期 2021")
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon.webp?_v_=#{cdnPayVersion}", type="image/webp")
+ source.lazy(data-srcset="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon.jpeg?_v_=#{cdnPayVersion}", type="image/jpeg")
+ img.lazy(data-src="#{cdnPayRoot}/#{ecWWWLang}/images/event/20210705-apachecon.jpeg?_v_=#{cdnPayVersion}", alt="ApacheCon Asia 2021")
section#feature-section
.container
diff --git a/images/event/20210705-apachecon-en.jpeg b/images/event/20210705-apachecon-en.jpeg
new file mode 100644
index 0000000..4b3ffb9
--- /dev/null
+++ b/images/event/20210705-apachecon-en.jpeg
Binary files differ
diff --git a/images/event/20210705-apachecon-en.webp b/images/event/20210705-apachecon-en.webp
new file mode 100644
index 0000000..e859935
--- /dev/null
+++ b/images/event/20210705-apachecon-en.webp
Binary files differ
diff --git a/images/event/20210705-apachecon.jpeg b/images/event/20210705-apachecon.jpeg
new file mode 100644
index 0000000..7c1f76f
--- /dev/null
+++ b/images/event/20210705-apachecon.jpeg
Binary files differ
diff --git a/images/event/20210705-apachecon.webp b/images/event/20210705-apachecon.webp
new file mode 100644
index 0000000..870862b
--- /dev/null
+++ b/images/event/20210705-apachecon.webp
Binary files differ
diff --git a/images/people/nick.jpg b/images/people/nick.jpg
new file mode 100644
index 0000000..fcaee32
--- /dev/null
+++ b/images/people/nick.jpg
Binary files differ
