diff --git a/assets/scss/header.scss b/assets/scss/header.scss index dd0af5bc1..9948813ca 100644 --- a/assets/scss/header.scss +++ b/assets/scss/header.scss @@ -32,7 +32,7 @@ .nav { height:100%; - margin-left: 200px; + margin-left: 300px; margin-right: 340px; line-height: 93px; @@ -137,6 +137,14 @@ // } } + .menu-Scenario { + width: 260px; + } + + .menu-Community { + width: 120px; + } + .right-menu { position: absolute; top: 28px; @@ -178,7 +186,7 @@ } .dropdown-menu { color: black; - width: 120px; + width: 100px; padding-left: 20px; li { padding: 0; diff --git a/config/_default/config.toml b/config/_default/config.toml index 19e62f2d0..3d7d95a71 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -33,11 +33,6 @@ weight = 1 languageCode = "en-US" languageName = "English" -[[languages.en.menu.main]] -weight = 1 -name = "Why KubeSphere" -URL = "reason" - [[languages.en.menu.main]] weight = 2 name = "Scenario" @@ -45,22 +40,19 @@ hasChildren = true [[languages.en.menu.main]] parent = "Scenario" - name = "DevOps" - Title = "Embracing One-stop DevOps Workflow" + name = "Embracing One-stop DevOps Workflow" URL = "devops" weight = 1 [[languages.en.menu.main]] parent = "Scenario" - name = "Service Mesh" - Title = "Running Microservices on Kubernetes" + name = "Running Microservices on Kubernetes" URL = "service-mesh" weight = 2 [[languages.en.menu.main]] parent = "Scenario" - name = "Observability" - Title = "Building Cloud Native Observability" + name = "Building Cloud Native Observability" URL = "observability" weight = 3 @@ -120,17 +112,18 @@ name = "Community" URL = "partner" weight = 3 + [[languages.en.menu.main]] + parent = "Community" + name = "RoadMap" + URL = "https://github.com/kubesphere/kubesphere/blob/master/docs/roadmap.md" + weight = 4 + [languages.zh] weight = 2 contentDir = "content/zh" languageCode = "zh-CN" languageName = "简体中文" -[[languages.zh.menu.main]] -weight = 1 -name = "Why KubeSphere" -URL = "reason" - [[languages.zh.menu.main]] weight = 2 name = "Scenario" @@ -218,11 +211,6 @@ contentDir = "content/tr" languageCode = "tr-TR" languageName = "Türkçe" -[[languages.tr.menu.main]] -weight = 1 -name = "Neden KubeSphere" -URL = "reason" - [[languages.tr.menu.main]] weight = 2 name = "Senaryolar" diff --git a/config/allMenu/config.toml b/config/allMenu/config.toml new file mode 100644 index 000000000..0d310c13e --- /dev/null +++ b/config/allMenu/config.toml @@ -0,0 +1,301 @@ +[languages.en] +contentDir = "content/en" +weight = 1 +languageCode = "en-US" +languageName = "English" + +[[languages.en.menu.main]] +weight = 1 +name = "Why KubeSphere" +URL = "reason" + +[[languages.en.menu.main]] +weight = 2 +name = "Scenario" +hasChildren = true + + [[languages.en.menu.main]] + parent = "Scenario" + name = "Embracing One-stop DevOps Workflow" + URL = "devops" + weight = 1 + + [[languages.en.menu.main]] + parent = "Scenario" + name = "Running Microservices on Kubernetes" + URL = "service-mesh" + weight = 2 + + [[languages.en.menu.main]] + parent = "Scenario" + name = "Building Cloud Native Observability" + URL = "observability" + weight = 3 + +[[languages.en.menu.main]] +weight = 3 +name = "Resources" +hasChildren = true + + [[languages.en.menu.main]] + parent = "Resources" + name = "Open Source Projects" + URL = "projects" + weight = 1 + + [[languages.en.menu.main]] + parent = "Resources" + name = "KubeCon & QCon" + URL = "conferences" + weight = 2 + + [[languages.en.menu.main]] + parent = "Resources" + name = "Technology Blogs" + URL = "blogs" + weight = 3 + + [[languages.en.menu.main]] + parent = "Resources" + name = "Video Resources" + URL = "videos" + weight = 4 + +[[languages.en.menu.main]] +weight = 4 +name = "Documentation" +URL = "https://kubesphere.io/docs/" + +[[languages.en.menu.main]] +weight = 5 +hasChildren = true +name = "Community" + [[languages.en.menu.main]] + parent = "Community" + name = "Contribution" + URL = "contribution" + weight = 1 + + [[languages.en.menu.main]] + parent = "Community" + name = "Case Studies" + URL = "case" + weight = 2 + + [[languages.en.menu.main]] + parent = "Community" + name = "Partner" + URL = "partner" + weight = 3 + +[languages.zh] +weight = 2 +contentDir = "content/zh" +languageCode = "zh-CN" +languageName = "简体中文" + +[[languages.zh.menu.main]] +weight = 1 +name = "Why KubeSphere" +URL = "reason" + +[[languages.zh.menu.main]] +weight = 2 +name = "Scenario" +hasChildren = true + + [[languages.zh.menu.main]] + parent = "Scenario" + name = "DevOps" + URL = "devOps" + weight = 2 + + [[languages.zh.menu.main]] + parent = "Scenario" + name = "Service Mesh" + URL = "service-mesh" + weight = 4 + + [[languages.zh.menu.main]] + parent = "Scenario" + name = "Observability" + URL = "observability" + weight = 8 + +[[languages.zh.menu.main]] +weight = 3 +name = "Resources" +hasChildren = true + + [[languages.zh.menu.main]] + parent = "Resources" + name = "Open Source Projects" + URL = "projects" + weight = 1 + + [[languages.zh.menu.main]] + parent = "Resources" + name = "KubeCon & QCon" + URL = "conferences" + weight = 2 + + [[languages.zh.menu.main]] + parent = "Resources" + name = "Technology Blogs" + URL = "blogs" + weight = 3 + + [[languages.zh.menu.main]] + parent = "Resources" + name = "Video Resources" + URL = "videos" + weight = 4 + +[[languages.zh.menu.main]] +weight = 4 +name = "Documentation" +URL = "docs" + +[[languages.zh.menu.main]] +weight = 5 +hasChildren = true +name = "Community" + [[languages.zh.menu.main]] + parent = "Community" + name = "Contribution" + URL = "contribution" + weight = 1 + + [[languages.zh.menu.main]] + parent = "Community" + name = "Case Studies" + URL = "case" + weight = 2 + + [[languages.zh.menu.main]] + parent = "Community" + name = "Partner" + URL = "partner" + weight = 3 + + + +[languages.tr] +weight = 3 +contentDir = "content/tr" +languageCode = "tr-TR" +languageName = "Türkçe" + +[[languages.tr.menu.main]] +weight = 1 +name = "Neden KubeSphere" +URL = "reason" + +[[languages.tr.menu.main]] +weight = 2 +name = "Senaryolar" +hasChildren = true + + [[languages.tr.menu.main]] + parent = "Senaryolar" + name = "Multi-cluster" + URL = "multi-cluster" + weight = 1 + + [[languages.tr.menu.main]] + parent = "Senaryolar" + name = "DevOps" + URL = "devOps" + weight = 2 + + [[languages.tr.menu.main]] + parent = "Senaryolar" + name = "Network" + URL = "network" + weight = 3 + + [[languages.tr.menu.main]] + parent = "Senaryolar" + name = "Service Mesh" + URL = "service-mesh" + weight = 4 + + [[languages.tr.menu.main]] + parent = "Senaryolar" + name = "Storage" + URL = "storage" + weight = 5 + + [[languages.tr.menu.main]] + parent = "Senaryolar" + name = "AppStore" + URL = "app-store" + weight = 6 + + [[languages.tr.menu.main]] + parent = "Senaryolar" + name = "Multi-tenancy" + URL = "multi-tenancy" + weight = 7 + + [[languages.tr.menu.main]] + parent = "Senaryolar" + name = "Observability" + URL = "observability" + weight = 8 + +[[languages.tr.menu.main]] +weight = 3 +name = "Kaynaklar" +hasChildren = true + + [[languages.tr.menu.main]] + parent = "Kaynaklar" + name = "Open Source Projeler" + URL = "projects" + weight = 1 + + [[languages.tr.menu.main]] + parent = "Kaynaklar" + name = "KubeCon & QCon" + URL = "conferences" + weight = 2 + + [[languages.tr.menu.main]] + parent = "Kaynaklar" + name = "Blog Yazıları" + URL = "blogs" + weight = 3 + + [[languages.tr.menu.main]] + parent = "Kaynaklar" + name = "Videolar" + URL = "videos" + weight = 4 + +[[languages.tr.menu.main]] +weight = 4 +name = "Dokümantasyon" +URL = "docs" + +[[languages.tr.menu.main]] +weight = 5 +hasChildren = true +name = "Topluluk" + [[languages.tr.menu.main]] + parent = "Topluluk" + name = "Contribution" + URL = "contribution" + weight = 1 + + [[languages.tr.menu.main]] + parent = "Topluluk" + name = "Case Studies" + URL = "case" + weight = 2 + + [[languages.tr.menu.main]] + parent = "Topluluk" + name = "Partnerler" + URL = "partner" + weight = 3 \ No newline at end of file diff --git a/content/en/contribution/request.md b/content/en/contribution/request.md index bbb026a90..055dd6f41 100644 --- a/content/en/contribution/request.md +++ b/content/en/contribution/request.md @@ -9,46 +9,8 @@ section1: content: 'Join the community to get help, get involved, or get updates and KubeSphere news!' topImage: "/images/contribution/contribution-top.jpg" -section2: - topType: - - name: 'Download' - icon1: 'images/contribution/download.svg' - icon2: 'images/contribution/37.png' - children: - - content: 'Download KubeSphere' - link: 'https://kubesphere.io/docs/installation/intro/' - - content: 'Quickstart' - link: 'https://kubesphere.io/docs/quick-start/admin-quick-start/' - - content: 'Tutorial Videos' - link: '../videos' - - - name: 'Contribute' - icon1: 'images/contribution/contribute.svg' - icon2: 'images/contribution/38.png' - children: - - content: 'Join the SIGs and WGs' - link: 'https://github.com/kubesphere/community#kubesphere-community' - - content: 'Improve the Docs' - link: 'https://github.com/kubesphere/docs.kubesphere.io/issues?q=is%3Aissue+is%3Aopen+label%3A%22for+new+contributor%22' - - content: 'Submit a Bug or Suggestion' - link: 'https://github.com/kubesphere/kubesphere/issues/new/choose' - - - name: 'Get in Touch' - icon1: 'images/contribution/business.svg' - icon2: 'images/contribution/39.png' - children: - - content: 'Join KubeSphere Slack' - link: 'https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE' - - content: 'Join the Mailing List' - link: 'https://groups.google.com/forum/#!forum/kubesphere' - - content: 'Follow us on Twitter' - link: 'https://twitter.com/KubeSphere' -section3: +sectionIframe: title: Become a KubeSphere Ambassador googleFormUrl: https://docs.google.com/forms/d/e/1FAIpQLSf2kT-J9xJma3ASsZF6n0jVaAldJU2gNL8wVz88SraNJyCE4Q/viewform?embedded=true -section4: - involved: - children: - --- diff --git a/content/en/devops/_index.md b/content/en/devops/_index.md index c54b69d2c..a0cadc54b 100644 --- a/content/en/devops/_index.md +++ b/content/en/devops/_index.md @@ -9,13 +9,13 @@ section1: content: KubeSphere provides rich observability from infrastructure to applications. It integrates your favorite tools for multi-dimensional monitoring metrics, multi-tenant log query and collection, alerting and notification. image: /images/service-mesh/banner.jpg -image: /images/dev-ops/dev-ops.jpg +image: /images/devops/dev-ops.jpg section2: title: Automatically Checkout Code, Test, Analyse, Build, Deploy and Release list: - title: Multi-dimensional Monitoring - image: /images/observability/multi-dimensional-monitoring.png + image: /images/devops/CD-pipeline.svg contentList: - content: Easy to integrate with your SCM, support GitLab / GitHub / BitBucket / SVN - content: Design a graphical editing panel to create CI/CD pipelines, without writing Jenkinsfile @@ -24,7 +24,7 @@ section2: - content: Provide dynamic build agents to automatically spin up Pods as necessary - title: Built-in automated toolkits - image: /images/observability/log-query-and-collection.png + image: /images/devops/Built-in-automated-toolkits.svg contentList: - content: Source to Image, building reproducible container images from source code, without writing dockerfile - content: Binary-to-imageis the bridge between your artifact and a runnable image @@ -32,7 +32,7 @@ section2: - content: Good recoverability and flexibility, you can rebuild and rerun S2I / B2I whenever a patch is needed - title: Use GitOps to implement DevOps, not just culture - image: /images/observability/flexible-alerting-and-notification.png + image: /images/devops/Clear-insight.svg contentList: - content: Combine Git with Kubernetes’ convergence, and automates the cloud native Apps delivery - content: Designed for teams, offer built-in multitenancy in DevOps project diff --git a/content/en/partner/request.md b/content/en/partner/request.md index d04dc66aa..04d866602 100644 --- a/content/en/partner/request.md +++ b/content/en/partner/request.md @@ -24,7 +24,7 @@ section2: bg2: 'images/partner/background1.svg' bg3: 'images/partner/background2.svg' -section3: +sectionIframe: title: Become a Partner with KubeSphere googleFormUrl: https://docs.google.com/forms/d/e/1FAIpQLSf2kT-J9xJma3ASsZF6n0jVaAldJU2gNL8wVz88SraNJyCE4Q/viewform?embedded=true --- \ No newline at end of file diff --git a/layouts/contribution/request.html b/layouts/contribution/request.html index 4090062a7..79dd9aa83 100644 --- a/layouts/contribution/request.html +++ b/layouts/contribution/request.html @@ -10,7 +10,7 @@ {{ end }}
- {{ with .Params.section3 }} + {{ with .Params.sectionIframe }}

{{ .title }}

diff --git a/layouts/partials/header.html b/layouts/partials/header.html index f4fbaf8c4..0a6879d2d 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -20,14 +20,14 @@
  • {{ .Name }} -
    • - {{ with .Params.section3 }} + {{ with .Params.sectionIframe }}

    {{ .title }}

    diff --git a/static/images/devops/Built-in-automated-toolkits.svg b/static/images/devops/Built-in-automated-toolkits.svg new file mode 100755 index 000000000..bad2ae541 --- /dev/null +++ b/static/images/devops/Built-in-automated-toolkits.svg @@ -0,0 +1,74 @@ + + + + illustrations / Built-in automated toolkits + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/devops/CD-pipeline.svg b/static/images/devops/CD-pipeline.svg new file mode 100755 index 000000000..ee847e712 --- /dev/null +++ b/static/images/devops/CD-pipeline.svg @@ -0,0 +1,100 @@ + + + + illustrations / Out-of-box CI/CD pipeline + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CI/CD pipeline + + + + + \ No newline at end of file diff --git a/static/images/devops/Clear-insight.svg b/static/images/devops/Clear-insight.svg new file mode 100644 index 000000000..c7a93a258 --- /dev/null +++ b/static/images/devops/Clear-insight.svg @@ -0,0 +1,65 @@ + + + + illustrations / Clear insight into each build and workflow + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/dev-ops/dev-ops.jpg b/static/images/devops/dev-ops.jpg similarity index 100% rename from static/images/dev-ops/dev-ops.jpg rename to static/images/devops/dev-ops.jpg