diff --git a/assets/scss/footer.scss b/assets/scss/footer.scss index 86b054c4a..4ea56b2a6 100644 --- a/assets/scss/footer.scss +++ b/assets/scss/footer.scss @@ -102,8 +102,54 @@ .img-div { font-size: 0; - img { + + a { + display: inline-block; + width: 34px; + height: 34px; margin: 0 6px; + background-position: center; + background-repeat: no-repeat; + } + + .facebook-a { + background-image: url("/images/footer/facebook.svg"); + + &:hover { + background-image: url("/images/footer/facebook-hover.svg"); + } + } + + .youtube-a { + background-image: url("/images/footer/youtube.svg"); + + &:hover { + background-image: url("/images/footer/youtube-hover.svg"); + } + } + + .slack-a { + background-image: url("/images/footer/slack.svg"); + + &:hover { + background-image: url("/images/footer/slack-hover.svg"); + } + } + + .twitter-a { + background-image: url("/images/footer/twitter.svg"); + + &:hover { + background-image: url("/images/footer/twitter-hover.svg"); + } + } + + .github-a { + background-image: url("/images/footer/github.svg"); + + &:hover { + background-image: url("/images/footer/github-hover.svg"); + } } } diff --git a/assets/scss/header.scss b/assets/scss/header.scss index 7fdfb4955..95c9f035e 100644 --- a/assets/scss/header.scss +++ b/assets/scss/header.scss @@ -91,7 +91,6 @@ li { padding: 0 20px; - height: 32px; line-height: 32px; font-size: 12px; color: #36435c; @@ -191,7 +190,8 @@ } .dropdown-menu { - top: 60px + width: 300px; + top: 60px; } ol { diff --git a/assets/scss/search.scss b/assets/scss/search.scss new file mode 100644 index 000000000..e69de29bb diff --git a/config/_default/config.toml b/config/_default/config.toml index b012a949b..22cf7bba6 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -9,8 +9,22 @@ baseURL = "https://hugo-first.netlify.app" [params] logo = "images/logo.svg" + +title = "KubeSphere | Enterprise container platform, built on Kubernetes" +description = "KubeSphere is an open source container platform based on Kubernetes for enterprise app development and deployment, suppors installing anywhere from on-premise datacenter to any cloud to edge." +keywords = "KubeSphere, Kubernetes Dashboard, Install Enterprise Kubernetes, DevOps, container platform" + mailchimpSubscribeUrl = "https://gmail.us18.list-manage.com/subscribe/post?u=553ce463e00897cc36ed80866&id=f4b5009074" +gcs_engine_id = "018068616810858123755%3Apb1pt8sx6ve" + +githubLink = "https://github.com/kubesphere/kubesphere" +slackLink = "https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE" +youtubeLink = "https://www.youtube.com/channel/UCyTdUQUYjf7XLjxECx63Hpw" +facebookLink = "" +twitterLink = "https://twitter.com/KubeSphere" + + [languages.en] contentDir = "content/en" weight = 1 diff --git a/content/en/_index.md b/content/en/_index.md index 972b185c1..443e722c4 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -10,7 +10,9 @@ section1: topic: The Kubernetes platform tailored for hybrid multicloud content: KubeSphere is a distributed operating system managing cloud native applications with Kubernetes as its kernel, and provides plug-and-play architecture for the seamless integration of third-party applications to boost its ecosystem. btnContent1: Install on Kubernetes + downloadLink1: "" btnContent2: Install on Linux + downloadLink2: "" section2: title: One Platform for Full Stack Solutions @@ -94,36 +96,43 @@ section4: - name: Application Store icon: /images/home/store.svg content: Provide an application store for Helm-based applications, and offer application lifecycle management + link: "" color: grape - name: Service Mesh (Istio-based) icon: /images/home/service.svg content: Provide fine-grained traffic management, observability and tracing, and offer visualization for traffic topology + link: "" color: red - name: Rich Observability icon: /images/home/rich.svg content: Multi-dimensional monitoring metrics, multi-tenant log query and collection, and alerting and notification support + link: "" color: green - name: DevOps System icon: /images/home/dev-ops.svg content: Out-of-box CI/CD based on Jenkins, and automated workflow tools including S2I & B2I + link: "" color: orange - name: Multiple Storage Solutions icon: /images/home/multiple.svg content: Support GlusterFS, CephRBD, NFS, LocalPV solutions, and provide CSI plugins to consume storage from multiple cloud providers + link: "" color: grape - name: Multiple Network Solutions icon: /images/home/network.svg content: Support Calico and Flannel, and provide load balancer plug-in Porter for Kubernetes installed on physical machines + link: "" color: green - name: Multi-cluster Management icon: /images/home/management.svg content: Distribute applications across multiple clusters and cloud providers, and provide disaster recovery solutions and cross-cluster discovery + link: "" color: orange section5: @@ -161,7 +170,7 @@ section6: - icon: /images/home/section6-9.jpg - icon: /images/home/section6-10.jpg btnContent: Case Studies - btnLink: + btnLink: case link: linkContent: Want your logo up there? Just submit a pull request → joinTitle: Join the Revolution, Partner with KubeSphere diff --git a/content/en/blogs/_index.md b/content/en/blogs/_index.md index d4552ac27..62c79d356 100644 --- a/content/en/blogs/_index.md +++ b/content/en/blogs/_index.md @@ -1,5 +1,7 @@ --- -title: blogs +title: Open Source Community - Open Source Community - KubeSphere | Enterprise container platform, built on Kubernetes +description: KubeSphere is an open source container platform based on Kubernetes for enterprise app development and deployment, suppors installing anywhere from on-premise datacenter to any cloud to edge. +keywords: KubeSphere, Kubernetes Dashboard, Install Enterprise Kubernetes, DevOps, Istio, Service Mesh, Jenkins, container platform css: scss/blogs.scss diff --git a/content/en/conferences/_index.md b/content/en/conferences/_index.md index 3434324e9..953646054 100644 --- a/content/en/conferences/_index.md +++ b/content/en/conferences/_index.md @@ -1,5 +1,7 @@ --- -title: "page1" +title: Open Source Community - Open Source Community - KubeSphere | Enterprise container platform, built on Kubernetes +description: KubeSphere is an open source container platform based on Kubernetes for enterprise app development and deployment, suppors installing anywhere from on-premise datacenter to any cloud to edge. +keywords: KubeSphere, Kubernetes Dashboard, Install Enterprise Kubernetes, DevOps, Istio, Service Mesh, Jenkins, container platform css: "scss/conferences.scss" diff --git a/content/en/contribution/_index.md b/content/en/contribution/_index.md index 08a406588..47ca95a61 100644 --- a/content/en/contribution/_index.md +++ b/content/en/contribution/_index.md @@ -37,11 +37,11 @@ section2: icon2: 'images/contribution/39.png' children: - content: 'Join KubeSphere Slack' - link: '' + link: 'https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE' - content: 'Join the Mailing List' link: '' - content: 'Follow us on Twitter' - link: '' + link: 'https://twitter.com/KubeSphere' organization: topic: 'Community Governance' diff --git a/content/en/partner/_index.md b/content/en/partner/_index.md index 4a4d67882..ad6b73f1c 100644 --- a/content/en/partner/_index.md +++ b/content/en/partner/_index.md @@ -1,5 +1,5 @@ --- -title: "page1" +title: "partner" css: "scss/partner.scss" diff --git a/content/en/projects/_index.md b/content/en/projects/_index.md index a658a359a..1101d7930 100644 --- a/content/en/projects/_index.md +++ b/content/en/projects/_index.md @@ -1,34 +1,87 @@ --- -title: "About" - +title: "Open Source Community - Open Source Community - KubeSphere | Enterprise container platform, built on Kubernetes" +description: KubeSphere is an open source container platform based on Kubernetes for enterprise app development and deployment, suppors installing anywhere from on-premise datacenter to any cloud to edge. +keywords: KubeSphere, Kubernetes Dashboard, Install Enterprise Kubernetes, DevOps, Istio, Service Mesh, Jenkins, container platform css: "scss/projects.scss" name: Open Source Projects groups: - name: Container Platform children: - - title: KubeSphere - icon: 'images/kubesphere.svg' - link: '' + - title: KubeSphere 容器平台 + icon: images/projects/kubesphere.svg + link: "https://github.com/kubesphere/kubesphere" description: 基于 Kubernetes 之上构建的以应用为中心的多租户容器平台，支持部署运行在任何基础设施之上，提供简单易用的操作界面以及向导式 UI，旨在解决 Kubernetes 的存储、网络、安全与易用性等痛点。 - name: App Management children: - title: OpenPitrix - icon: '' - link: '' + icon: images/projects/openpitrix.svg + link: "https://github.com/openpitrix/openpitrix" description: 开源的多云应用管理平台，用来在多云环境下打包、部署和管理不同类型的应用，包括传统应用、微服务应用以及 Serverless 应用等，其中云平台包括 AWS、Kubernetes、QingCloud、VMWare。 - name: Storage Plugins children: - title: QingStor-CSI - icon: '' - link: '' + icon: images/projects/qingstor.svg + link: "https://github.com/yunify/qingstor-csi" description: QingStor CSI 插件实现 CSI 接口，使容器编排平台（如 Kubernetes）能够使用 NeonSAN 分布式存储的资源。目前，QingStor CSI 插件实现了存储卷管理和快照管理功能，并在 Kubernetes v1.12 环境中通过了 CSI Sanity 测试。 - title: QingCloud-CSI - icon: '' - link: '' + icon: images/projects/qingcloud.svg + link: "https://github.com/yunify/qingcloud-csi" description: QingCloud CSI 插件实现了 CSI 接口，并使容器管理平台能够使用 QingCloud 云平台的块存储资源。目前，QingCloud CSI 插件已经在 Kubernetes v1.14/v1.15 环境中通过了 CSI 测试。 + + - name: Network Plugins + children: + - title: Porter LB 插件 + icon: images/projects/porter.svg + link: "https://github.com/kubesphere/porter" + description: 适用于物理部署 Kubernetes 环境的负载均衡器插件，Porter 使用物理交换机实现，利用 BGP 和 ECMP 从而达到性能最优和高可用性，提供用户在物理环境暴露 LoadBalancer 类型服务与云上获得一致性体验。 + - title: Qingcloud Load Balancer + icon: images/projects/qingcloud.svg + link: "https://github.com/yunify/qingcloud-cloud-controller-manager" + description: QingCloud 云平台的负载均衡器插件，使用户能够在 QingCloud 云平台快速创建 LoadBalancer 类型的服务并暴露给集群外部访问。 + + - title: Hostnic-CNI + icon: images/projects/qingcloud.svg + link: "https://github.com/yunify/hostnic-cni" + description: QingCloud 云平台的负载均衡器插件，会直接调用 QingCloud 云平台的接口去创建网卡，并将容器的内部的接口连接到网卡上，不同 Node 上的 Pod 能够借助云平台的 SDN 进行通讯。 + + + - name: CI/CD + children: + - title: S2i-operator + icon: images/projects/s2i-operator.svg + link: "https://github.com/kubesphere/s2ioperator" + description: S2I ( Source to Image )是一款自动将代码容器化的工具，通过预置的模板来支持多种语言和框架，比如 Java、Nodejs、Python 等，提供 CLI、API 和 webhook，是一种 CI/CD 的实现方式。 + + - name: Notification & Alerting + children: + - title: Notification（通知系统） + icon: images/projects/notification.svg + link: "https://github.com/openpitrix/notification" + description: 通用的企业级高性能的分布式通知系统，面向云原生的设计，可独立部署与使用，支持邮件通知，计划新增 WebSocket、微信、SMS 短信等通知渠道。 + + - title: Alert（告警系统） + icon: images/projects/alert.svg + link: "https://github.com/kubesphere/alert" + description: 通用的企业级高性能的分布式告警系统，面向云原生的设计，可独立部署与使用，支持集群、Workload、Pod、容器级别的自定义告警规则。 + + + - name: Logging Operator + children: + - title: Fluentbit-operator + icon: images/projects/fluentbit-operator.svg + link: "https://github.com/kubesphere/fluentbit-operator" + description: Fluent Bit Operator 实现以声明式配置的方式，对 Fluent Bit 动态管理和运维。可帮助开发者将日志信息与应用程序打包在一起。借助 CRD 可以在其图表中描述应用程序的行为。 + + + - name: Identity Management + children: + - title: IM + icon: images/projects/im.svg + link: "https://github.com/kubesphere/im" + description: 通用的身份认证管理系统 --- \ No newline at end of file diff --git a/content/en/search/_index.md b/content/en/search/_index.md new file mode 100644 index 000000000..6e2878d22 --- /dev/null +++ b/content/en/search/_index.md @@ -0,0 +1,4 @@ +--- +title: search + +--- \ No newline at end of file diff --git a/content/en/videos/_index.md b/content/en/videos/_index.md index fb01b90f9..2b6bf106f 100644 --- a/content/en/videos/_index.md +++ b/content/en/videos/_index.md @@ -1,5 +1,7 @@ --- -title: "page1" +title: Open Source Community - Open Source Community - KubeSphere | Enterprise container platform, built on Kubernetes +description: KubeSphere is an open source container platform based on Kubernetes for enterprise app development and deployment, suppors installing anywhere from on-premise datacenter to any cloud to edge. +keywords: KubeSphere,DevOps,Istio,Service Mesh,Jenkins, css: "scss/videos.scss" minCss: css/jquery.modal.min.css tip: ALL diff --git a/data/en/footer.yaml b/data/en/footer.yaml index fa73092ac..d1accd723 100644 --- a/data/en/footer.yaml +++ b/data/en/footer.yaml @@ -19,16 +19,18 @@ footer: - content: Notification Manager link: '' + - title: Resources list: - content: Projects - link: + link: projects - content: Blogs - link: + link: blogs - content: KubeCon & QCon - link: + link: conferences - content: Videos - link: + link: videos + - title: KubeSphere Docs list: - content: Introduction @@ -39,13 +41,14 @@ footer: link: '' - content: API Documentation link: '' + - title: Community list: - content: Contribution - link: + link: contribution - content: Case Studies - link: + link: case - content: Partners - link: + link: partner - content: Roadmap - link: \ No newline at end of file + link: roadmap \ No newline at end of file diff --git a/i18n/en.yaml b/i18n/en.yaml index 3519f25d0..7c3a72461 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -26,5 +26,13 @@ translation: email is required! - id: Please enter a valid email address. translation: Please enter a valid email address! - - +- id: Demo + translation: Demo +- id: demo content 1 + translation: "1.Online experience account: demo1 / Demo123" +- id: demo content 2 + translation: 2.This demo account is only allowed to view parts of UI +- id: demo content 3 + translation: 3.It's recommended that install KubeSphere in your environment +- id: Read More + translation: Read More diff --git a/layouts/_default/search.html b/layouts/_default/search.html new file mode 100644 index 000000000..e1ad53e9e --- /dev/null +++ b/layouts/_default/search.html @@ -0,0 +1,22 @@ +{{ define "main" }} +
+
+

{{ .Title }}

+{{ with .Site.Params.gcs_engine_id }} + + +{{ end }} +
+
+ +{{ end }} \ No newline at end of file diff --git a/layouts/case/list.html b/layouts/case/list.html index 1bd53b74e..80543584b 100644 --- a/layouts/case/list.html +++ b/layouts/case/list.html @@ -48,7 +48,7 @@ {{ end }} {{ with .bottomContent }} -

{{ .content }} {{ .linkContent }}

+

{{ .content }} {{ .linkContent }}

{{ end }} diff --git a/layouts/contribution/list.html b/layouts/contribution/list.html index b65b4bc29..238cd55e1 100644 --- a/layouts/contribution/list.html +++ b/layouts/contribution/list.html @@ -24,7 +24,7 @@ @@ -122,7 +122,7 @@

{{ .title }}

{{ .content }}

- {{ .linkContent }} + {{ .linkContent }}
{{ end }} diff --git a/layouts/index.html b/layouts/index.html index 50f01d6ea..55786ebb1 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -10,8 +10,8 @@

{{ .title }}

{{ .topic }}

{{ .content }}

- - + + @@ -102,7 +102,7 @@

{{ .content }}

- Read More → + {{ i18n "Read More" }} → {{ end }} @@ -163,7 +163,7 @@ {{ end }}
- +
{{ .linkContent }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index c8fd32dc1..a33bbb5da 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -26,7 +26,7 @@
  • {{ .title }}
    {{ range .list }} - {{ .content }} + {{ .content }} {{ end }}
    • {{ end }} @@ -36,11 +36,11 @@
    - - - - - + + + + +

    {{ i18n "introduction2" }}

    diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 4fa203433..2568533b5 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -4,7 +4,7 @@ - + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 21b6ec95d..85858788d 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -46,17 +46,19 @@
  • - + + +
      -
    1. -
    2. -
    3. +
    4. {{ i18n "demo content 1" }}
      5. +
    5. {{ i18n "demo content 2" }}
      6. +
    6. {{ i18n "demo content 3" }}
  • - - - + + +
    • @@ -70,12 +72,12 @@ var bindNavMouseEvent = function(selector) { return false } flag = true - $(this).find('.dropdown-menu').fadeIn(300, function() { + $(this).find('.dropdown-menu').fadeIn(200, function() { flag = false }) }); $(selector).mouseleave(function() { - $(this).find('.dropdown-menu').fadeOut(300) + $(this).find('.dropdown-menu').fadeOut(200) }); } diff --git a/layouts/partner/list.html b/layouts/partner/list.html index aba2fd47d..48cd20625 100644 --- a/layouts/partner/list.html +++ b/layouts/partner/list.html @@ -56,7 +56,7 @@

    {{ .title }}

    {{ .content }}

    - {{ $tip }} + {{ $tip }}
    {{ end }} diff --git a/layouts/projects/list.html b/layouts/projects/list.html index abff0a7fd..451db85a9 100644 --- a/layouts/projects/list.html +++ b/layouts/projects/list.html @@ -18,10 +18,10 @@ {{ range .children }}
  • - {{ .title }} + {{ .title }}

    {{ .description }}

    - Github + Github
    • {{ end }} diff --git a/static/images/footer/facebook-hover.svg b/static/images/footer/facebook-hover.svg new file mode 100644 index 000000000..1fe2411a1 --- /dev/null +++ b/static/images/footer/facebook-hover.svg @@ -0,0 +1,28 @@ + + + + Facebook/hover + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/footer/github-hover.svg b/static/images/footer/github-hover.svg new file mode 100644 index 000000000..5c4197ca7 --- /dev/null +++ b/static/images/footer/github-hover.svg @@ -0,0 +1,23 @@ + + + + GitHub/hover + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/footer/slack-hover.svg b/static/images/footer/slack-hover.svg new file mode 100755 index 000000000..fb1e1b210 --- /dev/null +++ b/static/images/footer/slack-hover.svg @@ -0,0 +1,31 @@ + + + + Slack + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/footer/twitter-hover.svg b/static/images/footer/twitter-hover.svg new file mode 100644 index 000000000..c919d536b --- /dev/null +++ b/static/images/footer/twitter-hover.svg @@ -0,0 +1,23 @@ + + + + Twitter/hover + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/footer/youtube-hover.svg b/static/images/footer/youtube-hover.svg new file mode 100755 index 000000000..a23fd26fe --- /dev/null +++ b/static/images/footer/youtube-hover.svg @@ -0,0 +1,14 @@ + + + + 编组 2 + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/static/images/projects/alert.svg b/static/images/projects/alert.svg new file mode 100644 index 000000000..a1e6461bd --- /dev/null +++ b/static/images/projects/alert.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/static/images/projects/fluentbit-operator.svg b/static/images/projects/fluentbit-operator.svg new file mode 100644 index 000000000..833eb652d --- /dev/null +++ b/static/images/projects/fluentbit-operator.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/static/images/projects/im.svg b/static/images/projects/im.svg new file mode 100644 index 000000000..dc1397e48 --- /dev/null +++ b/static/images/projects/im.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/static/images/kubesphere.svg b/static/images/projects/kubesphere.svg similarity index 100% rename from static/images/kubesphere.svg rename to static/images/projects/kubesphere.svg diff --git a/static/images/projects/notification.svg b/static/images/projects/notification.svg new file mode 100644 index 000000000..983ca49bb --- /dev/null +++ b/static/images/projects/notification.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/static/images/projects/openpitrix.svg b/static/images/projects/openpitrix.svg new file mode 100644 index 000000000..bf0c8c23f --- /dev/null +++ b/static/images/projects/openpitrix.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/static/images/projects/porter.svg b/static/images/projects/porter.svg new file mode 100644 index 000000000..c6b842f4d --- /dev/null +++ b/static/images/projects/porter.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/static/images/projects/qingcloud.svg b/static/images/projects/qingcloud.svg new file mode 100644 index 000000000..069ef695b --- /dev/null +++ b/static/images/projects/qingcloud.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/static/images/projects/qingstor.svg b/static/images/projects/qingstor.svg new file mode 100644 index 000000000..d57d1edce --- /dev/null +++ b/static/images/projects/qingstor.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/static/images/projects/s2i-operator.svg b/static/images/projects/s2i-operator.svg new file mode 100644 index 000000000..631af5914 --- /dev/null +++ b/static/images/projects/s2i-operator.svg @@ -0,0 +1,7 @@ + + + + + + +