From 2de6b6a3b1bc5744fe2fb987918ff2a0b062ccb7 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Tue, 20 Apr 2021 23:21:44 +0200
Subject: [PATCH] PopEye theme updates

---
 bl-kernel/boot/rules/69.pages.php | 14 +++++--------
 bl-themes/popeye/css/helpers.css  | 16 ++++++++++++++
 bl-themes/popeye/css/style.css    | 35 +++++++++++++++++++++++++++++--
 bl-themes/popeye/index.php        |  2 +-
 bl-themes/popeye/php/footer.php   | 20 +++++++++---------
 bl-themes/popeye/php/home.php     | 22 +++++++++----------
 bl-themes/popeye/php/navbar.php   | 11 +++++-----
 bl-themes/popeye/php/page.php     | 21 +++++++++----------
 8 files changed, 92 insertions(+), 49 deletions(-)
 create mode 100644 bl-themes/popeye/css/helpers.css

diff --git a/bl-kernel/boot/rules/69.pages.php b/bl-kernel/boot/rules/69.pages.php
index aa613ed2..58651653 100644
--- a/bl-kernel/boot/rules/69.pages.php
+++ b/bl-kernel/boot/rules/69.pages.php
@@ -16,7 +16,7 @@
 */
 $content = array();
 
-// Page filtered by the user, is a Page Object
+// Page filtered by the user, will be a Page Object
 $page = false;
 
 // Array with static content, each item is a Page Object
@@ -29,7 +29,7 @@ $page = false;
 		N => Page Object
 	)
 */
-$staticContent = $staticPages = buildStaticPages();
+$staticContent = buildStaticPages();
 
 // ============================================================================
 // Main
@@ -61,7 +61,7 @@ if ($site->homepage() && $url->whereAmI()==='home') {
 
 // Build specific page
 if ($url->whereAmI()==='page') {
-	$content[0] = $page = buildThePage();
+	$page = buildThePage();
 }
 // Build content by tag
 elseif ($url->whereAmI()==='tag') {
@@ -73,14 +73,10 @@ elseif ($url->whereAmI()==='category') {
 }
 // Build content for the homepage
 elseif ( ($url->whereAmI()==='home') || ($url->whereAmI()==='blog') ) {
-        $content = buildPagesForHome();
-}
-
-if (isset($content[0])) {
-	$page = $content[0];
+    $content = buildPagesForHome();
 }
 
 // If set notFound, create the page 404
 if ($url->notFound()) {
-	$content[0] = $page = buildErrorPage();
+	$page = buildErrorPage();
 }
diff --git a/bl-themes/popeye/css/helpers.css b/bl-themes/popeye/css/helpers.css
new file mode 100644
index 00000000..0bce3543
--- /dev/null
+++ b/bl-themes/popeye/css/helpers.css
@@ -0,0 +1,16 @@
+/* HELPERs */
+.color-blue {
+	color: #0a58ca;
+}
+
+.color-light {
+    color: #495057;
+}
+
+.bold {
+	font-weight: 600;
+}
+
+.italic {
+    font-style: italic;
+}
\ No newline at end of file
diff --git a/bl-themes/popeye/css/style.css b/bl-themes/popeye/css/style.css
index 5fc9f877..3170c372 100755
--- a/bl-themes/popeye/css/style.css
+++ b/bl-themes/popeye/css/style.css
@@ -9,9 +9,40 @@ a:hover {
 	color: #0a58ca;
 }
 
-.page-date {
+img {
+	max-width: 100%;
+}
+
+pre, code {
+	color: #f8f8f8;
+	background-color: #495057;
+}
+
+code {
+	display: inline-block;
+	padding: 0 0.5em;
+	line-height: 1.4em;
+	border-radius: 3px;
+}
+
+pre {
+	overflow-x: scroll;
+	padding: 1.6rem 2.2rem;
+	line-height: 1.5;
+	border-radius: 5px !important;
+}
+
+/* PAGE */
+section.page h1.title {
+	font-size: 2rem;
+}
+
+section.page .description {
+    font-style: italic;
+}
+
+section.page a {
 	color: #0a58ca;
-	font-weight: 600;
 }
 
 /* VIDEO EMBED RESPONSIVE */
diff --git a/bl-themes/popeye/index.php b/bl-themes/popeye/index.php
index 900b53ec..23489286 100755
--- a/bl-themes/popeye/index.php
+++ b/bl-themes/popeye/index.php
@@ -21,7 +21,7 @@
 	<?php echo HTML::cssBootstrapIcons(); ?>
 
 	<!-- Include CSS Styles from this theme -->
-	<?php echo HTML::css('css/style.css'); ?>
+	<?php echo HTML::css(array('css/style.css', 'css/helpers.css')); ?>
 
 	<!-- Execute Bludit plugins for the hook "Site head" -->
 	<?php execPluginsByHook('siteHead'); ?>
diff --git a/bl-themes/popeye/php/footer.php b/bl-themes/popeye/php/footer.php
index e4cf68ba..52f5fe8e 100644
--- a/bl-themes/popeye/php/footer.php
+++ b/bl-themes/popeye/php/footer.php
@@ -1,12 +1,12 @@
 <footer class="bd-footer p-3 p-md-5 mt-5 bg-light text-center text-sm-start">
-  <div class="container">
-    <ul class="bd-footer-links ps-0 mb-3">
-      <li class="d-inline-block"><a href="#">GitHub</a></li>
-      <li class="d-inline-block ms-3"><a href="#">Twitter</a></li>
-      <li class="d-inline-block ms-3"><a href="#">Facebook</a></li>
-      <li class="d-inline-block ms-3"><a href="#">About</a></li>
-    </ul>
-    <p class="mb-0">Design for Bludit v4.0</p>
-    <p class="mb-0">Running over Bludit CMS</p>
-  </div>
+	<div class="container">
+		<ul class="bd-footer-links ps-0 mb-3">
+			<?php foreach (HTML::socialNetworks() as $key => $name) {
+				echo '<li class="d-inline-block p-2"><i class="me-2 bi bi-' . $key . '"></i>' . $name . '</li>';
+			}
+			?>
+		</ul>
+		<p class="mb-0">Design for Bludit v4.0</p>
+		<p class="mb-0">Running over Bludit CMS</p>
+	</div>
 </footer>
\ No newline at end of file
diff --git a/bl-themes/popeye/php/home.php b/bl-themes/popeye/php/home.php
index d07265a6..ddb27014 100644
--- a/bl-themes/popeye/php/home.php
+++ b/bl-themes/popeye/php/home.php
@@ -1,11 +1,11 @@
-<!-- Site logo and description -->
-<header class="bg-light p-3">
+<header class="p-3">
 	<div class="container text-center">
-
+		<!-- Site logo -->
 		<div class="site-logo">
 			<img class="img-thumbnail rounded mx-auto d-block" height="150px" width="150px" src="<?php echo ($site->logo()?$site->logo():HTML_PATH_THEME_IMG.'logo.svg') ?>" alt="">
 		</div>
 
+		<!-- Site description -->
 		<?php if ($site->description()) : ?>
 			<div class="site-description mt-2">
 				<p><?php echo $site->description(); ?></p>
@@ -28,19 +28,19 @@
 				<!-- Search input -->
 				<form class="d-flex mb-4">
 					<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
-					<button class="btn btn-outline-success" type="submit">Search</button>
+					<button class="btn btn-outline-primary" type="submit">Search</button>
 				</form>
 				<!-- Pages -->
 				<div class="list-group list-group-flush">
-					<?php foreach ($content as $page) : ?>
+					<?php foreach ($content as $tmp) : ?>
 						<div class="list-group-item pt-3 pb-3" aria-current="true">
 							<div class="d-flex w-100 justify-content-between">
 								<!-- Print page's title -->
-								<a href="<?php echo $page->url() ?>">
-									<h5 class="mb-1"><?php echo $page->title() ?></h5>
+								<a href="<?php echo $tmp->url() ?>">
+									<h5 class="mb-1"><?php echo $tmp->title() ?></h5>
 								</a>
 								<!-- Print page's date -->
-								<small class="page-date"><?php echo $page->relativeTime() ?></small>
+								<small class="color-blue bold"><?php echo $tmp->relativeTime() ?></small>
 							</div>
 
 							<!-- Print page's description -->
@@ -48,10 +48,10 @@
 
 							<!-- Print page's tags -->
 							<?php
-							$tmp = $page->tags(true);
-							if (!empty($tmp)) {
+							$tagsList = $tmp->tags(true);
+							if (!empty($tagsList)) {
 								echo '<small>';
-								foreach ($tmp as $tagKey => $tagName) {
+								foreach ($tagsList as $tagKey => $tagName) {
 									echo '<a class="badge bg-light text-dark text-decoration-none" href="' . DOMAIN_TAGS . $tagKey . '">' . $tagName . '</a>';
 								}
 								echo '</small>';
diff --git a/bl-themes/popeye/php/navbar.php b/bl-themes/popeye/php/navbar.php
index 4e817b0f..a567f5e7 100644
--- a/bl-themes/popeye/php/navbar.php
+++ b/bl-themes/popeye/php/navbar.php
@@ -1,11 +1,12 @@
-<nav class="navbar sticky-top navbar-light bg-light">
+<nav class="navbar sticky-top">
 	<div class="container">
 		<a class="navbar-brand" href="<?php echo $site->url() ?>"><?php echo $site->title() ?></a>
 		<div class="d-flex">
-			<?php foreach (HTML::socialNetworks() as $key=>$name) {
-				echo '<span class="p-2"><i class="me-2 bi bi-'.$key.'"></i>'.$name.'</span>';
-			}
-			?>
+				<!-- Static pages -->
+				<?php foreach ($staticContent as $tmp): ?>
+					<a href="<?php echo $tmp->url(); ?>"><?php echo $tmp->title(); ?></a>
+				<?php endforeach ?>
 		</div>
 	</div>
+
 </nav>
\ No newline at end of file
diff --git a/bl-themes/popeye/php/page.php b/bl-themes/popeye/php/page.php
index 91713bda..b1ca75cd 100644
--- a/bl-themes/popeye/php/page.php
+++ b/bl-themes/popeye/php/page.php
@@ -1,23 +1,22 @@
-<section class="page">
+<section class="page mt-4 mb-4">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-8 mx-auto">
+			<div class="col-lg-6 mx-auto">
 				<!-- Load Bludit Plugins: Page Begin -->
 				<?php execPluginsByHook('pageBegin'); ?>
 
+				<!-- Page information -->
+				<div class="page-information form-text">
+					<span><?php echo $page->date() ?></span>
+					<span class="ps-3"><?php echo $page->readingTime().' '.$L->g('read') ?></span>
+				</div>
+
 				<!-- Page title -->
 				<h1 class="title"><?php echo $page->title(); ?></h1>
 
 				<!-- Page description -->
 				<?php if ($page->description()): ?>
-				<p class="page-description"><?php echo $page->description(); ?></p>
-				<?php endif ?>
-
-				<!-- Page cover image -->
-				<?php if ($page->coverImage()): ?>
-				<div class="page-cover-image py-6 mb-4" style="background-image: url('<?php echo $page->coverImage(); ?>');">
-					<div style="height: 300px;"></div>
-				</div>
+				<p class="italic mt-1 mb-3 color-light"><?php echo $page->description(); ?></p>
 				<?php endif ?>
 
 				<!-- Page content -->
@@ -30,4 +29,4 @@
 			</div>
 		</div>
 	</div>
-</section>
+</section>
\ No newline at end of file