diff --git a/README.md b/README.md index f8b9abba1d3..c2c1c982eb9 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ [![QQ](https://img.shields.io/badge/QQ-236915833-orange)](https://jq.qq.com/?_wv=1027&k=aVIVB2K9) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow) -**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) Global | [hertzbeat.com](https://hertzbeat.com) China** +**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org)** ## 🎡 Introduction diff --git a/README_CN.md b/README_CN.md index 8cbfa15d355..71fb93de49c 100644 --- a/README_CN.md +++ b/README_CN.md @@ -20,7 +20,7 @@ [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow) -**官网: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) 全球网络 | [hertzbeat.com](https://hertzbeat.com) 中国网络** +**官网: [hertzbeat.dromara.org](https://hertzbeat.dromara.org)** ## 🎡 介绍 diff --git a/home/docs/introduce.md b/home/docs/introduce.md index 63ee010d649..8c2df0bcb0f 100644 --- a/home/docs/introduce.md +++ b/home/docs/introduce.md @@ -16,7 +16,7 @@ slug: / [![QQ](https://img.shields.io/badge/QQ-236915833-orange)](https://jq.qq.com/?_wv=1027&k=aVIVB2K9) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow) -**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) Global | [hertzbeat.com](https://hertzbeat.com) China** +**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org)** ## 🎡 Introduction diff --git a/home/sidebars.json b/home/sidebars.json index 80a8853ee41..2f580d65132 100644 --- a/home/sidebars.json +++ b/home/sidebars.json @@ -5,19 +5,9 @@ "label": "quickstart", "items": [ "introduce", - { - "type": "link", - "label": "Cloud Service", - "href": "https://console.tancloud.cn" - }, "start/quickstart", "start/docker-deploy", "start/package-deploy", - { - "type": "link", - "label": "Install via HuaweiCloud", - "href": "https://marketplace.huaweicloud.com/contents/0477015c-ad63-4522-a308-816861769f0a#productid=OFFI863735781612109824" - }, "start/rainbond-deploy", { "type": "link", diff --git a/web-app/src/app/layout/basic/basic.component.ts b/web-app/src/app/layout/basic/basic.component.ts index fe1e5498a4c..bad237a5705 100644 --- a/web-app/src/app/layout/basic/basic.component.ts +++ b/web-app/src/app/layout/basic/basic.component.ts @@ -51,7 +51,7 @@ import { CONSTANTS } from '../../shared/constants';
- {{ 'menu.extras.tags' | i18n }} + {{ 'menu.advanced.tags' | i18n }}
diff --git a/web-app/src/app/routes/routes-routing.module.ts b/web-app/src/app/routes/routes-routing.module.ts index 696c6a29e85..93747f255af 100644 --- a/web-app/src/app/routes/routes-routing.module.ts +++ b/web-app/src/app/routes/routes-routing.module.ts @@ -33,7 +33,7 @@ const routes: Routes = [ { path: 'status', component: LayoutBlankComponent, - children: [{ path: '', component: StatusPublicComponent, data: { titleI18n: 'menu.extras.status' } }] + children: [{ path: '', component: StatusPublicComponent, data: { titleI18n: 'menu.advanced.status' } }] }, // passport { diff --git a/web-app/src/app/routes/setting/collector/collector.component.html b/web-app/src/app/routes/setting/collector/collector.component.html index 8144bb031e9..8bb5d8e2148 100644 --- a/web-app/src/app/routes/setting/collector/collector.component.html +++ b/web-app/src/app/routes/setting/collector/collector.component.html @@ -1,7 +1,7 @@ diff --git a/web-app/src/app/routes/setting/define/define.component.html b/web-app/src/app/routes/setting/define/define.component.html index 1af4df04b4b..99d968f03cf 100644 --- a/web-app/src/app/routes/setting/define/define.component.html +++ b/web-app/src/app/routes/setting/define/define.component.html @@ -1,7 +1,7 @@ diff --git a/web-app/src/app/routes/setting/setting-routing.module.ts b/web-app/src/app/routes/setting/setting-routing.module.ts index 840a465af96..1b45306a682 100644 --- a/web-app/src/app/routes/setting/setting-routing.module.ts +++ b/web-app/src/app/routes/setting/setting-routing.module.ts @@ -14,7 +14,7 @@ const routes: Routes = [ { path: 'tags', component: SettingTagsComponent }, { path: 'collector', component: CollectorComponent }, { path: 'status', component: StatusComponent }, - { path: 'define', component: DefineComponent, data: { titleI18n: 'menu.extras.define' } }, + { path: 'define', component: DefineComponent, data: { titleI18n: 'menu.advanced.define' } }, { path: 'settings', component: SettingsComponent, diff --git a/web-app/src/app/routes/setting/status/status.component.html b/web-app/src/app/routes/setting/status/status.component.html index 9e34be28e2e..422fdda54da 100644 --- a/web-app/src/app/routes/setting/status/status.component.html +++ b/web-app/src/app/routes/setting/status/status.component.html @@ -1,7 +1,7 @@ @@ -134,7 +134,7 @@
@@ -222,7 +222,7 @@ diff --git a/web-app/src/app/routes/setting/tags/tags.component.html b/web-app/src/app/routes/setting/tags/tags.component.html index bde8582f794..692492b58b7 100644 --- a/web-app/src/app/routes/setting/tags/tags.component.html +++ b/web-app/src/app/routes/setting/tags/tags.component.html @@ -1,7 +1,7 @@ diff --git a/web-app/src/app/routes/status-public/status-public.component.ts b/web-app/src/app/routes/status-public/status-public.component.ts index e78b9c0399f..8f20a25e7f7 100644 --- a/web-app/src/app/routes/status-public/status-public.component.ts +++ b/web-app/src/app/routes/status-public/status-public.component.ts @@ -45,7 +45,7 @@ export class StatusPublicComponent implements OnInit { switchMap((message: Message) => { if (message.code === 0) { this.statusOrg = message.data; - this.titleService.setTitle(`${this.statusOrg.name} ${this.i18nSvc.fanyi('menu.extras.status')}`); + this.titleService.setTitle(`${this.statusOrg.name} ${this.i18nSvc.fanyi('menu.advanced.status')}`); } else { this.statusOrg = new StatusPageOrg(); console.log(message.msg); diff --git a/web-app/src/assets/app-data.json b/web-app/src/assets/app-data.json index ed2b9012738..58f7f24264e 100644 --- a/web-app/src/assets/app-data.json +++ b/web-app/src/assets/app-data.json @@ -154,14 +154,14 @@ ] }, { - "text": "More", - "i18n": "menu.extras", + "text": "Advanced", + "i18n": "menu.advanced", "group": true, "hideInBreadcrumb": true, "children": [ { "text": "status", - "i18n": "menu.extras.status", + "i18n": "menu.advanced.status", "icon": "anticon-mobile", "link": "/setting/status", "badgeDot": true, @@ -169,24 +169,32 @@ }, { "text": "collector", - "i18n": "menu.extras.collector", + "i18n": "menu.advanced.collector", "icon": "anticon-cluster", "link": "/setting/collector" }, { "text": "tags", - "i18n": "menu.extras.tags", + "i18n": "menu.advanced.tags", "icon": "anticon-tags", "link": "/setting/tags" }, { "text": "define", - "i18n": "menu.extras.define", + "i18n": "menu.advanced.define", "icon": "anticon-code", "link": "/setting/define", "badgeDot": true, "badge": 1 - }, + } + ] + }, + { + "text": "More", + "i18n": "menu.extras", + "group": true, + "hideInBreadcrumb": true, + "children": [ { "text": "settings", "i18n": "menu.extras.settings", diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index 4e25b9794a8..504def913a7 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -41,16 +41,19 @@ "silence": "Alarm Silence", "dispatch": "Notification" }, - "extras": { - "": "More", + "advanced": { + "": "Advanced", "collector": "Collector Cluster", "tags": "Tags Manage", "define": "Monitor Template", + "status": "Status Page" + }, + "extras": { + "": "More", "help": "Help Center", "setting": "Setting", "settings": "Settings", - "about": "About", - "status": "Status Page" + "about": "About" }, "more": "More" }, diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index 73e12080544..72027fae465 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -41,16 +41,19 @@ "setting": "阈值规则", "dispatch": "消息通知" }, - "extras": { - "": "更多", + "advanced": { + "": "高级", "collector": "采集集群", "tags": "标签管理", "define": "监控模版", + "status": "状态页面" + }, + "extras": { + "": "更多", "help": "帮助中心", "setting": "设置", "settings": "系统设置", - "about": "关于", - "status": "状态页面" + "about": "关于" }, "more": "更多" }, diff --git a/web-app/src/assets/i18n/zh-TW.json b/web-app/src/assets/i18n/zh-TW.json index 4244df73c63..f1f9a02bb7b 100644 --- a/web-app/src/assets/i18n/zh-TW.json +++ b/web-app/src/assets/i18n/zh-TW.json @@ -41,16 +41,19 @@ "silence": "告警靜默", "dispatch": "消息通知" }, - "extras": { - "": "更多", + "advanced": { + "": "高级", "collector": "採集集群", "tags": "標簽管理", "define": "監控模版", + "status": "狀態頁面" + }, + "extras": { + "": "更多", "help": "幫助中心", "setting": "設置", "settings": "系統設置", - "about": "關於", - "status": "狀態頁面" + "about": "關於" }, "more": "更多" },