diff --git a/config.toml b/config.toml index e4290ad75535197278605c648ed91d89dcc6b68a..55e28171984be0864e85429ace8a32766dcfb4f0 100644 --- a/config.toml +++ b/config.toml @@ -98,12 +98,6 @@ paginate = 10 url = "/en/news.html" weight = 1 -#[[menu.main]] -# identifier = "releases" -# name = "Releases" -# url = "/en/releases.html" -# weight = 4 - [[menu.main]] identifier = "docs" name = "Docs" @@ -118,22 +112,28 @@ paginate = 10 url = "/en/docs/Installation/Installation.html" weight=3 +# [[menu.main]] +# identifier = "releases" +# name = "Releases" +# url = "/en/releases.html" +# weight = 6 + [[menu.main]] identifier = "download" name = "Download" url = "/en/download.html" - weight = 6 + weight = 7 [[menu.main]] identifier = "security" name = "Security" url = "/en/security.html" - weight = 7 + weight = 8 [[menu.main]] identifier = "lang" name = "中文" url = "/zh" - weight = 8 + weight = 9 # Menu chinese [[languages.zh.menu.main]] @@ -212,12 +212,6 @@ paginate = 10 url = "/zh/news.html" weight = 2 -#[[languages.zh.menu.main]] -# identifier = "releases" -# name = "版本" -# url = "/zh/releases.html" -# weight = 4 - [[languages.zh.menu.main]] identifier = "docs" name = "文档" @@ -246,12 +240,12 @@ paginate = 10 url = "/zh/docs/Administration/administration.html" weight = 4 -#[[languages.zh.menu.main]] -# identifier = "container" -# name = "容器用户指南" -# parent = "docs" -# url = "/zh/docs/Container/container.html" -# weight = 5 +[[languages.zh.menu.main]] + identifier = "secHarden" + name = "安全加固指南" + parent = "docs" + url = "/zh/docs/SecHarden/secHarden.html" + weight = 5 [[languages.zh.menu.main]] identifier = "vitrual" @@ -260,24 +254,36 @@ paginate = 10 url = "/zh/docs/Virtualization/virtualization.html" weight = 6 +[[languages.zh.menu.main]] + identifier = "container" + name = "容器用户指南" + parent = "docs" + url = "/zh/docs/Container/container.html" + weight = 7 + +#[[languages.zh.menu.main]] +# identifier = "releases" +# name = "版本" +# url = "/zh/releases.html" +# weight = 7 [[languages.zh.menu.main]] identifier = "download" name = "下载" url = "/zh/download.html" - weight = 6 + weight = 8 [[languages.zh.menu.main]] identifier = "security" name = "安全" url = "/zh/security.html" - weight = 7 + weight = 9 [[languages.zh.menu.main]] identifier = "lang" name = "EN" url = "/en" - weight = 8 + weight = 10 # Top bar social links menu diff --git a/content/en/intro/why.md b/content/en/intro/why.md index 1a086ba200646a1b8b9fcb45e3fa54c316a58af4..86b585c40e591885d553d0244d0e76106bfb10ae 100644 --- a/content/en/intro/why.md +++ b/content/en/intro/why.md @@ -4,6 +4,9 @@ title = "openEuler" brief = "" +++ -

Co-built, shared, and co-governed community

-

With spirit of openness, collaboration, and innovation

-

OS community that best matches the application scenarios

+

openEuler is an open source, free Linux +distribution platform. The platform provides an open community for global +developers to build an open, diversified, and architecture-inclusive software +ecosystem. openEuler is also an innovative platform that encourages everyone to +propose new ideas, explore new approaches, and practice new solutions.

+ diff --git a/content/en/releases/_index.md b/content/en/releases/_index.md new file mode 100644 index 0000000000000000000000000000000000000000..3c571a86cfa56908c9571c3f52a474587dff6822 --- /dev/null +++ b/content/en/releases/_index.md @@ -0,0 +1,5 @@ ++++ +title = "Releases" + ++++ +此处是版本计划占位 \ No newline at end of file diff --git a/content/en/releases/version1.0base.md b/content/en/releases/version1.0base.md new file mode 100644 index 0000000000000000000000000000000000000000..daf86a1218c4b991be82221f7935a6f7f2b598b6 --- /dev/null +++ b/content/en/releases/version1.0base.md @@ -0,0 +1,13 @@ ++++ +isLastestVersion="true" +version="openEuler 1.0 Base" +description="" +status="Maintained" +releaseDate="2020/02/11" +installationGuide="https://openeuler.org/en/docs/Installation/Installation.html" +EOLDate="-" +ISOUrl="https://121.36.97.194/openeuler1.0/base/iso/" ++++ +The openEuler 1.0 Base version is released to meet service requirements of specific users in specified scenarios and will be in the end-of-life (EOL) status after the openEuler 1.0 Standard version is released. + +The openEuler 1.0 Standard version is a standard release version that meets open scenario requirements. It is planned as a long term service (LTS) version and has a lifecycle of four years. \ No newline at end of file diff --git a/content/en/versions/_index.md b/content/en/versions/_index.md deleted file mode 100644 index 71789263e1bcfd14f3d9918953e1ffeb588f5ead..0000000000000000000000000000000000000000 --- a/content/en/versions/_index.md +++ /dev/null @@ -1,4 +0,0 @@ -+++ -title = "Versions" - -+++ diff --git a/content/en/versions/version1.0.md b/content/en/versions/version1.0.md deleted file mode 100644 index c68773ee4c73398857a0f0dd43adf7267b6acdf1..0000000000000000000000000000000000000000 --- a/content/en/versions/version1.0.md +++ /dev/null @@ -1,10 +0,0 @@ -+++ -isLastestVersion="true" -version="openEuler 1.0 Beta" -description="openEuler is an open-source Linux distribution. It is an efficient, stable, and secure open-source operating system built by global contributors and applies to database, big data, cloud computing, and artificial intelligence scenarios. " -status="" -releaseDate="" -installationGuide="https://openeuler.org/en/docs/Installation/Installation.html" -EOLDate="" -ISOUrl="https://121.36.97.194/openeuler1.0/iso/" -+++ diff --git a/content/zh/intro/why.md b/content/zh/intro/why.md index bb982a6b828f749891e2859fec9c4eb8410569b1..97a4b30be3aa846bb1cac755eec31336624fae4d 100644 --- a/content/zh/intro/why.md +++ b/content/zh/intro/why.md @@ -1,9 +1,7 @@ +++ -question = "为什么选择openEuler" +question = "openEuler是什么" title = "openEuler" brief = "" +++ -

共建、共享、共治的社区

-

开放、协作、创新的精神

-

最匹配应用场景的操作系统社区

+

openEuler是一个开源、免费的Linux发行版平台，将通过开放的社区形式与全球的开发者共同构建一个开放、多元和架构包容的软件生态体系。同时，openEuler也是一个创新的平台，鼓励任何人在该平台上提出新想法、开拓新思路、实践新方案。

diff --git a/content/zh/versions/_index.md b/content/zh/releases/_index.md similarity index 49% rename from content/zh/versions/_index.md rename to content/zh/releases/_index.md index 33c54fae6c3fd2345b54d0074cac2631a4cd4e5b..a45f00cc35e7481103f74fcd7198cb697acb9bd5 100644 --- a/content/zh/versions/_index.md +++ b/content/zh/releases/_index.md @@ -2,3 +2,4 @@ title = "版本" +++ +此处是版本计划描述 \ No newline at end of file diff --git a/content/zh/versions/version1.0.md b/content/zh/releases/version1.0base.md similarity index 30% rename from content/zh/versions/version1.0.md rename to content/zh/releases/version1.0base.md index ebb187d75c3476f1955e2344a37b9e7f66f705fb..262b859f5fbc020c0659adf8a846881c5292564d 100644 --- a/content/zh/versions/version1.0.md +++ b/content/zh/releases/version1.0base.md @@ -1,11 +1,14 @@ +++ isLastestVersion="true" -version="openEuler 1.0 Beta" -description="openEuler是一款开源操作系统，其内核源于Linux，是由全球开源贡献者构建的高效、稳定、安全的开源操作系统，适用于数据库、大数据、云计算、人工智能等应用场景。" -status="" -releaseDate="" +version="openEuler 1.0 Base" +description="" +status="Maintained" +releaseDate="2020/02/11" releaseNote="https://openeuler.org/zh/docs/Releasenotes/release_notes.html" installationGuide="https://openeuler.org/zh/docs/Installation/installation.html" -EOLDate="" -ISOUrl="https://121.36.97.194/openeuler1.0/iso/" +EOLDate="-" +ISOUrl="https://121.36.97.194/openeuler1.0/base/iso/" +++ +openEuler 1.0 Base版本是为了满足特定用户指定场景业务需求发布的版本，在openEuler 1.0 Standard版本发布后，本版本停止服务。 + +openEuler 1.0 Standard 版本是满足开放场景的标准发行版，规划作为LTS版本，生命周期四年。 \ No newline at end of file diff --git a/i18n/en.toml b/i18n/en.toml index fcc58047ea7cd0a71c8a520999278e304e432bd2..a900bcff8b4d57e65c33301f7dced0241aac7f62 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -103,4 +103,34 @@ other = "Release Note:" other = "Download ISO:" [download_installationGuide] -other = "Installation Guide:" \ No newline at end of file +other = "Installation Guide:" + +[download_versionsUrl] +other = "/en/releases.html" + +[download_allRelease] +other = "All Releases>>" + +[versions_versionPlan] +other = "Version Plan" + +[versions_versionName] +other = "Versions" + +[versions_status] +other = "Status" + +[versions_releaseTime] +other = "Release Date" + +[versions_EOLTime] +other = "EOL Date" + +[versions_releaseNote] +other = "Release Note" + +[versions_getiso] +other = "ISO" + +[versions_installationGuide] +other = "Installation Guide" \ No newline at end of file diff --git a/i18n/zh.toml b/i18n/zh.toml index 45eb40ecc8033fa01bd674cbf65752977c471720..2404622c2849376776d85e646d6bc64880fe98f2 100644 --- a/i18n/zh.toml +++ b/i18n/zh.toml @@ -104,6 +104,36 @@ other = "获取ISO:" [download_installationGuide] other = "安装指南:" +[download_versionsUrl] +other = "/zh/releases.html" + +[download_allRelease] +other = "获取全部版本>>" + +[versions_versionPlan] +other = "版本计划" + +[versions_versionName] +other = "版本" + +[versions_status] +other = "状态" + +[versions_releaseTime] +other = "发行时间" + +[versions_EOLTime] +other = "EOL时间" + +[versions_releaseNote] +other = "发行说明" + +[versions_getiso] +other = "ISO" + +[versions_installationGuide] +other = "安装指南" + diff --git a/themes/project/layouts/download/list.html b/themes/project/layouts/download/list.html index 629c64f293c35d1b06352c5e9189f9775625774c..96367ed922058cb1f9dd8640b368620fe1dee766 100644 --- a/themes/project/layouts/download/list.html +++ b/themes/project/layouts/download/list.html @@ -12,13 +12,13 @@
- {{ range where $.Page.Site.Pages "Type" "versions" }} + {{ range where $.Page.Site.Pages "Type" "releases" }} {{ if .Params }} {{ if .Params.isLastestVersion}}
-

{{.Params.version}}

-
{{.Params.description}}
+
{{.Params.version}}    {{ i18n "download_allRelease"}}
+
{{ .Content }}
{{ if .Params.releaseNote}}
{{ i18n "download_releaseNote"}}Link
{{ end }} diff --git a/themes/project/layouts/partials/reason.html b/themes/project/layouts/partials/reason.html index d97fcac6e7a42ad607b214772b35a1fb42f5e298..736065dd42c5a65ee4edb4cf15bbc3eacb946272 100644 --- a/themes/project/layouts/partials/reason.html +++ b/themes/project/layouts/partials/reason.html @@ -5,10 +5,6 @@ {{ range first 1 $whys }}

{{ .Params.question }}

-
-

{{ .Params.Title }}

-

{{ .Params.Brief }}

-
{{ .Content }}
diff --git a/themes/project/layouts/releases/list.html b/themes/project/layouts/releases/list.html new file mode 100644 index 0000000000000000000000000000000000000000..7605c78264b5f5e92ef1f14cf16b0ff2a49abf3d --- /dev/null +++ b/themes/project/layouts/releases/list.html @@ -0,0 +1,74 @@ + + + + {{ partial "head.html" . }} + + + +
+ +
+ + {{ partial "nav.html" . }} + +
+ + {{ partial "breadcrumbs.html" . }} + +
+
+
+ +
+ + + + + + + + + + + + {{ range where $.Page.Site.Pages "Type" "releases" }} + {{ if .Params }} + {{ if .Params.version}} + + + + + {{ if .Params.releaseNote}} + + {{ else }} + + {{ end }} + + + + + {{ end }} + {{ end }} + {{ end }} + +
{{ i18n "versions_versionName"}}{{ i18n "versions_status"}}{{ i18n "versions_releaseTime"}}{{ i18n "versions_releaseNote"}}{{ i18n "versions_EOLTime"}}{{ i18n "versions_getiso"}}{{ i18n "versions_installationGuide"}}
{{ .Params.version}}{{ .Params.status}}{{ .Params.releaseDate}}Link-{{ .Params.EOLDate}}LinkLink
+
+ +
+ +
+ +
+ + + {{ partial "footer.html" . }} + +
+ + + {{ partial "scripts.html" . }} + + + diff --git a/themes/project/static/css/custom.css b/themes/project/static/css/custom.css index d1c74e7ffd7324adb596f9ef59b8c92189ba1b0e..391e17b4e0ea36d17364cf4fba7876f41f6f174c 100644 --- a/themes/project/static/css/custom.css +++ b/themes/project/static/css/custom.css @@ -294,7 +294,7 @@ padding: 170px 30px 70px; } .reason h2 { - margin-bottom: 67px; + margin-bottom: 40px; font-size: 40px; color: #333333; text-align: center; @@ -307,30 +307,7 @@ max-width: 1366px; margin: 0 auto; } -.reason .content_why .bg { - background: url('../img/flows.png') no-repeat; - height: 300px; - width: 500px; - flex-shrink: 0; - background-size: cover; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - color: #FFFFFF; - padding: 0 10px; - text-align: center; -} -.reason .content_why .bg h3 { - font-size: 59px; - color: #FFFFFF; - margin-top: 80px; -} -.reason .content_why .bg p { - margin-top: 60px; - font-size: 18px; - line-height: 28px; -} + .reason .content_why .detail { margin-left: 50px; } @@ -340,26 +317,11 @@ line-height: 30px; padding-left: 15px; } -/* .reason .content_why .detail p:nth-child(1) { - margin-bottom: 40px; -} */ -.reason .content_why .detail>div { +/*.reason .content_why .detail>div { position: relative; margin: 30px 0px; -} - -.reason .content_why .detail>div p::before{ - content:''; - display: inline-block; - position: absolute; - top: 10px; - left:0; - border-radius: 50%; - background: #000; - width: 5px; - height: 5px; -} +}*/ .e_mail { background: url('../img/bg2.png') no-repeat; diff --git a/themes/project/static/css/custommobile.css b/themes/project/static/css/custommobile.css index 855f398a1247d237be26f0100769b240cc8d9970..993ba4b82839974e23c8b31ecfc2eb2716e799c3 100644 --- a/themes/project/static/css/custommobile.css +++ b/themes/project/static/css/custommobile.css @@ -224,31 +224,14 @@ } .reason h2 { font-size: 0.46rem; - margin-bottom: .68rem; + margin-bottom: .38rem; } .reason .content_why { flex-direction: column; } - .reason .content_why .bg { - width: 95%; - height: 4rem; - background-position: center; - position: relative; - } - .reason .content_why .bg h3 { - font-size: .6rem; - } - .reason .content_why .bg p { - font-size: .24rem; - margin-top: .6rem; - line-height: inherit; - position: absolute; - bottom: .44rem; - padding: 0 10px; - } + .reason .content_why .detail { margin-left: 0; - margin-top: 0.5rem; } .reason .content_why .detail p { font-size: .28rem; @@ -601,7 +584,6 @@ .reason .content_why .detail { margin-left: 0; width: 580px; - margin-top: 0.5rem; } .action .active_box .active h2 { font-size: 0.45rem; @@ -656,10 +638,6 @@ footer .notice { width: 360px; } - .reason .content_why .bg p { - margin-top: 40px; - padding: 0 10px; - } #mask { position: fixed; top: 0; diff --git a/themes/project/static/img/flows.png b/themes/project/static/img/flows.png deleted file mode 100644 index f9037a887bba7e56d3c340d78e908cc94881eb5d..0000000000000000000000000000000000000000 Binary files a/themes/project/static/img/flows.png and /dev/null differ