From 33c89e8bd7e96c6628ac3daee6f0afb9b44c13a3 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Fri, 20 Jul 2018 18:36:47 +0200
Subject: [PATCH] Plugin position implemented, fix in pagination

---
 bl-kernel/admin/themes/booty/css/bludit.css |  4 ++
 bl-kernel/admin/themes/booty/index.php      |  1 +
 bl-kernel/admin/themes/booty/init.php       | 14 +++++
 bl-kernel/admin/views/content.php           |  4 +-
 bl-kernel/admin/views/plugins-position.php  | 59 +++++++++++++--------
 bl-kernel/functions.php                     |  1 +
 bl-kernel/helpers/theme.class.php           |  6 +++
 bl-kernel/js/jquery.sortable.min.js         |  1 +
 bl-themes/alternative/php/home.php          | 18 +++----
 bl-themes/blogx/php/home.php                | 18 +++----
 index.php                                   |  4 ++
 11 files changed, 87 insertions(+), 43 deletions(-)
 create mode 100755 bl-kernel/js/jquery.sortable.min.js

diff --git a/bl-kernel/admin/themes/booty/css/bludit.css b/bl-kernel/admin/themes/booty/css/bludit.css
index 967aa879..90df3f23 100644
--- a/bl-kernel/admin/themes/booty/css/bludit.css
+++ b/bl-kernel/admin/themes/booty/css/bludit.css
@@ -61,6 +61,10 @@ code {
 	color: #444;
 }
 
+.list-group-sortable {
+	cursor: pointer;
+}
+
 /*
 	LOGIN
 */
diff --git a/bl-kernel/admin/themes/booty/index.php b/bl-kernel/admin/themes/booty/index.php
index 4bcbcfe4..0501a988 100644
--- a/bl-kernel/admin/themes/booty/index.php
+++ b/bl-kernel/admin/themes/booty/index.php
@@ -28,6 +28,7 @@
 			'jquery-auto-complete.min.js',
 			'jquery.datetimepicker.full.min.js'
 		), DOMAIN_ADMIN_THEME_JS);
+		echo Theme::jsSortable();
 	?>
 
 	<!-- Plugins -->
diff --git a/bl-kernel/admin/themes/booty/init.php b/bl-kernel/admin/themes/booty/init.php
index db5f1677..8e6e2acc 100644
--- a/bl-kernel/admin/themes/booty/init.php
+++ b/bl-kernel/admin/themes/booty/init.php
@@ -344,4 +344,18 @@ EOF;
 	{
 		return '<input type="hidden" id="js'.$args['name'].'" name="'.$args['name'].'" value="'.$args['value'].'">';
 	}
+
+	public static function alert($args)
+	{
+		$class = 'alert';
+		if (!empty($args['class'])) {
+			$class = $class.' '.$args['class'];
+		}
+
+		$text = $args['text'];
+
+return <<<EOF
+<div class="$class" role="alert">$text</div>
+EOF;
+	}
 }
diff --git a/bl-kernel/admin/views/content.php b/bl-kernel/admin/views/content.php
index 4dce83c5..3d7a631c 100644
--- a/bl-kernel/admin/views/content.php
+++ b/bl-kernel/admin/views/content.php
@@ -165,7 +165,7 @@ function table($type) {
 			<ul class="pagination flex-wrap justify-content-center">
 
 			<!-- First button -->
-			<li class="page-item">
+			<li class="page-item <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
 				<a class="page-link" href="<?php echo Paginator::firstPageUrl() ?>"><span class="align-middle oi oi-media-skip-backward"></span> <?php echo $Language->get('First'); ?></a>
 			</li>
 
@@ -180,7 +180,7 @@ function table($type) {
 			</li>
 
 			<!-- Last button -->
-			<li class="page-item">
+			<li class="page-item <?php if (!Paginator::showNext()) echo 'disabled' ?>">
 				<a class="page-link" href="<?php echo Paginator::lastPageUrl() ?>"><?php echo $Language->get('Last'); ?> <span class="align-middle oi oi-media-skip-forward"></span></a>
 			</li>
 
diff --git a/bl-kernel/admin/views/plugins-position.php b/bl-kernel/admin/views/plugins-position.php
index e22efb76..07ed5577 100644
--- a/bl-kernel/admin/views/plugins-position.php
+++ b/bl-kernel/admin/views/plugins-position.php
@@ -1,38 +1,53 @@
-<?php
+<?php defined('BLUDIT') or die('Bludit CMS.');
 
-HTML::title(array('title'=>$L->g('Plugins Position'), 'icon'=>'puzzle-piece'));
+echo Bootstrap::pageTitle(array('title'=>$L->g('Plugin position'), 'icon'=>'tags'));
 
-echo '<div class="hint">'.$L->g('drag-and-drop-to-set-the-position-of-the-plugin').'</div>';
+echo Bootstrap::alert(array('class'=>'alert-primary', 'text'=>$L->g('Drag and Drop to sort the plugins')));
 
-echo '<form class="uk-form" method="post" action="" autocomplete="off">';
+echo Bootstrap::formOpen(array('id'=>'jsform'));
 
-HTML::formInputHidden(array(
-	'name'=>'tokenCSRF',
-	'value'=>$security->getTokenCSRF()
-));
+	// Token CSRF
+	echo Bootstrap::formInputHidden(array(
+		'name'=>'tokenCSRF',
+		'value'=>$security->getTokenCSRF()
+	));
 
-echo '<div class="uk-sortable" data-uk-sortable>';
+	echo Bootstrap::formInputHidden(array(
+		'name'=>'plugin-list',
+		'value'=>''
+	));
 
-foreach ($plugins['siteSidebar'] as $Plugin) {
-	echo '<div class="plugin-position" data-plugin="'.$Plugin->className().'"><i class="uk-icon-bars"></i> '.$Plugin->name().'</div>';
-}
+	echo '<ul class="list-group list-group-sortable">';
+	foreach ($plugins['siteSidebar'] as $Plugin) {
+		echo '<li class="list-group-item" data-plugin="'.$Plugin->className().'"><span class="oi oi-move"></span> '.$Plugin->name().'</li>';
+	}
+	echo '</ul>';
+
+	echo '
+	<div class="form-group mt-3">
+		<button type="button" class="jsbuttonSave btn btn-primary">'.$L->g('Save').'</button>
+		<a href="'.HTML_PATH_ADMIN_ROOT.'plugins" class="btn btn-secondary">'.$L->g('Cancel').'</a>
+	</div>
+	';
+
+echo Bootstrap::formClose();
 
-echo '</div>';
-echo '<input id="plugin-list" name="plugin-list" type="text" value="" hidden/>';
-echo '<button class="uk-button uk-button-primary" type="button" id="jsSave">'.$L->g('Save').'</button>';
-echo '</form>';
 ?>
 
 <script>
-$( document ).ready(function() {
-	$("#jsSave").on("click", function() {
+$(document).ready(function() {
+
+	$('.list-group-sortable').sortable({
+		placeholderClass: 'list-group-item'
+	});
+
+	$(".jsbuttonSave").on("click", function() {
 		var tmp = [];
-		$( "div.plugin-position" ).each(function() {
+		$("li.list-group-item").each(function() {
 			tmp.push( $(this).attr("data-plugin") );
 		});
-		console.log( tmp.join(",") );
-		$("#plugin-list").attr("value", tmp.join(",") );
-		$(".uk-form").submit();
+		$("#jsplugin-list").attr("value", tmp.join(",") );
+		$("#jsform").submit();
 	});
 });
 </script>
\ No newline at end of file
diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php
index 29f3b283..4b323c95 100644
--- a/bl-kernel/functions.php
+++ b/bl-kernel/functions.php
@@ -257,6 +257,7 @@ function changePluginsPosition($pluginClassList) {
 		'notes'=>''
 	));
 
+	Alert::set($Language->g('The changes have been saved'));
 	return true;
 }
 
diff --git a/bl-kernel/helpers/theme.class.php b/bl-kernel/helpers/theme.class.php
index af7b43f2..723c90a2 100644
--- a/bl-kernel/helpers/theme.class.php
+++ b/bl-kernel/helpers/theme.class.php
@@ -205,6 +205,12 @@ class Theme {
 	{
 		return '<link rel="stylesheet" type="text/css" href="'.DOMAIN_CORE_CSS.'bootstrap.min.css?version='.BLUDIT_VERSION.'">'.PHP_EOL;
 	}
+
+	public static function jsSortable()
+	{
+		// https://github.com/psfpro/bootstrap-html5sortable
+		return '<script charset="utf-8" src="'.DOMAIN_CORE_JS.'jquery.sortable.min.js?version='.BLUDIT_VERSION.'"></script>'.PHP_EOL;
+	}
 }
 
 ?>
diff --git a/bl-kernel/js/jquery.sortable.min.js b/bl-kernel/js/jquery.sortable.min.js
new file mode 100755
index 00000000..db0cb533
--- /dev/null
+++ b/bl-kernel/js/jquery.sortable.min.js
@@ -0,0 +1 @@
+(function(n){var t,i=n();n.fn.sortable=function(r){var u=String(r);return r=n.extend({connectWith:!1},r),this.each(function(){var o,s,h,e,f;if(/^enable|disable|destroy$/.test(u)){e=n(this).children(n(this).data("items")).attr("draggable",u=="enable");u=="destroy"&&e.add(this).removeData("connectWith items").off("dragstart.h5s dragend.h5s selectstart.h5s dragover.h5s dragenter.h5s drop.h5s");return}e=n(this).children(r.items);f=n("<"+(/^ul|ol$/i.test(this.tagName)?"li":/^tbody$/i.test(this.tagName)?"tr":"div")+' class="sortable-placeholder '+r.placeholderClass+'">').html("&nbsp;");e.find(r.handle).mousedown(function(){o=!0}).mouseup(function(){o=!1});n(this).data("items",r.items);i=i.add(f);r.connectWith&&n(r.connectWith).add(this).data("connectWith",r.connectWith);e.attr("draggable","true").on("dragstart.h5s",function(i){if(r.handle&&!o)return!1;o=!1;var u=i.originalEvent.dataTransfer;u.effectAllowed="move";u.setData("Text","dummy");h=(t=n(this)).addClass("sortable-dragging").index();s=t.parent()}).on("dragend.h5s",function(){t&&(t.removeClass("sortable-dragging").show(),i.detach(),h!=t.index()&&t.parent().trigger("sortupdate",{item:t}),t.parent().is(s)||t.parent().trigger("sortconnect",{item:t}),t=null)}).not("a[href], img").on("selectstart.h5s",function(){return this.dragDrop&&this.dragDrop(),!1}).end().add([this,f]).on("dragover.h5s dragenter.h5s drop.h5s",function(u){return!e.is(t)&&r.connectWith!==n(t).parent().data("connectWith")?!0:u.type=="drop"?(u.stopPropagation(),i.filter(":visible").after(t),t.trigger("dragend.h5s"),!1):(u.preventDefault(),u.originalEvent.dataTransfer.dropEffect="move",e.is(this)?(r.forcePlaceholderSize&&f.height(t.outerHeight()),t.hide(),n(this)[f.index()<n(this).index()?"after":"before"](f),i.not(f).detach()):i.is(this)||n(this).children(r.items).length||(i.detach(),n(this).append(f)),!1)})})}})(jQuery);
\ No newline at end of file
diff --git a/bl-themes/alternative/php/home.php b/bl-themes/alternative/php/home.php
index 9d0f9f4b..6a2862a2 100644
--- a/bl-themes/alternative/php/home.php
+++ b/bl-themes/alternative/php/home.php
@@ -49,20 +49,20 @@
 	<ul class="pagination flex-wrap justify-content-center">
 
 		<!-- Previous button -->
-		<li class="page-item <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
-			<a class="page-link" href="<?php echo Paginator::previousPageUrl() ?>" tabindex="-1"><?php echo $Language->get('Previous'); ?></a>
+		<li class="page-item mr-2 <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::previousPageUrl() ?>" tabindex="-1">&#9664; <?php echo $Language->get('Previous'); ?></a>
 		</li>
 
-		<!-- List of pages -->
-		<?php for ($i = 1; $i <= Paginator::amountOfPages(); $i++): ?>
-		<li class="page-item <?php if ($i==Paginator::currentPage()) echo 'active' ?>">
-			<a class="page-link" href="<?php echo Paginator::numberUrl($i) ?>"><?php echo $i ?></a>
+		<!-- Home button -->
+		<?php if (Paginator::currentPage() > 1): ?>
+		<li class="page-item">
+			<a class="page-link" href="<?php echo $site->url() ?>">Home</a>
 		</li>
-		<?php endfor ?>
+		<?php endif ?>
 
 		<!-- Next button -->
-		<li class="page-item <?php if (!Paginator::showNext()) echo 'disabled' ?>">
-			<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>"><?php echo $Language->get('Next'); ?></a>
+		<li class="page-item ml-2 <?php if (!Paginator::showNext()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>"><?php echo $Language->get('Next'); ?> &#9658;</a>
 		</li>
 
 	</ul>
diff --git a/bl-themes/blogx/php/home.php b/bl-themes/blogx/php/home.php
index 1772c8ad..908faef2 100644
--- a/bl-themes/blogx/php/home.php
+++ b/bl-themes/blogx/php/home.php
@@ -41,24 +41,22 @@
 
 <!-- Pagination -->
 <?php if (Paginator::amountOfPages()>1): ?>
-<nav class="my-4" aria-label="Page navigation">
+<nav class="paginator">
 	<ul class="pagination flex-wrap">
 
 		<!-- Previous button -->
-		<li class="page-item <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
-			<a class="page-link" href="<?php echo Paginator::previousPageUrl() ?>" tabindex="-1"><?php echo $Language->get('Previous'); ?></a>
+		<li class="page-item mr-2 <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::previousPageUrl() ?>" tabindex="-1">&#9664; <?php echo $Language->get('Previous'); ?></a>
 		</li>
 
-		<!-- List of pages -->
-		<?php for ($i = 1; $i <= Paginator::amountOfPages(); $i++): ?>
-		<li class="page-item <?php if ($i==Paginator::currentPage()) echo 'active' ?>">
-			<a class="page-link" href="<?php echo Paginator::numberUrl($i) ?>"><?php echo $i ?></a>
+		<!-- Home button -->
+		<li class="page-item <?php if (Paginator::currentPage()==1) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo $site->url() ?>">Home</a>
 		</li>
-		<?php endfor ?>
 
 		<!-- Next button -->
-		<li class="page-item <?php if (!Paginator::showNext()) echo 'disabled' ?>">
-			<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>"><?php echo $Language->get('Next'); ?></a>
+		<li class="page-item ml-2 <?php if (!Paginator::showNext()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>"><?php echo $Language->get('Next'); ?> &#9658;</a>
 		</li>
 
 	</ul>
diff --git a/index.php b/index.php
index d72a1827..10db1134 100644
--- a/index.php
+++ b/index.php
@@ -40,3 +40,7 @@ if ($url->whereAmI()==='admin') {
 else {
 	require(PATH_BOOT.'site.php');
 }
+
+$endLoadTime = microtime(true);
+$time = $endLoadTime - $loadTime;
+var_dump($time);
\ No newline at end of file