From 7b8bbf024a77450a6240f661ee006289aae12349 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jmiller-moko@noreply.git.mokoconsulting.tech>
Date: Tue, 2 Jun 2026 10:17:32 -0500
Subject: [PATCH] fix: consolidate cpanel bottom rows into single compact bar
 [skip ci]

Merged disk/IP/versions, plugin badges, and quick actions into one
inline row with border separators. Icons-only for action buttons.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../mod_mokowaas_cpanel/tmpl/default.php      | 83 ++++++++-----------
 1 file changed, 33 insertions(+), 50 deletions(-)

diff --git a/src/packages/mod_mokowaas_cpanel/tmpl/default.php b/src/packages/mod_mokowaas_cpanel/tmpl/default.php
index 56f79d4f..7c22b258 100644
--- a/src/packages/mod_mokowaas_cpanel/tmpl/default.php
+++ b/src/packages/mod_mokowaas_cpanel/tmpl/default.php
@@ -117,69 +117,52 @@ $diskColor = ($diskPct !== null && $diskPct > 90) ? 'bg-danger' : (($diskPct !==
 		</div>
 	</div>
 
-	<!-- Disk + IP + Versions row -->
-	<div class="d-flex flex-wrap align-items-center gap-3 mb-3 small text-muted">
+	<!-- Info + plugins + actions (consolidated) -->
+	<div class="d-flex flex-wrap align-items-center gap-2 small">
 		<?php if ($showDisk && $diskPct !== null): ?>
-		<div class="d-flex align-items-center gap-1">
+		<span class="text-muted d-inline-flex align-items-center gap-1">
 			<span class="icon-hdd" aria-hidden="true"></span>
-			<span>Disk <?php echo $diskPct; ?>%</span>
-			<div class="progress" style="width:60px;height:6px">
-				<div class="progress-bar <?php echo $diskColor; ?>" style="width:<?php echo $diskPct; ?>%"></div>
-			</div>
-			<span><?php echo number_format(($disk->free_mb ?? 0) / 1024, 1); ?> GB free</span>
-		</div>
+			<?php echo $diskPct; ?>%
+			<span class="progress d-inline-flex" style="width:40px;height:5px"><span class="progress-bar <?php echo $diskColor; ?>" style="width:<?php echo $diskPct; ?>%"></span></span>
+			<?php echo number_format(($disk->free_mb ?? 0) / 1024, 1); ?>G free
+		</span>
 		<?php endif; ?>
 		<?php if ($showIp && $currentIp): ?>
-		<div>
-			<span class="icon-globe" aria-hidden="true"></span>
-			Your IP: <code><?php echo htmlspecialchars($currentIp); ?></code>
-		</div>
+		<span class="text-muted"><span class="icon-globe" aria-hidden="true"></span> <code><?php echo htmlspecialchars($currentIp); ?></code></span>
 		<?php endif; ?>
 		<?php if ($showVersions): ?>
-		<div class="ms-auto">
-			Joomla <?php echo htmlspecialchars($siteInfo->joomla_version ?? ''); ?> / PHP <?php echo htmlspecialchars($siteInfo->php_version ?? ''); ?>
-		</div>
+		<span class="text-muted">J<?php echo htmlspecialchars($siteInfo->joomla_version ?? ''); ?> / PHP <?php echo htmlspecialchars($siteInfo->php_version ?? ''); ?></span>
 		<?php endif; ?>
-	</div>
-	<?php endif; ?>
-
-	<?php if ($showPlugins && !empty($plugins)): ?>
-	<!-- Feature plugin badges -->
-	<div class="d-flex align-items-center gap-2 mb-3">
-		<small class="text-muted"><?php echo Text::sprintf('MOD_MOKOWAAS_CPANEL_PLUGINS_SUMMARY', $enabledCount, $totalCount); ?></small>
-		<div class="d-flex flex-wrap gap-1">
-			<?php foreach ($plugins as $p): ?>
-				<?php
-					$label     = $labels[$p->element] ?? $p->element;
-					$badge     = $p->enabled ? 'bg-success' : 'bg-secondary';
-					$icon      = $p->enabled ? 'icon-check' : 'icon-times';
-					$configUrl = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . (int) $p->extension_id);
-				?>
-				<a href="<?php echo $configUrl; ?>" class="badge <?php echo $badge; ?> text-decoration-none" title="<?php echo htmlspecialchars($p->name); ?> — click to configure">
-					<span class="<?php echo $icon; ?>" aria-hidden="true"></span>
-					<?php echo htmlspecialchars($label); ?>
-				</a>
-			<?php endforeach; ?>
-		</div>
-	</div>
-	<?php endif; ?>
-
-	<?php if ($showActions): ?>
-	<!-- Quick action buttons -->
-	<div class="d-flex flex-wrap gap-2">
-		<button type="button" class="btn btn-sm btn-outline-secondary" id="mokowaas-cpanel-cache"
+		<?php if ($showPlugins && !empty($plugins)): ?>
+		<span class="border-start ps-2 ms-1"></span>
+		<?php foreach ($plugins as $p): ?>
+			<?php
+				$label     = $labels[$p->element] ?? $p->element;
+				$badge     = $p->enabled ? 'bg-success' : 'bg-secondary';
+				$icon      = $p->enabled ? 'icon-check' : 'icon-times';
+				$configUrl = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . (int) $p->extension_id);
+			?>
+			<a href="<?php echo $configUrl; ?>" class="badge <?php echo $badge; ?> text-decoration-none" title="<?php echo htmlspecialchars($p->name); ?>">
+				<span class="<?php echo $icon; ?>" aria-hidden="true"></span> <?php echo htmlspecialchars($label); ?>
+			</a>
+		<?php endforeach; ?>
+		<?php endif; ?>
+		<?php if ($showActions): ?>
+		<span class="border-start ps-2 ms-1"></span>
+		<button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" id="mokowaas-cpanel-cache"
 			data-url="<?php echo Route::_('index.php?option=com_mokowaas&task=display.clearCache&format=json'); ?>"
-			data-token="<?php echo $token; ?>">
-			<span class="icon-trash" aria-hidden="true"></span> Clear Cache
+			data-token="<?php echo $token; ?>" title="Clear Cache">
+			<span class="icon-trash" aria-hidden="true"></span>
 		</button>
-		<a href="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" class="btn btn-sm btn-outline-secondary">
-			<span class="icon-refresh" aria-hidden="true"></span> Check Updates
+		<a href="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" class="btn btn-sm btn-outline-secondary py-0 px-1" title="Check Updates">
+			<span class="icon-refresh" aria-hidden="true"></span>
 		</a>
 		<?php if ($counts->updates > 0): ?>
-		<a href="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" class="btn btn-sm btn-warning">
-			<span class="icon-upload" aria-hidden="true"></span> <?php echo $counts->updates; ?> Update<?php echo $counts->updates > 1 ? 's' : ''; ?> Available
+		<a href="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" class="badge bg-warning text-dark text-decoration-none">
+			<span class="icon-upload" aria-hidden="true"></span> <?php echo $counts->updates; ?> update<?php echo $counts->updates > 1 ? 's' : ''; ?>
 		</a>
 		<?php endif; ?>
+		<?php endif; ?>
 	</div>
 	<?php endif; ?>