From 52153eea6f2e4fad32b9be9c55c985d712139dfc Mon Sep 17 00:00:00 2001 From: pxq <1456889284@qq.com> Date: Fri, 26 Aug 2022 14:10:23 +0800 Subject: [PATCH 01/29] =?UTF-8?q?fix:ui=E6=9B=B4=E6=96=B0=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .hugo_build.lock | 0 .pnpm-debug.log | 14 + Dockerfile | 4 +- deploy/docs-builder-ru.sh | 2 +- deploy/docs-builder.sh | 10 +- i18n/en/en.toml | 17 +- i18n/ru/ru.toml | 15 +- i18n/zh/zh.toml | 27 +- layouts/docs/baseof.html | 91 +- layouts/index.html | 48 +- layouts/partials/docs/menu.html | 1 + layouts/partials/docs/test-list.html | 828 ++++++++++++++++++ layouts/partials/head.html | 2 + layouts/partials/insideNav.html | 19 +- layouts/partials/link.html | 45 +- layouts/partials/nav.html | 108 ++- layouts/partials/pcfooter.html | 22 +- layouts/partials/scripts.html | 3 +- layouts/partials/turn.html | 13 + layouts/partials/version.html | 39 + static/css/_color.css | 245 ++++++ static/css/common.css | 112 ++- static/css/docdetail.css | 519 +++++++---- static/css/doclist.css | 23 +- static/css/docsearch.css | 8 +- static/css/h5_footer.css | 12 +- static/css/index.css | 809 +++++++++-------- static/css/markdown.css | 22 +- static/css/pcfooter.css | 69 +- static/css/revision_new.css | 423 +++++++++ static/img/common/banner-bg.png | Bin 0 -> 39305 bytes static/img/common/banner-iii.png | Bin 0 -> 19059 bytes static/img/common/down.svg | 7 + static/img/common/footer-logo-dark.png | Bin 0 -> 2107 bytes static/img/common/footer-logo.png | Bin 2685 -> 2039 bytes static/img/common/help-dark.png | Bin 0 -> 361 bytes static/img/common/icon-arrow-left1.svg | 4 + static/img/common/icon-arrow-right-open.svg | 4 + static/img/common/icon-arrow-right.svg | 4 + static/img/common/icon-arrow-right1.svg | 4 + static/img/common/icon-chevron-right-dark.svg | 4 + static/img/common/icon-chevron-right.svg | 4 + static/img/common/icon-close-dark.svg | 11 + static/img/common/icon-close-light.svg | 11 + .../{icon-down.svg => icon-down-dark.svg} | 2 +- static/img/common/icon-down-light.svg | 1 + static/img/common/logo-h5.png | Bin 4594 -> 1216 bytes static/img/common/moon.svg | 4 + static/img/common/more-dark.svg | 11 + static/img/common/more-light.svg | 11 + static/img/common/search.svg | 15 +- static/img/common/sun.svg | 5 + .../common/\347\274\226\347\273\204 14.svg" | 16 + static/img/detail/feedback-dark.svg | 13 + static/img/detail/feedback-light.svg | 13 + static/img/detail/source-code-dark.svg | 13 + static/img/detail/source-code-light.svg | 13 + static/js/docdetail.js | 45 +- static/js/doclist.js | 2 +- static/js/revision_new.js | 136 +++ 61 files changed, 3075 insertions(+), 831 deletions(-) create mode 100644 .hugo_build.lock create mode 100644 .pnpm-debug.log create mode 100644 layouts/partials/docs/test-list.html create mode 100644 layouts/partials/turn.html create mode 100644 layouts/partials/version.html create mode 100644 static/css/_color.css create mode 100644 static/css/revision_new.css create mode 100644 static/img/common/banner-bg.png create mode 100644 static/img/common/banner-iii.png create mode 100644 static/img/common/down.svg create mode 100644 static/img/common/footer-logo-dark.png create mode 100644 static/img/common/help-dark.png create mode 100644 static/img/common/icon-arrow-left1.svg create mode 100644 static/img/common/icon-arrow-right-open.svg create mode 100644 static/img/common/icon-arrow-right.svg create mode 100644 static/img/common/icon-arrow-right1.svg create mode 100644 static/img/common/icon-chevron-right-dark.svg create mode 100644 static/img/common/icon-chevron-right.svg create mode 100644 static/img/common/icon-close-dark.svg create mode 100644 static/img/common/icon-close-light.svg rename static/img/common/{icon-down.svg => icon-down-dark.svg} (92%) create mode 100644 static/img/common/icon-down-light.svg create mode 100644 static/img/common/moon.svg create mode 100644 static/img/common/more-dark.svg create mode 100644 static/img/common/more-light.svg create mode 100644 static/img/common/sun.svg create mode 100644 "static/img/common/\347\274\226\347\273\204 14.svg" create mode 100644 static/img/detail/feedback-dark.svg create mode 100644 static/img/detail/feedback-light.svg create mode 100644 static/img/detail/source-code-dark.svg create mode 100644 static/img/detail/source-code-light.svg create mode 100644 static/js/revision_new.js diff --git a/.gitignore b/.gitignore index 8fdf790c7..78f7cf2be 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ *.vscode /content /web-ui/node_modules -/web-ui/package-lock.json \ No newline at end of file +/web-ui/package-lock.json +public \ No newline at end of file diff --git a/.hugo_build.lock b/.hugo_build.lock new file mode 100644 index 000000000..e69de29bb diff --git a/.pnpm-debug.log b/.pnpm-debug.log new file mode 100644 index 000000000..95d567634 --- /dev/null +++ b/.pnpm-debug.log @@ -0,0 +1,14 @@ +{ + "0 debug pnpm:scope": { + "selected": 1 + }, + "1 error pnpm": { + "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND", + "err": { + "name": "pnpm", + "message": "No package.json (or package.yaml, or package.json5) was found in \"C:\\Users\\panxiangqu\\Desktop\\提交\\docs\".", + "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND", + "stack": "pnpm: No package.json (or package.yaml, or package.json5) was found in \"C:\\Users\\panxiangqu\\Desktop\\提交\\docs\".\n at readProjectManifest (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:20808:13)\n at async Object.readProjectManifestOnly (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:20812:28)\n at async readProjectManifestOnly (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:43834:24)\n at async Object.handler (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:178132:24)\n at async C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:182701:21\n at async run (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:182675:34)\n at async runPnpm (C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:182893:5)\n at async C:\\Users\\panxiangqu\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:182885:7" + } + } +} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1bdb00c3c..6845d9bb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,11 @@ RUN mkdir -p /usr/local/src && \ cd /usr/local/src && \ curl -L https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz | tar -xz && \ mv hugo /usr/local/bin/ - +RUN cd / +RUN ls RUN mkdir -p /src/ COPY . /src/website +RUN ls /src/website/content/zh/docs/ RUN cd /src/ && \ cd /src/website && /usr/local/bin/hugo -b / && /usr/local/bin/hugo --gc --minify && \ diff --git a/deploy/docs-builder-ru.sh b/deploy/docs-builder-ru.sh index 0d0265013..afdb45f20 100644 --- a/deploy/docs-builder-ru.sh +++ b/deploy/docs-builder-ru.sh @@ -8,7 +8,7 @@ if [ -d "./website" ]; then fi mkdir website -git clone https://gitee.com/openeuler/docs +git clone https://gitee.com/panxiangqu/docs cd ./docs git checkout -b website origin/website cp -r * ../website diff --git a/deploy/docs-builder.sh b/deploy/docs-builder.sh index 707e42d5f..87f80fea7 100644 --- a/deploy/docs-builder.sh +++ b/deploy/docs-builder.sh @@ -8,7 +8,7 @@ if [ -d "./website" ]; then fi mkdir website -git clone https://gitee.com/openeuler/docs +git clone https://gitee.com/panxiangqu/docs cd ./docs git checkout -b website origin/website cp -r * ../website @@ -19,17 +19,19 @@ do git checkout -b $b $r mkdir -p ../website/content/zh/docs/$b - cp -r ./docs/zh/* ../website/content/zh/docs/$b/ + cp -r ./docs/zh/* ../website/content/zh/docs/$b/ mkdir -p ../website/content/en/docs/$b - cp -r ./docs/en/* ../website/content/en/docs/$b/ + cp -r ./docs/en/* ../website/content/en/docs/$b/ if [ -d "./docs/ru" ]; then mkdir -p ../website/content/ru/docs/$b - cp -r ./docs/ru/* ../website/content/ru/docs/$b/ + cp -r ./docs/ru/* ../website/content/ru/docs/$b/ fi cd .. cd ./docs done cd .. +pwd + diff --git a/i18n/en/en.toml b/i18n/en/en.toml index 44c7a9b3b..ff0ccc717 100644 --- a/i18n/en/en.toml +++ b/i18n/en/en.toml @@ -90,7 +90,22 @@ other = "/en/docs/20.03_LTS_SP1/docs/Releasenotes/terms-of-use.html" other = "/en/docs/20.09/docs/Releasenotes/terms-of-use.html" [know_98_1] other = "/en/docs/20.03_LTS/docs/Releasenotes/terms-of-use.html" - +[version_91] +other = "22.03 LTS" +[version_92] +other = "20.03 LTS SP3" +[version_93] +other = "21.09" +[version_94] +other= "20.03 LTS SP2" +[version_95] +other = "21.03" +[version_96] +other = "20.03 LTS SP1" +[version_97] +other= "20.09" +[version_98] +other = "20.03 LTS" [atom] other = "openEuler is an open source project incubated and operated by the OpenAtom Foundation." diff --git a/i18n/ru/ru.toml b/i18n/ru/ru.toml index 82d1b3822..c9cafddd2 100644 --- a/i18n/ru/ru.toml +++ b/i18n/ru/ru.toml @@ -50,7 +50,20 @@ other = "/ru/docs/20.03_LTS/docs/Releasenotes/terms-of-use.html" [know_97_1] other = "/ru/docs/20.09/docs/Releasenotes/terms-of-use.html" - +[version_91] +other = "22.03 LTS" +[version_93] +other = "21.09" +[version_94] +other= "20.03 LTS SP2" +[version_95] +other = "21.03" +[version_96] +other = "20.03 LTS SP1" +[version_97] +other= "20.09" +[version_98] +other = "20.03 LTS" [atom] other = "openEuler - это проект с открытым исходным кодом, созданный и управляемый фондом OpenAtom." diff --git a/i18n/zh/zh.toml b/i18n/zh/zh.toml index 9c65965ce..bffc615e1 100644 --- a/i18n/zh/zh.toml +++ b/i18n/zh/zh.toml @@ -41,6 +41,22 @@ other = "/zh/docs/20.03_LTS_SP1/docs/Releasenotes/法律声明.html" other = "/zh/docs/20.09/docs/Releasenotes/法律声明.html" [know_98_1] other = "/zh/docs/20.03_LTS/docs/Releasenotes/法律声明.html" +[version_91] +other = "22.03 LTS" +[version_92] +other = "20.03 LTS SP3" +[version_93] +other = "21.09" +[version_94] +other= "20.03 LTS SP2" +[version_95] +other = "21.03" +[version_96] +other = "20.03 LTS SP1" +[version_97] +other= "20.09" +[version_98] +other = "20.03 LTS" [hot_document] @@ -140,7 +156,7 @@ other = "有奖捉虫" other = "“有虫”文档片段" [issue_reason] -other = "存在的问题" +other = "问题描述" [satisfaction] other = "您对文档的总体满意度" @@ -200,3 +216,12 @@ other = "的结果" [hot_docs_version] other = "20.03 LTS" + +[relative] +other = "关于openEuler" + +[website] +other = "openEuler官网" + +[other_link] +other = "友情链接" diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html index 2a5cf1d3c..ad1b37090 100644 --- a/layouts/docs/baseof.html +++ b/layouts/docs/baseof.html @@ -26,8 +26,7 @@