This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new f3791dccf5 optimization, images and resources
f3791dccf5 is described below
commit f3791dccf5f74fe4d2a68e6b8eb365aa05f680d5
Author: chickenlj <[email protected]>
AuthorDate: Wed Feb 22 16:13:50 2023 +0800
optimization, images and resources
---
.github/actions/always-upload-cache | 2 +-
assets/scss/_base.scss | 2 +-
.../images/dubbo_video_homepage_background.jpg | Bin 0 -> 191008 bytes
.../images/dubbo_video_homepage_background.png | Bin 2408906 -> 0 bytes
content/en/featured-background.jpg | Bin 0 -> 83079 bytes
content/en/featured-background.png | Bin 3303325 -> 0 bytes
.../images/dubbo_video_homepage_background.jpg | Bin 0 -> 191862 bytes
.../images/dubbo_video_homepage_background.png | Bin 2413815 -> 0 bytes
content/zh-cn/featured-background.jpg | Bin 0 -> 83079 bytes
content/zh-cn/featured-background.png | Bin 3303325 -> 0 bytes
content/zh-cn/overview/core-features/ecosystem.md | 2 +-
data/announcements/{ => en}/scheduled.yaml | 7 ++++---
data/announcements/zh/scheduled.yaml | 12 ++++++++++++
layouts/partials/announcement.html | 8 +++++++-
layouts/partials/head.html | 3 ---
layouts/shortcodes/mse.html | 2 ++
static/imgs/texture.png | Bin 0 -> 35987 bytes
17 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/.github/actions/always-upload-cache
b/.github/actions/always-upload-cache
index af4dd99ec5..ae40d8b5ae 160000
--- a/.github/actions/always-upload-cache
+++ b/.github/actions/always-upload-cache
@@ -1 +1 @@
-Subproject commit af4dd99ec5b9c91a41d9c7de3a6b2f372427fcc9
+Subproject commit ae40d8b5aef19835431042468b08b756288b87a8
diff --git a/assets/scss/_base.scss b/assets/scss/_base.scss
index aae3dd6bc6..4d17fee328 100755
--- a/assets/scss/_base.scss
+++ b/assets/scss/_base.scss
@@ -148,7 +148,7 @@ main {
// HERO
.header-hero {
- background-image: url(/images/texture.png);
+ background-image: url(/imgs/texture.png);
background-color: $blue;
text-align: center;
padding-left: 0;
diff --git
a/content/en/_common-resources/images/dubbo_video_homepage_background.jpg
b/content/en/_common-resources/images/dubbo_video_homepage_background.jpg
new file mode 100644
index 0000000000..26d1d06a78
Binary files /dev/null and
b/content/en/_common-resources/images/dubbo_video_homepage_background.jpg differ
diff --git
a/content/en/_common-resources/images/dubbo_video_homepage_background.png
b/content/en/_common-resources/images/dubbo_video_homepage_background.png
deleted file mode 100644
index bab7ef8221..0000000000
Binary files
a/content/en/_common-resources/images/dubbo_video_homepage_background.png and
/dev/null differ
diff --git a/content/en/featured-background.jpg
b/content/en/featured-background.jpg
new file mode 100644
index 0000000000..f6a02b9113
Binary files /dev/null and b/content/en/featured-background.jpg differ
diff --git a/content/en/featured-background.png
b/content/en/featured-background.png
deleted file mode 100644
index 4411d3ca8e..0000000000
Binary files a/content/en/featured-background.png and /dev/null differ
diff --git
a/content/zh-cn/_common-resources/images/dubbo_video_homepage_background.jpg
b/content/zh-cn/_common-resources/images/dubbo_video_homepage_background.jpg
new file mode 100644
index 0000000000..1f912f16cb
Binary files /dev/null and
b/content/zh-cn/_common-resources/images/dubbo_video_homepage_background.jpg
differ
diff --git
a/content/zh-cn/_common-resources/images/dubbo_video_homepage_background.png
b/content/zh-cn/_common-resources/images/dubbo_video_homepage_background.png
deleted file mode 100644
index 5d505cde78..0000000000
Binary files
a/content/zh-cn/_common-resources/images/dubbo_video_homepage_background.png
and /dev/null differ
diff --git a/content/zh-cn/featured-background.jpg
b/content/zh-cn/featured-background.jpg
new file mode 100644
index 0000000000..f6a02b9113
Binary files /dev/null and b/content/zh-cn/featured-background.jpg differ
diff --git a/content/zh-cn/featured-background.png
b/content/zh-cn/featured-background.png
deleted file mode 100644
index 4411d3ca8e..0000000000
Binary files a/content/zh-cn/featured-background.png and /dev/null differ
diff --git a/content/zh-cn/overview/core-features/ecosystem.md
b/content/zh-cn/overview/core-features/ecosystem.md
index e63c7b54db..301a1de0d6 100644
--- a/content/zh-cn/overview/core-features/ecosystem.md
+++ b/content/zh-cn/overview/core-features/ecosystem.md
@@ -9,7 +9,7 @@ feature:
description: >
一站式微服务生态适配：注册中心、网关、限流降级、负载均衡、一致性事务、异步消息、Tracing 等。
---
-
+{{< mse >}}
Dubbo 社区和众多优秀的开源项目一起围绕 Dubbo 建立了丰富的微服务生态支持，这让开发者从选型 Dubbo
作为开发框架的第一天，就无需担心后续的服务治理诉求，Dubbo 对每一个常见问题均提供了生产级的解决方案。
diff --git a/data/announcements/scheduled.yaml
b/data/announcements/en/scheduled.yaml
similarity index 79%
rename from data/announcements/scheduled.yaml
rename to data/announcements/en/scheduled.yaml
index 8da8e55a7b..43f24d642d 100755
--- a/data/announcements/scheduled.yaml
+++ b/data/announcements/en/scheduled.yaml
@@ -29,14 +29,15 @@
# leave the "announcements" key in place
announcements:
-- name: Dubbo Meetup Shanghai
+- name: Brandnew Website
startTime: 2023-02-21T00:00:00
endTime: 2023-03-20T18:00:00
style: >-
background-image: linear-gradient(90deg, rgb(249, 145, 6) 0%, rgb(252, 29,
68) 100%);
title: |
<img src ="/imgs/announcements/announcement-apache-dubbo-white.png"
style="float: right; width: 20%; height: auto;" />
- <a href= "#">Apache Dubbo 全新改版网站与文档</a> <em> 正式上线！</em>
+ <a href= "#">The brandnew website and documentation</a> <em> is now
available!</em>
message: |
- 新版文档仍处于持续完善中，将涵盖 Dubbo3 及最新特性使用方式，我们计划在未来几个月内为用户提供最完善、易用的使用体验！<br />
+ The new site is still under development and is aimming to cover all new
features including Dubbo3. We are determined to provide all of our users with
the best experience in the next few months! <br />
2023-02-21.
+
diff --git a/data/announcements/zh/scheduled.yaml
b/data/announcements/zh/scheduled.yaml
new file mode 100644
index 0000000000..0ae1a42c0a
--- /dev/null
+++ b/data/announcements/zh/scheduled.yaml
@@ -0,0 +1,12 @@
+announcements:
+ - name: Brandnew Website
+ startTime: 2023-02-21T00:00:00
+ endTime: 2023-03-20T18:00:00
+ style: >-
+ background-image: linear-gradient(90deg, rgb(249, 145, 6) 0%, rgb(252,
29, 68) 100%);
+ title: |
+ <img src ="/imgs/announcements/announcement-apache-dubbo-white.png"
style="float: right; width: 20%; height: auto;" />
+ <a href= "#">Apache Dubbo 全新改版网站与文档</a> <em> 正式上线！</em>
+ message: |
+ 新版文档仍处于持续完善中，将涵盖 Dubbo3 及最新特性使用方式，我们计划在未来几个月内为用户提供最完善、易用的使用体验！<br />
+ 2023-02-21.
diff --git a/layouts/partials/announcement.html
b/layouts/partials/announcement.html
index bff71bfe4c..c48a076ce8 100755
--- a/layouts/partials/announcement.html
+++ b/layouts/partials/announcement.html
@@ -1,6 +1,12 @@
{{ $dateRegExp :=
"^[0-9]{4}-1[0-2]|0[1-9]-(?:3[01]|0[1-9]|[12][0-9])T(?:2[0-3]|[01][0-9]):(?:[0-5][0-9]):(?:60|[0-5][0-9])$"
}}
{{ $announcementShown := false }}
-{{ range $.Site.Data.announcements }}
+
+{{ $currentAnnouncements := $.Site.Data.announcements.zh }}
+{{ if eq .Site.Language.Lang "en" }}
+ {{ $currentAnnouncements := $.Site.Data.announcements.en }}
+{{ end }}
+
+{{ range $currentAnnouncements }}
{{ range .announcements }}
{{ if or ( eq .endTime nil ) ( eq .message nil ) }}
{{ errorf "Invalid announcement: %#v" . }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index d7f03f1166..233b7a62e3 100755
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -68,9 +68,6 @@
{{ end }}
<!-- Place this tag in your head or just before your close body tag. -->
<script async defer src="/js/github-buttons.js"></script>
-<script
src="https://g.alicdn.com/mamba/assets/0.0.7/mse-arc-ui.min.js";></script>
-<link rel="stylesheet"
href="https://g.alicdn.com/mamba/assets/0.0.7/mse-arc-ui.min.css"; />
-
<link href="/css/community.css" rel="stylesheet">
<link href="/css/contactus.css" rel="stylesheet">
diff --git a/layouts/shortcodes/mse.html b/layouts/shortcodes/mse.html
new file mode 100644
index 0000000000..e8690bb410
--- /dev/null
+++ b/layouts/shortcodes/mse.html
@@ -0,0 +1,2 @@
+<script
src="https://g.alicdn.com/mamba/assets/0.0.7/mse-arc-ui.min.js";></script>
+<link rel="stylesheet"
href="https://g.alicdn.com/mamba/assets/0.0.7/mse-arc-ui.min.css"; />
diff --git a/static/imgs/texture.png b/static/imgs/texture.png
new file mode 100755
index 0000000000..856707b059
Binary files /dev/null and b/static/imgs/texture.png differ
