Skip to content
Permalink
Browse files
migrate v5.x pages to the entry
  • Loading branch information
pissang committed Jan 6, 2021
1 parent 31c8eda commit 46dbbd41e0897e2d82f87c52687cab23c5079dc7
Show file tree
Hide file tree
Showing 33 changed files with 19 additions and 321 deletions.
@@ -98,19 +98,6 @@ mixin nav(hostParam, cdnPayRootParam, cdnPayVersionParam)
li
a(href='https://www.apache.org/foundation/thanks.html', target='_blank') 鸣谢
include ./svg/external-link
//- li#nav-ec5
//- a(href='#', class="dropdown-toggle", data-toggle="dropdown") ECharts 5
//- span.new new
//- b.caret
//- ul.dropdown-menu
//- li
//- a(href="#{hostParam}/next/zh/tutorial.html") 教程
//- li
//- a(href="#{hostParam}/next/zh/api.html") API
//- li
//- a(href="#{hostParam}/next/zh/option.html") 配置项手册
//- li
//- a(href='#{hostParam}/next/examples/zh/index.html') 实例

ul(class='nav navbar-nav navbar-right')
li#nav-homeen
@@ -96,19 +96,6 @@ mixin nav(hostParam, cdnPayRootParam)
li
a(href='https://www.apache.org/foundation/thanks.html', target='_blank') Thanks
include ../components/svg/external-link
li#nav-ec5
a(href='#', class="dropdown-toggle", data-toggle="dropdown") ECharts 5
span.new new
b.caret
ul.dropdown-menu
li
a(href="#{hostParam}/next/en/tutorial.html") Tutorials
li
a(href="#{hostParam}/next/en/api.html") API
li
a(href="#{hostParam}/next/en/option.html") Chart Configuration
li
a(href='#{hostParam}/next/examples/en/index.html') Examples

ul(class='nav navbar-nav navbar-right')
li#nav-homeen
@@ -1,4 +1,4 @@
extends ../../layouts/next-example-redirect
extends ../layouts/example-redirect

block variables
- var redirectTo = 'editor.html'
File renamed without changes.
@@ -1,4 +1,4 @@
extends ../../../layouts/next-example
extends ../../layouts/example

block variablesLang
include ./_variablesLang.jade
@@ -1,4 +1,4 @@
extends ../../../layouts/next-example
extends ../../layouts/example

block variablesLang
include ./_variablesLang.jade
@@ -1,4 +1,4 @@
extends ../../../layouts/next-example-simple
extends ../../layouts/example

block variablesLang
include ./_variablesLang.jade
@@ -1,4 +1,4 @@
extends ../../layouts/next-example-redirect
extends ../layouts/example-redirect

block variables
- var redirectTo = 'index.html'
@@ -1,4 +1,4 @@
extends ../../layouts/next-example-redirect
extends ../layouts/example-redirect

block variables
- var redirectTo = 'view.html'
@@ -1,4 +1,4 @@
extends ../../../layouts/next-example
extends ../../layouts/example

block global_args_extra

@@ -1,4 +1,4 @@
extends ../../../layouts/next-example
extends ../../layouts/example

block global_args_extra

@@ -1,4 +1,4 @@
extends ../../../layouts/next-example-simple
extends ../../layouts/example

block global_args_extra

@@ -21,22 +21,6 @@ block content
.page-main
block vars

if isOption
.doc-version-change
if ecWWWLang == 'zh'
if isECharts4
a(href="option3.html") 前往 v3.x 文档
else
a(href="option.html") 前往 v4.x 文档
a(href="https://www.echartsjs.com/echarts2/") 前往 v2.x 文档
else
if isECharts4
//- a(href="option3.html") v3.x Doc
else
a(href="option.html") v4.x Doc
a(href="https://www.echartsjs.com/echarts2/index-en.html") v2.x Doc


#ec-doc-main

block extra_js
@@ -52,7 +36,6 @@ block extra_js
block global_args_extra

script(type="text/javascript").
document.getElementById('nav-doc').className = 'active';
window.globalArgsExtra.version = '#{docHash}';
echartsDoc.init('#ec-doc-main', window.globalArgsExtra);

@@ -11,5 +11,5 @@ html
var search = (location.search || '').replace('?', '');
var lang = navigator.language || navigator.userLanguage;
lang = lang.indexOf('zh') > -1 ? 'zh' : 'en';
location.href = '#{host}/next/' + lang + '/#{redirectTo}'
location.href = '#{host}/examples/' + lang + '/#{redirectTo}'
+ (search ? '?' + search : '') + (hash ? '#' + hash : '');
@@ -8,7 +8,7 @@ block extra_head
overflow-x: hidden;
}
link(rel="stylesheet", href="#{cdnThirdParty.elementUICSS}")
link(rel="stylesheet", href="#{getAssetUrl(cdnPayRoot, 'next/examples/css/example-bundle.css')}")
link(rel="stylesheet", href="#{getAssetUrl(cdnPayRoot, 'examples/css/example-bundle.css')}")

block content

@@ -17,15 +17,15 @@ block content
block extra_js
script(src="#{cdnThirdParty.vueJS}")
script(src="#{cdnThirdParty.elementUIJS}")
script(src="#{getAssetUrl(cdnPayRoot, 'next/examples/js/example-bundle.js')}")
script(src="#{getAssetUrl(cdnPayRoot, 'examples/js/example-bundle.js')}")
script(type="text/javascript").
window.EC_WWW_CDN_PAY_ROOT = '#{cdnPayRoot}';

block global_args_extra

script(type="text/javascript").
window.globalArgsExtra.version = '#{homeVersion}';
window.globalArgsExtra.cdnRoot = EC_WWW_CDN_PAY_ROOT + '/next/examples';
window.globalArgsExtra.cdnRoot = EC_WWW_CDN_PAY_ROOT + '/examples';
echartsExample.init('#ec-example-main', window.globalArgsExtra);

// Remove apache banner
@@ -8,7 +8,7 @@ block extra_head
overflow-x: hidden;
}
link(rel="stylesheet", href="#{cdnThirdParty.elementUICSS}")
link(rel="stylesheet", href="#{getAssetUrl(cdnPayRoot, 'next/examples/css/example-bundle.css')}")
link(rel="stylesheet", href="#{getAssetUrl(cdnPayRoot, 'examples/css/example-bundle.css')}")

block content

@@ -26,15 +26,14 @@ block content
block extra_js
script(src="#{cdnThirdParty.vueJS}")
script(src="#{cdnThirdParty.elementUIJS}")
script(src="#{getAssetUrl(cdnPayRoot, 'next/examples/js/example-bundle.js')}")
script(src="#{getAssetUrl(cdnPayRoot, 'examples/js/example-bundle.js')}")
script(type="text/javascript").
window.EC_WWW_CDN_PAY_ROOT = '#{cdnPayRoot}';

block global_args_extra

script(type="text/javascript").
document.getElementById('nav-ec5').className = 'active';
window.globalArgsExtra.version = '#{homeVersion}';
window.globalArgsExtra.cdnRoot = EC_WWW_CDN_PAY_ROOT + '/next/examples';
window.globalArgsExtra.cdnRoot = EC_WWW_CDN_PAY_ROOT + '/examples';
echartsExample.init('#ec-example-main', window.globalArgsExtra);

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 46dbbd4

Please sign in to comment.