Skip to content

Commit 5cc41ae

Browse files
committed
💄 优化 server-status 主题
1 parent e7c2296 commit 5cc41ae

File tree

10 files changed

+19
-60
lines changed

10 files changed

+19
-60
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<br>
55
<small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
66
<br><br>
7-
<img src="https://img.shields.io/github/actions/workflow/status/naiba/nezha/dashboard.yml?branch=master&label=Dash%20v0.15.6&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?branch=v0.15.6&label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.0-brightgreen?style=for-the-badge&logo=linux">
7+
<img src="https://img.shields.io/github/actions/workflow/status/naiba/nezha/dashboard.yml?branch=master&label=Dash%20v0.15.7&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?branch=v0.15.7&label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.0-brightgreen?style=for-the-badge&logo=linux">
88
<br>
99
<br>
1010
<p>:trollface: <b>Nezha Monitoring: Self-hostable, lightweight, servers and websites monitoring and O&M tool.</b></p>

resource/l10n/en-US.toml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -607,17 +607,5 @@ other = "Info"
607607
[HideForGuest]
608608
other = "No display to visitors"
609609

610-
[Feature]
610+
[Menu]
611611
other = "Menu"
612-
613-
[SitePV]
614-
other = "Total page views"
615-
616-
[SitePVUnit]
617-
other = "Page views"
618-
619-
[SiteUV]
620-
other = "Total visitors"
621-
622-
[SiteUVUnit]
623-
other = "Visitors"

resource/l10n/es-ES.toml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -607,17 +607,5 @@ other = "Información"
607607
[HideForGuest]
608608
other = "No se muestra a los visitantes"
609609

610-
[Feature]
611-
other = "Características"
612-
613-
[SitePV]
614-
other = "Número total de visitas al sitio"
615-
616-
[SitePVUnit]
617-
other = "visitas"
618-
619-
[SiteUV]
620-
other = "Número total de visitantes únicos al sitio"
621-
622-
[SiteUVUnit]
623-
other = "visitantes únicos"
610+
[Menu]
611+
other = "Menú"

resource/l10n/zh-CN.toml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -607,17 +607,5 @@ other = "信息"
607607
[HideForGuest]
608608
other = "对游客隐藏"
609609

610-
[Feature]
611-
other = "功能"
612-
613-
[SitePV]
614-
other = "本站总访问量"
615-
616-
[SitePVUnit]
617-
other = ""
618-
619-
[SiteUV]
620-
other = "本站总访客数"
621-
622-
[SiteUVUnit]
623-
other = "人次"
610+
[Menu]
611+
other = "菜单"

resource/l10n/zh-TW.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ other = "訊息"
607607
[HideForGuest]
608608
other = "對遊客隱藏"
609609

610-
[Feature]
610+
[Menu]
611611
other = "功能"
612612

613613
[SitePV]

resource/template/theme-server-status/content-footer.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
<div class="container">
33
<p style="text-align: center; font-size: 10px;">
44
{{ .Title }} | Theme <a href="https://github.com/cppla/ServerStatus">ServerStatus</a> | Powered by <a
5-
href="https://github.com/naiba/nezha">{{tr "NezhaMonitoring"}}</a>
6-
</p>
7-
<p style="text-align: center; font-size: 10px;">
8-
<span id="busuanzi_container_site_pv" style="display: none">
9-
{{tr "SitePV" }} <span id="busuanzi_value_site_pv"></span> {{tr "SitePVUnit" }} | {{tr "SiteUV" }} <span id="busuanzi_value_site_uv"></span> {{tr "SiteUVUnit" }}
10-
</span>
5+
href="https://github.com/naiba/nezha">{{tr "NezhaMonitoring"}}</a> {{.Version}}
116
</p>
127
</div>
138
{{end}}

resource/template/theme-server-status/content-nav.html

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,30 @@
99
<span class="icon-bar"></span>
1010
<span class="icon-bar"></span>
1111
</button>
12-
<a href="#" class="navbar-brand">{{ .Title }}</a>
12+
<a href="/" class="navbar-brand">{{.Conf.Site.Brand}}</a>
1313
</div>
1414
<div class="navbar-collapse collapse">
1515
<ul class="nav navbar-nav">
16+
<li><a href="/">{{tr "Home" }}</a></li>
17+
<li><a href="/service">{{tr "Services" }}</a></li>
18+
</ul>
19+
<ul class="nav navbar-nav navbar-right">
1620
<li class="dropdown">
17-
<a data-toggle="dropdown" class="dropdown-toggle" href="#">{{tr "Feature" }}<b class="caret"></b></a>
21+
<a data-toggle="dropdown" href="#">{{tr "Menu" }}<b class="caret"></b></a>
1822
<ul class="dropdown-menu">
19-
<li><a href="/">{{tr "Home" }}</a></li>
20-
<li><a href="/service">{{tr "Services" }}</a></li>
2123
{{if .Admin}}
2224
<li><a href="/server">{{tr "AdminPanel" }} ({{.Admin.Name}})</a></li>
2325
{{else}}
2426
<li><a href="/login">{{tr "Login" }}</a></li>
2527
{{end}}
2628
<li><a href="#" @click="setSystemTheme">{{tr "SystemMode" }}
27-
<span style="color: #fff" v-if="isSystemTheme"> ✔️</span></a>
29+
<span style="color: #fff" v-if="isSystemTheme"> ✔️</span></a>
2830
</li>
2931
<li><a href="#" @click="setTheme('dark', true)">{{tr "DarkMode" }}
30-
<span v-if="theme === 'dark' && !isSystemTheme"> ✔️</span></a>
32+
<span v-if="theme === 'dark' && !isSystemTheme"> ✔️</span></a>
3133
</li>
3234
<li><a href="#" @click="setTheme('light', true)">{{tr "LightMode" }}
33-
<span v-if="theme === 'light' && !isSystemTheme"> ✔️</span></a>
35+
<span v-if="theme === 'light' && !isSystemTheme"> ✔️</span></a>
3436
</li>
3537
</ul>
3638
</li>

resource/template/theme-server-status/header.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<script src="/static/theme-server-status/js/bootstrap.min.js"></script>
2929
<script src="https://cdn.staticfile.org/vue/2.6.14/vue.min.js"></script>
3030
<script src="/static/theme-server-status/js/mixin.js"></script>
31-
<!-- custom code 引入这段代码即可开启卜算子统计 -->
32-
<!--<script async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>-->
3331
</head>
3432
<body>
3533
{{end}}

resource/template/theme-server-status/service.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</div>
4646

4747
<div class="ui container">
48-
<div class="service-status">
48+
<div class="service-status" style="margin-bottom: 20px;">
4949
{{if .CycleTransferStats}}
5050

5151
<h2 style="text-align: center;">{{tr "CycleTransferStats"}}</h2>

service/singleton/singleton.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/naiba/nezha/pkg/utils"
1313
)
1414

15-
var Version = "v0.15.6" // !!记得修改 README 中的 badge 版本!!
15+
var Version = "v0.15.7" // !!记得修改 README 中的 badge 版本!!
1616

1717
var (
1818
Conf *model.Config

0 commit comments

Comments
 (0)