From 368eb89cd9259c8be5f3cff5f7c23929812c6523 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Wed, 21 Feb 2024 02:24:28 +0100
Subject: [PATCH] revert main page style

---
 web/html/xui/index.html                | 67 +++++++++++++++-----------
 web/translation/translate.en_US.toml   |  2 +-
 web/translation/translate.fa_IR.toml   |  6 +--
 web/translation/translate.ru_RU.toml   |  2 +-
 web/translation/translate.vi_VN.toml   |  2 +-
 web/translation/translate.zh_Hans.toml |  2 +-
 6 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/web/html/xui/index.html b/web/html/xui/index.html
index c542ea88..05cb6b6f 100644
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -83,23 +83,14 @@
             <transition name="list" appear>
                 <a-row>
                     <a-col :sm="24" :md="12">
-                        <a-card hoverable> 
-                            <strong>{{ i18n "pages.index.machineInfo" }}:</strong>
-                            <a-tooltip>
-                            <template slot="title">
-                            {{ i18n "pages.index.hostname" }}
-                            </template>
-                            <a-tag color="blue" style="margin-right: 3px;">[[ status.hostInfo.hostname ]]</a-tag>
+                        <a-card hoverable>
+                            <strong>{{ i18n "pages.inbounds.stream.tcp.version" }}:</strong>
+                            <a href="https://github.com/alireza0/x-ui/releases" target="_blank">
+                                <a-tag color="purple" style="cursor: pointer;">X-UI {{ .cur_ver }}</a-tag>
+                            </a>
+                            <a-tooltip title='{{ i18n "pages.index.xraySwitch" }}'>
+                                <a-tag color="purple" style="cursor: pointer;" @click="openSelectV2rayVersion">Xray [[ status.xray.version ]]</a-tag>
                             </a-tooltip>
-                            <template v-if="status.hostInfo.ipv4">    
-                            <a-tooltip>
-                                <template slot="title">
-                                  IPv4:<br>[[ status.hostInfo.ipv4 ]]<br>IPv6:<br>[[ status.hostInfo.ipv6 ]]
-                            </template>
-                                <a-tag color="blue" style="margin-right: 3px;">IPv4/v6</a-tag>
-                              </a-tooltip>
-                            <a href="https://github.com/alireza0/x-ui/releases" target="_blank"><a-tag color="purple">X-UI {{ .cur_ver }}</a-tag></a>
-                            </template>
                         </a-card>
                     </a-col>
                     <a-col :sm="24" :md="12">
@@ -134,10 +125,7 @@
                                 <a-icon type="exclamation-circle"></a-icon>
                             </a-popover>
                             <a-tag color="purple" style="cursor: pointer; margin-right: 3px;" @click="stopXrayService">{{ i18n "pages.index.stopXray" }}</a-tag>
-                            <a-tag color="purple" style="cursor: pointer; margin-right: 3px;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>
-                            <a-tooltip title='{{ i18n "pages.index.xraySwitch" }}'>
-                                <a-tag color="purple" style="cursor: pointer;" @click="openSelectV2rayVersion">[[ status.xray.version ]]</a-tag>
-                            </a-tooltip>                   
+                            <a-tag color="purple" style="cursor: pointer; margin-right: 3px;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>             
                         </a-card>
                     </a-col>
                     <a-col :sm="24" :md="12">
@@ -154,20 +142,43 @@
                             <a-tooltip>
                                 <template slot="title">
                                     {{ i18n "pages.index.systemLoadDesc" }}
-                                    </template>
-                            <a-tag color="blue">[[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]</a-tag>
-                        </a-tooltip>
+                                </template>
+                                <a-tag color="blue">[[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]</a-tag>
+                            </a-tooltip>
                         </a-card>
                     </a-col>
                     <a-col :sm="24" :md="12">
                         <a-card hoverable>
                             <strong>{{ i18n "usage" }}:</strong>
-                            <a-tooltip>
                             <a-tag color="blue" style="margin-right: 3px;">RAM [[ sizeFormat(status.appStats.mem) ]]</a-tag>
-                            </a-tooltip>
+                            <a-tag color="blue">Threads [[ status.appStats.threads ]]</a-tag>
+                        </a-card>
+                    </a-col>
+                    <a-col :sm="24" :md="12">
+                        <a-card hoverable>
+                            <strong>{{ i18n "pages.index.serverInfo" }}:</strong>
                             <a-tooltip>
-                              <a-tag color="blue">Threads [[ status.appStats.threads ]]</a-tag>
+                                <template slot="title">
+                                    {{ i18n "pages.index.hostname" }}
+                                </template>
+                                <a-tag color="blue" style="margin-right: 3px;">[[ status.hostInfo.hostname ]]</a-tag>
                             </a-tooltip>
+                            <template v-if="status.hostInfo.ipv4">    
+                                <a-tooltip>
+                                    <template slot="title">
+                                        [[ status.hostInfo.ipv4 ]]
+                                    </template>
+                                    <a-tag color="blue" style="margin-right: 3px;">IPv4</a-tag>
+                                </a-tooltip>
+                            </template>
+                            <template v-if="status.hostInfo.ipv6">
+                                <a-tooltip>
+                                    <template slot="title">
+                                        [[ status.hostInfo.ipv6 ]]
+                                    </template>
+                                    <a-tag color="blue" style="margin-right: 3px;">IPv6</a-tag>
+                                </a-tooltip>
+                            </template>
                         </a-card>
                     </a-col>
                     <a-col :sm="24" :md="12">
@@ -179,7 +190,7 @@
                                         <template slot="title">
                                             {{ i18n "pages.index.connectionTcpCountDesc" }}
                                         </template>
-                                        <strong>TCP:</Strong> [[ status.tcpCount ]]
+                                        <strong>TCP:</Strong> <a-tag>[[ status.tcpCount ]]</a-tag>
                                     </a-tooltip>
                                 </a-col>
                                 <a-col :span="12">
@@ -188,7 +199,7 @@
                                         <template slot="title">
                                             {{ i18n "pages.index.connectionUdpCountDesc" }}
                                         </template>
-                                        <strong>UDP:</strong> [[ status.udpCount ]]
+                                        <strong>UDP:</strong> <a-tag>[[ status.udpCount ]]</a-tag>
                                     </a-tooltip>
                                 </a-col>
                             </a-row>
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 46929880..bf784a02 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -78,7 +78,7 @@
 "title" = "Overview"
 "memory" = "RAM"
 "hard" = "Disk"
-"machineInfo" = "Machine"
+"serverInfo" = "Server"
 "hostname" = "Hostname"
 "xrayStatus" = "Xray"
 "stopXray" = "Stop"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index 6f2ae39d..367d41b7 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -78,7 +78,7 @@
 "title" = "نمای کلی"
 "memory" = "RAM"
 "hard" = "Disk"
-"machineInfo" = "ماشین"
+"serverInfo" = "سرور"
 "hostname" = "نام میزبان"
 "xrayStatus" = "‌ایکس‌ری"
 "stopXray" = "توقف"
@@ -311,8 +311,8 @@
 "advancedTemplate" = "پیشرفته"
 "generalConfigs" = "استراتژی‌ کلی"
 "generalConfigsDesc" = "این گزینه‌ها استراتژی کلی ترافیک را تعیین می‌کنند"
-"logConfigs" = "لاگ"
-"logConfigsDesc" = "لاگ ها ممکن است بر کارایی سرور شما تأثیر بگذارند. توصیه می شود فقط در صورت نیاز آن را آگاهانه فعال کنید"
+"logConfigs" = "گزارش‌ها"
+"logConfigsDesc" = "گزارش‌ها ممکن است بر کارایی سرور شما تأثیر بگذارند. توصیه می شود فقط در صورت نیاز آن را آگاهانه فعال کنید"
 "blockConfigs" = "سپر محافظ"
 "blockConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس پروتکل‌های درخواستی خاص، و وب سایت‌ها مسدود می‌کند"
 "blockCountryConfigs" = "مسدودسازی کشور"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index 883bdba3..54cd98ef 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -78,7 +78,7 @@
 "title" = "Статус системы"
 "memory" = "ОЗУ"
 "hard" = "Место на диске"
-"machineInfo" = "Машина"
+"serverInfo" = "Сервер"
 "hostname" = "Имя хоста"
 "xrayStatus" = "Xray"
 "stopXray" = "Остановка"
diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
index fdf456b6..91aa6b99 100644
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -78,7 +78,7 @@
 "title" = "Trạng thái hệ thống"
 "memory" = "Bộ nhớ"
 "hard" = "Ổ cứng"
-"machineInfo" = "Máy"
+"serverInfo" = "Máy chủ"
 "hostname" = "Tên máy chủ"
 "xrayStatus" = "Xray"
 "stopXray" = "Dừng"
diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml
index 9067b0df..c6933047 100644
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -78,7 +78,7 @@
 "title" = "系统状态"
 "memory" = "内存"
 "hard" = "硬盘"
-"machineInfo" = "机器"
+"serverInfo" = "服务器"
 "hostname" = "主机名"
 "xrayStatus" = "Xray"
 "stopXray" = "停止"