Update.

xOS · Oct 3, 2022 · 0bbcc4b · 0bbcc4b
1 parent a14cbfe
commit 0bbcc4b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/resource/l10n/en-US.toml b/resource/l10n/en-US.toml
@@ -217,6 +217,9 @@ other = "Greater numbers will be displayed first"
 [Secret]
 other = "Secret"
 
+[CopySecret]
+other="Copy Secret"
+
 [Note]
 other = "Note"
 

diff --git a/resource/l10n/zh-CN.toml b/resource/l10n/zh-CN.toml
@@ -203,7 +203,7 @@ other = "批量修改分组"
 other = "输入分组名称"
 
 [ServerGroup]
-other = "服务器分组"
+other = "分组"
 
 [EinsteinLightspeed1]
 other = "北京"
@@ -217,6 +217,9 @@ other = "越大越靠前"
 [Secret]
 other = "密钥"
 
+[CopySecret]
+other="复制密钥"
+
 [Note]
 other = "备注"
 
@@ -236,7 +239,7 @@ other = "最后执行"
 other = "最后结果"
 
 [Administration]
-other = "管理"
+other = "操作"
 
 [CoverAll]
 other = "覆盖所有"
@@ -299,7 +302,7 @@ other = "强制更新"
 other = "全选"
 
 [VersionNumber]
-other = "版本号"
+other = "版本"
 
 [OneKeyInstall]
 other = "一键安装"
@@ -626,4 +629,4 @@ other = "流量剩余"
 other = "管理后台主题"
 
 [HideForGuest]
-other = "对游客隐藏"
+other = "仅管理可见"
diff --git a/resource/static/main.css b/resource/static/main.css
@@ -598,6 +598,10 @@ i.logout.icon {
     color: #ef1505 !important;
 }
 
+i.copy.icon {
+    color: #FF9800 !important;
+}
+
 i.edit.icon {
     color: #21ba45 !important;
 }

diff --git a/resource/template/common/footer.html b/resource/template/common/footer.html
@@ -11,7 +11,9 @@
 <script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/vue/2.6.14/vue.min.js"></script>
 <script src="static/main.js?v20221003"></script>
 <script src="static/wallpaper.js?v20220423"></script>
+<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/clipboard.js/2.0.6/clipboard.min.js"></script>
 <script>
+    var clipboard = new ClipboardJS('.ui.icon.mini.button');
     var def_bg = document.getElementById('def_background');
     if (def_bg) {
         Wallpaper.init(def_bg);

diff --git a/resource/template/common/header.html b/resource/template/common/header.html
@@ -19,7 +19,7 @@
     <link href="static/osi/osi.css?v0.22.0" rel="stylesheet">
     <link href="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/flag-icon-css/4.1.5/css/flag-icons.min.css" rel="stylesheet">
     <link rel="stylesheet" type="text/css" href="static/semantic-ui-alerts.min.css?v20220423">
-    <link rel="stylesheet" type="text/css" href="static/main.css?v20220624">
+    <link rel="stylesheet" type="text/css" href="static/main.css?v20221003">
     <link rel="shortcut icon" type="image/png" href="static/logo.svg?v20220602" />
 </head>
 <body id="bg">

diff --git a/resource/template/dashboard-default/api.html b/resource/template/dashboard-default/api.html
@@ -13,8 +13,9 @@
         <table class="ui very basic table">
             <thead>
             <tr>
-                <th>{{tr "Token"}}</th>
+                <th>{{tr "APIToken"}}</th>
                 <th>{{tr "Note"}}</th>
+                <th>{{tr "Administration"}}</th>
             </tr>
             </thead>
             <tbody>
@@ -24,6 +25,9 @@
                 <td>{{$token.Note}}</td>
                 <td>
                     <div class="ui mini icon buttons">
+                        <button class="ui icon mini button" data-clipboard-text="{{$token.Token}}">
+                            <i class="copy icon"></i>
+                        </button>
                         <button class="ui button"
                                 onclick="showConfirm('{{tr "DeleteToken"}}'+'[{{$token.Note}}]','{{tr "ConfirmToDeleteThisToken"}}',deleteRequest,'/api/token/'+{{$token.Token}})">
                         <i class="trash alternate outline icon"></i>

diff --git a/resource/template/dashboard-default/server.html b/resource/template/dashboard-default/server.html
@@ -3,7 +3,7 @@
     <div class="ui container">
         <div class="ui grid">
             <div class="right floated right aligned twelve wide column">
-                <button class="ui right labeled nezha-primary-btn icon button" onclick="batchEditServerGroup()"><i
+                <button class="ui right labeled server-primary-btn icon button" onclick="batchEditServerGroup()"><i
                         class="edit icon"></i> {{tr "BatchEditServerGroup"}}
                 </button>
                 <button class="ui right labeled server-primary-btn icon button" onclick="addOrEditServer()"><i
@@ -24,7 +24,7 @@
                     <th>{{tr "IPAddress"}}</th>
                     <th>{{tr "VersionNumber"}}</th>
                     <th>{{tr "HideForGuest"}}</th>
-                    <th>{{tr "Secret"}}</th>
+                    <th>{{tr "CopySecret"}}</th>
                     <th>{{tr "OneKeyInstall"}}</th>
                     <th>{{tr "Note"}}</th>
                     <th>{{tr "Administration"}}</th>
@@ -40,11 +40,12 @@
                     <td>{{$server.Host.IP}}</td>
                     <td>{{$server.Host.Version}}</td>
                     <td>{{$server.HideForGuest}}</td>
-                    <td>
-                        <div class="ui mini icon buttons">
-						<button class="ui icon mini button" data-clipboard-text="{{$server.Secret}}">
+                    <td><button class="ui icon mini button" data-clipboard-text="{{$server.Secret}}">
                             <i class="copy icon"></i>
                         </button>
+                    </td>
+                    <td>
+                        <div class="ui mini icon buttons">
                         <button class="ui icon mini button" data-clipboard-text="{{if $.Conf.GRPCHost}}curl -L https://fastly.jsdelivr.net/gh/xos/serverstatus@master/script/server-status.sh -o server-status.sh && chmod +x server-status.sh && ./server-status.sh install_agent {{$.Conf.GRPCHost}} {{if $.Conf.ProxyGRPCPort}}{{$.Conf.ProxyGRPCPort}}{{else}}{{$.Conf.GRPCPort}}{{end}} {{$server.Secret}}{{if $.Conf.TLS}} --tls{{end}}{{else}}{{tr "NoDomainAlert"}}{{end}}"
                             data-tooltip="{{tr "ClickToCopyTheInstallationCommand"}}">
                             <i class="linux icon"></i>
@@ -76,9 +77,7 @@
     </div>
 </div>
 {{template "component/server" .}} {{template "common/footer" .}}
-<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/clipboard.js/2.0.6/clipboard.min.js"></script>
 <script>
-    var clipboard = new ClipboardJS('.ui.icon.mini.button');
     const checkBoxList = document.querySelectorAll('tbody > tr > td > input.server-servers[type=checkbox]')
 
     function checkAllServer() {