You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2020/12/29 05:13:44 UTC
[incubator-echarts-www] branch master updated: update website after
graduation
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-www.git
The following commit(s) were added to refs/heads/master by this push:
new 999609f update website after graduation
999609f is described below
commit 999609f5c2ebe7fb73c09c562c2e00d3a4d2624b
Author: Ovilia <zw...@gmail.com>
AuthorDate: Tue Dec 29 13:13:27 2020 +0800
update website after graduation
---
README.md | 2 +-
_jade/components/download.jade | 4 +-
_jade/components/footer.jade | 9 +-
_jade/components/inner-footer.jade | 1 -
_jade/components/nav-mixin.jade | 3 -
_jade/en/changelog.jade | 4 +-
_jade/en/cheat-sheet.jade | 4 +-
_jade/en/coding-standard.jade | 4 +-
_jade/en/committers.jade | 163 ++++++++++-----------
_jade/en/contributing.jade | 8 +-
_jade/en/dependencies.jade | 4 +-
_jade/en/download-extension.jade | 4 +-
_jade/en/download-map.jade | 4 +-
_jade/en/download-theme.jade | 4 +-
_jade/en/download.jade | 6 +-
_jade/en/faq.jade | 6 +-
_jade/en/feature.jade | 6 +-
_jade/en/footer.jade | 7 +-
_jade/en/index.jade | 6 +-
_jade/en/maillist.jade | 8 +-
_jade/en/nav-mixin.jade | 3 -
_jade/en/resources.jade | 4 +-
_jade/en/security.jade | 6 +-
_jade/en/spreadsheet.jade | 2 +-
_jade/en/theme-builder.jade | 2 +-
_jade/layouts/basic.jade | 8 +-
_jade/layouts/doc.jade | 2 +-
_jade/layouts/next-doc.jade | 2 +-
_jade/layouts/next-example-simple.jade | 2 +-
_jade/layouts/next-example.jade | 2 +-
_jade/manually-redirect.jade | 5 +-
_jade/zh/changelog.jade | 4 +-
_jade/zh/cheat-sheet.jade | 4 +-
_jade/zh/coding-standard.jade | 4 +-
_jade/zh/committers.jade | 162 ++++++++++----------
_jade/zh/contributing.jade | 8 +-
_jade/zh/demo.jade | 2 +-
_jade/zh/dependencies.jade | 6 +-
_jade/zh/download-extension.jade | 4 +-
_jade/zh/download-map.jade | 4 +-
_jade/zh/download-theme.jade | 4 +-
_jade/zh/examples.jade | 2 +-
_jade/zh/faq.jade | 4 +-
_jade/zh/feature.jade | 4 +-
_jade/zh/index.jade | 4 +-
_jade/zh/maillist.jade | 8 +-
_jade/zh/resources.jade | 4 +-
_jade/zh/security.jade | 6 +-
_jade/zh/spreadsheet.jade | 2 +-
_jade/zh/theme-builder.jade | 2 +-
_scss/_components.footer.scss | 34 ++---
_scss/_pages.about.scss | 13 +-
ecop-public/asf-email/tpl/announce-release.tpl | 6 +-
.../asf-email/tpl/vote-dev-release-result.tpl | 2 +-
.../asf-email/tpl/vote-general-release-result.tpl | 4 +-
55 files changed, 276 insertions(+), 316 deletions(-)
diff --git a/README.md b/README.md
index ca65909..f457d24 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# About
-This project is part of the source of [The Apache ECharts (incubating) Official Website](https://echarts.apache.org/). See [incubator-echarts-website](https://github.com/apache/incubator-echarts-website) for more details of the building process.
+This project is part of the source of [The Apache ECharts Official Website](https://echarts.apache.org/). See [incubator-echarts-website](https://github.com/apache/incubator-echarts-website) for more details of the building process.
## dev
diff --git a/_jade/components/download.jade b/_jade/components/download.jade
index abbb67d..0380e44 100644
--- a/_jade/components/download.jade
+++ b/_jade/components/download.jade
@@ -2,7 +2,7 @@ extends ../layouts/basic
block extra_head
- title 下载 - Apache ECharts (incubating)
+ title 下载 - Apache ECharts
//- script(src="#{cdnThirdParty.sweetalertJS}")
block content
@@ -45,7 +45,7 @@ block content
li shasum -a 512 apache-echarts-X.Y.Z-incubating-src.zip
h4 License
- p Apache ECharts (incubating) 基于 <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> 发布
+ p Apache ECharts 基于 <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> 发布
//- if isECharts4
//- h3 （前往下载 <a href="download3.html">3.x 版本）</a>
diff --git a/_jade/components/footer.jade b/_jade/components/footer.jade
index b72de9b..60e5b3a 100644
--- a/_jade/components/footer.jade
+++ b/_jade/components/footer.jade
@@ -2,11 +2,8 @@ footer
.container
.row
.col-md-9
- p Apache ECharts is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicat [...]
p Copyright © 2017-2020, The Apache Software Foundation Apache ECharts, ECharts, Apache, the Apache feather, and the Apache ECharts project logo are either registered trademarks or trademarks of the Apache Software Foundation.
- .col-md-3#footer-icon-panel
- a(href='https://www.apache.org')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/asf_logo.svg?_v_=#{cdnPayVersion}', class="footer-apache-logo")
+
.icon-panel
a.footer-icon(href='mailto:dev@echarts.apache.org?body=%28Thanks%20for%20using%20ECharts.%20Email%20us%20if%20you%20have%20non-technical%20problems%20using%20ECharts.%20For%20technical%20support%2C%20please%20go%20to%20https%3A//github.com/apache/incubator-echarts/issues%20.%29')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-email.png?_v_=#{cdnPayVersion}')
@@ -16,3 +13,7 @@ footer
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-weibo.png?_v_=#{cdnPayVersion}')
a.footer-icon(href='https://github.com/apache/incubator-echarts')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-github.png?_v_=#{cdnPayVersion}')
+
+ .col-md-3#footer-icon-panel
+ a(href='https://www.apache.org')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/asf_logo.svg?_v_=#{cdnPayVersion}', class="footer-apache-logo")
diff --git a/_jade/components/inner-footer.jade b/_jade/components/inner-footer.jade
index 73f84f7..f013d41 100644
--- a/_jade/components/inner-footer.jade
+++ b/_jade/components/inner-footer.jade
@@ -2,7 +2,6 @@ footer.inner-footer
.container
.row
.col-md-8
- p Apache ECharts is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicat [...]
p Copyright © 2017-2020, The Apache Software Foundation Apache ECharts, ECharts, Apache, the Apache feather, and the Apache ECharts project logo are either registered trademarks or trademarks of the Apache Software Foundation.
.col-md-4#footer-icon-panel
a(href='https://www.apache.org')
diff --git a/_jade/components/nav-mixin.jade b/_jade/components/nav-mixin.jade
index a44a8bb..b6b82fd 100644
--- a/_jade/components/nav-mixin.jade
+++ b/_jade/components/nav-mixin.jade
@@ -115,6 +115,3 @@ mixin nav(hostParam, cdnPayRootParam, cdnPayVersionParam)
ul(class='nav navbar-nav navbar-right')
li#nav-homeen
a(href='javascript:;', onclick="changeLang('en')") EN
- li#nav-apache
- a(href="https://www.apache.org/" target="_blank")
- img(src="#{cdnPayRootParam}/zh/images/apache-incubator-white.png?_v_=#{cdnPayVersionParam}", width="18")
diff --git a/_jade/en/changelog.jade b/_jade/en/changelog.jade
index 6e835b7..3bf256e 100644
--- a/_jade/en/changelog.jade
+++ b/_jade/en/changelog.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Changelog - Apache ECharts (incubating)
+ title Changelog - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top')
@@ -14,7 +14,7 @@ block content
.page-info
h1 Changelog
p [+]Add [-]Remove [^]Update [#]Fix
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.single-page
.page-nav
diff --git a/_jade/en/cheat-sheet.jade b/_jade/en/cheat-sheet.jade
index c846ec8..7db5bd4 100644
--- a/_jade/en/cheat-sheet.jade
+++ b/_jade/en/cheat-sheet.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Cheat Sheet - Apache ECharts (incubating)
+ title Cheat Sheet - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -14,7 +14,7 @@ block content
.page-info
h1 Cheat Sheet
p Learn the component names quickly.
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.container.page-cheatsheet
h2 Frequently-used Components
diff --git a/_jade/en/coding-standard.jade b/_jade/en/coding-standard.jade
index d3f9e6a..060dcec 100644
--- a/_jade/en/coding-standard.jade
+++ b/_jade/en/coding-standard.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Coding Standard - Apache ECharts (incubating)
+ title Coding Standard - Apache ECharts
link(rel='stylesheet', type='text/css', href='#{cdnPayRoot}/#{ecWWWLang}/vendors/prettify/prettify.css?_v_=#{cdnPayVersion}')
script(type='text/javascript', src='#{cdnThirdParty.prettifyJS}')
@@ -19,7 +19,7 @@ block content
.page-info
h1 Coding Standard
p Please follow this standard when contribute to ECharts project.
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.single-page
.page-nav
diff --git a/_jade/en/committers.jade b/_jade/en/committers.jade
index a7c75e2..c6efb07 100644
--- a/_jade/en/committers.jade
+++ b/_jade/en/committers.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Committers - Apache ECharts (incubating)
+ title Committers - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top')
@@ -15,35 +15,11 @@ block content
h1 Thanks for Helping
p The development of ECharts is associated with the outstanding contributions from the people in the community,<br>who have different skills and come from different backgrounds.
p Thank you all your help!
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
#about-page
section.container.contributor
-
- h4.group.mentors Apache Mentors
- .row
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/dave.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Dave Fisher
- .about-desc San Francisco, US
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/kevin.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Kevin A. McGrail
- .about-desc Washington, US
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/shengwu.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Sheng Wu
- .about-desc Beijing, China
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/tedliu.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Ted Liu
- .about-desc Beijing, China
-
- h4.group.code PPMC
+ h4.group.pmc PMC
.row
.col-md-3.col-sm-4.col-xs-6
.about-person
@@ -68,13 +44,6 @@ block content
.about-desc Shanghai, China
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/deqingli', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/德清.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Deqing Li
- .about-desc Alibaba
- .about-desc Hangzhou, China
- .col-md-3.col-sm-4.col-xs-6
- .about-person
a(href='https://www.behance.net/wjtjiayouac8aa', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/王俊婷.jpg?_v_=#{cdnPayVersion}')
h5.about-name Junting Wang
@@ -82,20 +51,60 @@ block content
.about-desc Shanghai, China
.col-md-3.col-sm-4.col-xs-6
.about-person
+ a(href='https://github.com/plainheart', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/plainheart.jpg')
+ h5.about-name Zhongxiang Wang
+ .about-desc Henan, China
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ a(href='https://github.com/susiwen8', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/苏思文.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Siwen Su
+ .about-desc Baidu
+ .about-desc Beijing, China
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ a(href='https://github.com/wf123537200', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/zakwu.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Zak Wu
+ .about-desc Tencent
+ .about-desc Shenzhen, China
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
a(href='https://github.com/kener', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/林峰.jpg?_v_=#{cdnPayVersion}')
h5.about-name Feng Lin
.about-desc Alibaba
.about-desc Hangzhou, China
-
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ a(href='https://github.com/deqingli', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/德清.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Deqing Li
+ .about-desc Alibaba
+ .about-desc Hangzhou, China
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/dave.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Dave Fisher
+ .about-desc San Francisco, US
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/kevin.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Kevin A. McGrail
+ .about-desc Washington, US
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/shengwu.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Sheng Wu
+ .about-desc Beijing, China
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/erik168', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/erik.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Erik
+ h5.about-name Erik Dong
.about-desc Baidu
.about-desc Beijing, China
-
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/chriswong', target='_blank')
@@ -104,31 +113,15 @@ block content
.about-desc GSX
.about-desc Beijing, China
+ h4.group.committer Committers
+ .row
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/susiwen8', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/苏思文.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Siwen Su
+ a(href='https://github.com/yufeng04', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/禹峰.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Feng Yu
.about-desc Baidu
- .about-desc Beijing, China
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- a(href='https://github.com/plainheart', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/plainheart.jpg')
- h5.about-name Zhongxiang Wang
- .about-desc Henan, China
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- a(href='https://github.com/wf123537200', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/zakwu.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Zak Wu
- .about-desc Tencent
- .about-desc Shenzhen, China
-
-
-
- h4.group.code Committers
- .row
+ .about-desc Shanghai, China
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/cuijian-dexter', target='_blank')
@@ -136,30 +129,19 @@ block content
h5.about-name Jian Cui
.about-desc Baidu
.about-desc Beijing, 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
- .about-desc MURAL
- .about-desc Texas, US
-
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- a(href='https://github.com/yufeng04', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/禹峰.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Feng Yu
- .about-desc Baidu
+ a(href='https://github.com/quillblue', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/qiansheng.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Sheng Qian
+ .about-desc Dow Inc.
.about-desc Shanghai, China
-
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/SnailSword', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/韩天.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Tian Han
- .about-desc Student
- .about-desc Beijing, China
+ a(href='https://github.com/chfw', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/chfw.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name chfw
+ .about-desc UK
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/alex2wong', target='_blank')
@@ -169,18 +151,23 @@ block content
.about-desc Shanghai, China
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/chfw', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/chfw.jpg?_v_=#{cdnPayVersion}')
- h5.about-name chfw
- .about-desc UK
+ a(href='https://github.com/SnailSword', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/韩天.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Tian Han
+ .about-desc Merico
+ .about-desc Beijing, China
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/quillblue', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/qiansheng.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Sheng Qian
- .about-desc Dow Inc.
- .about-desc Shanghai, China
-
+ a(href='https://github.com/ClemMakesApps', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/clement.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Clement Ho
+ .about-desc MURAL
+ .about-desc Texas, US
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/tedliu.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Ted Liu
+ .about-desc Beijing, China
h4.group.contributor Contributors
.row
diff --git a/_jade/en/contributing.jade b/_jade/en/contributing.jade
index c900c0b..90c5812 100644
--- a/_jade/en/contributing.jade
+++ b/_jade/en/contributing.jade
@@ -4,7 +4,7 @@ block variables
- var pageTitle = 'ECharts FAQ'
block extra_head
- title Contributing - Apache ECharts (incubating)
+ title Contributing - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -14,11 +14,11 @@ block content
.page-info
.container
h1 Contributing
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content
.container
- h2 Contributing to Apache ECharts (incubating)
+ h2 Contributing to Apache ECharts
p There are many ways that you can help make ECharts better. Please dive in and help!
h3 Issues
@@ -39,7 +39,7 @@ block content
p Join us on the <a href="./maillist.html">mailing list</a> and take part in any conversations.
h3 Documents
- p Documentation is massively important to help users make the most of Apache ECharts (incubating) and it's probably the area that needs the most help! So if you are interested, whether it's just to fix a page here or there, correct a link or improve what documentation is already there, please do dive in and help!
+ p Documentation is massively important to help users make the most of Apache ECharts and it's probably the area that needs the most help! So if you are interested, whether it's just to fix a page here or there, correct a link or improve what documentation is already there, please do dive in and help!
p The source code of document is available at <a href="https://github.com/apache/incubator-echarts-doc" target="_blank">GitHub</a> and maybe the easiest way to find where to change is by searching key words already there.
p In the issue list, we also have a <a href="https://github.com/apache/incubator-echarts/labels/doc" target="_blank">"doc"</a> label. We appreciate pull requests to fix them indeed!
diff --git a/_jade/en/dependencies.jade b/_jade/en/dependencies.jade
index c52733f..aa604fe 100644
--- a/_jade/en/dependencies.jade
+++ b/_jade/en/dependencies.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Dependencies - Apache ECharts (incubating)
+ title Dependencies - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top')
@@ -13,7 +13,7 @@ block content
.page-main
.page-info
h1 Dependencies
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content
.container
diff --git a/_jade/en/download-extension.jade b/_jade/en/download-extension.jade
index c585d55..6314d7f 100644
--- a/_jade/en/download-extension.jade
+++ b/_jade/en/download-extension.jade
@@ -24,7 +24,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Download Extensions - Apache ECharts (incubating)
+ title Download Extensions - Apache ECharts
block content
@@ -35,7 +35,7 @@ block content
.page-info
h1 Download Extensions
p Download extensions and enhance what ECharts can do.
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.container#extension
.nav-container
diff --git a/_jade/en/download-map.jade b/_jade/en/download-map.jade
index 958b336..c4e8194 100644
--- a/_jade/en/download-map.jade
+++ b/_jade/en/download-map.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Download Maps - Apache ECharts (incubating)
+ title Download Maps - Apache ECharts
block content
@@ -15,7 +15,7 @@ block content
.page-info
h1 Download Maps
p ECharts doesn't provide with Map data to download now.
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content(style='text-align: left; min-height: 300px; margin-top: 30px;', class='container')
p ECharts doesn't come with Map data. To create Map charts, it is advised to use Baidu Map or other third party maps for the underlying map. Here is an example of <a href="#{host}/examples/en/editor.html?c=map-polygon">ECharts with Baidu Map</a>.
diff --git a/_jade/en/download-theme.jade b/_jade/en/download-theme.jade
index 06c2a22..3a4c669 100644
--- a/_jade/en/download-theme.jade
+++ b/_jade/en/download-theme.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Download Themes - Apache ECharts (incubating)
+ title Download Themes - Apache ECharts
link(rel='stylesheet', type='text/css', href='#{cdnPayRoot}/#{ecWWWLang}/vendors/prettify/prettify.css?_v_=#{cdnPayVersion}')
block content
@@ -17,7 +17,7 @@ block content
h1 Download Themes
p Change the looking of your charts.
p You can also make your own theme along with using the themes we provide.
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.container#themes
.row
diff --git a/_jade/en/download.jade b/_jade/en/download.jade
index 9152489..5094fdd 100644
--- a/_jade/en/download.jade
+++ b/_jade/en/download.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Download - Apache ECharts (incubating)
+ title Download - Apache ECharts
block content
@@ -26,7 +26,7 @@ block content
.page-info
h1 Download
p Free to choose to download different versions, different topics, the map data you need. You can be customized according to your needs.
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.container#download-main
.d-section-version.d-section
@@ -57,7 +57,7 @@ block content
li shasum -a 512 apache-echarts-X.Y.Z-incubating-src.zip
h4 License
- p Apache ECharts (incubating) is licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+ p Apache ECharts is licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
h3 Option 2: Install from npm
p <code>npm install echarts</code>
diff --git a/_jade/en/faq.jade b/_jade/en/faq.jade
index 9388564..715f15c 100644
--- a/_jade/en/faq.jade
+++ b/_jade/en/faq.jade
@@ -4,10 +4,10 @@ block variablesLang
include ./_variablesLang.jade
block variables
- - var pageTitle = 'FAQ - Apache ECharts (incubating)'
+ - var pageTitle = 'FAQ - Apache ECharts'
block extra_head
- title FAQ - Apache ECharts (incubating)
+ title FAQ - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top')
@@ -18,7 +18,7 @@ block content
.container
h1 FAQ
p Frequently asked questions
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.single-page#faq-page
.page-nav
diff --git a/_jade/en/feature.jade b/_jade/en/feature.jade
index 2232825..567d9a5 100644
--- a/_jade/en/feature.jade
+++ b/_jade/en/feature.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Features - Apache ECharts (incubating)
+ title Features - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top')
@@ -14,14 +14,14 @@ block content
.page-info
.container
h1 Features
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.single-page
.page-nav
h4 Features
ul
.page-detail
- p.page-detail-desc Apache ECharts (incubating)<sup>TM</sup> is an open-sourced JavaScript visualization tool, which can run fluently on PC and mobile devices. It is compatible with most modern Web Browsers, e.g., IE8/9/10/11, Chrome, Firefox, Safari and so on. ECharts depends on <a href="https://github.com/ecomfe/zrender" target="_blank">ZRender</a>, a graphic rendering engine, to create intuitive, interactive, and highly-customizable charts.
+ p.page-detail-desc Apache ECharts<sup>TM</sup> is an open-sourced JavaScript visualization tool, which can run fluently on PC and mobile devices. It is compatible with most modern Web Browsers, e.g., IE8/9/10/11, Chrome, Firefox, Safari and so on. ECharts depends on <a href="https://github.com/ecomfe/zrender" target="_blank">ZRender</a>, a graphic rendering engine, to create intuitive, interactive, and highly-customizable charts.
h2#chart-types Abundant Chart Types
p The basic chart types ECharts supports include <a href="option.html#series-line" target="_blank">line series</a>, <a href="option.html#series-line" target="_blank">bar series</a>, <a href="option.html#series-scatter" target="_blank">scatter series</a>, <a href="option.html#series-pie" target="_blank">pie charts</a>, <a href="option.html#series-candlestick" target="_blank">candle-stick series</a>, <a href="option.html#series-boxplot" target="_blank">boxplot series</a> fo [...]
diff --git a/_jade/en/footer.jade b/_jade/en/footer.jade
index b72de9b..7ee2864 100644
--- a/_jade/en/footer.jade
+++ b/_jade/en/footer.jade
@@ -2,11 +2,7 @@ footer
.container
.row
.col-md-9
- p Apache ECharts is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicat [...]
p Copyright © 2017-2020, The Apache Software Foundation Apache ECharts, ECharts, Apache, the Apache feather, and the Apache ECharts project logo are either registered trademarks or trademarks of the Apache Software Foundation.
- .col-md-3#footer-icon-panel
- a(href='https://www.apache.org')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/asf_logo.svg?_v_=#{cdnPayVersion}', class="footer-apache-logo")
.icon-panel
a.footer-icon(href='mailto:dev@echarts.apache.org?body=%28Thanks%20for%20using%20ECharts.%20Email%20us%20if%20you%20have%20non-technical%20problems%20using%20ECharts.%20For%20technical%20support%2C%20please%20go%20to%20https%3A//github.com/apache/incubator-echarts/issues%20.%29')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-email.png?_v_=#{cdnPayVersion}')
@@ -16,3 +12,6 @@ footer
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-weibo.png?_v_=#{cdnPayVersion}')
a.footer-icon(href='https://github.com/apache/incubator-echarts')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-github.png?_v_=#{cdnPayVersion}')
+ .col-md-3#footer-icon-panel
+ a(href='https://www.apache.org')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/asf_logo.svg?_v_=#{cdnPayVersion}', class="footer-apache-logo")
diff --git a/_jade/en/index.jade b/_jade/en/index.jade
index 7f24ca9..ffe294e 100644
--- a/_jade/en/index.jade
+++ b/_jade/en/index.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Apache ECharts (incubating)
+ title Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -45,7 +45,7 @@ block content
section#feature-section
.container
.row.features
- p Apache ECharts (incubating)<sup>TM</sup> is an incubation project at <a target="_blank" href="https://www.apache.org/">The Apache Software Foundation</a> (ASF).
+ p Apache ECharts<sup>TM</sup> is a top-level project of <a target="_blank" href="https://www.apache.org/">The Apache Software Foundation</a> (ASF).
.row.features
.col-sm-4
@@ -141,7 +141,7 @@ block content
section.normal#about-section
.container
h3 Follow Us
- p You may follow Apache ECharts (incubating) to keep informed.
+ p You may follow Apache ECharts to keep informed.
.btn-panel
a#btn-github(href='https://github.com/apache/incubator-echarts')
.btn-content
diff --git a/_jade/en/maillist.jade b/_jade/en/maillist.jade
index 7d34ee7..4b8787c 100644
--- a/_jade/en/maillist.jade
+++ b/_jade/en/maillist.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Mailing List - Apache ECharts (incubating)
+ title Mailing List - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top')
@@ -13,7 +13,7 @@ block content
.page-main
.page-info
h1 Mailing List
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content#maillist
.container
@@ -27,12 +27,12 @@ block content
p If you have a specific bug to report or feature request, we'd suggest you opening an issue with our <a href="https://ecomfe.github.io/echarts-issue-helper">issue helper tool</a>, which is a more efficient way to report the details.
- p <a href="mailto:commits@echarts.incubator.apache.org">commits@echarts.incubator.apache.org</a> focuses on the commit logs, while <a href="mailto:dev@echarts.incubator.apache.org">dev@echarts.incubator.apache.org</a> holds other general discussions.
+ p <a href="mailto:commits@echarts.apache.org">commits@echarts.apache.org</a> focuses on the commit logs, while <a href="mailto:dev@echarts.apache.org">dev@echarts.apache.org</a> holds other general discussions.
p These two are public mailing list, and you can get access to them on Website <a href="https://lists.apache.org/list.html?commits@echarts.apache.org">https://lists.apache.org/list.html?commits@echarts.apache.org</a> and <a href="https://lists.apache.org/list.html?dev@echarts.apache.org">https://lists.apache.org/list.html?dev@echarts.apache.org</a> without subscribing.
h2 How To Subscribe
- p Email <a href="mailto:commits-subscribe@echarts.incubator.apache.org">commits-subscribe@echarts.incubator.apache.org</a> or <a href="mailto:dev-subscribe@echarts.incubator.apache.org">dev-subscribe@echarts.incubator.apache.org</a> to subscribe commits@echarts.incubator.apache.org and dev@echarts.incubator.apache.org accordingly.
+ p Email <a href="mailto:commits-subscribe@echarts.apache.org">commits-subscribe@echarts.apache.org</a> or <a href="mailto:dev-subscribe@echarts.apache.org">dev-subscribe@echarts.apache.org</a> to subscribe commits@echarts.apache.org and dev@echarts.apache.org accordingly.
p You should receive an email and please follow the instructions in that.
include ./footer
diff --git a/_jade/en/nav-mixin.jade b/_jade/en/nav-mixin.jade
index 06fb862..ebbb6e5 100644
--- a/_jade/en/nav-mixin.jade
+++ b/_jade/en/nav-mixin.jade
@@ -113,6 +113,3 @@ mixin nav(hostParam, cdnPayRootParam)
ul(class='nav navbar-nav navbar-right')
li#nav-homeen
a(href='javascript:;', onclick="changeLang('zh')") 中文
- li#nav-apache
- a(href="https://www.apache.org/" target="_blank")
- img(src="#{cdnPayRootParam}/en/images/apache-incubator-white.png", width="18")
diff --git a/_jade/en/resources.jade b/_jade/en/resources.jade
index e3695eb..1d90e40 100644
--- a/_jade/en/resources.jade
+++ b/_jade/en/resources.jade
@@ -4,7 +4,7 @@ block variables
- var pageTitle = 'More Resources'
block extra_head
- title More Resources - Apache ECharts (incubating)
+ title More Resources - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -14,7 +14,7 @@ block content
.page-info
.container
h1 More Resources
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content
.page-nav
diff --git a/_jade/en/security.jade b/_jade/en/security.jade
index 89be835..5129102 100644
--- a/_jade/en/security.jade
+++ b/_jade/en/security.jade
@@ -4,7 +4,7 @@ block variables
- var pageTitle = 'Security'
block extra_head
- title Security - Apache ECharts (incubating)
+ title Security - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -14,12 +14,12 @@ block content
.page-info
.container
h1 Security
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content#maillist
.page-nav
.container
- p The Apache ECharts (incubating)<sup>TM</sup> takes a rigorous standpoint in annihilating the security issues in its software projects. Apache ECharts (incubating) is highly sensitive and forthcoming to issues pertaining to its features and functionality.
+ p The Apache ECharts<sup>TM</sup> takes a rigorous standpoint in annihilating the security issues in its software projects. Apache ECharts is highly sensitive and forthcoming to issues pertaining to its features and functionality.
p If you have apprehensions regarding ECharts's security or you discover vulnerability or potential threat, don't hesitate to get in touch with the <a href="http://www.apache.org/security/" target="_blank">Apache Security Team</a> by dropping a mail at <a href="mailto:security@apache.org">security@apache.org</a>. In the mail, specify the project name ECharts with the description of the issue or potential threat. You are also urged to recommend the way to reproduce and rep [...]
p PLEASE PAY ATTENTION to report the security issue on the security email before disclosing it on public domain.
diff --git a/_jade/en/spreadsheet.jade b/_jade/en/spreadsheet.jade
index 932aa1f..871b33c 100644
--- a/_jade/en/spreadsheet.jade
+++ b/_jade/en/spreadsheet.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Spreadsheet Tool - Apache ECharts (incubating)
+ title Spreadsheet Tool - Apache ECharts
link(rel="stylesheet", type="text/css", href="#{cdnPayRoot}/#{ecWWWLang}/vendors/handsontable/0.26.1/dist/handsontable.full.min.css?_v_=#{cdnPayVersion}")
link(rel="stylesheet", type="text/css", href="#{getAssetUrl(cdnPayRoot, ecWWWLang + '/css/spreadsheet.css')}")
script(src="vendors/esl.js")
diff --git a/_jade/en/theme-builder.jade b/_jade/en/theme-builder.jade
index bb71936..9d410cc 100644
--- a/_jade/en/theme-builder.jade
+++ b/_jade/en/theme-builder.jade
@@ -4,7 +4,7 @@ block variablesLang
include ./_variablesLang.jade
block extra_head
- title Theme Builder - Apache ECharts (incubating)
+ title Theme Builder - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top')
diff --git a/_jade/layouts/basic.jade b/_jade/layouts/basic.jade
index 6a2bc0e..5b3d14a 100644
--- a/_jade/layouts/basic.jade
+++ b/_jade/layouts/basic.jade
@@ -55,11 +55,11 @@ html(lang='#{htmlAttrLang}')
#apache-banner
.txt
if ecWWWLang == 'en'
- p Apache ECharts is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
- p We are working on redirecting this Website to <a href="https://echarts.apache.org" target="_blank">https://echarts.apache.org</a>. You may visit our new official Website now.
+ p Please visit the official Apache ECharts Website at
+ a(id="a2", href="https://echarts.apache.org/zh/index.html") https://echarts.apache.org
else
- p Apache ECharts 是一个正在由 Apache 孵化器赞助的 Apache 开源基金会孵化的项目。
- p 我们正在处理将本站跳转到 <a href="https://echarts.apache.org" target="_blank">https://echarts.apache.org</a> 的迁移工作。您可以现在就前往我们的 Apache 官网。
+ p 请访问 Apache ECharts 的官网
+ a(id="a1", href="https://echarts.apache.org/zh/index.html") https://echarts.apache.org
a.btn.btn-main(href="https://echarts.apache.org", target="_blank", onclick="logApache()")
if ecWWWLang == 'en'
div Visit Official Website
diff --git a/_jade/layouts/doc.jade b/_jade/layouts/doc.jade
index a040b98..cdae403 100644
--- a/_jade/layouts/doc.jade
+++ b/_jade/layouts/doc.jade
@@ -1,7 +1,7 @@
extends basic
block extra_head
- title Documentation - Apache ECharts(incubating)
+ title Documentation - Apache ECharts
style.
html, body {
/* position: sticky should not have overflow parents.*/
diff --git a/_jade/layouts/next-doc.jade b/_jade/layouts/next-doc.jade
index 1c08e97..9fadde9 100644
--- a/_jade/layouts/next-doc.jade
+++ b/_jade/layouts/next-doc.jade
@@ -1,7 +1,7 @@
extends basic
block extra_head
- title Documentation - Apache ECharts(incubating)
+ title Documentation - Apache ECharts
style.
html, body {
/* position: sticky should not have overflow parents.*/
diff --git a/_jade/layouts/next-example-simple.jade b/_jade/layouts/next-example-simple.jade
index aa4252f..36f4f0a 100644
--- a/_jade/layouts/next-example-simple.jade
+++ b/_jade/layouts/next-example-simple.jade
@@ -1,7 +1,7 @@
extends basic
block extra_head
- title Examples - Apache ECharts(incubating)
+ title Examples - Apache ECharts
style.
html, body {
/* position: sticky should not have overflow parents.*/
diff --git a/_jade/layouts/next-example.jade b/_jade/layouts/next-example.jade
index 7869763..3ef30d2 100644
--- a/_jade/layouts/next-example.jade
+++ b/_jade/layouts/next-example.jade
@@ -1,7 +1,7 @@
extends basic
block extra_head
- title Examples - Apache ECharts(incubating)
+ title Examples - Apache ECharts
style.
html, body {
/* position: sticky should not have overflow parents.*/
diff --git a/_jade/manually-redirect.jade b/_jade/manually-redirect.jade
index a7da88b..f34b0a0 100644
--- a/_jade/manually-redirect.jade
+++ b/_jade/manually-redirect.jade
@@ -24,12 +24,11 @@ body
div.main
div.content
div
- span ECharts 正在 Apache 开源基金会孵化中，因此本域名不再使用，请访问
+ span 请访问 Apache ECharts 的官网
a(id="a1", href="https://echarts.apache.org/zh/index.html") https://echarts.apache.org
div
- span ECharts is now under incubation at the Apache Software Foundation. So this domain name is no longer in use. Visit
+ span Please visit the official Apache ECharts Website at
a(id="a2", href="https://echarts.apache.org/zh/index.html") https://echarts.apache.org
- span please
script(type="text/javascript").
document.getElementById('a1').setAttribute('href', 'https://echarts.apache.org/zh/index.html'+((!location.pathname||location.pathname==='/')?'':location.pathname+(!location.search?'':location.search)+(!location.hash?'':location.hash)));
document.getElementById('a2').setAttribute('href', document.getElementById('a1').getAttribute('href'));
diff --git a/_jade/zh/changelog.jade b/_jade/zh/changelog.jade
index fb87aaa..6eb6045 100644
--- a/_jade/zh/changelog.jade
+++ b/_jade/zh/changelog.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title 版本记录 - Apache ECharts (incubating)
+ title 版本记录 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -10,7 +10,7 @@ block content
.page-main
.page-info
h1 版本记录
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.single-page
.page-nav
diff --git a/_jade/zh/cheat-sheet.jade b/_jade/zh/cheat-sheet.jade
index c89aff7..54936ed 100644
--- a/_jade/zh/cheat-sheet.jade
+++ b/_jade/zh/cheat-sheet.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title 术语速查手册 - Apache ECharts (incubating)
+ title 术语速查手册 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -11,7 +11,7 @@ block content
.page-info
h1 术语速查手册
p 快速了解功能名称，帮助定位到配置项手册
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.container.page-cheatsheet
h2 常用组件说明
diff --git a/_jade/zh/coding-standard.jade b/_jade/zh/coding-standard.jade
index da9c091..a137fe9 100644
--- a/_jade/zh/coding-standard.jade
+++ b/_jade/zh/coding-standard.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title 代码规范 - Apache ECharts (incubating)
+ title 代码规范 - Apache ECharts
link(rel='stylesheet', type='text/css', href='#{cdnPayRoot}/#{ecWWWLang}/vendors/prettify/prettify.css?_v_=#{cdnPayVersion}')
script(type='text/javascript', src='#{cdnThirdParty.prettifyJS}')
@@ -16,7 +16,7 @@ block content
.page-info
h1 代码规范
p 如果你想要为 ECharts 贡献代码，请遵从以下代码规范。
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.single-page
.page-nav
diff --git a/_jade/zh/committers.jade b/_jade/zh/committers.jade
index 1442c8a..af22be5 100644
--- a/_jade/zh/committers.jade
+++ b/_jade/zh/committers.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title Committers - Apache ECharts (incubating)</title>
+ title Committers - Apache ECharts</title>
block content
nav(class='navbar navbar-default navbar-fixed-top')
@@ -12,37 +12,10 @@ block content
h1 贡献者列表
p ECharts 的发展离不开其背后很多人的卓越贡献，他们有着不同的技能，甚至来自不同的岗位和公司
p 感谢每一个人的帮助与支持，更希望以后能有更多的人助力 ECharts 的成长
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
#about-page
section.container.contributor
- h4.group.mentors Apache Mentors
- .row
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- //- a(href='https://whimsy.apache.org/roster/committer/wave', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/dave.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Dave Fisher
- .about-desc 美国 · 旧金山
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- //- a(href='https://whimsy.apache.org/roster/committer/kmcgrail', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/kevin.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Kevin A. McGrail
- .about-desc 美国 · 华盛顿
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- //- a(href='https://whimsy.apache.org/roster/committer/wusheng', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/shengwu.jpg?_v_=#{cdnPayVersion}')
- h5.about-name 吴晟
- .about-desc 中国 · 北京
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- //- a(href='https://whimsy.apache.org/roster/committer/tedliu', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/tedliu.jpg?_v_=#{cdnPayVersion}')
- h5.about-name Ted Liu
- .about-desc 中国 · 北京
-
- h4.group.code PPMC
+ h4.group.pmc PMC
.row
.col-md-3.col-sm-4.col-xs-6
.about-person
@@ -67,13 +40,6 @@ block content
.about-desc 中国 · 上海
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/deqingli', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/德清.jpg?_v_=#{cdnPayVersion}')
- h5.about-name 德清
- .about-desc 阿里巴巴
- .about-desc 中国 · 杭州
- .col-md-3.col-sm-4.col-xs-6
- .about-person
a(href='https://www.behance.net/wjtjiayouac8aa', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/王俊婷.jpg')
h5.about-name 王俊婷
@@ -81,6 +47,26 @@ block content
.about-desc 中国 · 上海
.col-md-3.col-sm-4.col-xs-6
.about-person
+ a(href='https://github.com/plainheart', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/plainheart.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name 王忠祥
+ .about-desc 中国 · 河南
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ a(href='https://github.com/susiwen8', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/苏思文.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name 苏思文
+ .about-desc 百度
+ .about-desc 中国 · 北京
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ a(href='https://github.com/wf123537200', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/zakwu.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name 巫枫
+ .about-desc 腾讯
+ .about-desc 中国 · 深圳
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
a(href='https://github.com/kener', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/林峰.jpg?_v_=#{cdnPayVersion}')
h5.about-name 林峰
@@ -88,6 +74,31 @@ block content
.about-desc 中国 · 杭州
.col-md-3.col-sm-4.col-xs-6
.about-person
+ a(href='https://github.com/deqingli', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/德清.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name 德清
+ .about-desc 阿里巴巴
+ .about-desc 中国 · 杭州
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ //- a(href='https://whimsy.apache.org/roster/committer/wave', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/dave.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Dave Fisher
+ .about-desc 美国 · 旧金山
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ //- a(href='https://whimsy.apache.org/roster/committer/kmcgrail', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/kevin.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Kevin A. McGrail
+ .about-desc 美国 · 华盛顿
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ //- a(href='https://whimsy.apache.org/roster/committer/wusheng', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/shengwu.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name 吴晟
+ .about-desc 中国 · 北京
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
a(href='https://github.com/erik168', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/erik.jpg?_v_=#{cdnPayVersion}')
h5.about-name 董睿
@@ -100,30 +111,16 @@ block content
h5.about-name 黄后锦
.about-desc 跟谁学
.about-desc 中国 · 北京
+
+ h4.group.committer Committers
+ .row
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/susiwen8', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/苏思文.jpg?_v_=#{cdnPayVersion}')
- h5.about-name 苏思文
+ a(href='https://github.com/yufeng04', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/禹峰.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name 禹峰
.about-desc 百度
- .about-desc 中国 · 北京
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- a(href='https://github.com/plainheart', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/plainheart.jpg?_v_=#{cdnPayVersion}')
- h5.about-name 王忠祥
- .about-desc 中国 · 河南
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- a(href='https://github.com/wf123537200', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/zakwu.jpg?_v_=#{cdnPayVersion}')
- h5.about-name 巫枫
- .about-desc 腾讯
- .about-desc 中国 · 深圳
-
-
- h4.group.code Committers
- .row
+ .about-desc 中国 · 上海
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/cuijian-dexter', target='_blank')
@@ -133,25 +130,17 @@ block content
.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
- .about-desc MURAL
- .about-desc 美国 · 得克萨斯州
- .col-md-3.col-sm-4.col-xs-6
- .about-person
- a(href='https://github.com/yufeng04', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/禹峰.jpg?_v_=#{cdnPayVersion}')
- h5.about-name 禹峰
- .about-desc 百度
+ a(href='https://github.com/quillblue', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/qiansheng.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name 钱晟
+ .about-desc 陶氏化学
.about-desc 中国 · 上海
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/SnailSword', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/韩天.jpg?_v_=#{cdnPayVersion}')
- h5.about-name 韩天
- .about-desc 学生
- .about-desc 中国 · 北京
+ a(href='https://github.com/chfw', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/chfw.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name chfw
+ .about-desc 英国
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/alex2wong', target='_blank')
@@ -161,18 +150,23 @@ block content
.about-desc 中国 · 上海
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/chfw', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/chfw.jpg?_v_=#{cdnPayVersion}')
- h5.about-name chfw
- .about-desc 英国
+ a(href='https://github.com/SnailSword', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/韩天.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name 韩天
+ .about-desc Merico
+ .about-desc 中国 · 北京
.col-md-3.col-sm-4.col-xs-6
.about-person
- a(href='https://github.com/quillblue', target='_blank')
- img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/qiansheng.jpg?_v_=#{cdnPayVersion}')
- h5.about-name 钱晟
- .about-desc 陶氏化学
- .about-desc 中国 · 上海
-
+ a(href='https://github.com/ClemMakesApps', target='_blank')
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/clement.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Clement Ho
+ .about-desc MURAL
+ .about-desc 美国 · 得克萨斯州
+ .col-md-3.col-sm-4.col-xs-6
+ .about-person
+ img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/tedliu.jpg?_v_=#{cdnPayVersion}')
+ h5.about-name Ted Liu
+ .about-desc 中国 · 北京
h4.group.contributor Contributors
.row
diff --git a/_jade/zh/contributing.jade b/_jade/zh/contributing.jade
index 9886ddb..d3f4ad7 100644
--- a/_jade/zh/contributing.jade
+++ b/_jade/zh/contributing.jade
@@ -4,7 +4,7 @@ block variables
- var pageTitle = 'ECharts FAQ'
block extra_head
- title 如何贡献 - Apache ECharts (incubating)
+ title 如何贡献 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -14,12 +14,12 @@ block content
.page-info
.container
h1 如何贡献
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content
.container
- h2 如何为 Apache ECharts (incubating) 项目贡献一份力量
+ h2 如何为 Apache ECharts 项目贡献一份力量
p ECharts 欢迎各种形式的贡献！
h3 Issues
@@ -40,7 +40,7 @@ block content
p 欢迎订阅<a href="./maillist.html">邮件组</a>参与我们的讨论。
h3 文档
- p 文档的修缮可能是 Apache ECharts (incubating) 最需要帮助的地方。如果你对此感兴趣，无论是对某个页面文字的小修改，还是纠正一个链接或者其他的小改动，我们都非常欢迎！
+ p 文档的修缮可能是 Apache ECharts 最需要帮助的地方。如果你对此感兴趣，无论是对某个页面文字的小修改，还是纠正一个链接或者其他的小改动，我们都非常欢迎！
p 文档的源代码可以在 <a href="https://github.com/apache/incubator-echarts-doc" target="_blank">GitHub</a> 找到。如果想要知道应该修改项目中的哪个文件，通常最简单的方式是在项目中搜索关键字。
p 在 issue 列表中，<a href="https://github.com/apache/incubator-echarts/labels/doc" target="_blank">"doc"</a> 标签表示相关文档需要修改。我们非常欢迎提 PR 修改这些问题！
diff --git a/_jade/zh/demo.jade b/_jade/zh/demo.jade
index 44edaf8..9a04471 100644
--- a/_jade/zh/demo.jade
+++ b/_jade/zh/demo.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title Examples - Apache ECharts (incubating)
+ title Examples - Apache ECharts
script.
var chartId = location.hash.slice(1);
window.location ='./examples/editor.html?c=' + chartId;
diff --git a/_jade/zh/dependencies.jade b/_jade/zh/dependencies.jade
index 5e73c54..46b6721 100644
--- a/_jade/zh/dependencies.jade
+++ b/_jade/zh/dependencies.jade
@@ -4,7 +4,7 @@ block variables
- var pageTitle = 'ECharts FAQ'
block extra_head
- title 依赖项 - Apache ECharts (incubating)
+ title 依赖项 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -13,12 +13,12 @@ block content
.page-main
.page-info
h1 依赖项
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content
.container
h2 ZRender
- p Apache ECharts (incubating)<sup>TM</sup> 底层依赖 <a href="https://github.com/ecomfe/zrender">ZRender</a>，一个轻量级的二维绘制库。
+ p Apache ECharts<sup>TM</sup> 底层依赖 <a href="https://github.com/ecomfe/zrender">ZRender</a>，一个轻量级的二维绘制库。
include ../components/footer
diff --git a/_jade/zh/download-extension.jade b/_jade/zh/download-extension.jade
index 7f4b1d8..064478e 100644
--- a/_jade/zh/download-extension.jade
+++ b/_jade/zh/download-extension.jade
@@ -21,7 +21,7 @@ mixin extension(ext)
.extension-desc #{ext.desc}
block extra_head
- title 扩展下载 - Apache ECharts (incubating)
+ title 扩展下载 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top')
@@ -32,7 +32,7 @@ block content
.page-info
h1 扩展下载
p 可在此免费下载各类 ECharts 扩展插件，获取更丰富的图表类型和增强功能
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.container#extension
.nav-container
diff --git a/_jade/zh/download-map.jade b/_jade/zh/download-map.jade
index 87db7f9..2bc1f3a 100644
--- a/_jade/zh/download-map.jade
+++ b/_jade/zh/download-map.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title 地图下载 - Apache ECharts (incubating)
+ title 地图下载 - Apache ECharts
link(rel='stylesheet', type='text/css', href='#{cdnPayRoot}/#{ecWWWLang}/vendors/prettify/prettify.css?_v_=#{cdnPayVersion}')
block content
@@ -12,7 +12,7 @@ block content
.page-info
h1 地图下载
p （暂不提供地图下载）
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
//- p ECharts 提供世界、中国、各省地图，数据来自第三方
.page-content(style='text-align: left; min-height: 300px; margin-top: 30px;', class='container')
diff --git a/_jade/zh/download-theme.jade b/_jade/zh/download-theme.jade
index 319a9ab..d8393f5 100644
--- a/_jade/zh/download-theme.jade
+++ b/_jade/zh/download-theme.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title 主题下载 - Apache ECharts (incubating)
+ title 主题下载 - Apache ECharts
link(rel='stylesheet', type='text/css', href='#{cdnPayRoot}/#{ecWWWLang}/vendors/prettify/prettify.css?_v_=#{cdnPayVersion}')
block content
@@ -13,7 +13,7 @@ block content
#themes.container
h1 主题下载
p 让你的图表整体换个装，除了官方提供的主题之外，还可以定制你自己的主题
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.container#themes
.row
diff --git a/_jade/zh/examples.jade b/_jade/zh/examples.jade
index 44e6af8..5c3bf2b 100644
--- a/_jade/zh/examples.jade
+++ b/_jade/zh/examples.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title Examples - Apache ECharts (incubating)
+ title Examples - Apache ECharts
script.
var chartId = location.hash.slice(1);
window.location ='./examples/index.html';
diff --git a/_jade/zh/faq.jade b/_jade/zh/faq.jade
index f982d15..197e854 100644
--- a/_jade/zh/faq.jade
+++ b/_jade/zh/faq.jade
@@ -4,7 +4,7 @@ block variables
- var pageTitle = 'ECharts FAQ'
block extra_head
- title FAQ - Apache ECharts (incubating)
+ title FAQ - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -15,7 +15,7 @@ block content
.container
h1 FAQ
p 常见问题的解答
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.single-page#faq-page
.page-nav
diff --git a/_jade/zh/feature.jade b/_jade/zh/feature.jade
index 99e517c..14fb5f6 100644
--- a/_jade/zh/feature.jade
+++ b/_jade/zh/feature.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title 特性 - Apache ECharts (incubating)
+ title 特性 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -11,7 +11,7 @@ block content
.page-info
.container
h1 特性
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content.single-page
.page-nav
diff --git a/_jade/zh/index.jade b/_jade/zh/index.jade
index 6770166..f1cfe9c 100644
--- a/_jade/zh/index.jade
+++ b/_jade/zh/index.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title Apache ECharts (incubating)
+ title Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -41,7 +41,7 @@ block content
section#feature-section
.container
.row.features
- p Apache ECharts (incubating)<sup>TM</sup> 是一个正在 <a target="_blank" href="https://www.apache.org/">Apache Software Foundation</a> (ASF) 孵化中的项目。
+ p Apache ECharts<sup>TM</sup> 是一个 <a target="_blank" href="https://www.apache.org/">Apache Software Foundation</a> (ASF) 的顶级项目。
.row.features
.col-sm-4
diff --git a/_jade/zh/maillist.jade b/_jade/zh/maillist.jade
index 09c66fd..880e46e 100644
--- a/_jade/zh/maillist.jade
+++ b/_jade/zh/maillist.jade
@@ -4,7 +4,7 @@ block variables
- var pageTitle = 'ECharts FAQ'
block extra_head
- title 邮件列表 - Apache ECharts (incubating)
+ title 邮件列表 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -14,7 +14,7 @@ block content
.page-info
.container
h1 邮件列表
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content#maillist
.page-nav
@@ -29,12 +29,12 @@ block content
p 如果你有一个特定的问题想要问，建议使用 <a href="https://ecomfe.github.io/echarts-issue-helper/?lang=zh-cn">Issue Helper</a> 报 Bug 或提需求，这是一种更有效率的方式。
- p <a href="mailto:commits@echarts.incubator.apache.org">commits@echarts.incubator.apache.org</a> 主要是代码提交记录，而 <a href="mailto:dev@echarts.incubator.apache.org">dev@echarts.incubator.apache.org</a> 则是其他通用问题的讨论。
+ p <a href="mailto:commits@echarts.apache.org">commits@echarts.apache.org</a> 主要是代码提交记录，而 <a href="mailto:dev@echarts.apache.org">dev@echarts.apache.org</a> 则是其他通用问题的讨论。
p 这两个邮件列表是公开的，这意味着你可以在 <a href="https://lists.apache.org/list.html?commits@echarts.apache.org">https://lists.apache.org/list.html?commits@echarts.apache.org</a> 和 <a href="https://lists.apache.org/list.html?dev@echarts.apache.org">https://lists.apache.org/list.html?dev@echarts.apache.org</a> 访问到邮件内容，而无需订阅。
h2 如何订阅
- p 给 <a href="mailto:commits-subscribe@echarts.incubator.apache.org">commits-subscribe@echarts.incubator.apache.org</a> 或 <a href="mailto:dev-subscribe@echarts.incubator.apache.org">dev-subscribe@echarts.incubator.apache.org</a> 发邮件来分别订阅 commits@echarts.incubator.apache.org and dev@echarts.incubator.apache.org。
+ p 给 <a href="mailto:commits-subscribe@echarts.apache.org">commits-subscribe@echarts.apache.org</a> 或 <a href="mailto:dev-subscribe@echarts.apache.org">dev-subscribe@echarts.apache.org</a> 发邮件来分别订阅 commits@echarts.apache.org and dev@echarts.apache.org。
p 你会收到一封回信，请照着邮件内容操作。
include ../components/footer
diff --git a/_jade/zh/resources.jade b/_jade/zh/resources.jade
index 756e663..6c642f5 100644
--- a/_jade/zh/resources.jade
+++ b/_jade/zh/resources.jade
@@ -4,7 +4,7 @@ block variables
- var pageTitle = '更多资源'
block extra_head
- title 更多资源 - Apache ECharts (incubating)
+ title 更多资源 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -14,7 +14,7 @@ block content
.page-info
.container
h1 更多资源
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content
.page-nav
diff --git a/_jade/zh/security.jade b/_jade/zh/security.jade
index 9529379..060a058 100644
--- a/_jade/zh/security.jade
+++ b/_jade/zh/security.jade
@@ -4,7 +4,7 @@ block variables
- var pageTitle = '安全'
block extra_head
- title 安全 - Apache ECharts (incubating)
+ title 安全 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
@@ -14,12 +14,12 @@ block content
.page-info
.container
h1 安全
- p.page-info-echarts Apache ECharts (incubating)<sup>TM</sup>
+ p.page-info-echarts Apache ECharts<sup>TM</sup>
.page-content#maillist
.page-nav
.container
- p Apache ECharts (incubating)<sup>TM</sup> 在消除其软件项目中的安全问题方面采取了严格的立场。也十分关注与其特性和功能相关的安全问题。
+ p Apache ECharts<sup>TM</sup> 在消除其软件项目中的安全问题方面采取了严格的立场。也十分关注与其特性和功能相关的安全问题。
p 如果您对 ECharts 的安全性感到担忧，或者您发现了漏洞或潜在的威胁，请不要犹豫与 <a href="http://www.apache.org/security/" target="_blank">Apache 安全团队</a>联系，发送邮件至 <a href="mailto:security@apache.org">security@apache.org</a>。在邮件中请指明项目名称 ECharts 并提供相关问题或潜在威胁的描述。同时推荐重现和复制安全问题的方法。在评估和分析调查结果后，Apache 安全团队和 ECharts 社区将直接与您回复。
p 请注意在提交安全邮件之前，请勿在公共领域披露安全电子邮件报告的安全问题。
diff --git a/_jade/zh/spreadsheet.jade b/_jade/zh/spreadsheet.jade
index d933e08..592ddbc 100644
--- a/_jade/zh/spreadsheet.jade
+++ b/_jade/zh/spreadsheet.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title Spreadsheet Tool - Apache ECharts (incubating)
+ title Spreadsheet Tool - Apache ECharts
link(rel="stylesheet", type="text/css", href="#{cdnPayRoot}/#{ecWWWLang}/vendors/handsontable/0.26.1/dist/handsontable.full.min.css?_v_=#{cdnPayVersion}")
link(rel="stylesheet", type="text/css", href="#{cdnPayRoot}/#{ecWWWLang}/css/spreadsheet.css?_v_=#{homeVersion}")
script(src="vendors/esl.js")
diff --git a/_jade/zh/theme-builder.jade b/_jade/zh/theme-builder.jade
index d6f7fac..c8fa877 100644
--- a/_jade/zh/theme-builder.jade
+++ b/_jade/zh/theme-builder.jade
@@ -1,7 +1,7 @@
extends ../layouts/basic
block extra_head
- title 主题编辑器 - Apache ECharts (incubating)
+ title 主题编辑器 - Apache ECharts
block content
nav(class='navbar navbar-default navbar-fixed-top', role="navigation")
diff --git a/_scss/_components.footer.scss b/_scss/_components.footer.scss
index ff7f480..ee961e7 100644
--- a/_scss/_components.footer.scss
+++ b/_scss/_components.footer.scss
@@ -1,5 +1,5 @@
footer {
- min-height: 236px;
+ min-height: 190px;
background-color: $clr-primary;
color: #808795;
font-size: 14px;
@@ -24,7 +24,7 @@ footer {
}
#footer-icon-panel {
- text-align: left;
+ text-align: right;
img {
margin-top: 20px;
@@ -52,13 +52,6 @@ footer {
margin: 0 0 10px 0;
}
- #efe-product {
- li {
- width: 50%;
- display: inline-block;
- }
- }
-
#echarts-copyright {
color: rgba(255, 255, 255, 0.4);
margin: 65px 0 20px 0;
@@ -95,10 +88,8 @@ footer {
}
}
- #footer-icon-panel {
- text-align: right;
- font-weight: 300;
- float: right;
+ .icon-panel {
+ margin-top: 20px;
}
.footer-icon {
@@ -106,30 +97,31 @@ footer {
width: 40px;
height: 40px;
border-radius: 50px;
- margin: 5px 0 5px 10px;
+ margin-right: 10px;
padding: 8px 10px;
border: 1px solid white;
+ opacity: 0.5;
+ transition: 0.5s;
+
+ &:hover {
+ opacity: 1;
+ }
}
}
@media (max-width: 992px) {
footer {
.footer-apache-logo {
- margin: 10px -30px 0 0;
+ transform: scale(0.7);
}
.icon-panel {
- margin: -20px -50px 20px 0;
- text-align: center;
+ margin: 20px 0;
}
#echarts-copyright {
margin: 20px 0;
text-align: center;
}
-
- .footer-icon {
- margin: 30px 5px 5px 5px;
- }
}
}
diff --git a/_scss/_pages.about.scss b/_scss/_pages.about.scss
index 5db53ab..316d00a 100644
--- a/_scss/_pages.about.scss
+++ b/_scss/_pages.about.scss
@@ -1,5 +1,5 @@
#about-page {
- margin-top: 60px;
+ margin-bottom: 20px;
text-align: center;
section {
@@ -25,20 +25,15 @@
border-left: 4px solid;
padding-left: 15px;
- &.mentors {
+ &.pmc {
margin: 0px 0 10px 0;
border-color: #E86C4B;
}
-
- &.code {
- margin: 40px 0 10px 0;
- border-color: #40A7DC;
- }
- &.contributor {
+ &.committer {
margin: 40px 0 40px 0;
border-color: #40A7DC;
}
- &.companie {
+ &.contributor {
margin: 40px 0 40px 0;
border-color: #58A77C;
}
diff --git a/ecop-public/asf-email/tpl/announce-release.tpl b/ecop-public/asf-email/tpl/announce-release.tpl
index dafca31..c3d0359 100755
--- a/ecop-public/asf-email/tpl/announce-release.tpl
+++ b/ecop-public/asf-email/tpl/announce-release.tpl
@@ -3,13 +3,13 @@ general@incubator.apache.org
------------------------------------------------------------------------------
--- Subject: ---
-[ANNOUNCE] Release Apache ECharts (incubating) {{ECHARTS_RELEASE_VERSION}}
+[ANNOUNCE] Release Apache ECharts {{ECHARTS_RELEASE_VERSION}}
------------------------------------------------------------------------------
Hi all,
-The Apache ECharts (incubating) team is proud to announce Apache ECharts
+The Apache ECharts team is proud to announce Apache ECharts
version {{ECHARTS_RELEASE_VERSION}}-incubating.
ECharts is a powerful, interactive charting and visualization library.
@@ -24,4 +24,4 @@ Website: http://echarts.apache.org/
ECharts Resources:
- Issue: https://github.com/apache/incubator-echarts/issues
- Build Guide: https://github.com/apache/incubator-echarts/blob/{{ECHARTS_RELEASE_VERSION}}/README.md
-- Mailing list: dev@echarts.incubator.apache.org
+- Mailing list: dev@echarts.apache.org
diff --git a/ecop-public/asf-email/tpl/vote-dev-release-result.tpl b/ecop-public/asf-email/tpl/vote-dev-release-result.tpl
index 8659cd8..7d40ae9 100755
--- a/ecop-public/asf-email/tpl/vote-dev-release-result.tpl
+++ b/ecop-public/asf-email/tpl/vote-dev-release-result.tpl
@@ -3,7 +3,7 @@ dev@echarts.apache.org
---------------------------------------------------------------------------------
--- Subject: ---
-[RESULTS] [VOTE] Release Apache ECharts (incubating) 4.8.0 (release candidate 1)
+[RESULTS] [VOTE] Release Apache ECharts 4.8.0 (release candidate 1)
---------------------------------------------------------------------------------
diff --git a/ecop-public/asf-email/tpl/vote-general-release-result.tpl b/ecop-public/asf-email/tpl/vote-general-release-result.tpl
index f993096..a9db49e 100755
--- a/ecop-public/asf-email/tpl/vote-general-release-result.tpl
+++ b/ecop-public/asf-email/tpl/vote-general-release-result.tpl
@@ -3,7 +3,7 @@ general@incubator.apache.org
---------------------------------------------------------------
--- Subject: ---
-[RESULT] [VOTE] Release Apache ECharts (incubating) 4.8.0
+[RESULT] [VOTE] Release Apache ECharts 4.8.0
---------------------------------------------------------------
@@ -22,5 +22,5 @@ The release has PASSED with the following IPMC votes:
Vote thread:
https://lists.apache.org/thread.html/rc2527174db0d238c140e88e6135999af5f393b07a8db9f71ffa200b4%40%3Cgeneral.incubator.apache.org%3E
-I'm going to release the source release of Apache ECharts (incubating) 4.8.0.
+I'm going to release the source release of Apache ECharts 4.8.0.
Thank you all for making this happen!
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org