From cb107ab1e04a690f8ecc16045dc85a096c9c230e Mon Sep 17 00:00:00 2001 From: Kris <“x@hi.sy”> Date: Fri, 29 Apr 2022 14:49:24 +0200 Subject: [PATCH 1/3] Update theme-default and zh-CN.toml --- resource/l10n/zh-CN.toml | 204 +++++++++++++++++- resource/template/theme-default/home.html | 50 ++--- resource/template/theme-default/service.html | 24 +-- .../template/theme-default/viewpassword.html | 4 +- 4 files changed, 242 insertions(+), 40 deletions(-) diff --git a/resource/l10n/zh-CN.toml b/resource/l10n/zh-CN.toml index 6d20a27..ac242f4 100644 --- a/resource/l10n/zh-CN.toml +++ b/resource/l10n/zh-CN.toml @@ -1,217 +1,419 @@ [nezhaMonitor] other = "哪吒监控" + [Server] other = "主机" + [Services] other = "服务" + [Task] other = "任务" + [Notification] other = "报警" + [Settings] other = "设置" + [Home] other = "首页" + [BackToHomepage] other = "返回前台" + [AdminPanel] other = "管理后台" + [Logout] other = "注销登录" + [Login] other = "登录" + [ConfirmLogout] other = "确认注销?" + [AfterLoggingOutYouHaveToLoginAgain] other = "注销后您必须重新登录才能使用" + [Cancel] other = "取消" + [Confirm] other = "确认" + [AddScheduledTasks] other = "添加计划任务" + [Name] other = "名称" + [Scheduler] other = "计划" + [BackUp] other = "备份" + [3amDaily] other = "(每天3点)" + [Command] other = "命令" + [Coverage] other = "覆盖范围" + [IgnoreAllAndExecuteOnlyThroughSpecificServers] other = "忽略所有,仅通过特定服务器执行" + [AllIncludedOnlySpecificServersAreNotExecuted] other = "覆盖所有,仅特定服务器不执行" + [SpecificServers] other = "特定服务器" + [EnterIdAndNameToSearch] other = "输入ID/名称以搜索" + [NotificationMethod] other = "通知方式组" + [PushSuccessMessages] other = "推送成功的消息" + [TheFormaOfTheScheduleIs] other = "计划的格式为:" + [SecondsMinutesHoursDaysMonthsWeeksSeeDetails] other = "秒 分 时 天 月 星期,详情见" + [ScheduleExpressionFormat] other = "计划表达式格式" + [IntroductionOfCommands] other = "命令:就像写 shell/bat 脚本一样,但是不推荐换行,多个命令使用 &&/& 连接,如果遇到 xxx 命令找不到,可能是PATH 环境变量的问题,Linux 主机在命令开头加入source ~/.bashrc或者使用绝对路径执行。" + [AddMonitor] other = "添加监控" + [Blog] other = "博客" + [Target] other = "目标" + [Type] other = "类型" + [SslExpirationOrChange] other = "(SSL到期、变更)" + [Duration] other = "请求间隔" + [Seconds] other = "秒" + [EnableFailureNotification] other = "启用故障通知" + [IntroductionOfMonitor] other = """ 类型为 HTTP-GET 时输入URL(带 http/https, HTTPS协议的会顺带监控SSL证书);
类型为 ICMP-Ping 时输入主机名/IP,不带端口;
类型为 TCP-Ping 时输入主机名/IP + 端口号:example.com:22""" + [AddNotificationMethod] other = "添加通知方式" + [Tag] other = "分组" + [DoNotSendTestMessages] other = "不发送测试信息" + [RequestMethod] other = "请求方式" + [RequestType] other = "请求类型" + [VerifySSL] other = "验证SSL" + [AddNotificationRule] other = "添加报警规则" + [Rules] other = "规则" + [Enable] other = "启用" + [AddServer] other = "添加服务器" + [ServerGroup] other = "服务器分组" + [EinsteinLightspeed1] other = "爱因斯坦-光速1号" + [DisplayIndex] other = "排序" + [TheLargerTheNumberTheHigherThePriority] other = "越大越靠前" + [Secret] other = "密钥" + [Note] other = "备注" + [LinuxOneKeyInstall] other = "Linux 一键安装" + [NoDomainAlert] other = "请先在设置页面配置 未接入CDN的面板服务器域名/IP" + [PushSuccessfully] other = "成功推送" + [LastExecution] other = "最后执行" + [LastResult] other = "最后结果" + [Administration] other = "管理" + [CoverAll] other = "覆盖所有" + [IgnoreAll] other = "忽略所有" + [DeleteScheduledTask] other = "删除计划任务" + [ConfirmToDeleteThisScheduledTask] other = "确认删除此计划任务?" + [AccessDenied] other = "访问受限" + [Use] other = "使用" + [AccountToLogin] other = "账号登录" + [SignUp] other = "注册" + [DontHaveAnAccount] other = "没有账号?" + [SSLCertificate] other = "HTTP(S)/SSL证书" + [TCPPort] other = "TCP 端口" + [DeleteService] other = "删除服务" + [ConfirmToDeleteThisService] other = "确认删除此服务?" + [DeleteNotificationMethod] other = "删除通知方式" + [ConfirmToDeleteThisNotificationMethod] other = "确认删除此通知方式?" + [ForceUpdate] other = "强制更新" + [SelectAll] other = "全选" + [VersionNumber] other = "版本号" + [OneKeyInstall] other = "一键安装" + [ClickToCopyTheInstallationCommand] other = "点击复制安装命令" + [NotSupportedYet] other = "尚未支持,请下载release手动安装" + [DeleteServer] other = "删除主机" + [ConfirmToDeleteThisServer] other = "确认删除此主机?" + [NoServerSelected] other = "当前没有选中的服务器" + [ExecutionResults] other = "执行结果" + [SiteTitle] other = "站点标题" + [AdministratorList] other = "管理员列表" + [Theme] other = "主题" + [DefaultTheme] other = "默认主题" + [CustomCodes] other = "自定义代码(style、script 都可以)" + [AccessPassword] other = "前台查看密码" + [PanelServerDomainAndIP] other = "未接入CDN的面板服务器域名/IP" + [IPChangeAlert] other = "IP 变更提醒" + [AllIncludedOnlySpecificServersAreNotAlerted] other = "覆盖所有,仅特定服务器不提醒" + [IgnoreAllOnlyAlertSpecificServers] other = "忽略所有,仅提醒特定服务器" + [IgnoreAllRequestOnlyThroughSpecificServers] other = "忽略所有,仅通过特定服务器请求" + [AllIncludedOnlySpecificServersAreNotRequest] other = "覆盖所有,仅特定服务器不请求" + [ServerIDSeparatedByCommas] other = "服务器ID 以逗号隔开" + [IPChangeNotificationTag] other = "提醒发送至指定的通知分组" + [NotificationMessagesDoNotHideIP] other = "通知信息IP不打码" + [Save] other = "保存" + [ModifiedSuccessfully] other = "修改成功" + [TerminalConnectionTimeOutOrSessionEnded] other = "Terminal 连接超时或会话已结束" + [TerminalConnectionFailed] -other = "Terminal 连接失败,请检查 /terminal/* 的 WebSocket 反代情况" \ No newline at end of file +other = "Terminal 连接失败,请检查 /terminal/* 的 WebSocket 反代情况" + +[Default] +other = "默认" + +[Offline] +other = "已离线" + +[Platform] +other = "系统" + +[DiskUsed] +other = "硬盘" + +[MemUsed] +other = "内存" + +[SwapUsed] +other = "交换" + +[NetTransfer] +other = "流量" + +[Load] +other = "负载" + +[ProcessCount] +other = "进程数" + +[ConnCount] +other = "连接数" + +[BootTime] +other = "启动" + +[LastActive] +other = "活动" + +[Version] +other = "版本" + +[NetSpeed] +other = "网络" + +[Uptime] +other = "在线" + +[ServerIsOffline] +other = "节点已离线" + +[Day] +other = "天" + +[RealtimeChannelEstablished] +other = "实时通道建立" + +[GetTheLatestMonitoringDataInRealTime] +other = "可以实时获取最新监控数据啦" + +[RealtimeChannelDisconnect] +other = "实时通道断开" + +[CanNotGetTheLatestMonitoringDataInRealTime] +other = "无法实时获取最新监控数据咯" + +[30DaysOnline] +other = "30天在线率" + +[Details] +other = "详情" + +[Status] +other = "状态" + +[Availability] +other = "在线率" + +[AverageLatency] +other = "平均延迟" + +[CycleTransferStats] +other = "循环流量统计" + +[From] +other = "自" + +[To] +other = "至" + +[NextCheck] +other = "下次检查" + +[CurrentUsage] +other = "当前用量" + +[VerifyPassword] +other = "验证查看密码" diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html index 50610c4..4020df6 100644 --- a/resource/template/theme-default/home.html +++ b/resource/template/theme-default/home.html @@ -6,7 +6,7 @@
- @#(group.Tag!==''?group.Tag:'默认')#@ + @#(group.Tag!==''?group.Tag:'{{tr "Default"}}')#@
@@ -17,26 +17,26 @@ class="apple icon"> - @#server.Name + (server.live?'':'[已离线]')#@ + @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@
@@ -50,7 +50,7 @@
-
内存
+
{{tr "MemUsed"}}
-
交换
+
{{tr "SwapUsed"}}
-
网络
+
{{tr "NetSpeed"}}
@#formatByteSize(server.State.NetInSpeed)#@/s @#formatByteSize(server.State.NetOutSpeed)#@/s
-
硬盘
+
{{tr "DiskUsed"}}
-
在线
+
{{tr "Uptime"}}
@#secondToDate(server.State.Uptime)#@
@@ -93,7 +93,7 @@

@#server.Name#@

-

节点已离线

+

{{tr "ServerIsOffline"}}

@@ -163,7 +163,7 @@ secondToDate(s) { var d = Math.floor(s / 3600 / 24); if (d > 0) { - return d + "天" + return d + "{{tr "Day"}}" } var h = Math.floor(s / 3600 % 24); var m = Math.floor(s / 60 % 60); @@ -205,8 +205,8 @@ const ws = new WebSocket(wsProtocol + '://' + window.location.host + '/ws'); ws.onopen = function (evt) { $.suiAlert({ - title: '实时通道建立', - description: '可以实时获取最新监控数据啦', + title: '{{tr "RealtimeChannelEstablished"}}', + description: '{{tr "GetTheLatestMonitoringDataInRealTime"}}', type: 'success', time: '2', position: 'top-center', @@ -232,8 +232,8 @@ } ws.onclose = function () { $.suiAlert({ - title: '实时通道断开', - description: '无法实时获取最新监控数据咯', + title: '{{tr "RealtimeChannelDisconnect"}}', + description: '{{tr "CanNotGetTheLatestMonitoringDataInRealTime"}}', type: 'warning', time: '2', position: 'top-center', diff --git a/resource/template/theme-default/service.html b/resource/template/theme-default/service.html index df20c35..8272b4a 100644 --- a/resource/template/theme-default/service.html +++ b/resource/template/theme-default/service.html @@ -10,10 +10,10 @@ - - - - + + + + @@ -25,7 +25,7 @@
名称30天在线率详情状态{{tr "Name"}}{{tr "30DaysOnline"}}{{tr "Details"}}{{tr "Status"}}
{{range $i,$d := $service.Delay}}
+ data-tooltip="{{dayBefore $i}},{{tr "Availability"}}:{{float32f (div (index $service.Up $i) (add (index $service.Up $i) (index $service.Down $i)))}}%,{{tr "AverageLatency"}}:{{float32f $d}}ms">
{{end}}
@@ -39,20 +39,20 @@ {{if .CycleTransferStats}} -

循环流量统计

+

{{tr "CycleTransferStats"}}

- - - - + + + + - - + + diff --git a/resource/template/theme-default/viewpassword.html b/resource/template/theme-default/viewpassword.html index c78d78a..5199572 100644 --- a/resource/template/theme-default/viewpassword.html +++ b/resource/template/theme-default/viewpassword.html @@ -9,14 +9,14 @@

- 验证查看密码 + {{tr "VerifyPassword"}}

- + From 363b8909a1fdd8ee1173c14c664d7b59623f0637 Mon Sep 17 00:00:00 2001 From: Kris <“x@hi.sy”> Date: Fri, 29 Apr 2022 15:59:39 +0200 Subject: [PATCH 2/3] Update all theme texts --- resource/l10n/zh-CN.toml | 42 +++++++++++++++++++ resource/template/theme-daynight/home.html | 28 ++++++------- resource/template/theme-daynight/service.html | 20 ++++----- .../template/theme-daynight/viewpassword.html | 8 ++-- resource/template/theme-hotaru/home.html | 40 +++++++++--------- resource/template/theme-hotaru/service.html | 10 ++--- .../template/theme-hotaru/viewpassword.html | 4 +- resource/template/theme-mdui/home.html | 26 ++++++------ resource/template/theme-mdui/menu.html | 22 +++++----- resource/template/theme-mdui/service.html | 30 ++++++------- .../template/theme-mdui/viewpassword.html | 8 ++-- 11 files changed, 140 insertions(+), 98 deletions(-) diff --git a/resource/l10n/zh-CN.toml b/resource/l10n/zh-CN.toml index ac242f4..89fd671 100644 --- a/resource/l10n/zh-CN.toml +++ b/resource/l10n/zh-CN.toml @@ -417,3 +417,45 @@ other = "当前用量" [VerifyPassword] other = "验证查看密码" + +[LightMode] +other = "白昼模式" + +[DarkMode] +other = "暗黑模式" + +[GridLayout] +other = "网格视图" + +[ListLayout] +other = "列表视图" + +[EnterPassword] +other = "输入密码" + +[StatusTips] +other = """ +状态更新和事件报告可能会延迟最多30秒 +这取决于技术原因。请向下滚动查看过去的活动报告 +""" + +[Location] +other = "地区" + +[Running] +other = "运行中" + +[UpNetTransfer] +other = "上行" + +[DownNetTransfer] +other = "下行" + +[TotalUpNetTransfer] +other = "总上行" + +[TotalDownNetTransfer] +other = "总下行" + +[WrongPassword] +other = "密码错误" diff --git a/resource/template/theme-daynight/home.html b/resource/template/theme-daynight/home.html index f0a7680..cb786f7 100644 --- a/resource/template/theme-daynight/home.html +++ b/resource/template/theme-daynight/home.html @@ -37,12 +37,12 @@ @@ -111,7 +111,7 @@
  • -

    硬盘

    +

    {{tr "DiskUsed"}}

    @@ -239,7 +239,7 @@ secondToDate(s) { var d = Math.floor(s / 3600 / 24); if (d > 0) { - return d + "天" + return d + "{{tr "Day"}}" } var h = Math.floor(s / 3600 % 24); var m = Math.floor(s / 60 % 60); @@ -261,8 +261,8 @@ Swal.fire({ position: 'top', icon: 'success', - title: '实时通道建立', - text: '可以实时获取最新监控数据啦', + title: '{{tr "RealtimeChannelEstablished"}}', + text: '{{tr "GetTheLatestMonitoringDataInRealTime"}}', showConfirmButton: false, timer: 2000 }); @@ -288,8 +288,8 @@ Swal.fire({ position: 'top', icon: 'error', - title: '实时通道断开', - text: '无法实时获取最新监控数据咯', + title: '{{tr "RealtimeChannelDisconnect"}}', + text: '{{tr "CanNotGetTheLatestMonitoringDataInRealTime"}}', showConfirmButton: false, timer: 2000 }); diff --git a/resource/template/theme-daynight/service.html b/resource/template/theme-daynight/service.html index 157566a..3661f5d 100644 --- a/resource/template/theme-daynight/service.html +++ b/resource/template/theme-daynight/service.html @@ -41,12 +41,12 @@
    @@ -55,8 +55,8 @@
    -

    服务状态

    -

    最近30天在线率

    +

    {{tr "Status"}}

    +

    {{tr "30DaysOnline"}}

    {{range $service := .Services}} @@ -86,10 +86,10 @@ diff --git a/resource/template/theme-daynight/viewpassword.html b/resource/template/theme-daynight/viewpassword.html index edc7c69..47f6870 100644 --- a/resource/template/theme-daynight/viewpassword.html +++ b/resource/template/theme-daynight/viewpassword.html @@ -17,13 +17,13 @@
    -

    登 录

    +

    {{tr "Login"}}

    -

    验证查看密码

    - +

    {{tr "VerifyPassword"}}

    + - +
  • ID规则服务器{{tr "Rules"}}{{tr "Server"}}{{tr "From"}}{{tr "To"}} MAX MIN下次检查当前用量{{tr "NextCheck"}}{{tr "CurrentUsage"}}
    - - - - - - - + + + + + + + - + @@ -61,7 +61,7 @@ @@ -123,7 +123,7 @@
      -
    • 网络: +
    • {{tr "NetSpeed"}}: @#server.State?formatByteSize(server.State.NetInSpeed)+'/s|'+formatByteSize(server.State.NetOutSpeed)+'/s':'-'#@
    @@ -135,15 +135,15 @@
    @@ -224,7 +224,7 @@ secondToDate(s) { var d = Math.floor(s / 3600 / 24); if (d > 0) { - return d + "天" + return d + "{{tr "Day"}}" } var h = Math.floor(s / 3600 % 24); var m = Math.floor(s / 60 % 60); @@ -251,8 +251,8 @@ const ws = new WebSocket(wsProtocol + '://' + window.location.host + '/ws'); ws.onopen = function (evt) { $.suiAlert({ - title: '实时通道建立', - description: '可以实时获取最新监控数据啦', + title: '{{tr "RealtimeChannelEstablished"}}', + description: '{{tr "GetTheLatestMonitoringDataInRealTime"}}', type: 'success', time: '2', position: 'top-center', @@ -276,8 +276,8 @@ } ws.onclose = function () { $.suiAlert({ - title: '实时通道断开', - description: '无法实时获取最新监控数据咯', + title: '{{tr "RealtimeChannelDisconnect"}}', + description: '{{tr "CanNotGetTheLatestMonitoringDataInRealTime"}}', type: 'warning', time: '2', position: 'top-center', diff --git a/resource/template/theme-hotaru/service.html b/resource/template/theme-hotaru/service.html index 854d0bf..608dd5b 100644 --- a/resource/template/theme-hotaru/service.html +++ b/resource/template/theme-hotaru/service.html @@ -11,10 +11,10 @@
    运行状态节点名系统位置在线网络(B/s) ↓|↑流量(B) ↓|↑{{tr "Status"}}{{tr "Name"}}{{tr "Platform"}}{{tr "Location"}}{{tr "Uptime"}}{{tr "NetSpeed"}}(B/s) ↓|↑{{tr "NetTransfer"}}(B) ↓|↑ CPU RAM硬盘{{tr "DiskUsed"}}
    - @#server.live?'运行中':'已离线'#@ + @#server.live?'{{tr "Running"}}':'{{tr "Offline"}}'#@
    - - - - + + + + @@ -26,7 +26,7 @@ - - - - - + + + + + - + @@ -178,7 +178,7 @@ secondToDate(s) { var d = Math.floor(s / 3600 / 24); if (d > 0) { - return d + "天" + return d + "{{tr "Day"}}" } var h = Math.floor(s / 3600 % 24); var m = Math.floor(s / 60 % 60); @@ -229,7 +229,7 @@ const ws = new WebSocket(wsProtocol + '://' + window.location.host + '/ws'); ws.onopen = function (evt) { mdui.snackbar({ - message: '实时通道建立', + message: '{{tr "RealtimeChannelEstablished"}}', timeout: 2000, position: 'top', onClosed: function(){ @@ -281,7 +281,7 @@ } ws.onclose = function () { mdui.snackbar({ - message: '实时通道断开', + message: '{{tr "RealtimeChannelDisconnect"}}', timeout: 2000, position: 'top', }); diff --git a/resource/template/theme-mdui/menu.html b/resource/template/theme-mdui/menu.html index 7d0be88..ccbc461 100644 --- a/resource/template/theme-mdui/menu.html +++ b/resource/template/theme-mdui/menu.html @@ -4,25 +4,25 @@ diff --git a/resource/template/theme-mdui/service.html b/resource/template/theme-mdui/service.html index 6732e5f..7044f93 100644 --- a/resource/template/theme-mdui/service.html +++ b/resource/template/theme-mdui/service.html @@ -26,10 +26,10 @@
    名称30天在线率详情状态{{tr "Name"}}{{tr "30DaysOnline"}}{{tr "Details"}}{{tr "Status"}}
    {{range $i,$d := $service.Delay}}
    + data-tooltip="{{dayBefore $i}}, {{tr "AverageLatency"}}:{{float32f $d}}ms">
    {{end}}
    diff --git a/resource/template/theme-hotaru/viewpassword.html b/resource/template/theme-hotaru/viewpassword.html index cc2b1fb..73b1b75 100644 --- a/resource/template/theme-hotaru/viewpassword.html +++ b/resource/template/theme-hotaru/viewpassword.html @@ -9,14 +9,14 @@

    - 验证查看密码 + {{tr "VerifyPassword"}}

    - +
    diff --git a/resource/template/theme-mdui/home.html b/resource/template/theme-mdui/home.html index 01cfc8a..de63302 100644 --- a/resource/template/theme-mdui/home.html +++ b/resource/template/theme-mdui/home.html @@ -68,13 +68,13 @@
  • swap_vert
    -
    上行
    +
    {{tr "UpNetTransfer"}}
    @#formatNetByteSize(server.State.NetOutSpeed)#@
    -
    下行
    +
    {{tr "DownNetTransfer"}}
    @#formatNetByteSize(server.State.NetInSpeed)#@
    @@ -83,13 +83,13 @@
  • swap_horiz
    -
    总上行
    +
    {{tr "TotalUpNetTransfer"}}
    @#formatByteSize(server.State.NetOutTransfer)#@
    -
    总下行
    +
    {{tr "TotalDownNetTransfer"}}
    @#formatByteSize(server.State.NetInTransfer)#@
    @@ -107,14 +107,14 @@
  • IDNameUpDownTotal UpTotal Down{{tr "Name"}}{{tr "UpNetTransfer"}}{{tr "DownNetTransfer"}}{{tr "TotalUpNetTransfer"}}{{tr "TotalDownNetTransfer"}} CPU RAMOnline{{tr "Uptime"}}
    - - - - + + + + @@ -41,13 +41,13 @@ {{range $i,$d := $service.Delay}} {{$percent := (div (index $service.Up $i) (add (index $service.Up $i) (index $service.Down $i)))}} {{if eq $percent 0.0}} - favorite_border + favorite_border {{else if ge $percent 95.0}} - favorite + favorite {{else if ge $percent 80.0}} - favorite + favorite {{else}} - favorite + favorite {{end}} {{end}} @@ -74,20 +74,20 @@ {{if .CycleTransferStats}} -

    Network Traffic Statistics

    +

    {{tr "CycleTransferStats"}}

    NameSLADetails of Last 30 DaysNow{{tr "Name"}}{{tr "Availability"}}{{tr "30DaysOnline"}}{{tr "Status"}}
    - - - - + + + + - - + + diff --git a/resource/template/theme-mdui/viewpassword.html b/resource/template/theme-mdui/viewpassword.html index 19a84f7..c8084ef 100644 --- a/resource/template/theme-mdui/viewpassword.html +++ b/resource/template/theme-mdui/viewpassword.html @@ -18,18 +18,18 @@
    -
    验证查看密码
    +
    {{tr "VerifyPassword"}}
    lock - +
    - +
    @@ -52,7 +52,7 @@ window.location.href = res.url; } else { mdui.snackbar({ - message: '密码错误', + message: '{{tr "WrongPassword"}}', position: 'top', timeout: 2000, }); From 68ecd36c9fad0c95cde99777a39d8732e4cb2758 Mon Sep 17 00:00:00 2001 From: naiba Date: Fri, 29 Apr 2022 22:35:17 +0800 Subject: [PATCH 3/3] improve --- resource/l10n/zh-CN.toml | 6 ------ resource/template/theme-daynight/home.html | 10 +++++----- resource/template/theme-daynight/service.html | 8 ++++---- resource/template/theme-hotaru/home.html | 11 +++-------- 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/resource/l10n/zh-CN.toml b/resource/l10n/zh-CN.toml index 89fd671..dd15fb0 100644 --- a/resource/l10n/zh-CN.toml +++ b/resource/l10n/zh-CN.toml @@ -433,12 +433,6 @@ other = "列表视图" [EnterPassword] other = "输入密码" -[StatusTips] -other = """ -状态更新和事件报告可能会延迟最多30秒 -这取决于技术原因。请向下滚动查看过去的活动报告 -""" - [Location] other = "地区" diff --git a/resource/template/theme-daynight/home.html b/resource/template/theme-daynight/home.html index cb786f7..1d0ed21 100644 --- a/resource/template/theme-daynight/home.html +++ b/resource/template/theme-daynight/home.html @@ -42,7 +42,7 @@ {{if .Admin}}
  • {{tr "AdminPanel"}}
  • {{else}} -
  • {{tr Login}}
  • +
  • {{tr "Login"}}
  • {{end}} @@ -133,10 +133,10 @@ diff --git a/resource/template/theme-daynight/service.html b/resource/template/theme-daynight/service.html index 3661f5d..83a4470 100644 --- a/resource/template/theme-daynight/service.html +++ b/resource/template/theme-daynight/service.html @@ -86,10 +86,10 @@ diff --git a/resource/template/theme-hotaru/home.html b/resource/template/theme-hotaru/home.html index 4ca5df2..c26242d 100644 --- a/resource/template/theme-hotaru/home.html +++ b/resource/template/theme-hotaru/home.html @@ -28,14 +28,9 @@
    -

    +

    {{.Title}}

    -
    -

    - {{tr "StatusTips"}} -

    -
    @@ -135,8 +130,8 @@
    IDRuleSeverDate FromDate To{{tr "Rules"}}{{tr "Server"}}{{tr "From"}}{{tr "To"}} MAX MINCheck NextUsage{{tr "NextCheck"}}{{tr "CurrentUsage"}}