!122 Minisite:1.Packaging 与 Base Service 组合并。2.documentation组主席换成谭志鹏

Merge pull request !122 from ZhengyuhangHans/MinisiteUpdateInformation

!122 Minisite:1.Packaging 与 Base Service 组合并。2.documentation组主席换成谭志鹏
Merge pull request !122 from ZhengyuhangHans/MinisiteUpdateInformation
d34a40d0 · openeuler-ci-bot · Gitee · 28937efb · a6de293d · d34a40d0
5 changed file
--- a/content/en/summit/2020-virtual-summit.md
+++ b/content/en/summit/2020-virtual-summit.md
@@ -139,7 +139,7 @@ room1Period2MeetingInfo = " "
 room1Period2SignUpLink = "https://welink-meeting.zoom.us/j/138895546"
 room1Period2MeetingLink = "http://etherpad.openeuler.org/p/openeuler-virtual-summit-2020-container"

-room1Period3Kernel = "Packaging"
+room1Period3Kernel = "Packaging & Base Service"
 room1Period3GroupName = " "
 room1Period3ChairName = "Xiaowen He"
 room1Period3ChairIntroduction = "Packaging Maintainer"
@@ -147,14 +147,6 @@ room1Period3MeetingInfo = " "
 room1Period3SignUpLink = "https://welink-meeting.zoom.us/j/138895546"
 room1Period3MeetingLink = "http://etherpad.openeuler.org/p/openeuler-virtual-summit-2020-packaging"

-room1Period4Kernel = "Base Service"
-room1Period4GroupName = " "
-room1Period4ChairName = "Cihua Li"
-room1Period4ChairIntroduction = "Base Service Maintainer"
-room1Period4MeetingInfo = " "
-room1Period4SignUpLink = "https://welink-meeting.zoom.us/j/138895546"
-room1Period4MeetingLink = "http://etherpad.openeuler.org/p/openeuler-virtual-summit-2020-base-service"
-
 room1Period5Kernel = "Community Governance"
 room1Period5GroupName = " "
 room1Period5ChairName = "Fred Li"
@@ -190,7 +182,7 @@ room2Period1MeetingLink = "http://etherpad.openeuler.org/p/openeuler-virtual-sum

 room2Period2Kernel = "Documentation"
 room2Period2GroupName = " "
-room2Period2ChairName = "Yanting Zhu"
+room2Period2ChairName = "Zhipeng Tan"
 room2Period2ChairIntroduction = "Documentation Maintainer"
 room2Period2MeetingInfo = " "
 room2Period2SignUpLink = "https://welink-meeting.zoom.us/j/806028921"

--- a/content/en/summit/css/community.css
+++ b/content/en/summit/css/community.css
@@ -565,6 +565,13 @@ html,body{
        padding: .2rem;
        padding-bottom: .34rem;
    }
+    .summit-room-item-noBackground{
+        width: 100%;
+        height: 150px;
+        padding: .2rem;
+        padding-bottom: .34rem;
+        margin-bottom: 20px;
+    }

    .summit div[class^=col-]{
        padding-left: .1rem;

--- a/content/zh/summit/2020-virtual-summit.md
+++ b/content/zh/summit/2020-virtual-summit.md
@@ -137,7 +137,7 @@ room1Period2MeetingInfo = " "
 room1Period2SignUpLink = "https://welink-meeting.zoom.us/j/138895546"
 room1Period2MeetingLink = "http://etherpad.openeuler.org/p/openeuler-virtual-summit-2020-container"

-room1Period3Kernel = "Packaging"
+room1Period3Kernel = "Packaging & Base Service"
 room1Period3GroupName = " "
 room1Period3ChairName = "何晓文"
 room1Period3ChairIntroduction = "Packaging Maintainer"
@@ -145,13 +145,7 @@ room1Period3MeetingInfo = " "
 room1Period3SignUpLink = "https://welink-meeting.zoom.us/j/138895546"
 room1Period3MeetingLink = "http://etherpad.openeuler.org/p/openeuler-virtual-summit-2020-packaging"

-room1Period4Kernel = "Base Service"
-room1Period4GroupName = " "
-room1Period4ChairName = "李次华"
-room1Period4ChairIntroduction = "Base Service Maintainer"
-room1Period4MeetingInfo = " "
-room1Period4SignUpLink = "https://welink-meeting.zoom.us/j/138895546"
-room1Period4MeetingLink = "http://etherpad.openeuler.org/p/openeuler-virtual-summit-2020-base-service"
+

 room1Period5Kernel = "社区治理"
 room1Period5GroupName = " "
@@ -188,7 +182,7 @@ room2Period1MeetingLink = "http://etherpad.openeuler.org/p/openeuler-virtual-sum

 room2Period2Kernel = "Documentation"
 room2Period2GroupName = " "
-room2Period2ChairName = "朱艳婷"
+room2Period2ChairName = "谭志鹏"
 room2Period2ChairIntroduction = "Documentation Maintainer"
 room2Period2MeetingInfo = " "
 room2Period2SignUpLink = "https://welink-meeting.zoom.us/j/806028921"

--- a/content/zh/summit/css/community.css
+++ b/content/zh/summit/css/community.css
@@ -565,7 +565,13 @@ html,body{
        padding: .2rem;
        padding-bottom: .34rem;
    }
-
+    .summit-room-item-noBackground{
+        width: 100%;
+        height: 150px;
+        padding: .2rem;
+        padding-bottom: .34rem;
+        margin-bottom: 20px;
+    }
    .summit div[class^=col-]{
        padding-left: .1rem;
        padding-right: .1rem;

--- a/themes/project/layouts/summit/single.html
+++ b/themes/project/layouts/summit/single.html
 <!DOCTYPE html>
 <html lang="{{ .Site.LanguageCode }}">
 {{ partial "head.html" . }}
-<link rel="stylesheet" href="./css/community.css?t=202000415">
+<link rel="stylesheet" href="./css/community.css?t=202000416">
 <body>
    <div id="all">
        <header>
@@ -592,6 +592,7 @@
                            <div class="col-lg-10">
                                <div class="row">
                                    <div class="col-lg-4">
+                                        {{ if .Params.room1Period4Kernel}}
                                        <div class="summit-room-item">
                                            <p class="summit-room-item-title">{{.Params.room1Period4Kernel}}</p>
                                            <span class="summit-room-item-time">{{.Params.Period4}}</span>
@@ -608,6 +609,7 @@
                                                <a href='{{.Params.room1Period4MeetingLink}}' target="_blank">{{.Params.roomPeriodMeeting}}</a>
                                            </div>
                                        </div>
+                                        {{ end}}
                                    </div>
                                    <div class="col-lg-4">
                                        <div class="summit-room-item">
@@ -894,6 +896,7 @@
                                    <a href='{{.Params.room1Period3MeetingLink}}' target="_blank">{{.Params.roomPeriodMeeting}}</a>
                                </div>
                            </div>
+                            {{ if .Params.room1Period4Kernel}}
                            <div class="summit-room-item">
                                <p class="summit-room-item-title">{{.Params.room1Period4Kernel}}</p>
                                <span class="summit-room-item-date">{{.Params.date1}}</span>
@@ -911,6 +914,11 @@
                                    <a href='{{.Params.room1Period4MeetingLink}}' target="_blank">{{.Params.roomPeriodMeeting}}</a>
                                </div>
                            </div>
+                            {{ else }}
+                            <div class="summit-room-item-noBackground">
+
+                            </div>
+                            {{ end }}
                            <div class="summit-room-item">
                                <p class="summit-room-item-title">{{.Params.room1Period5Kernel}}</p>
                                <span class="summit-room-item-date">{{.Params.date2}}</span>