From c654f06f3eb734a2baeb20ffbf8a7fb137964998 Mon Sep 17 00:00:00 2001
From: TheYoungManLi <cjl@kubesphere.io>
Date: Fri, 11 Nov 2022 15:56:01 +0800
Subject: [PATCH] fix: Update partner page

Signed-off-by: TheYoungManLi <cjl@kubesphere.io>
---
 assets/scss/partner.scss       | 25 +++++++++++++++++++++++--
 config/upstream-zh/config.toml |  2 ++
 config/upstream/config.toml    |  1 +
 content/en/partner/_index.md   |  2 ++
 content/zh/partner/_index.md   | 12 +++++++++---
 layouts/partner/list.html      |  9 +++++++++
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/assets/scss/partner.scss b/assets/scss/partner.scss
index d27ca3801..35b8ceeb5 100644
--- a/assets/scss/partner.scss
+++ b/assets/scss/partner.scss
@@ -242,8 +242,10 @@
       }
 
       li {
+        display: flex;
+        flex-direction: column;
         width: 570px;
-        height: 309px;
+        min-height: 309px;
         border-radius: 10px;
         margin-top: 20px;
         box-shadow: 0 4px 8px 0 rgba(36, 46, 66, 0.06), 0 8px 16px 0 rgba(36, 46, 66, 0.05);
@@ -258,10 +260,11 @@
         }
 
         p {
-          height: 128px;
+          min-height: 128px;
           margin-left: 40px;
           margin-right: 40px;
           line-height: 2;
+          flex: 1;
 
           @media only screen and (max-width: $mobile-max-width) {
             height: auto;
@@ -274,10 +277,28 @@
           margin-bottom: 20px;
           font-weight: 600;
           line-height: 1.5;
+
+          &:last-of-type{
+            justify-self: flex-end;
+          }
         }
       }
     }
   }
+
+  .apply{
+    display: flex;
+    margin: 0px auto;
+    justify-content: center;
+    margin-top: 20px;
+    width: 130px;
+    height: 48px;
+    border-radius: 30px;
+    align-items: center;
+    color: #fff;
+    cursor: pointer;
+    background-image: linear-gradient(to bottom,rgba(0,0,0,0),rgba(0,0,0,0.1) 97%),linear-gradient(to bottom,#55bc8a,#55bc8a);
+  }
 }
 
 .section-4 {
diff --git a/config/upstream-zh/config.toml b/config/upstream-zh/config.toml
index fda431197..10038580a 100644
--- a/config/upstream-zh/config.toml
+++ b/config/upstream-zh/config.toml
@@ -8,6 +8,8 @@ addBaiduAnalytics = true
 
 bilibiliLink = "https://space.bilibili.com/438908638"
 
+applyAllInOne = true
+
 [languages.en.params]
 useSendcloud = true
 mailchimpSubscribeUrl = "https://www.sendcloud.net/v3/api/subInvite/subscription?invitecode=1dc5a4fb-894c-4470-b01d-ca7fa9d47a46"
diff --git a/config/upstream/config.toml b/config/upstream/config.toml
index ff2fa19aa..aefaf6738 100644
--- a/config/upstream/config.toml
+++ b/config/upstream/config.toml
@@ -2,6 +2,7 @@ baseURL = "https://kubesphere.io"
 
 [params]
 
+applyAllInOne = false
 addGoogleAnalytics = true
 addGoogleTag = true
 hotjarTracking = true
diff --git a/content/en/partner/_index.md b/content/en/partner/_index.md
index 0295008bb..5d0c76ba9 100644
--- a/content/en/partner/_index.md
+++ b/content/en/partner/_index.md
@@ -24,6 +24,8 @@ section2:
 section3:
   title: 'Partner Types'
   tip: Apply now →
+  link: "https://jinshuju.net/f/QZ52Gm"
+  linkText: 'Apply now'
   partnerType:
     - title: "App Providers"
       content: "KubeSphere App Store is a great place to showcase your applications. KubeSphere brings your applications to tens of thousands of users, allowing them to deploy your App to Kubernetes with one click."
diff --git a/content/zh/partner/_index.md b/content/zh/partner/_index.md
index 517704471..8082a0b26 100644
--- a/content/zh/partner/_index.md
+++ b/content/zh/partner/_index.md
@@ -23,20 +23,26 @@ section2:
   bg3: 'images/partner/background2.svg'
 section3:
   title: '合作伙伴类型'
-  
+  zhForm: true
+  link: "https://jinshuju.net/f/QZ52Gm"
+  linkText: '立即申请'
+  tip: '立即申请 →'
   partnerType:
     - title: "应用程序提供商"
       content: KubeSphere 在 OpenPitrix 的基础上，为用户提供了一个基于 Helm 的应用商店，用于应用生命周期管理。KubeSphere 应用商店让 ISV、开发者和用户能够在一站式服务中只需点击几下就可以上传、测试、安装和发布应用。KubeSphere 拥有数以万计的用户，所以您可以作为应用程序提供商，将应用发布到 KubeSphere 应用商店，让这些用户可以一键将您的应用部署到 Kubernetes。     
+      link: "request/"
 
     - title: "技术合作伙伴"
-      content: 基于技术协作或联合解决方案为 KubeSphere 提供硬件平台、云服务或应用程序。如果您有这种解决方案，欢迎成为 KubeSphere 的技术合作伙伴，通过产品生态合作共同推动产业繁荣。     
+      content: 基于技术协作或联合解决方案为 KubeSphere 提供硬件平台、云服务或应用程序。如果您有这种解决方案，欢迎成为 KubeSphere 的技术合作伙伴，通过产品生态合作共同推动产业繁荣。  
+      link: "request/"  
 
     - title: "云提供商"
       content: 如果您是基于 Kubernetes 提供解决方案的云提供商，还可以将 KubeSphere 集成到您的应用程序市场中，使用 KubeSphere 来扩展您的生态系统。
+      link: "request/"
 
     - title: "市场合作伙伴"
       content: 如果您是开源社区或致力于推广您的开源项目，可以联合 KubeSphere 社区组织活动（比如线上直播和线下 Meetup），也可以共同产出优质内容（技术博客等），或者进行丰富多样的联合推广，推动更多用户使用 KubeSphere 家族产品获得成功。
-      link: "https://jinshuju.net/f/QZ52Gm"
+      link: "request/"
   
 section4:
   title: '合作伙伴'
diff --git a/layouts/partner/list.html b/layouts/partner/list.html
index 8a684c867..649ca9f55 100644
--- a/layouts/partner/list.html
+++ b/layouts/partner/list.html
@@ -45,8 +45,10 @@
 </section>
 
 <section class="section-3">
+    {{ $applyZh := .Site.Params.applyAllInOne }}
     {{ with .Params.section3 }}
     {{ $tip := .tip }}
+    {{ $linkText := .linkText }}
     <div class="common-layout">
         <h2 class="title-black-h2">{{ .title }}</h2>
         <ul class="partner-ul common-flex-layout">
@@ -54,12 +56,19 @@
                 <li>
                     <h3 class="common-content">{{ .title }}</h3>
                     <p class="common-p">{{ .content }}</p>
+                    {{ if not $applyZh }}
                     <div>
                         <a class="common-green-a" href="{{ .link }}">{{ $tip }}</a>
                     </div>
+                    {{ end }}
                 </li>
             {{ end }}
         </ul>
+        {{if $applyZh}}
+        <div>
+            <a class="apply common-green-a" href="{{ .link }}" target="_blank">{{ $tip }}</a>
+        </div>
+        {{ end }}
     </div>
     {{ end }}
 </section>