From 12e6340632e885fe48f70c50ece702c5a325cfee Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Mon, 24 Jul 2023 09:27:38 +0800
Subject: [PATCH] * Adjust style of host.

---
 module/host/css/treemap.css         |  2 ++
 module/host/js/browse.ui.js         | 15 ++++++++++++++-
 module/host/ui/browse.html.php      |  6 ++++--
 module/serverroom/css/common.ui.css |  2 +-
 module/serverroom/ui/edit.html.php  |  2 ++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/module/host/css/treemap.css b/module/host/css/treemap.css
index 6e946bb511..6d4452981e 100644
--- a/module/host/css/treemap.css
+++ b/module/host/css/treemap.css
@@ -1 +1,3 @@
 #hostsTreemap {white-space: nowrap;}
+.m-host-treemap #subHeader .container {background: white; margin-bottom: 12px;}
+.m-host-treemap #subHeader .container #subNavbar {text-align: center;}
\ No newline at end of file
diff --git a/module/host/js/browse.ui.js b/module/host/js/browse.ui.js
index f0c0aba9d3..1cd652aa99 100644
--- a/module/host/js/browse.ui.js
+++ b/module/host/js/browse.ui.js
@@ -4,4 +4,17 @@ window.createSortLink = function(col)
     if(sort == orderBy) sort = col.name + '_desc';
 
     return sortLink.replace('{orderBy}', sort);
-}
\ No newline at end of file
+}
+
+window.renderCell = function(result, {col, row})
+{
+    if(col.name === 'osVersion')
+    {
+        const{osName, osVersion} = row.data;
+        if(osName) result[0] = {html: hostLang[osName + 'List'][osVersion]};
+
+        return result;
+    }
+
+    return result;
+};
diff --git a/module/host/ui/browse.html.php b/module/host/ui/browse.html.php
index 3e13eca11a..63f3cabeaf 100644
--- a/module/host/ui/browse.html.php
+++ b/module/host/ui/browse.html.php
@@ -12,8 +12,9 @@ declare(strict_types=1);
 
 namespace zin;
 
-jsVar('orderBy',  $orderBy);
-jsVar('sortLink', helper::createLink('host', 'browse', "browseType=$browseType&param=$param&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"));
+jsVar('orderBy',   $orderBy);
+jsVar('hostLang',  $lang->host);
+jsVar('sortLink',  helper::createLink('host', 'browse', "browseType=$browseType&param=$param&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"));
 
 $config->host->featureBar[0]['active'] = true;
 $config->host->featureBar[0]['badge']  = $pager->recTotal != '' ? array('text' => $pager->recTotal, 'class' => 'size-sm rounded-full white') : null;
@@ -58,6 +59,7 @@ dtable
     set::cols(array_values($config->host->dtable->fieldList)),
     set::data($tableData),
     set::sortLink(jsRaw('createSortLink')),
+    set::onRenderCell(jsRaw('window.renderCell')),
     set::footPager(usePager()),
 );
 
diff --git a/module/serverroom/css/common.ui.css b/module/serverroom/css/common.ui.css
index c1fffdf5aa..233e6cd0bd 100644
--- a/module/serverroom/css/common.ui.css
+++ b/module/serverroom/css/common.ui.css
@@ -1 +1 @@
-#serverroomCreateForm .form-row {width: 50%;}
\ No newline at end of file
+#serverroomCreateForm .form-row {width: 600px;}
\ No newline at end of file
diff --git a/module/serverroom/ui/edit.html.php b/module/serverroom/ui/edit.html.php
index 51fb50f609..475f4f0551 100644
--- a/module/serverroom/ui/edit.html.php
+++ b/module/serverroom/ui/edit.html.php
@@ -20,6 +20,7 @@ formPanel
     (
         formGroup
         (
+            set::width('600px'),
             set::name('name'),
             set::label($lang->serverroom->name),
             set::value($serverRoom->name),
@@ -29,6 +30,7 @@ formPanel
     (
         formGroup
         (
+            set::width('600px'),
             set::name('bandwidth'),
             set::label($lang->serverroom->bandwidth),
             set::value($serverRoom->bandwidth),