diff --git a/2.x/conf.py b/2.x/conf.py index ebc64969d..814ac3a84 100644 --- a/2.x/conf.py +++ b/2.x/conf.py @@ -67,7 +67,7 @@ master_doc = 'index' # General information about the project. -project = u'FISCO BCOS v2' +project = u'FISCO BCOS 2.0' copyright = u'© 2020. All rights reserved.' author = u'fisco-bcos-dev' diff --git a/2.x/en/index.rst b/2.x/en/index.rst index 8d63b7ddb..e38b74fbd 100644 --- a/2.x/en/index.rst +++ b/2.x/en/index.rst @@ -2,7 +2,7 @@ FISCO BCOS Documentation ############################################################## -.. image:: _static/images/FISCO_BCOS_Logo_2_0.png +.. image:: _static/images/FISCO_BCOS_Logo_2.0.svg FISCO BCOS is a reliable, secure, efficient and portable blockchain platform with proven success from many partners and successful financial-grade applications. diff --git a/2.x/images/tutorial/link_2.0.svg b/2.x/images/tutorial/link_2.0.svg new file mode 100644 index 000000000..d404d71eb --- /dev/null +++ b/2.x/images/tutorial/link_2.0.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/2.x/images/tutorial/link_2.0_gray.svg b/2.x/images/tutorial/link_2.0_gray.svg new file mode 100644 index 000000000..e1e2ea64c --- /dev/null +++ b/2.x/images/tutorial/link_2.0_gray.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/2.x/images/tutorial/link_3.0.svg b/2.x/images/tutorial/link_3.0.svg new file mode 100644 index 000000000..4d47dd33c --- /dev/null +++ b/2.x/images/tutorial/link_3.0.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/2.x/images/tutorial/link_3.0_gray.svg b/2.x/images/tutorial/link_3.0_gray.svg new file mode 100644 index 000000000..8734f3edb --- /dev/null +++ b/2.x/images/tutorial/link_3.0_gray.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/2.x/index.rst b/2.x/index.rst index 8119f86bf..4165adbe1 100644 --- a/2.x/index.rst +++ b/2.x/index.rst @@ -1,9 +1,45 @@ +请根据需求选择FISCO BCOS的版本，并确认周边组件与其版本相匹配。 + +.. container:: row + + .. container:: card-holder-bigger + + .. container:: card-bigger + + .. image:: _static/images/FISCO_BCOS_Logo_2.0.svg + + .. raw:: html + +
+
+ 本文档版本 2.0：简单、易用、经典、稳定 +


+
+
+ + .. raw:: html + +
+
+ ====>> 切换至 3.0 版本文档 +

+
+
+ + +.. container:: row + + .. raw:: html +

+
+
+ + + ############################################################## -FISCO BCOS 技术文档 +FISCO BCOS 2.0 技术文档 ############################################################## -.. image:: _static/images/FISCO_BCOS_Logo_2_0.png - FISCO BCOS 是一个稳定、高效、安全的区块链底层平台，经过多家机构、多个应用，长时间在生产环境运行的实际检验。 .. note:: diff --git a/3.x/_static/css/custom.css b/3.x/_static/css/custom.css index f8d3ca5f4..a00f37e93 100644 --- a/3.x/_static/css/custom.css +++ b/3.x/_static/css/custom.css @@ -48,6 +48,10 @@ p { width: 100% } +ul.wy-breadcrumbs a.icon.icon-home::after { + content: " FISCO BCOS 3.0"; +} + .wy-side-nav-search img { display: block; margin: auto auto .809em auto; diff --git a/3.x/_static/images/FISCO_BCOS_Logo_3.0.svg b/3.x/_static/images/FISCO_BCOS_Logo_3.0.svg new file mode 100644 index 000000000..5a7fd923a --- /dev/null +++ b/3.x/_static/images/FISCO_BCOS_Logo_3.0.svg @@ -0,0 +1,72 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + + + + + + + + + + + + + diff --git a/3.x/_static/images/link_2.0_gray.svg b/3.x/_static/images/link_2.0_gray.svg new file mode 100644 index 000000000..e1e2ea64c --- /dev/null +++ b/3.x/_static/images/link_2.0_gray.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/3.x/_static/images/link_3.0.svg b/3.x/_static/images/link_3.0.svg new file mode 100644 index 000000000..4d47dd33c --- /dev/null +++ b/3.x/_static/images/link_3.0.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/3.x/_templates/layout.html b/3.x/_templates/layout.html index 37308785c..f95defea0 100644 --- a/3.x/_templates/layout.html +++ b/3.x/_templates/layout.html @@ -3,8 +3,16 @@ \n ' + metatags %}{% endif %} {% block sidebartitle %} {{ super() }} +
-FISCO BCOS +FISCO BCOS +FISCO BCOS 3.0 +FISCO BCOS 2.0
GitHub @@ -14,4 +22,5 @@ Twitter + {% endblock %} diff --git a/3.x/zh_CN/conf.py b/3.x/zh_CN/conf.py index 0f76f9cf8..819198fca 100644 --- a/3.x/zh_CN/conf.py +++ b/3.x/zh_CN/conf.py @@ -76,7 +76,7 @@ master_doc = 'index' # General information about the project. -project = u'FISCO BCOS v3' +project = u'FISCO BCOS 3.0' copyright = u'© 2022. All rights reserved.' author = u'fisco-bcos-dev' diff --git a/3.x/zh_CN/index.rst b/3.x/zh_CN/index.rst index 1b571ea18..8af2dc86f 100644 --- a/3.x/zh_CN/index.rst +++ b/3.x/zh_CN/index.rst @@ -1,8 +1,44 @@ +请根据需求选择FISCO BCOS的版本，并确认周边组件与其版本相匹配。 + +.. container:: row + + .. container:: card-holder-bigger + + .. container:: card-bigger + + .. image:: _static/images/FISCO_BCOS_Logo_3_0.png + + .. raw:: html + +
+
+ 本文档版本 3.0：高性能、易拓展、高可用 +


+
+
+ + .. raw:: html + +
+
+ ====>> 切换至 2.0 版本文档 +

+
+
+ +.. container:: row + + .. raw:: html +

+
+
+ + + ############################################################## -FISCO BCOS 技术文档 +FISCO BCOS 3.0 技术文档 ############################################################## -.. image:: _static/images/FISCO_BCOS_Logo_3_0.png FISCO BCOS（读作/ˈfɪskl bi:ˈkɒz/） 是一个稳定、高效、安全的区块链底层平台，其可用性经广泛应用实践检验。至今已超过4000家企业及机构、300+产业数字化标杆应用，覆盖文化版权、司法服务、政务服务、物联网、金融、智慧社区、房产建筑、社区治理、乡村振兴等领域。 diff --git a/_static/css/custom.css b/_static/css/custom.css index 5abc31d90..18310f381 100644 --- a/_static/css/custom.css +++ b/_static/css/custom.css @@ -48,6 +48,10 @@ p { width: 100% } +ul.wy-breadcrumbs a.icon.icon-home::after { + content: " FISCO BCOS 2.0"; +} + .wy-side-nav-search img { display: block; margin: auto auto .809em auto; diff --git a/_static/images/FISCO_BCOS_Logo_2.0.svg b/_static/images/FISCO_BCOS_Logo_2.0.svg new file mode 100644 index 000000000..d3e1d46ac --- /dev/null +++ b/_static/images/FISCO_BCOS_Logo_2.0.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_static/images/link_2.0.svg b/_static/images/link_2.0.svg new file mode 100644 index 000000000..d404d71eb --- /dev/null +++ b/_static/images/link_2.0.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/_static/images/link_2.0_gray.svg b/_static/images/link_2.0_gray.svg new file mode 100644 index 000000000..e1e2ea64c --- /dev/null +++ b/_static/images/link_2.0_gray.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/_static/images/link_3.0.svg b/_static/images/link_3.0.svg new file mode 100644 index 000000000..4d47dd33c --- /dev/null +++ b/_static/images/link_3.0.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/_static/images/link_3.0_gray.svg b/_static/images/link_3.0_gray.svg new file mode 100644 index 000000000..8734f3edb --- /dev/null +++ b/_static/images/link_3.0_gray.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/_templates/layout.html b/_templates/layout.html index 2f9d642fe..99a1ebc3f 100644 --- a/_templates/layout.html +++ b/_templates/layout.html @@ -3,9 +3,16 @@ \n ' + metatags %}{% endif %} {% block sidebartitle %} {{ super() }} +
FISCO BCOS + pathto("_static/images/FISCO_BCOS_Logo.svg", 1) }} /> +FISCO BCOS 3.0 +FISCO BCOS 2.0
GitHub @@ -15,4 +22,5 @@ Twitter + {% endblock %}