From b0747fb9da1a71bd1fc4278dddab9d2525685ec5 Mon Sep 17 00:00:00 2001
From: Hai Zheng <hai.zheng@litespeedtech.com>
Date: Thu, 26 Sep 2024 11:32:40 -0400
Subject: [PATCH] Dash GUI tune

---
 tpl/dash/dashboard.tpl.php | 132 +++++++++++++++++++------------------
 1 file changed, 68 insertions(+), 64 deletions(-)

diff --git a/tpl/dash/dashboard.tpl.php b/tpl/dash/dashboard.tpl.php
index a5118bd23..12c8bd1f9 100644
--- a/tpl/dash/dashboard.tpl.php
+++ b/tpl/dash/dashboard.tpl.php
@@ -35,76 +35,80 @@
 <div class="litespeed-dashboard">
 
 	<?php if (!$__cloud->activated()) : ?>
+		<div class="litespeed-dashboard-group">
+			<div class="litespeed-flex-container">
+
+				<div class="postbox litespeed-postbox litespeed-postbox-cache">
+					<div class="inside">
+						<h3 class="litespeed-title">
+							<?php echo __('Cache Status', 'litespeed-cache'); ?>
+							<a href="<?php echo admin_url('admin.php?page=litespeed-cache'); ?>" class="litespeed-title-right-icon"><?php echo __('More', 'litespeed-cache'); ?></a>
+						</h3>
+
+						<?php
+						$cache_list = array(
+							Base::O_CACHE			=> __('Public Cache', 'litespeed-cache'),
+							Base::O_CACHE_PRIV		=> __('Private Cache', 'litespeed-cache'),
+							Base::O_OBJECT			=> __('Object Cache', 'litespeed-cache'),
+							Base::O_CACHE_BROWSER	=> __('Browser Cache', 'litespeed-cache'),
+						);
+						foreach ($cache_list as $id => $title) :
+						?>
+							<p>
+								<?php if ($this->conf($id)) : ?>
+									<span class="litespeed-label-success litespeed-label-dashboard">ON</span>
+								<?php else : ?>
+									<span class="litespeed-label-danger litespeed-label-dashboard">OFF</span>
+								<?php endif; ?>
+								<?php echo esc_html($title); ?>
+							</p>
+						<?php endforeach; ?>
+					</div>
+				</div>
 
-		<div class="postbox litespeed-postbox litespeed-postbox-cache">
-			<div class="inside">
-				<h3 class="litespeed-title">
-					<?php echo __('Cache Status', 'litespeed-cache'); ?>
-					<a href="<?php echo admin_url('admin.php?page=litespeed-cache'); ?>" class="litespeed-title-right-icon"><?php echo __('More', 'litespeed-cache'); ?></a>
-				</h3>
-
-				<?php
-				$cache_list = array(
-					Base::O_CACHE			=> __('Public Cache', 'litespeed-cache'),
-					Base::O_CACHE_PRIV		=> __('Private Cache', 'litespeed-cache'),
-					Base::O_OBJECT			=> __('Object Cache', 'litespeed-cache'),
-					Base::O_CACHE_BROWSER	=> __('Browser Cache', 'litespeed-cache'),
-				);
-				foreach ($cache_list as $id => $title) :
-				?>
-					<p>
-						<?php if ($this->conf($id)) : ?>
-							<span class="litespeed-label-success litespeed-label-dashboard">ON</span>
-						<?php else : ?>
-							<span class="litespeed-label-danger litespeed-label-dashboard">OFF</span>
+				<div class="postbox litespeed-postbox litespeed-postbox-crawler">
+					<div class="inside">
+						<h3 class="litespeed-title">
+							<?php echo __('Crawler Status', 'litespeed-cache'); ?>
+							<a href="<?php echo admin_url('admin.php?page=litespeed-crawler'); ?>" class="litespeed-title-right-icon"><?php echo __('More', 'litespeed-cache'); ?></a>
+						</h3>
+
+						<p>
+							<code><?php echo count(Crawler::cls()->list_crawlers()); ?></code> <?php echo __('Crawler(s)', 'litespeed-cache'); ?>
+						</p>
+						<p>
+							<?php echo __('Currently active crawler', 'litespeed-cache'); ?>: <code><?php echo esc_html($crawler_summary['curr_crawler']); ?></code>
+						</p>
+
+						<?php if ($crawler_summary['curr_crawler_beginning_time']) : ?>
+							<p>
+								<b><?php echo __('Current crawler started at', 'litespeed-cache'); ?>:</b>
+								<?php echo Utility::readable_time($crawler_summary['curr_crawler_beginning_time']); ?>
+							</p>
 						<?php endif; ?>
-						<?php echo esc_html($title); ?>
-					</p>
-				<?php endforeach; ?>
-			</div>
-		</div>
 
-		<div class="postbox litespeed-postbox litespeed-postbox-crawler">
-			<div class="inside">
-				<h3 class="litespeed-title">
-					<?php echo __('Crawler Status', 'litespeed-cache'); ?>
-					<a href="<?php echo admin_url('admin.php?page=litespeed-crawler'); ?>" class="litespeed-title-right-icon"><?php echo __('More', 'litespeed-cache'); ?></a>
-				</h3>
-
-				<p>
-					<code><?php echo count(Crawler::cls()->list_crawlers()); ?></code> <?php echo __('Crawler(s)', 'litespeed-cache'); ?>
-				</p>
-				<p>
-					<?php echo __('Currently active crawler', 'litespeed-cache'); ?>: <code><?php echo esc_html($crawler_summary['curr_crawler']); ?></code>
-				</p>
-
-				<?php if ($crawler_summary['curr_crawler_beginning_time']) : ?>
-					<p>
-						<b><?php echo __('Current crawler started at', 'litespeed-cache'); ?>:</b>
-						<?php echo Utility::readable_time($crawler_summary['curr_crawler_beginning_time']); ?>
-					</p>
-				<?php endif; ?>
-
-				<?php if ($crawler_summary['last_start_time']) : ?>
-					<p class='litespeed-desc'>
-						<b><?php echo __('Last interval', 'litespeed-cache'); ?>:</b>
-						<?php echo Utility::readable_time($crawler_summary['last_start_time']); ?>
-					</p>
-				<?php endif; ?>
+						<?php if ($crawler_summary['last_start_time']) : ?>
+							<p class='litespeed-desc'>
+								<b><?php echo __('Last interval', 'litespeed-cache'); ?>:</b>
+								<?php echo Utility::readable_time($crawler_summary['last_start_time']); ?>
+							</p>
+						<?php endif; ?>
 
-				<?php if ($crawler_summary['end_reason']) : ?>
-					<p class='litespeed-desc'>
-						<b><?php echo __('Ended reason', 'litespeed-cache'); ?>:</b>
-						<?php echo esc_html($crawler_summary['end_reason']); ?>
-					</p>
-				<?php endif; ?>
+						<?php if ($crawler_summary['end_reason']) : ?>
+							<p class='litespeed-desc'>
+								<b><?php echo __('Ended reason', 'litespeed-cache'); ?>:</b>
+								<?php echo esc_html($crawler_summary['end_reason']); ?>
+							</p>
+						<?php endif; ?>
 
-				<?php if ($crawler_summary['last_crawled']) : ?>
-					<p class='litespeed-desc'>
-						<?php echo sprintf(__('<b>Last crawled:</b> %d item(s)', 'litespeed-cache'), $crawler_summary['last_crawled']); ?>
-					</p>
-				<?php endif; ?>
+						<?php if ($crawler_summary['last_crawled']) : ?>
+							<p class='litespeed-desc'>
+								<?php echo sprintf(__('<b>Last crawled:</b> %d item(s)', 'litespeed-cache'), $crawler_summary['last_crawled']); ?>
+							</p>
+						<?php endif; ?>
 
+					</div>
+				</div>
 			</div>
 		</div>