change css and content

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;

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"

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

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: <span>Easy to integrate with your SCM, </span> support GitLab / GitHub / BitBucket / SVN
         - content: <span>Design a graphical editing panel</span> to create CI/CD pipelines, without writing Jenkinsfile
@@ -24,7 +24,7 @@ section2:
         - content: <span>Provide dynamic build agents</span> 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: <span>Source to Image,</span> building reproducible container images from source code, without writing dockerfile
         - content: <span>Binary-to-image</span>is the bridge between your artifact and a runnable image
@@ -32,7 +32,7 @@ section2:
         - content: <span>Good recoverability and flexibility,</span> 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: <span>Combine Git with Kubernetes’ convergence, and automates the cloud native Apps delivery</span>
         - content: <span>Designed for teams, offer built-in multitenancy in DevOps project</span>

layouts/partials/header.html

@@ -20,14 +20,14 @@
 
                 <li {{ if $active }} class="menu-li menu-active" {{ else }} class="menu-li" {{ end}}>
                     <span class='menu-span'>{{ .Name }}</span>
-                    <ul class="dropdown-menu">
+                    <ul class="dropdown-menu menu-{{ .Name }}">
                         {{ range .Children }}
-                        <li {{ if eq $section .URL }} class="active"{{ end}}><a href="{{ .URL | absLangURL }}">{{ .Name }}</a></li>
+                        <li {{ if eq $section .URL }} class="active"{{ end}}><a href="{{ .URL | absLangURL }}" target="_blank">{{ .Name }}</a></li>
                         {{ end }}
                     </ul>
                 </li>
                 {{ else }}
-                <li {{ if eq $section .URL }} class="active"{{ end}}><a href="{{ .URL | absLangURL }}">{{ .Name }}</a></li>
+                <li {{ if eq $section .URL }} class="active"{{ end}}><a href="{{ .URL | absLangURL }}" target="_blank">{{ .Name }}</a></li>
                 {{ end }}
 
                 {{ end }}
@@ -87,13 +87,7 @@
                 <ul class="dropdown-menu">
                     {{ range .Children }}
                     <li {{ if eq $section .URL }} class="active"{{ end}}>
-                        <a href="{{ .URL | absLangURL }}">
-                            {{ if .Title }}
-                            {{ .Title }}
-                            {{ else }}
-                            {{ .Name }}
-                            {{ end }}
-                        </a>
+                        <a href="{{ .URL | absLangURL }}">{{ .Name }}</a>
                     </li>
                     {{ end }}
                 </ul>

layouts/partials/openSource.html

@@ -17,7 +17,7 @@
   </div>
   <ul class="open-source-tab common-layout">
     {{ $section := .Page.Section }}
-    {{ $menus := (index .Site.Menus.main 2).Children }}
+    {{ $menus := (index .Site.Menus.main 1).Children }}
     {{ range $menus }}
     <li class="">
       <a {{ if eq $section .URL }} class="active"{{ end }} href="{{ .URL | absLangURL }}">{{ .Name }}</a>