From 87a5190b7d2e01678a6fbb08722e1326692f3530 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Sun, 7 May 2023 17:12:47 +0330
Subject: v1.4.0

---
 web/html/xui/client_bulk_modal.html         | 24 +++++++++++++++++++++---
 web/html/xui/form/client.html               | 25 ++++++++++++++++++++++---
 web/html/xui/form/protocol/dokodemo.html    |  2 ++
 web/html/xui/form/protocol/shadowsocks.html | 24 +++++++++++++++++++++---
 web/html/xui/form/protocol/socks.html       |  2 ++
 web/html/xui/form/protocol/trojan.html      | 22 ++++++++++++++++++++--
 web/html/xui/form/protocol/vless.html       | 24 +++++++++++++++++++++---
 web/html/xui/form/protocol/vmess.html       | 25 ++++++++++++++++++++++---
 web/html/xui/form/stream/stream_kcp.html    | 12 ++++++++++--
 web/html/xui/form/tls_settings.html         |  4 ++--
 web/html/xui/inbound_info_modal.html        |  2 +-
 11 files changed, 144 insertions(+), 22 deletions(-)

(limited to 'web/html')

diff --git a/web/html/xui/client_bulk_modal.html b/web/html/xui/client_bulk_modal.html
index e856c6df..709e0fac 100644
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -33,10 +33,28 @@
             <span slot="label">{{ i18n "pages.client.clientCount" }}</span>
             <a-input-number v-model="clientsBulkModal.quantity" :min="1" :max="100"></a-input-number>
         </a-form-item>
-        <a-form-item label="Subscription">
-            <a-input v-model.trim="clientsBulkModal.subId"></a-input>
+        <a-form-item v-if="client.email">
+                <span slot="label">
+                    Subscription
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
+                <a-input v-model.trim="clientsBulkModal.subId"></a-input>
         </a-form-item>
-        <a-form-item label="Telegram ID">
+        <a-form-item>
+            <span slot="label">
+                Telegram ID
+                <a-tooltip>
+                    <template slot="title">
+                        <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
+                    </template>
+                    <a-icon type="question-circle" theme="filled"></a-icon>
+                </a-tooltip>
+            </span>
             <a-input v-model.trim="clientsBulkModal.tgId"></a-input>
         </a-form-item>
         <a-form-item>
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html
index 017bd7dc..5f65756c 100644
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -23,16 +23,35 @@
         <a-icon v-if="inbound.protocol === Protocols.SHADOWSOCKS" @click="client.password = RandomUtil.randomShadowsocksPassword()" type="sync"> </a-icon>
         <a-input v-model.trim="client.password" style="width: 300px;" ></a-input>
     </a-form-item>
+    <br>
     <a-form-item label='{{ i18n "additional" }} ID' v-if="inbound.protocol === Protocols.VMESS">
         <a-input-number v-model="client.alterId"></a-input-number>
     </a-form-item>
     <a-form-item label="ID" v-if="inbound.protocol === Protocols.VMESS || inbound.protocol === Protocols.VLESS">
         <a-input v-model.trim="client.id" style="width: 300px;"></a-input>
     </a-form-item>
-	<a-form-item label="Subscription" v-if="client.email">
+	<a-form-item v-if="client.email">
+        <span slot="label">
+            Subscription
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
+                </template>
+                <a-icon type="question-circle" theme="filled"></a-icon>
+            </a-tooltip>
+        </span>
         <a-input v-model.trim="client.subId"></a-input>
-    </a-form-item>
-    <a-form-item label="Telegram Username" v-if="client.email">
+</a-form-item>
+    <a-form-item v-if="client.email">
+        <span slot="label">
+            Telegram ID
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
+                </template>
+                <a-icon type="question-circle" theme="filled"></a-icon>
+            </a-tooltip>
+        </span>
         <a-input v-model.trim="client.tgId"></a-input>
     </a-form-item>
 	<a-form-item>
diff --git a/web/html/xui/form/protocol/dokodemo.html b/web/html/xui/form/protocol/dokodemo.html
index f9204b8c..3e9e51ee 100644
--- a/web/html/xui/form/protocol/dokodemo.html
+++ b/web/html/xui/form/protocol/dokodemo.html
@@ -6,6 +6,7 @@
     <a-form-item label='{{ i18n "pages.inbounds.destinationPort"}}'>
         <a-input-number v-model="inbound.settings.port"></a-input-number>
     </a-form-item>
+    <br>
     <a-form-item label='{{ i18n "pages.inbounds.network"}}'>
         <a-select v-model="inbound.settings.network" style="width: 100px;" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
             <a-select-option value="tcp,udp">TCP+UDP</a-select-option>
@@ -13,6 +14,7 @@
             <a-select-option value="udp">UDP</a-select-option>
         </a-select>
     </a-form-item>
+    <br>
     <a-form-item label="FollowRedirect">
         <a-switch v-model="inbound.settings.followRedirect"></a-switch>
     </a-form-item>
diff --git a/web/html/xui/form/protocol/shadowsocks.html b/web/html/xui/form/protocol/shadowsocks.html
index c739ae10..35912d61 100644
--- a/web/html/xui/form/protocol/shadowsocks.html
+++ b/web/html/xui/form/protocol/shadowsocks.html
@@ -18,10 +18,28 @@
                 <a-icon @click="client.password = RandomUtil.randomShadowsocksPassword()" type="sync"> </a-icon>
                 <a-input v-model.trim="client.password" style="width: 250px;"></a-input>
             </a-form-item>
-            <a-form-item label="Subscription" v-if="client.email">
+            <a-form-item v-if="client.email">
+                <span slot="label">
+                    Subscription
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
                 <a-input v-model.trim="client.subId"></a-input>
-            </a-form-item>
-            <a-form-item label="Telegram Username" v-if="client.email">
+        </a-form-item>
+            <a-form-item v-if="client.email">
+                <span slot="label">
+                    Telegram ID
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
                 <a-input v-model.trim="client.tgId"></a-input>
             </a-form-item>
             <a-form-item>
diff --git a/web/html/xui/form/protocol/socks.html b/web/html/xui/form/protocol/socks.html
index 89cde72c..a3096d48 100644
--- a/web/html/xui/form/protocol/socks.html
+++ b/web/html/xui/form/protocol/socks.html
@@ -4,6 +4,7 @@
         <a-switch :checked="inbound.settings.auth === 'password'"
                   @change="checked => inbound.settings.auth = checked ? 'password' : 'noauth'"></a-switch>
     </a-form-item>
+    <br>
     <template v-if="inbound.settings.auth === 'password'">
         <a-form-item label='{{ i18n "username" }}'>
             <a-input v-model.trim="inbound.settings.accounts[0].user"></a-input>
@@ -12,6 +13,7 @@
             <a-input v-model.trim="inbound.settings.accounts[0].pass"></a-input>
         </a-form-item>
     </template>
+    <br>
     <a-form-item label='{{ i18n "pages.inbounds.enable" }} udp'>
         <a-switch v-model="inbound.settings.udp"></a-switch>
     </a-form-item>
diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html
index 9c392926..983c0ba9 100644
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -17,10 +17,28 @@
             <a-form-item label="Password">
                 <a-input v-model.trim="client.password" style="width: 150px;"></a-input>
             </a-form-item>
-            <a-form-item label="Subscription" v-if="client.email">
+            <a-form-item v-if="client.email">
+                <span slot="label">
+                    Subscription
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
                 <a-input v-model.trim="client.subId"></a-input>
             </a-form-item>
-            <a-form-item label="Telegram Username" v-if="client.email">
+            <a-form-item v-if="client.email">
+                <span slot="label">
+                    Telegram ID
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
                 <a-input v-model.trim="client.tgId"></a-input>
             </a-form-item>
             <a-form-item>
diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html
index c9547ae9..6b35c3fa 100644
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -17,10 +17,28 @@
             <a-form-item label="ID">
                 <a-input v-model.trim="client.id"  style="width: 300px;"></a-input>
             </a-form-item>
-            <a-form-item label="Subscription" v-if="client.email">
+            <a-form-item v-if="client.email">
+                <span slot="label">
+                    Subscription
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
                 <a-input v-model.trim="client.subId"></a-input>
-            </a-form-item>
-            <a-form-item label="Telegram Username" v-if="client.email">
+        </a-form-item>
+            <a-form-item v-if="client.email">
+                <span slot="label">
+                    Telegram ID
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
                 <a-input v-model.trim="client.tgId"></a-input>
             </a-form-item>
             <a-form-item>
diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html
index 0591d3d6..7fc9b630 100644
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -18,13 +18,32 @@
             <a-form-item label='{{ i18n "additional" }} ID'>
                 <a-input-number v-model="client.alterId"></a-input-number>
             </a-form-item>
+            <br>
             <a-form-item label="ID">
                 <a-input v-model.trim="client.id" style="width: 300px;"></a-input>
             </a-form-item>
-            <a-form-item label="Subscription" v-if="client.email">
+            <a-form-item v-if="client.email">
+                <span slot="label">
+                    Subscription
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
                 <a-input v-model.trim="client.subId"></a-input>
-            </a-form-item>
-            <a-form-item label="Telegram Username" v-if="client.email">
+        </a-form-item>
+            <a-form-item v-if="client.email">
+                <span slot="label">
+                    Telegram ID
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
                 <a-input v-model.trim="client.tgId"></a-input>
             </a-form-item>
             <a-form-item>
diff --git a/web/html/xui/form/stream/stream_kcp.html b/web/html/xui/form/stream/stream_kcp.html
index 52a930f9..07a7d600 100644
--- a/web/html/xui/form/stream/stream_kcp.html
+++ b/web/html/xui/form/stream/stream_kcp.html
@@ -1,7 +1,7 @@
 {{define "form/streamKCP"}}
 <a-form layout="inline">
     <a-form-item label='{{ i18n "camouflage" }}'>
-        <a-select v-model="inbound.stream.kcp.type" style="width: 280px;">
+        <a-select v-model="inbound.stream.kcp.type" style="width: 280px;" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
             <a-select-option value="none">None (Not Camouflage)</a-select-option>
             <a-select-option value="srtp">SRTP (Camouflage Video Call)</a-select-option>
             <a-select-option value="utp">UTP (Camouflage BT Download)</a-select-option>
@@ -10,27 +10,35 @@
             <a-select-option value="wireguard">Wireguard (Camouflage Wireguard Packages)</a-select-option>
         </a-select>
     </a-form-item>
+    <br>
     <a-form-item label='{{ i18n "password" }}'>
         <a-input v-model="inbound.stream.kcp.seed"></a-input>
-    </a-form-item><br />
+    </a-form-item>
+    <br>
     <a-form-item label="MTU">
         <a-input-number v-model="inbound.stream.kcp.mtu"></a-input-number>
     </a-form-item>
+    <br>
     <a-form-item label="TTI (ms)">
         <a-input-number v-model="inbound.stream.kcp.tti"></a-input-number>
     </a-form-item>
+    <br>
     <a-form-item label="Uplink Capacity (MB/S)">
         <a-input-number v-model="inbound.stream.kcp.upCap"></a-input-number>
     </a-form-item>
+    <br>
     <a-form-item label="Downlink Capacity (MB/S)">
         <a-input-number v-model="inbound.stream.kcp.downCap"></a-input-number>
     </a-form-item>
+    <br>
     <a-form-item label="Congestion">
         <a-switch v-model="inbound.stream.kcp.congestion"></a-switch>
     </a-form-item>
+    <br>
     <a-form-item label="Read Buffer Size (MB)">
         <a-input-number v-model="inbound.stream.kcp.readBuffer"></a-input-number>
     </a-form-item>
+    <br>
     <a-form-item label="Write Buffer Size (MB)">
         <a-input-number v-model="inbound.stream.kcp.writeBuffer"></a-input-number>
     </a-form-item>
diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index 7962acf3..e6e0bece 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -10,7 +10,7 @@
             Reality
             <a-tooltip>
                 <template slot="title">
-                  <span>{{ i18n "pages.inbounds.Realitydec" }}</span>
+                  <span>{{ i18n "pages.inbounds.realityDesc" }}</span>
                 </template>
                 <a-icon type="question-circle" theme="filled"></a-icon>
             </a-tooltip>
@@ -22,7 +22,7 @@
             XTLS
             <a-tooltip>
                 <template slot="title">
-                  <span>{{ i18n "pages.inbounds.XTLSdec" }}</span>
+                  <span>{{ i18n "pages.inbounds.xtlsDesc" }}</span>
                 </template>
                 <a-icon type="question-circle" theme="filled"></a-icon>
             </a-tooltip>
diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html
index 489a9a61..053e9724 100644
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -112,7 +112,7 @@
             <td><a :href="[[ subBase + infoModal.clientSettings.subId ]]" target="_blank">[[ subBase + infoModal.clientSettings.subId ]]</a></td>
         </tr>
         <tr v-if="infoModal.clientSettings.tgId">
-            <td>Telegram Username</td>
+            <td>Telegram ID</td>
             <td><a :href="[[ tgBase + infoModal.clientSettings.tgId ]]" target="_blank">@[[ infoModal.clientSettings.tgId ]]</a></td>
         </tr>
     </table>
-- 
cgit v1.2.3