Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ecomfe/echarts-www
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ovilia
Ovilia committed Jan 24, 2019
2 parents 993188d + de1ff3b commit 8bea849
Show file tree
Hide file tree
Showing 198 changed files with 24,251 additions and 7,881 deletions.
4 changes: 2 additions & 2 deletions 404-redirect.html
View file
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><script type="text/javascript">// If user visit a illegal link "http://echarts.baidu.com/asdf/zxcv.html",
<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><script type="text/javascript">// If user visit a illegal link "https://echarts.baidu.com/asdf/zxcv.html",
// 404.html will show but folder level is incorrect.
// I have no time to figure that out, so use this stupid approach.
location.href = 'http://echarts.baidu.com/404.html'</script></head></html>
location.href = 'https://echarts.baidu.com/404.html'</script></head></html>
4 changes: 2 additions & 2 deletions 404.html
View file
@@ -1,4 +1,4 @@
<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="vendors/bootstrap/css/bootstrap.min.css"><!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries--><!--[if lt IE 9]><script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script><script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]--><link rel="stylesheet" type="text/css" href="./css/main.css?_v_=1533623925103"><script>window.EC_WWW_LANG = 'cn';
<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="vendors/bootstrap/css/bootstrap.min.css"><!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries--><!--[if lt IE 9]><script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script><script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]--><link rel="stylesheet" type="text/css" href="./css/main.css?_v_=1546889705328"><script>window.EC_WWW_LANG = 'cn';
</script><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
var el = document.createElement('style');
el.innerHTML = ''
Expand All @@ -7,7 +7,7 @@
document.head.insertBefore(el, document.getElementById('font-hack'));
}
</script><script type="text/javascript" src="./vendors/jquery/jquery.min.js"></script></head><!--[if lte IE 8]><body class="lower-ie"><div id="lowie-main"><img src="./images/forie.png" alt="ie tip"></div></body><![endif]-->
<!--[if (gt IE 8)|!(IE)]><body class="undefined"></body><![endif]--><div id="main"><nav class="navbar navbar-default navbar-fixed-top"><div class="container-fluid"><div class="navbar-header"><button type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false" class="navbar-toggle collapsed"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a href="./index.html" class="navbar-brand"><img src="./images/logo.png" alt="echarts logo" class="navbar-logo"></a></div><div id="navbar-collapse" class="collapse navbar-collapse"><ul class="nav navbar-nav navbar-left"><li id="nav-index"><a href="./index.html">首页</a></li><li id="nav-doc" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">文档<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./feature.html">特性</a></li><li><a href="./tutorial.html">教程</a></li><li><a href="./api.html">API</a></li><li><a href="./option.html">配置项手册</a></li><li><a href="./option-gl.html">GL 配置项手册</a></li><li><a href="./faq.html">常见问题</a></li><li><a href="./changelog.html">版本记录</a></li></ul></li><li id="nav-download" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">下载<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./download.html">下载</a></li><li><a href="./download-theme.html">主题下载</a></li><li><a href="./download-map.html">地图下载</a></li><li><a href="./download-extension.html">扩展下载</a></li></ul></li><li id="nav-examples"><a href="#" data-toggle="dropdown" class="dropdown-toggle">实例<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./examples/">官方实例</a></li><li><a href="./examples/index.html#chart-type-globe">GL 实例</a></li></ul></li><li id="nav-community"><a href="#" data-toggle="dropdown" class="dropdown-toggle">社区<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="http://gallery.echartsjs.com">GALLERY</a></li><li><a href="http://efe.baidu.com/tags/ECharts/">博客</a></li></ul></li><li id="nav-tool"><a href="#" data-toggle="dropdown" class="dropdown-toggle">工具<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./spreadsheet.html">表格工具</a></li><li><a href="http://ecomfe.github.io/echarts-map-tool/">地图数据在线工具</a></li><li><a href="http://echarts.baidu.com/theme-builder/">主题构建工具</a></li></ul></li><li id="nav-about"><a href="#" data-toggle="dropdown" class="dropdown-toggle">关于<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./about.html">关于我们</a></li><li><a href="https://github.com/ecomfe/echarts/blob/master/LICENSE">版权声明</a></li></ul></li></ul><ul class="nav navbar-nav navbar-right"><li id="nav-github"><a href="https://github.com/ecomfe/echarts" target="_blank"><img src="./images/github.png" width="18"></a></li><li id="nav-2" class="0"><a href="http://echarts.baidu.com/echarts2/">2.0</a></li><li id="nav-homeen"><a href="https://ecomfe.github.io/echarts-doc/public/en/index.html">EN</a></li></ul></div></div></nav><div class="not-found"><img src="./images/404.png" alt="404"><div class="text">非常抱歉，您所访问的网页找不到了！您可以选择<a href="./index.html" class="link">返回首页</a></div></div></div><script type="text/javascript" src="./vendors/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="./js/common.js"></script><script type="text/javascript"></script><script type="text/javascript">var _hmt = _hmt || [];
<!--[if (gt IE 8)|!(IE)]><body class="undefined"></body><![endif]--><div id="main"><nav class="navbar navbar-default navbar-fixed-top"><div class="container-fluid"><div class="navbar-header"><button type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false" class="navbar-toggle collapsed"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a href="./index.html" class="navbar-brand"><img src="./images/logo.png" alt="echarts logo" class="navbar-logo"></a></div><div id="navbar-collapse" class="collapse navbar-collapse"><ul class="nav navbar-nav navbar-left"><li id="nav-index"><a href="./index.html">首页</a></li><li id="nav-doc" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">文档<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./feature.html">特性</a></li><li><a href="./tutorial.html">教程</a></li><li><a href="./api.html">API</a></li><li><a href="./option.html">配置项手册</a></li><li><a href="./option-gl.html">GL 配置项手册</a></li><li><a href="./faq.html">常见问题</a></li><li><a href="./changelog.html">版本记录</a></li></ul></li><li id="nav-download" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">下载<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./download.html">下载</a></li><li><a href="./download-theme.html">主题下载</a></li><li><a href="./download-map.html">地图下载</a></li><li><a href="./download-extension.html">扩展下载</a></li></ul></li><li id="nav-examples"><a href="#" data-toggle="dropdown" class="dropdown-toggle">实例<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./examples/">官方实例</a></li><li><a href="./examples/index.html#chart-type-globe">GL 实例</a></li></ul></li><li id="nav-community"><a href="#" data-toggle="dropdown" class="dropdown-toggle">社区<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://gallery.echartsjs.com">GALLERY</a></li><li><a href="https://efe.baidu.com/tags/ECharts/">博客</a></li></ul></li><li id="nav-tool"><a href="#" data-toggle="dropdown" class="dropdown-toggle">工具<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./spreadsheet.html">表格工具</a></li><li><a href="https://ecomfe.github.io/echarts-map-tool/">地图数据在线工具</a></li><li><a href="https://echarts.baidu.com/theme-builder/">主题构建工具</a></li></ul></li><li id="nav-about"><a href="#" data-toggle="dropdown" class="dropdown-toggle">关于<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="./about.html">关于我们</a></li><li><a href="https://github.com/ecomfe/echarts/blob/master/LICENSE">版权声明</a></li></ul></li></ul><ul class="nav navbar-nav navbar-right"><li id="nav-github"><a href="https://github.com/ecomfe/echarts" target="_blank"><img src="./images/github.png" width="18"></a></li><li id="nav-2" class="0"><a href="https://echarts.baidu.com/echarts2/">2.0</a></li><li id="nav-homeen"><a href="https://ecomfe.github.io/echarts-doc/public/en/index.html">EN</a></li></ul></div></div></nav><div class="not-found"><img src="./images/404.png" alt="404"><div class="text">非常抱歉，您所访问的网页找不到了！您可以选择<a href="./index.html" class="link">返回首页</a></div></div></div><script type="text/javascript" src="./vendors/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="./js/common.js"></script><script type="text/javascript"></script><script type="text/javascript">var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?4bad1df23f079e0d12bdbef5e65b072f";
Expand Down
4 changes: 2 additions & 2 deletions _jade/404-redirect.jade
View file
Expand Up @@ -5,7 +5,7 @@ html
meta(http-equiv='X-UA-Compatible', content='IE=edge')

script(type='text/javascript').
// If user visit a illegal link "http://echarts.baidu.com/asdf/zxcv.html",
// If user visit a illegal link "https://echarts.baidu.com/asdf/zxcv.html",
// 404.html will show but folder level is incorrect.
// I have no time to figure that out, so use this stupid approach.
location.href = 'http://echarts.baidu.com/404.html'
location.href = 'https://echarts.baidu.com/404.html'
4 changes: 2 additions & 2 deletions _jade/components/download.jade
View file
Expand Up @@ -77,8 +77,8 @@ block content
.circle-wrap
span.mode 源代码
span.size 1.74 MB
a.btn.btn-thirdary.btn-two(href="http://echarts.baidu.com/option-gl.html") 查看 GL 文档
a.btn.btn-thirdary.btn-two(href="http://echarts.baidu.com/examples.html#chart-type-globe") 查看 GL 实例
a.btn.btn-thirdary.btn-two(href="https://echarts.baidu.com/option-gl.html") 查看 GL 文档
a.btn.btn-thirdary.btn-two(href="https://echarts.baidu.com/examples.html#chart-type-globe") 查看 GL 实例

.d-section-theme.d-section
h2 主题
Expand Down
6 changes: 3 additions & 3 deletions _jade/components/footer.jade
View file
Expand Up @@ -11,9 +11,9 @@ footer
h3 百度EFE更多产品
ul#efe-product
li
a(href="http://vis.baidu.com/?fr=echarts", target="_blank") 可视化实验室
a(href="https://vis.baidu.com/?fr=echarts", target="_blank") 可视化实验室
li
a(href='http://github.com/ecomfe/zrender?fr=echarts', target="_blank") ZRender
a(href='https://github.com/ecomfe/zrender?fr=echarts', target="_blank") ZRender
li
a(href='https://github.com/pissang/claygl?fr=echarts', target="_blank") ClayGL
li
Expand All @@ -35,7 +35,7 @@ footer
img(src='images/icon-email.png')
a.footer-icon(href='https://twitter.com/EChartsJs')
img(src='images/icon-twitter.png')
a.footer-icon(href='http://weibo.com/u/5160877841')
a.footer-icon(href='https://weibo.com/u/5160877841')
img(src='images/icon-weibo.png')
a.footer-icon(href='https://github.com/ecomfe/echarts')
img(src='images/icon-github.png')
Expand Down
8 changes: 4 additions & 4 deletions _jade/components/nav-mixin.jade
View file
Expand Up @@ -55,7 +55,7 @@ mixin nav(basePath)
b.caret
ul.dropdown-menu
li
a(href="http://gallery.echartsjs.com") GALLERY
a(href="https://gallery.echartsjs.com") GALLERY
li
a(href="#{blogPath}") 博客
li#nav-tool
Expand All @@ -65,9 +65,9 @@ mixin nav(basePath)
li
a(href="#{basePath}/spreadsheet.html") 表格工具
li
a(href="http://ecomfe.github.io/echarts-map-tool/") 地图数据在线工具
a(href="https://ecomfe.github.io/echarts-map-tool/") 地图数据在线工具
li
a(href="http://echarts.baidu.com/theme-builder/") 主题构建工具
a(href="https://echarts.baidu.com/theme-builder/") 主题构建工具
li#nav-about
a(href='#', class="dropdown-toggle", data-toggle="dropdown") 关于
b.caret
Expand All @@ -82,7 +82,7 @@ mixin nav(basePath)
a(href="https://github.com/ecomfe/echarts" target="_blank")
img(src="#{basePath}/images/github.png", width="18")
li#nav-2.0
a(href='http://echarts.baidu.com/echarts2/') 2.0
a(href='https://echarts.baidu.com/echarts2/') 2.0
li#nav-homeen
a(href='https://echarts.apache.org/') EN

4 changes: 2 additions & 2 deletions _jade/download-map.jade
View file
Expand Up @@ -16,7 +16,7 @@ block content
.page-content(style='text-align: left; min-height: 300px; margin-top: 30px;', class='container')
p ECharts 之前提供下载的矢量地图数据来自第三方，由于部分数据不符合国家《测绘法》规定，目前暂时停止下载服务。
p 建议大家使用以百度地图为底图的形式，参考实例：
a(href='http://echarts.baidu.com/demo.html#map-polygon') http://echarts.baidu.com/demo.html#map-polygon
a(href='https://echarts.baidu.com/demo.html#map-polygon') https://echarts.baidu.com/demo.html#map-polygon

//- .page-content#map-download
//- #maps
Expand Down Expand Up @@ -63,7 +63,7 @@ block content
//- a(href="asset/map/json/province/#{provincePinyin[idx]}.json" download="#{provincePinyin[idx]}.json" target="_blank") JSON
//- section.section-bg
//- a.btn.btn-thirdary.more-btn(href='http://ecomfe.github.io/echarts-map-tool/') 地图定制
//- a.btn.btn-thirdary.more-btn(href='https://ecomfe.github.io/echarts-map-tool/') 地图定制
//- p 可在线选择生成省、市、县各级地图
//- .container
Expand Down
2 changes: 1 addition & 1 deletion _jade/download-theme.jade
View file
Expand Up @@ -24,7 +24,7 @@ block content
section.section-bg#theme-configure-section
.container
#theme-builder
a.btn.btn-thirdary.more-btn(href="http://echarts.baidu.com/theme-builder/") 定制主题
a.btn.btn-thirdary.more-btn(href="https://echarts.baidu.com/theme-builder/") 定制主题
p 可在线编辑定义主题并进行下载

section
Expand Down
8 changes: 4 additions & 4 deletions _jade/download.jade
View file
Expand Up @@ -4,7 +4,7 @@ block vars
- var downloadVersion = version;
- var downloadPath = 'dist';
- var isECharts4 = true;
- var sizeCommon = '452 KB';
- var sizeSimple = '291 KB';
- var sizeFull = '2.76 MB';
- var sizeMin = '717 KB';
- var sizeCommon = '470 KB';
- var sizeSimple = '305 KB';
- var sizeFull = '2.86 MB';
- var sizeMin = '744 KB';
2 changes: 1 addition & 1 deletion _jade/en/download.jade
View file
Expand Up @@ -38,7 +38,7 @@ block content
.d-section-version.d-section(style='border-bottom:0')
h2 Download Source
p ECharts is an Apache project under incubation. Download source code from Apache release.
a.btn.btn-thirdary.more-btn(href="http://www.apache.org/dist/incubator/echarts/") Download
a.btn.btn-thirdary.more-btn(href="https://www.apache.org/dist/incubator/echarts/") Download


include ./footer
Expand Down
2 changes: 1 addition & 1 deletion _jade/en/faq.jade
View file
Expand Up @@ -29,7 +29,7 @@ block content
ol
li Browse API and Option manual, and learn what configurations ECharts has. This makes it easier for you to know the key words to search or ask questions.
li Broswe FAQ questions on this page.
li Create a simple example to reproduce your problem on <a href="http://gallery.echartsjs.com/editor.html">ECharts Gallery</a>.
li Create a simple example to reproduce your problem on <a href="https://gallery.echartsjs.com/editor.html">ECharts Gallery</a>.
li Paste the link when you ask questions on <a href="https://stackoverflow.com">StackOverflow</a> and etc.

h3 Is ECharts free to use?
Expand Down
2 changes: 1 addition & 1 deletion _jade/en/footer.jade
View file
Expand Up @@ -11,7 +11,7 @@ footer
img(src='images/icon-email.png')
a.footer-icon(href='https://twitter.com/EChartsJs')
img(src='images/icon-twitter.png')
a.footer-icon(href='http://weibo.com/u/5160877841')
a.footer-icon(href='https://weibo.com/u/5160877841')
img(src='images/icon-weibo.png')
a.footer-icon(href='https://github.com/ecomfe/echarts')
img(src='images/icon-github.png')
4 changes: 2 additions & 2 deletions _jade/en/nav-mixin.jade
View file
Expand Up @@ -24,7 +24,7 @@ mixin nav(basePath)
li
a(href='https://ecomfe.github.io/echarts-examples/public/index.html', target='_blank') Examples
li
a(href='http://gallery.echartsjs.com', target='_blank') Gallery
a(href='https://gallery.echartsjs.com', target='_blank') Gallery
li#nav-doc.dropdown
a.dropdown-toggle(href='#', data-toggle='dropdown')
| Docs
Expand Down Expand Up @@ -67,4 +67,4 @@ mixin nav(basePath)
a(href="https://github.com/ecomfe/echarts" target="_blank")
img(src="./images/github.png", width="18")
li#nav-chinese
a(href='http://www.echartsjs.com/index.html') 中文
a(href='https://www.echartsjs.com/index.html') 中文

0 comments on commit 8bea849

Please sign in to comment.