diff --git a/pkg/mygin/preferred_theme.go b/pkg/mygin/preferred_theme.go index e02afcc..0c885af 100644 --- a/pkg/mygin/preferred_theme.go +++ b/pkg/mygin/preferred_theme.go @@ -14,7 +14,7 @@ func PreferredTheme(c *gin.Context) { if theme, err := c.Cookie("preferred_theme"); err == nil { if _, has := model.Themes[theme]; has { // 检验自定义主题 - if theme == "custom" && singleton.Conf.Site.Theme != "custom" && !utils.IsFileExists("resource/template/custom/home.html") { + if theme == "custom" && singleton.Conf.Site.Theme != "custom" && !utils.IsFileExists("resource/template/theme-custom/home.html") { return } c.Set(model.CtxKeyPreferredTheme, theme) diff --git a/resource/l10n/en-US.toml b/resource/l10n/en-US.toml index 87576ce..cac84ad 100644 --- a/resource/l10n/en-US.toml +++ b/resource/l10n/en-US.toml @@ -398,7 +398,7 @@ other = "Virtualization" other = "Swap" [NetTransfer] -other = "Network Transfer" +other = "Transfer" [Load] other = "Load" @@ -419,7 +419,7 @@ other = "Last Active" other = "Version" [NetSpeed] -other = "Network Speed" +other = "Speed" [Uptime] other = "Uptime" @@ -627,3 +627,6 @@ other = "Feature" [Template] other = "Template" + +[Stat] +other = "Stat" diff --git a/resource/l10n/es-ES.toml b/resource/l10n/es-ES.toml index 1d0be0e..f098531 100644 --- a/resource/l10n/es-ES.toml +++ b/resource/l10n/es-ES.toml @@ -627,3 +627,6 @@ other = "Característica" [Template] other = "Plantilla" + +[Stat] +other = "Stat" diff --git a/resource/l10n/zh-CN.toml b/resource/l10n/zh-CN.toml index 5de413c..82d7553 100644 --- a/resource/l10n/zh-CN.toml +++ b/resource/l10n/zh-CN.toml @@ -627,3 +627,6 @@ other = "功能" [Template] other = "主题" + +[Stat] +other = "信息" diff --git a/resource/l10n/zh-TW.toml b/resource/l10n/zh-TW.toml index 5c340b0..05327cf 100644 --- a/resource/l10n/zh-TW.toml +++ b/resource/l10n/zh-TW.toml @@ -627,3 +627,6 @@ other = "功能" [Template] other = "主題" + +[Stat] +other = "信息" diff --git a/resource/static/theme-default/css/main.css b/resource/static/theme-default/css/main.css index 73c214b..c3c0c62 100644 --- a/resource/static/theme-default/css/main.css +++ b/resource/static/theme-default/css/main.css @@ -86,21 +86,35 @@ td { margin-right: 0; } +.ui.grid { + margin-bottom:-0.5em +} + +.ui.card>.content>.header:not(.ui), .ui.cards>.card>.content>.header:not(.ui){ + line-height: 1em; +} + .status.cards .wide.column { padding-top: 0 !important; padding-bottom: 0 !important; - height:3.3rem !important; + height:2.3rem !important; } .status.cards .wide.column:nth-child(1) { - margin-top:2rem !important; + margin-top:1.2rem !important; } .status.cards .wide.column:nth-child(2) { - margin-top:2rem !important; + margin-top:1.2rem !important; +} + +.status.cards .three.wide.column { + text-align: center; + width: 22%!important; } .status.cards .thirteen.wide.column{ + width: 78%!important; padding-left:0; } @@ -124,7 +138,7 @@ td { .closePopup{ color:rgb(10, 148, 242) !important; position: absolute; - top: 10px; + top: 7px; right: 10px; cursor: pointer; z-index: 9999; @@ -194,6 +208,7 @@ td { } .nezha-secondary-font { + height: 1em; color: rgb(10, 148, 242) !important; } diff --git a/resource/static/theme-default/js/mixin.js b/resource/static/theme-default/js/mixin.js new file mode 100644 index 0000000..54646c2 --- /dev/null +++ b/resource/static/theme-default/js/mixin.js @@ -0,0 +1,56 @@ +const mixinsVue = { + delimiters: ['@#', '#@'], + data: { + preferredTemplate: null, + isMobile: false + }, + created() { + this.isMobile = this.checkIsMobile(); + this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : this.$root.defaultTemplate; + }, + methods: { + toggleTemplate(template) { + if( template != this.preferredTemplate){ + this.preferredTemplate = template; + this.updateCookie("preferred_theme", template); + window.location.reload(); + } + }, + updateCookie(name, value) { + document.cookie = name + "=" + value +"; path=/"; + }, + getCookie(name) { + const cookies = document.cookie.split(';'); + let cookieValue = null; + for (let i = 0; i < cookies.length; i++) { + const cookie = cookies[i].trim(); + if (cookie.startsWith(name + '=')) { + cookieValue = cookie.substring(name.length + 1, cookie.length); + break; + } + } + return cookieValue; + }, + checkIsMobile() { // 检测设备类型,页面宽度小于768px认为是移动设备 + return window.innerWidth <= 768; + }, + logOut(id) { + $.ajax({ + type: 'POST', + url: '/api/logout', + data: JSON.stringify({ id: id }), + contentType: 'application/json', + success: function (resp) { + if (resp.code == 200) { + window.location.reload(); + } else { + alert('注销失败(Error ' + resp.code + '): ' + resp.message); + } + }, + error: function (err) { + alert('网络错误: ' + err.responseText); + } + }); + } + } +} \ No newline at end of file diff --git a/resource/static/theme-server-status/js/mixin.js b/resource/static/theme-server-status/js/mixin.js index 5fe7abe..cdf6c42 100644 --- a/resource/static/theme-server-status/js/mixin.js +++ b/resource/static/theme-server-status/js/mixin.js @@ -5,14 +5,14 @@ const mixinsVue = { isSystemTheme: false, showGroup: false, showGoTop: false, - preferredTemplate: 'default', + preferredTemplate: null, isMobile: false }, created() { this.isMobile = this.checkIsMobile(); this.initTheme(); this.storedShowGroup(); - this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : 'default'; + this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : this.$root.defaultTemplate; window.addEventListener('scroll', this.handleScroll); }, destroyed() { diff --git a/resource/template/theme-default/header.html b/resource/template/theme-default/header.html index a29d73f..4baa373 100644 --- a/resource/template/theme-default/header.html +++ b/resource/template/theme-default/header.html @@ -12,14 +12,14 @@ - + - + {{end}} \ No newline at end of file diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html index 364c5f0..91a09a0 100644 --- a/resource/template/theme-default/home.html +++ b/resource/template/theme-default/home.html @@ -19,7 +19,7 @@ class="apple icon"> @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@ - +
{{tr "Platform"}}: @#server.Host.Platform#@-@#server.Host.PlatformVersion#@ @@ -90,7 +90,7 @@ @#formatByteSize(server.State.NetOutSpeed)#@/s
-
流量
+
{{tr "NetTransfer"}}
@#formatByteSize(server.State.NetInTransfer)#@ @@ -98,7 +98,7 @@ @#formatByteSize(server.State.NetOutTransfer)#@
-
信息
+
{{tr "Stat"}}
@#getCoreAndGHz(server.Host.CPU)#@   @@ -138,6 +138,7 @@ delimiters: ['@#', '#@'], data: { page: 'index', + defaultTemplate: {{.Conf.Site.Theme}}, templates: {{.Themes}}, data: [], groups: [], diff --git a/resource/template/theme-default/network.html b/resource/template/theme-default/network.html index 0aee4bd..4714d3f 100644 --- a/resource/template/theme-default/network.html +++ b/resource/template/theme-default/network.html @@ -36,6 +36,7 @@ delimiters: ['@#', '#@'], data: { page: 'network', + defaultTemplate: {{.Conf.Site.Theme}}, templates: {{.Themes}}, servers: initData, option: { diff --git a/resource/template/theme-default/service.html b/resource/template/theme-default/service.html index f5bc1b1..15d1335 100644 --- a/resource/template/theme-default/service.html +++ b/resource/template/theme-default/service.html @@ -87,6 +87,7 @@ delimiters: ['@#', '#@'], data: { page: 'service', + defaultTemplate: {{.Conf.Site.Theme}}, templates: {{.Themes}} }, mixins: [mixinsVue] diff --git a/resource/template/theme-server-status/header.html b/resource/template/theme-server-status/header.html index c0bfc5e..bfceab7 100644 --- a/resource/template/theme-server-status/header.html +++ b/resource/template/theme-server-status/header.html @@ -28,7 +28,7 @@ - + {{end}} \ No newline at end of file diff --git a/resource/template/theme-server-status/home.html b/resource/template/theme-server-status/home.html index 487218b..ce57d08 100644 --- a/resource/template/theme-server-status/home.html +++ b/resource/template/theme-server-status/home.html @@ -22,6 +22,7 @@ delimiters: ['@#', '#@'], data: { page: 'index', + defaultTemplate: {{.Conf.Site.Theme}}, templates: {{.Themes}}, nodesTag: [], nodesNoTag: [], diff --git a/resource/template/theme-server-status/network.html b/resource/template/theme-server-status/network.html index e2cf3f6..b5c854a 100644 --- a/resource/template/theme-server-status/network.html +++ b/resource/template/theme-server-status/network.html @@ -30,6 +30,7 @@ delimiters: ['@#', '#@'], data: { page: 'network', + defaultTemplate: {{.Conf.Site.Theme}}, templates: {{.Themes}}, servers: initData, option: { diff --git a/resource/template/theme-server-status/service.html b/resource/template/theme-server-status/service.html index 9a73874..f3dc885 100644 --- a/resource/template/theme-server-status/service.html +++ b/resource/template/theme-server-status/service.html @@ -78,6 +78,7 @@ delimiters: ['@#', '#@'], data: { page: 'service', + defaultTemplate: {{.Conf.Site.Theme}}, templates: {{.Themes}}, servicesTag: [], servicesNoTag: [],