From df5fd34ddeac6be485cdec747c7e166e2a7ff855 Mon Sep 17 00:00:00 2001
From: Anaggh S <anagghscm@gmail.com>
Date: Thu, 16 Aug 2018 17:49:21 +0530
Subject: [PATCH] Remove invalid span, plugin fixes

---
 bl-kernel/admin/themes/booty/html/navbar.php |  2 +-
 bl-kernel/helpers/theme.class.php            |  4 +--
 bl-plugins/links/plugin.php                  | 35 +++++++++++---------
 bl-plugins/sitemap/plugin.php                |  8 +++--
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/bl-kernel/admin/themes/booty/html/navbar.php b/bl-kernel/admin/themes/booty/html/navbar.php
index cd0521fd..7ab7cd6d 100644
--- a/bl-kernel/admin/themes/booty/html/navbar.php
+++ b/bl-kernel/admin/themes/booty/html/navbar.php
@@ -12,7 +12,7 @@
       <a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'new-content' ?>"><?php $L->p('New content') ?></a>
       </li>
       <li class="nav-item">
-      <a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'content' ?>"></span><?php $L->p('Content') ?></a>
+      <a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'content' ?>"><?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>
diff --git a/bl-kernel/helpers/theme.class.php b/bl-kernel/helpers/theme.class.php
index 60bf1099..f994f788 100644
--- a/bl-kernel/helpers/theme.class.php
+++ b/bl-kernel/helpers/theme.class.php
@@ -28,7 +28,7 @@ class Theme {
 
 	public static function rssUrl()
 	{
-		if (pluginEnabled('pluginRSS')) {
+		if (pluginActivated('pluginRSS')) {
 			return DOMAIN_BASE.'rss.xml';
 		}
 		return false;
@@ -36,7 +36,7 @@ class Theme {
 
 	public static function sitemapUrl()
 	{
-		if (pluginEnabled('pluginSitemap')) {
+		if (pluginActivated('pluginSitemap')) {
 			return DOMAIN_BASE.'sitemap.xml';
 		}
 		return false;
diff --git a/bl-plugins/links/plugin.php b/bl-plugins/links/plugin.php
index 4ab7cef3..252b745d 100644
--- a/bl-plugins/links/plugin.php
+++ b/bl-plugins/links/plugin.php
@@ -64,55 +64,58 @@ class pluginLinks extends Plugin {
 	{
 		global $L;
 
-		$html  = '<div>';
+		$html  = '<div class="alert alert-primary" role="alert">';
+		$html .= $this->description();
+		$html .= '</div>';
+
+		$html .= '<div>';
 		$html .= '<label>'.$L->get('Label').'</label>';
-		$html .= '<input name="label" type="text" value="'.$this->getValue('label').'">';
+		$html .= '<input name="label" class="form-control" type="text" value="'.$this->getValue('label').'">';
 		$html .= '<span class="tip">'.$L->get('This title is almost always used in the sidebar of the site').'</span>';
 		$html .= '</div>';
 
 		$html .= '<div>';
-		$html .= '<button name="save" class="btn btn-primary" type="submit">'.$L->get('Save').'</button>';
+		$html .= '<button name="save" class="btn btn-primary my-2" type="submit">'.$L->get('Save').'</button>';
 		$html .= '</div>';
 
 		// New link, when the user click on save button this call the method post()
 		// and the new link is added to the database
-		$html .= '<legend>'.$L->get('Add a new link').'</legend>';
+		$html .= '<h4 class="mt-3">'.$L->get('Add a new link').'</h4>';
 
 		$html .= '<div>';
 		$html .= '<label>'.$L->get('Name').'</label>';
-		$html .= '<input name="linkName" type="text" value="">';
+		$html .= '<input name="linkName" type="text" class="form-control" value="" placeholder="Bludit">';
 		$html .= '</div>';
 
 		$html .= '<div>';
 		$html .= '<label>'.$L->get('Url').'</label>';
-		$html .= '<input name="linkURL" type="text" value="">';
+		$html .= '<input name="linkURL" type="text" class="form-control" value="" placeholder="https://www.bludit.com/">';
 		$html .= '</div>';
 
 		$html .= '<div>';
-		$html .= '<button name="addLink" class="blue" type="submit">'.$L->get('Add').'</button>';
+		$html .= '<button name="addLink" class="btn btn-primary my-2" type="submit">'.$L->get('Add').'</button>';
 		$html .= '</div>';
 
-		$html .= '<legend>'.$L->get('Links').'</legend>';
-
 		// Get the JSON DB, getValue() with the option unsanitized HTML code
 		$jsondb = $this->getValue('jsondb', $unsanitized=false);
 		$links = json_decode($jsondb, true);
+
+		$html .= !empty($links) ? '<h4 class="mt-3">'.$L->get('Links').'</h4>' : '';
+
 		foreach($links as $name=>$url) {
-			$html .= '<div>';
+			$html .= '<div class="my-2">';
 			$html .= '<label>'.$L->get('Name').'</label>';
-			$html .= '<input type="text" value="'.$name.'" disabled>';
+			$html .= '<input type="text" class="form-control" value="'.$name.'" disabled>';
 			$html .= '</div>';
 
 			$html .= '<div>';
 			$html .= '<label>'.$L->get('Url').'</label>';
-			$html .= '<input type="text" value="'.$url.'" disabled>';
+			$html .= '<input type="text" class="form-control" value="'.$url.'" disabled>';
 			$html .= '</div>';
 
 			$html .= '<div>';
-			$html .= '<button name="deleteLink" type="submit" value="'.$name.'">'.$L->get('Delete').'</button>';
+			$html .= '<button name="deleteLink" class="btn btn-secondary my-2" type="submit" value="'.$name.'">'.$L->get('Delete').'</button>';
 			$html .= '</div>';
-
-			$html .= '</br>';
 		}
 
 		return $html;
@@ -150,4 +153,4 @@ class pluginLinks extends Plugin {
 
 		return $html;
 	}
-}
\ No newline at end of file
+}
diff --git a/bl-plugins/sitemap/plugin.php b/bl-plugins/sitemap/plugin.php
index 691dc57e..0f1067a9 100644
--- a/bl-plugins/sitemap/plugin.php
+++ b/bl-plugins/sitemap/plugin.php
@@ -12,7 +12,11 @@ class pluginSitemap extends Plugin {
 	{
 		global $L;
 
-		$html  = '<div>';
+		$html  = '<div class="alert alert-primary" role="alert">';
+		$html .= $this->description();
+		$html .= '</div>';
+
+		$html .= '<div>';
 		$html .= '<label>'.$L->get('Sitemap URL').'</label>';
 		$html .= '<a href="'.Theme::sitemapUrl().'">'.Theme::sitemapUrl().'</a>';
 		$html .= '</div>';
@@ -114,4 +118,4 @@ class pluginSitemap extends Plugin {
 			exit(0);
 		}
 	}
-}
\ No newline at end of file
+}