From c20dfdc7a3ec061f1461bd5c5c29e4f08e32dcb1 Mon Sep 17 00:00:00 2001 From: nap0o <144927971+nap0o@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:11:24 -0500 Subject: [PATCH] =?UTF-8?q?improve:=20status-server=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BC=98=E5=8C=96=20(#467)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * improve: status-server主题日常优化 1.首页vps套餐流量增加一种类型max(in,out)类型，感谢@hi2global 2.network页修复逻辑缺陷 3.一些其他小优化 演示地址 https://dev.nezha.pp.ua/ * 修正 NetTransfer 展示方式 --- resource/static/theme-server-status/css/dark.css | 2 -- resource/static/theme-server-status/css/dark.plus.css | 2 -- resource/static/theme-server-status/css/light.css | 5 +---- resource/static/theme-server-status/css/main.css | 4 ++-- resource/template/theme-server-status/footer.html | 4 ++-- resource/template/theme-server-status/header.html | 6 +++--- .../theme-server-status/home-group-false.html | 11 ++++------- .../template/theme-server-status/home-group-true.html | 11 ++++------- resource/template/theme-server-status/network.html | 2 +- 9 files changed, 17 insertions(+), 30 deletions(-) diff --git a/resource/static/theme-server-status/css/dark.css b/resource/static/theme-server-status/css/dark.css index 00e8e12..72309b3 100755 --- a/resource/static/theme-server-status/css/dark.css +++ b/resource/static/theme-server-status/css/dark.css @@ -46,8 +46,6 @@ body[theme="dark"] .content { background-color: rgba(28, 29, 38, 1); border: none; box-shadow: rgba(0, 0, 0, 0.5) 0 0.625em 2em; - -webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 0.625em 2em; - box-shadow: rgba(0, 0, 0, 0.5) 0 0.625em 2em; } body[theme="dark"] .table { diff --git a/resource/static/theme-server-status/css/dark.plus.css b/resource/static/theme-server-status/css/dark.plus.css index d8b7b98..dc13d5e 100644 --- a/resource/static/theme-server-status/css/dark.plus.css +++ b/resource/static/theme-server-status/css/dark.plus.css @@ -74,8 +74,6 @@ body[theme="dark"] .content { background-color: rgba(28, 29, 38, 0.8); border: none; box-shadow: rgba(0, 0, 0, 0.5) 0 0.625em 2em; - -webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 0.625em 2em; - box-shadow: rgba(0, 0, 0, 0.5) 0 0.625em 2em; } body[theme="dark"] .table > thead > tr.node-group-tag > th, diff --git a/resource/static/theme-server-status/css/light.css b/resource/static/theme-server-status/css/light.css index cfa9921..2a9369e 100755 --- a/resource/static/theme-server-status/css/light.css +++ b/resource/static/theme-server-status/css/light.css @@ -69,8 +69,6 @@ body[theme="light"] .content { background: rgba(255, 255, 255, 1); color: rgba(0, 0, 0, 0.87); border: 1px #cecece solid; - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, .1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, .1); box-shadow: 0 1px 10px rgba(0, 0, 0, .1); } @@ -119,8 +117,7 @@ body[theme="light"] tr.odd.expandRow > :hover { body[theme="light"] .plan { color: #000000; background-color: #f5f5f5; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); + box-shadow: inset 0 -0.5px 2px rgba(0, 0, 0, .1); } body[theme="light"] .progress-bar { diff --git a/resource/static/theme-server-status/css/main.css b/resource/static/theme-server-status/css/main.css index 5f6756f..33f3819 100755 --- a/resource/static/theme-server-status/css/main.css +++ b/resource/static/theme-server-status/css/main.css @@ -237,8 +237,8 @@ tr.accordion-toggle{ } .node-cell.network { - min-width: 100px; - max-width: 100px; + min-width: 110px; + max-width: 110px; } .node-cell.traffic { diff --git a/resource/template/theme-server-status/footer.html b/resource/template/theme-server-status/footer.html index 3e595cb..cad712f 100644 --- a/resource/template/theme-server-status/footer.html +++ b/resource/template/theme-server-status/footer.html @@ -28,8 +28,8 @@ {{if ts .CustomCode}}{{.CustomCode|safe}}{{end}} diff --git a/resource/template/theme-server-status/header.html b/resource/template/theme-server-status/header.html index 4247a70..f24f8bf 100644 --- a/resource/template/theme-server-status/header.html +++ b/resource/template/theme-server-status/header.html @@ -26,9 +26,9 @@ - - - + + + diff --git a/resource/template/theme-server-status/home-group-false.html b/resource/template/theme-server-status/home-group-false.html index 4a8f42b..246a8bc 100644 --- a/resource/template/theme-server-status/home-group-false.html +++ b/resource/template/theme-server-status/home-group-false.html @@ -96,17 +96,17 @@ @#node.additional.price.amount#@@#(node.additional.price.cycle ? '/' + node.additional.price.cycle : '')#@ - {{tr "Lifetime"}} {{tr "Expired"}} - @#node.additional.remaining.endDate.toISOString().split('T')[0]#@ + @#node.additional.remaining.endDate.toISOString().split('T')[0]#@ @#node.additional.plan.bandwidth#@ - + + @#node.additional.plan.trafficVol#@ @@ -159,10 +159,7 @@ {{tr "NetTransfer"}}: - @#formatByteSize(node.state.NetInTransfer)#@ - @#formatByteSize(node.state.NetOutTransfer)#@ + IN @#formatByteSize(node.state.NetInTransfer)#@ / OUT @#formatByteSize(node.state.NetOutTransfer)#@ {{tr "Load"}}: diff --git a/resource/template/theme-server-status/home-group-true.html b/resource/template/theme-server-status/home-group-true.html index 664940c..2c1da41 100644 --- a/resource/template/theme-server-status/home-group-true.html +++ b/resource/template/theme-server-status/home-group-true.html @@ -99,17 +99,17 @@ @#node.additional.price.amount#@@#(node.additional.price.cycle ? '/' + node.additional.price.cycle : '')#@ - {{tr "Lifetime"}} {{tr "Expired"}} - @#node.additional.remaining.endDate.toISOString().split('T')[0]#@ + @#node.additional.remaining.endDate.toISOString().split('T')[0]#@ @#node.additional.plan.bandwidth#@ - + + @#node.additional.plan.trafficVol#@ @@ -162,10 +162,7 @@ {{tr "NetTransfer"}}: - @#formatByteSize(node.state.NetInTransfer)#@ - @#formatByteSize(node.state.NetOutTransfer)#@ + IN @#formatByteSize(node.state.NetInTransfer)#@ / OUT @#formatByteSize(node.state.NetOutTransfer)#@ {{tr "Load"}}: diff --git a/resource/template/theme-server-status/network.html b/resource/template/theme-server-status/network.html index 6e7dfd1..7660e4b 100644 --- a/resource/template/theme-server-status/network.html +++ b/resource/template/theme-server-status/network.html @@ -15,7 +15,7 @@ -
@#chartTitle#@
+
@#chartTitle#@
{{template "theme-server-status/footer" .}}