diff --git a/resource/l10n/zh-CN.toml b/resource/l10n/zh-CN.toml index 5e240f9..3c9ff43 100644 --- a/resource/l10n/zh-CN.toml +++ b/resource/l10n/zh-CN.toml @@ -425,7 +425,7 @@ other = "活动" other = "版本" [NetSpeed] -other = "网络" +other = "网速" [Uptime] other = "在线" diff --git a/resource/l10n/zh-TW.toml b/resource/l10n/zh-TW.toml index 7a22a6f..732cc3a 100644 --- a/resource/l10n/zh-TW.toml +++ b/resource/l10n/zh-TW.toml @@ -425,7 +425,7 @@ other = "活動" other = "版本" [NetSpeed] -other = "網路" +other = "網速" [Uptime] other = "在線" diff --git a/resource/static/theme-server-status/css/dark.css b/resource/static/theme-server-status/css/dark.css index 011e4ca..47b57ee 100755 --- a/resource/static/theme-server-status/css/dark.css +++ b/resource/static/theme-server-status/css/dark.css @@ -9,7 +9,7 @@ body[theme="dark"] .navbar .navbar-brand { } body[theme="dark"] .navbar .navbar-nav li.pc-active a, -body[theme="dark"] .navbar .navbar-nav li.m-active a{ +body[theme="dark"] .navbar .navbar-nav li.m-active a { color: rgba(73, 146, 255, 1); } @@ -32,7 +32,7 @@ body[theme="dark"] .navbar .dropdown-menu > li > a:hover { body[theme="dark"] .navbar .navbar-nav > .open > a:focus, body[theme="dark"] .navbar .navbar-nav > .open > a:hover, body[theme="dark"] .navbar .navbar-nav > .active > a, -body[theme="dark"] .navbar .navbar-nav > .open > a{ +body[theme="dark"] .navbar .navbar-nav > .open > a { background-image: none; box-shadow: none; background-color: transparent; @@ -58,7 +58,7 @@ body[theme="dark"] .table { body[theme="dark"] .table > tbody > tr > td:before, body[theme="dark"] .table > tfoot > tr > td:before, body[theme="dark"] .table > thead > tr > td:before, -body[theme="dark"] .table > thead > tr.node-group-cell > th:before{ +body[theme="dark"] .table > thead > tr.node-group-cell > th:before { background-color: rgba(58, 62, 65, 1); } @@ -74,7 +74,7 @@ body[theme="dark"] .table-striped tbody > tr.odd > th { background-color: rgba(34, 35, 46, 1); } -body[theme="dark"] .table-hover > tbody > tr:hover{ +body[theme="dark"] .table-hover > tbody > tr:hover { background-color: unset; } @@ -83,11 +83,11 @@ body[theme="dark"] .table-hover > tbody > tr:not(.expandRow):hover > td { } /* expandRow展开部分样式 */ -body[theme="dark"] .table > tbody > tr.expandRow.odd > td:before{ +body[theme="dark"] .table > tbody > tr.expandRow.odd > td:before { background-color: rgba(34, 35, 46, 1); } -body[theme="dark"] .table > tbody > tr.expandRow.even > td:before{ +body[theme="dark"] .table > tbody > tr.expandRow.even > td:before { background-color: rgba(28, 29, 38, 1); } /* expandRow展开部分样式结束 */ @@ -155,29 +155,29 @@ body[theme="dark"] footer p a:hover { text-decoration: none; } -body[theme="dark"] .modal-content{ +body[theme="dark"] .modal-content { background-color: rgba(28, 29, 38, 1); color: #f1f1f1; } -body[theme="dark"] #earthChartBox .modal-content{ +body[theme="dark"] #earthChartBox .modal-content { background-color: rgba(0, 0, 0, 1); color: #f1f1f1; } -body[theme="dark"] .modal-header{ +body[theme="dark"] .modal-header { border-bottom-color:#080808; } -body[theme="dark"] .modal-header i.xclose{ +body[theme="dark"] .modal-header i.xclose { color: #f1f1f1; } -body[theme="dark"] .toolbox i{ +body[theme="dark"] .toolbox i { color: rgba(241, 241, 241, 1); background-color: rgba(0, 0, 0, 0.5); } -body[theme="dark"] .network-box .network-box-header{ +body[theme="dark"] .network-box .network-box-header { border-bottom-color: rgba(110, 112, 121, 0.25); } \ No newline at end of file diff --git a/resource/static/theme-server-status/css/dark.plus.css b/resource/static/theme-server-status/css/dark.plus.css index 0027644..d8b7b98 100644 --- a/resource/static/theme-server-status/css/dark.plus.css +++ b/resource/static/theme-server-status/css/dark.plus.css @@ -86,7 +86,7 @@ body[theme="dark"] .table > thead > tr.node-group-tag > th:before { body[theme="dark"] .table > tbody > tr > td:before, body[theme="dark"] .table > tfoot > tr > td:before, body[theme="dark"] .table > thead > tr > td:before, -body[theme="dark"] .table > thead > tr.node-group-cell > th:before{ +body[theme="dark"] .table > thead > tr.node-group-cell > th:before { /** border-bottom 颜色 **/ background-color: rgba(155, 155, 155, 0.1); } @@ -96,11 +96,11 @@ body[theme="dark"] .table-hover > tbody > tr:not(.expandRow):hover > td { } /* expandRow展开部分样式 */ -body[theme="dark"] .table > tbody > tr.expandRow.odd > td:before{ +body[theme="dark"] .table > tbody > tr.expandRow.odd > td:before { background-color: unset; } -body[theme="dark"] .table > tbody > tr.expandRow.even > td:before{ +body[theme="dark"] .table > tbody > tr.expandRow.even > td:before { background-color: unset; } /* expandRow展开部分样式结束 */ diff --git a/resource/static/theme-server-status/css/light.css b/resource/static/theme-server-status/css/light.css index 8cc7b08..9262d49 100755 --- a/resource/static/theme-server-status/css/light.css +++ b/resource/static/theme-server-status/css/light.css @@ -47,16 +47,16 @@ body[theme="light"] .navbar .navbar-nav .open .dropdown-menu > li > a { color: rgba(0, 0, 0, 0.87); } -body[theme="light"] .navbar .navbar-toggle{ +body[theme="light"] .navbar .navbar-toggle { border:none; padding:9px 12px; } -body[theme="light"] .navbar .navbar-collapse{ +body[theme="light"] .navbar .navbar-collapse { border-color:rgba(0, 0, 0, 0.085); } -body[theme="light"] .navbar .navbar-toggle .icon-bar{ +body[theme="light"] .navbar .navbar-toggle .icon-bar { background-color: rgba(0, 0, 0, 0.87); } @@ -95,12 +95,12 @@ body[theme="light"] .table-striped tbody > tr.odd > th { body[theme="light"] .table > tbody > tr > td:before, body[theme="light"] .table > tfoot > tr > td:before, body[theme="light"] .table > thead > tr > td:before, -body[theme="light"] .table > thead > tr.node-group-cell > th:before{ +body[theme="light"] .table > thead > tr.node-group-cell > th:before { background-color: rgba(221, 221, 221, 1); } body[theme="light"] .table > tbody > tr.expandRow > td:before, -body[theme="light"] .table > thead > tr.node-group-tag > th:before{ +body[theme="light"] .table > thead > tr.node-group-tag > th:before { background-color: rgba(255, 255, 255, 1); } @@ -174,35 +174,35 @@ body[theme="light"] footer p a:hover { text-decoration: none; } -body[theme="light"] .toolbox i{ +body[theme="light"] .toolbox i { color: rgba(94, 114, 228, .9); background-color: rgba(255, 255, 255, .5); box-shadow:0 .125rem .25rem rgba(0, 0, 0, .15) !important; } -body[theme="light"] .toolbox .mytoggle .tooltip-inner{ +body[theme="light"] .toolbox .mytoggle .tooltip-inner { background: #ffffff; box-shadow: 0 .125rem .25rem rgba(0, 0, 0, .15) !important; } -body[theme="light"] .toolbox .mytoggle li:hover{ +body[theme="light"] .toolbox .mytoggle li:hover { background-color:#e6e6e6; } -body[theme="light"] .modal-content{ +body[theme="light"] .modal-content { background-color: rgba(249, 249, 249, 1); color: rgba(0, 0, 0, 0.87); } -body[theme="light"] .modal-header{ +body[theme="light"] .modal-header { border-bottom-color:#f1f1f1; } -body[theme="light"] .modal-header i.xclose{ +body[theme="light"] .modal-header i.xclose { color: rgba(0, 0, 0, 0.87); } -body[theme="light"] .network-box .network-box-header{ +body[theme="light"] .network-box .network-box-header { border-bottom-color: rgba(224, 230, 241, 0.6); } diff --git a/resource/static/theme-server-status/css/light.plus.css b/resource/static/theme-server-status/css/light.plus.css index 2f30fe9..b74c805 100644 --- a/resource/static/theme-server-status/css/light.plus.css +++ b/resource/static/theme-server-status/css/light.plus.css @@ -36,16 +36,16 @@ body[theme="light"] .navbar .dropdown-menu { body[theme="light"] .navbar .dropdown-menu > li > a:focus, -body[theme="light"] .navbar .dropdown-menu > li > a:hover{ +body[theme="light"] .navbar .dropdown-menu > li > a:hover { /** 二级导航鼠标悬停选中背景 **/ background-color: rgba(0, 0, 0, .05); } -body[theme="light"] .navbar .navbar-collapse{ +body[theme="light"] .navbar .navbar-collapse { border-color:rgba(0, 0, 0, 0.085); } -body[theme="light"] .navbar .navbar-toggle .icon-bar{ +body[theme="light"] .navbar .navbar-toggle .icon-bar { background-color: rgba(0, 0, 0, 0.9); } @@ -87,7 +87,7 @@ body[theme="light"] .table > thead > tr.node-group-tag > th:before { body[theme="light"] .table > tbody > tr > td:before, body[theme="light"] .table > tfoot > tr > td:before, body[theme="light"] .table > thead > tr > td:before, -body[theme="light"] .table > thead > tr.node-group-cell > th:before{ +body[theme="light"] .table > thead > tr.node-group-cell > th:before { /** border-bottom 颜色 **/ background-color: rgba(0, 0, 0, 0.075); } @@ -97,11 +97,11 @@ body[theme="light"] .table-hover > tbody > tr:not(.expandRow):hover > td { } /* expandRow展开部分样式 */ -body[theme="light"] .table > tbody > tr.expandRow.odd > td:before{ +body[theme="light"] .table > tbody > tr.expandRow.odd > td:before { background-color: unset; } -body[theme="light"] .table > tbody > tr.expandRow.even > td:before{ +body[theme="light"] .table > tbody > tr.expandRow.even > td:before { background-color: unset; } /* expandRow展开部分样式结束 */ @@ -123,7 +123,7 @@ body[theme="light"] .progress-bar-danger { background-image: linear-gradient(to right, rgba(255, 70, 0, 0.6) 0, rgba(201, 48, 44,0.6) 100%); } -body[theme="light"] .toolbox i{ +body[theme="light"] .toolbox i { background-color: rgba(255, 255, 255, .55); } diff --git a/resource/static/theme-server-status/css/main.css b/resource/static/theme-server-status/css/main.css index 86b7735..0526b4c 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: 110px; - max-width: 110px; + min-width: 100px; + max-width: 100px; } .node-cell.traffic { @@ -340,11 +340,11 @@ td.ping-network-quality { /* 服务页 正文结束 */ /* 网络页 正文*/ -.network-box .btn-group.open .dropdown-toggle{ +.network-box .btn-group.open .dropdown-toggle { box-shadow:unset; } -.network-box .network-box-header{ +.network-box .network-box-header { font-size: 18px; padding: 5px 0px 15px 5px; cursor: pointer; @@ -365,12 +365,12 @@ td.ping-network-quality { display: none; } -.network-box .network-box-header .dropdown-menu li{ +.network-box .network-box-header .dropdown-menu li { height: 2em; cursor: pointer; } -.network-box .network-box-header .dropdown-menu li.input-group{ +.network-box .network-box-header .dropdown-menu li.input-group { margin: 0 auto; display: flex; position: sticky; @@ -378,7 +378,7 @@ td.ping-network-quality { z-index: 99999997; } -.network-box .network-box-header .dropdown-menu li.input-group input{ +.network-box .network-box-header .dropdown-menu li.input-group input { width: 100%; height: 2em; border-top: none; @@ -407,7 +407,7 @@ td.ping-network-quality { margin: 18px 0px 15px 0px; } -.network-box .chartTitle i.chartCountryCode{ +.network-box .chartTitle i.chartCountryCode { font-size: 16px; border-radius: 12.5%; } @@ -415,17 +415,17 @@ td.ping-network-quality { /* 网络页 正文结束 */ /* 地图版服务器分布图 */ -#mapChartBox{ +#mapChartBox { z-index: 999999999; padding-left: 0 !important; } -.modal-open .modal{ +.modal-open .modal { overflow-x: hidden; overflow-y: hidden; } -.modal-dialog-centered{ +.modal-dialog-centered { margin: 0 auto; width: 100%; max-width: 100%; @@ -435,7 +435,7 @@ td.ping-network-quality { min-height: calc(100%) /* 确保模态框占据整个视口高度 */ } -.modal-content{ +.modal-content { display: flex; flex-direction: column; pointer-events: auto; @@ -443,15 +443,15 @@ td.ping-network-quality { border: none; } -.modal-header{ +.modal-header { position: relative; } -.modal-header h4{ +.modal-header h4 { cursor: pointer; } -.modal-header i.xclose{ +.modal-header i.xclose { cursor: pointer; position: absolute; font-size: 30px; @@ -459,32 +459,32 @@ td.ping-network-quality { right: 10px; } -.modal-body{ +.modal-body { padding: 0px; } -a.template-item, a.cdn-item{ +a.template-item, a.cdn-item { display: block; } -footer{ +footer { padding-bottom: 20px; } -footer p{ +footer p { text-align: center; font-size: 10px; } @media only screen and (max-width: 1200px) { - .accordian-body{ + .accordian-body { margin: 5px 0px 5px 10px; } - table.monitor-detail{ + table.monitor-detail { margin:0px 0px 2px 0px; } .table .network-thead-tr th, - .table .node-group-tag th{ + .table .node-group-tag th { font-size:16px; padding-bottom:6px; } @@ -512,10 +512,10 @@ footer p{ padding: 0; margin-bottom: 10px; } - footer{ + footer { padding-bottom: 10px; } - .cycle-transfer-stats .dataTables_wrapper{ + .cycle-transfer-stats .dataTables_wrapper { margin-bottom: -10px; } .navbar .navbar-nav .open .dropdown-menu>li>a { @@ -537,54 +537,58 @@ footer p{ } .node-cell.os, .node-cell.uptime, - .node-cell.traffic{ + .node-cell.traffic { display: none; visibility: hidden; } - .node-cell.location{ + .node-cell.location { display: table-cell; visibility: visible; } - .node-cell-os-text,.node-cell-location-text{ + .node-cell-os-text,.node-cell-location-text { display: none; visibility: hidden; } + .node-cell.network { + min-width: 95px; + max-width: 95px; + } .node-cell.remaining { min-width: 75px; max-width: 75px; } - .accordian-body{ + .accordian-body { margin: 5px 0px 5px 10px; } - table.monitor-detail{ + table.monitor-detail { margin:0px 0px 2px 0px; } .table .network-thead-tr th, - .table .node-group-tag th{ + .table .node-group-tag th { font-size:14px; padding-bottom:6px; } - .table tr.network td{ + .table tr.network td { font-size: 12px; } - .service-status .service-status-th{ + .service-status .service-status-th { min-width:30px; } - .service-status .delay-today{ + .service-status .delay-today { margin-top:4px; justify-content: center; } - .service-status .delay-today i{ + .service-status .delay-today i { margin-right:0px; } - .service-status .delay-today-text{ + .service-status .delay-today-text { display: none; visibility: hidden; } - .service-status .service-averagelatency-th{ + .service-status .service-averagelatency-th { min-width:70px; } - .service-status .service-30daysonline-th{ + .service-status .service-30daysonline-th { min-width:75px; } .toolbox { @@ -602,7 +606,7 @@ footer p{ font-size: 16px; margin: 10px 0px 10px 0px; } - .network-box .chartTitle i.chartCountryCode{ + .network-box .chartTitle i.chartCountryCode { font-size: 15px; border-radius: 12.5%; } diff --git a/resource/template/theme-server-status/footer.html b/resource/template/theme-server-status/footer.html index dae2932..3e595cb 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 9f65c10..f1a098f 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 12ccf0e..cd1792c 100644 --- a/resource/template/theme-server-status/home-group-false.html +++ b/resource/template/theme-server-status/home-group-false.html @@ -32,15 +32,16 @@ - @#getPlatformName(node.os)#@ + @#getPlatformName(node.os) === '' && node.stateuptime > 0 ? 'linux' : getPlatformName(node.os)#@ -