From b35172b28630b546235b0a6cba0b50afbe1d36f1 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Wed, 25 Sep 2019 20:18:36 +0200
Subject: [PATCH] Open current tab after refresh page

---
 bl-kernel/admin/themes/booty/css/bludit.css |  2 --
 bl-kernel/admin/themes/booty/index.php      | 29 +++++++++------------
 bl-kernel/admin/themes/booty/init.php       |  2 +-
 bl-kernel/admin/views/edit-user.php         | 17 +++++++++++-
 bl-kernel/admin/views/new-content.php       |  3 +++
 5 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/bl-kernel/admin/themes/booty/css/bludit.css b/bl-kernel/admin/themes/booty/css/bludit.css
index 8b79cb37..31a51fc8 100644
--- a/bl-kernel/admin/themes/booty/css/bludit.css
+++ b/bl-kernel/admin/themes/booty/css/bludit.css
@@ -57,8 +57,6 @@ div.sidebar .nav-item h4 {
 	padding-top: 2px;
 }
 
-
-
 /*
 	BOOTSTRAP Hacks
 */
diff --git a/bl-kernel/admin/themes/booty/index.php b/bl-kernel/admin/themes/booty/index.php
index 04122023..cf34121f 100644
--- a/bl-kernel/admin/themes/booty/index.php
+++ b/bl-kernel/admin/themes/booty/index.php
@@ -12,25 +12,29 @@
 
 	<!-- CSS -->
 	<?php
-		echo Theme::cssBootstrap(); // Bootstrap
-		echo Theme::cssLineAwesome(); // Icons
+		echo Theme::cssBootstrap();
+		echo Theme::cssLineAwesome();
 		echo Theme::css(array(
-			'jquery-auto-complete.css',
-			'jquery.datetimepicker.min.css',
 			'bludit.css',
 			'bludit.bootstrap.css'
 		), DOMAIN_ADMIN_THEME_CSS);
+		echo Theme::css(array(
+			'jquery.datetimepicker.min.css',
+			'select2.min.css',
+			'select2-bootstrap4.min.css'
+		), DOMAIN_CORE_CSS);
 	?>
 
 	<!-- Javascript -->
 	<?php
 		echo Theme::jquery();
 		echo Theme::jsBootstrap();
-		echo Theme::js(array(
-			'jquery-auto-complete.min.js',
-			'jquery.datetimepicker.full.min.js'
-		), DOMAIN_ADMIN_THEME_JS);
 		echo Theme::jsSortable();
+		echo Theme::js(array(
+			'jquery.datetimepicker.full.min.js',
+			'select2.full.min.js',
+			'functions.js'
+		), DOMAIN_CORE_JS);
 	?>
 
 	<!-- Plugins -->
@@ -48,10 +52,6 @@
 	include(PATH_CORE_JS.'variables.php');
 	echo '</script>'.PHP_EOL;
 
-	echo '<script charset="utf-8">'.PHP_EOL;
-	include(PATH_CORE_JS.'functions.php');
-	echo '</script>'.PHP_EOL;
-
 	echo '<script charset="utf-8">'.PHP_EOL;
 	include(PATH_CORE_JS.'bludit-ajax.php');
 	echo '</script>'.PHP_EOL;
@@ -89,11 +89,8 @@
 	</div>
 </div>
 
-<!-- Check user logged and Internet connection -->
-<?php include('html/user-logged.php'); ?>
-
 <!-- Plugins -->
 <?php Theme::plugins('adminBodyEnd') ?>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/bl-kernel/admin/themes/booty/init.php b/bl-kernel/admin/themes/booty/init.php
index 80aeb2c0..77b1ffa1 100644
--- a/bl-kernel/admin/themes/booty/init.php
+++ b/bl-kernel/admin/themes/booty/init.php
@@ -180,7 +180,7 @@ EOF;
 
 		$html = '<div class="form-group row">';
 
-		if (isset($args['label'])) {
+		if (!empty($args['label'])) {
 			$html .= '<label for="'.$id.'" class="col-sm-2 col-form-label">'.$args['label'].'</label>';
 		}
 
diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php
index b373a029..cff399cf 100644
--- a/bl-kernel/admin/views/edit-user.php
+++ b/bl-kernel/admin/views/edit-user.php
@@ -272,4 +272,19 @@
 	</div>
 </div>
 
-<?php echo Bootstrap::formClose(); ?>
\ No newline at end of file
+<?php echo Bootstrap::formClose(); ?>
+
+<script>
+	// Open current tab after refresh page
+	$(function() {
+		$('a[data-toggle="tab"]').on('click', function(e) {
+			window.localStorage.setItem('activeTab', $(e.target).attr('href'));
+			console.log($(e.target).attr('href'));
+		});
+		var activeTab = window.localStorage.getItem('activeTab');
+		if (activeTab) {
+			$('#nav-tab a[href="' + activeTab + '"]').tab('show');
+			window.localStorage.removeItem("activeTab");
+		}
+	});
+</script>
\ No newline at end of file
diff --git a/bl-kernel/admin/views/new-content.php b/bl-kernel/admin/views/new-content.php
index 83c727d9..6a5c0ecd 100644
--- a/bl-kernel/admin/views/new-content.php
+++ b/bl-kernel/admin/views/new-content.php
@@ -213,8 +213,10 @@ echo Bootstrap::formOpen(array(
 					'disabled'=>true
 				));
 			?>
+
 			<script>
 			$(document).ready(function() {
+
 				// Changes in External cover image input
 				$("#jsexternalCoverImage").change(function() {
 					$("#jscoverImage").val( $(this).val() );
@@ -366,6 +368,7 @@ echo Bootstrap::formOpen(array(
 	}
 ?>
 
+
 <!-- Title -->
 <div id="jseditorTitle" class="form-group mb-1">
 	<input id="jstitle" name="title" type="text" class="form-control form-control-lg rounded-0" value="" placeholder="<?php $L->p('Enter title') ?>">