From 8636f6d6b8e4d05e31d0ef5ae2ab8b68773d1a07 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Mon, 5 Sep 2022 20:08:48 +0200
Subject: [PATCH] refactor UI

---
 .../themes/booty/css/bludit.bootstrap.css     |  4 --
 bl-kernel/admin/themes/booty/html/sidebar.php | 14 +++---
 bl-kernel/admin/views/dashboard.php           | 44 ++++++++++++++++---
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/bl-kernel/admin/themes/booty/css/bludit.bootstrap.css b/bl-kernel/admin/themes/booty/css/bludit.bootstrap.css
index e99a96ae..7ccce8f3 100644
--- a/bl-kernel/admin/themes/booty/css/bludit.bootstrap.css
+++ b/bl-kernel/admin/themes/booty/css/bludit.bootstrap.css
@@ -24,10 +24,6 @@ a.text-danger:hover {
 }
 
 /* Buttons */
-.btn {
-	border-radius: 2px;
-}
-
 .btn-primary {
 	background-color: #0078D4;
 	border-color: #0078D4;
diff --git a/bl-kernel/admin/themes/booty/html/sidebar.php b/bl-kernel/admin/themes/booty/html/sidebar.php
index 5a2508b5..36835d03 100644
--- a/bl-kernel/admin/themes/booty/html/sidebar.php
+++ b/bl-kernel/admin/themes/booty/html/sidebar.php
@@ -31,30 +31,30 @@
 		<h4><?php $L->p('Manage') ?></h4>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'content' ?>"><?php $L->p('Content') ?></a>
+		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'content' ?>"><span class="fa fa-folder"></span><?php $L->p('Content') ?></a>
 	</li>
 
 	<li class="nav-item">
-		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'categories' ?>"><?php $L->p('Categories') ?></a>
+		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'categories' ?>"><span class="fa fa-bookmark"></span><?php $L->p('Categories') ?></a>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>"><?php $L->p('Users') ?></a>
+		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>"><span class="fa fa-users"></span><?php $L->p('Users') ?></a>
 	</li>
 
 	<li class="nav-item mt-3">
 		<h4><?php $L->p('Settings') ?></h4>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'settings' ?>"><?php $L->p('General') ?></a>
+		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'settings' ?>"><span class="fa fa-gear"></span><?php $L->p('General') ?></a>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'plugins' ?>"><?php $L->p('Plugins') ?></a>
+		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'plugins' ?>"><span class="fa fa-puzzle-piece"></span><?php $L->p('Plugins') ?></a>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'themes' ?>"><?php $L->p('Themes') ?></a>
+		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'themes' ?>"><span class="fa fa-desktop"></span><?php $L->p('Themes') ?></a>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'about' ?>"><?php $L->p('About') ?></a>
+		<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'about' ?>"><span class="fa fa-info"></span><?php $L->p('About') ?></a>
 	</li>
 
 	<?php endif; ?>
diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php
index c1606fd5..a9d4269c 100644
--- a/bl-kernel/admin/views/dashboard.php
+++ b/bl-kernel/admin/views/dashboard.php
@@ -5,11 +5,21 @@
 			<!-- Good message -->
 			<div>
 			<h2 id="hello-message" class="pt-0">
-				<span class="fa fa-hand-spock-o"></span><span><?php echo $L->g('hello') ?></span>
+				<?php
+					$username = $login->username();
+					$user = new User($username);
+					$name = '';
+					if ($user->nickname()) {
+						$name = $user->nickname();
+					} elseif ($user->firstName()) {
+						$name = $user->firstName();
+					}
+				?>
+				<span class="fa fa-hand-spock-o"></span><span><?php echo $L->g('hello').' '.$name ?></span>
 			</h2>
 			<script>
 			$( document ).ready(function() {
-				$("#hello-message").fadeOut(1000, function() {
+				$("#hello-message").fadeOut(2400, function() {
 					var date = new Date()
 					var hours = date.getHours()
 					if (hours > 6 && hours < 12) {
@@ -27,10 +37,10 @@
 			</div>
 
 			<!-- Quick Links -->
-			<div class="container border-bottom pb-5" id="jsclippyContainer">
+			<div class="container pb-5" id="jsclippyContainer">
 
 				<div class="row">
-					<div class="col">
+					<div class="col p-0">
 						<div class="form-group">
 						<select id="jsclippy" class="clippy" name="state"></select>
 						</div>
@@ -93,7 +103,7 @@
 			});
 			</script>
 			</div>
-			<div class="container mt-4">
+			<div class="container border-top pt-4 mt-4">
 				<div class="row">
 					<div class="col">
 						<a class="quick-links text-center" target="_blank" href="https://docs.bludit.com">
@@ -108,12 +118,32 @@
 						</a>
 					</div>
 					<div class="col">
-						<a class="quick-links text-center" target="_blank" href="https://gitter.im/bludit/support">
+						<a class="quick-links text-center" target="_blank" href="https://discord.gg/CFaXEdZWds">
 							<div class="fa fa-comments quick-links-icons"></div>
 							<div><?php $L->p('Chat support') ?></div>
 						</a>
 					</div>
 				</div>
+				<div class="row">
+					<div class="col">
+						<a class="quick-links text-center" target="_blank" href="https://themes.bludit.com">
+							<div class="fa fa-desktop quick-links-icons"></div>
+							<div><?php $L->p('Themes') ?></div>
+						</a>
+					</div>
+					<div class="col border-left border-right">
+						<a class="quick-links text-center" target="_blank" href="https://plugins.bludit.com">
+							<div class="fa fa-puzzle-piece quick-links-icons"></div>
+							<div><?php $L->p('Plugins') ?></div>
+						</a>
+					</div>
+					<div class="col">
+						<a class="quick-links text-center" target="_blank" href="https://github.com/bludit/bludit">
+							<div class="fa fa-github quick-links-icons"></div>
+							<div><?php $L->p('GitHub') ?></div>
+						</a>
+					</div>
+				</div>
 			</div>
 
 			<?php Theme::plugins('dashboard') ?>
@@ -122,7 +152,7 @@
 
 			<!-- Notifications -->
 			<ul class="list-group list-group-striped b-0">
-			<li class="list-group-item pt-0"><h4><?php $L->p('Notifications') ?></h4></li>
+			<li class="list-group-item pt-0"><h4 class="m-0"><?php $L->p('Notifications') ?></h4></li>
 			<?php
 			$logs = array_slice($syslog->db, 0, NOTIFICATIONS_AMOUNT);
 			foreach ($logs as $log) {