v1.4.0

6 files changed, 88 insertions, 11 deletions

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>