From fe51ba9c4ba8e3f550f95555cb7d3b842a36d065 Mon Sep 17 00:00:00 2001
From: Berges Yannick <yannick@com3elles.com>
Date: Wed, 12 Apr 2023 21:20:11 +0200
Subject: [PATCH] First 3.0 RC

---
 elements/iconpicker.php          |   7 +-
 helper.php                       | 154 +++----
 media/css/style.css              | 194 +++++----
 mod_dashboard.php                |  51 ++-
 mod_dashboard.xml                | 279 ++++++++-----
 models/forms/addcustomblock.xml  |  52 ++-
 models/forms/freebutton.xml      |  11 +-
 models/forms/freebuttonchild.xml |  60 ++-
 tmpl/default.php                 | 667 +++++++++----------------------
 tmpl/inc/actionlog.php           |  93 +++++
 tmpl/inc/archived.php            |  95 +++++
 tmpl/inc/custom.php              | 109 +++++
 tmpl/inc/features.php            |  99 +++++
 tmpl/inc/index.html              |   0
 tmpl/inc/published.php           | 101 +++++
 tmpl/inc/trashed.php             |  97 +++++
 tmpl/inc/unpublished.php         |  96 +++++
 tmpl/inc/useritem.php            | 109 +++++
 18 files changed, 1472 insertions(+), 802 deletions(-)
 create mode 100644 tmpl/inc/actionlog.php
 create mode 100644 tmpl/inc/archived.php
 create mode 100644 tmpl/inc/custom.php
 create mode 100644 tmpl/inc/features.php
 create mode 100644 tmpl/inc/index.html
 create mode 100644 tmpl/inc/published.php
 create mode 100644 tmpl/inc/trashed.php
 create mode 100644 tmpl/inc/unpublished.php
 create mode 100644 tmpl/inc/useritem.php

diff --git a/elements/iconpicker.php b/elements/iconpicker.php
index b7bae0e..d9a0db9 100644
--- a/elements/iconpicker.php
+++ b/elements/iconpicker.php
@@ -17,8 +17,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-jimport('joomla.filesystem.folder');  // JFolder
-jimport('joomla.filesystem.file');    // JFile
+
 
 jimport('cms.html.html');      // JHtml
 jimport('cms.html.select');    // JHtmlSelect
@@ -63,7 +62,7 @@ public function getInput()
     $iconlist .= "
                    <script>
                        (function ($) {
-                       $('#". $this->id ."-wrapper').iconpicker({
+                       $('#" . $this->id . "-wrapper').iconpicker({
                        align: 'left',
                        arrowClass: 'btn-success',
                        arrowPrevIconClass: 'fa fa-arrow-left',
@@ -77,7 +76,7 @@ public function getInput()
                        labelFooter: '" . JText::sprintf('MOD_DASHBOARD_ICONLINK_ICONSINDEX', '{0}', '{1}', '{2}') . "',
                        placement: 'bottom',
                        search: true,
-                       searchText: '". JText::_('MOD_DASHBOARD_ICONLINK_SEARCHTEXT') . "',
+                       searchText: '" . JText::_('MOD_DASHBOARD_ICONLINK_SEARCHTEXT') . "',
                        selectedClass: 'btn-primary',
                        unselectedClass: 'btn-default',
                        iconClass: 'fontawesome',
diff --git a/helper.php b/helper.php
index 36f500e..34ecd03 100644
--- a/helper.php
+++ b/helper.php
@@ -1,12 +1,13 @@
 <?php
 
 /**
- * @version 0.5.0 stable $Id: default.php yannick berges
+ * @version 3.0 stable $Id: default.php yannick berges
  * @package Joomla
  * @copyright (C) 2018 Berges Yannick - www.com3elles.com
  * @license GNU/GPL v2
 
  * special thanks to my master Marc Studer
+ ** special thanks to Shane for helping
 
  * JOOMLA admin module by Com3elles is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +15,6 @@
  * GNU General Public License for more details.
  **/
 
-/*namespace Joomla\Module\Dashboard\Administrator\helper;*/
 
 //blocage des accés directs sur ce script
 \defined('_JEXEC') or die;
@@ -28,77 +28,95 @@
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogsModel;
 use Joomla\Module\Quickicon\Administrator\Event\QuickIconsEvent;
 use Joomla\Registry\Registry;
+use Joomla\Database\ParameterType;
 
 abstract class modDashboardHelper
 {
-	public static function getFeatured(&$params)
-	{
-		// recupere la connexion à la BD
-		$db = JFactory::getDbo();
-		$queryFeatured = 'SELECT a.id, a.title, b.name , a.catid, a.created, a.created_by, a.modified, a.modified_by, a.featured FROM #__content  AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE featured = 1 ORDER BY modified DESC LIMIT ' . (int) $params->get('count');
-		$db->setQuery($queryFeatured);
-		$itemsFeatured = $db->loadObjectList();
-		//print_r ($itemsRevised) ;
-		foreach ($itemsFeatured as &$itemFeatured) {
-			$itemFeatured->link = JRoute::_('index.php?option=com_content&task=article.edit&id=' . $itemFeatured->id);
-		}
-		return $itemsFeatured;
-	}
-	public static function getPublished(&$params)
-	{
-		// recupere la connexion à la BD
-		$db = JFactory::getDbo();
-		$queryPublished = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE state = 1 ORDER BY modified DESC LIMIT ' . (int) $params->get('count');
-		$db->setQuery($queryPublished);
-		$itemsPublished = $db->loadObjectList();
-		foreach ($itemsPublished as &$itemPublished) {
-			$itemPublished->link = JRoute::_('index.php?option=com_content&task=article.edit&id=' . $itemPublished->id);
-		}
-		return $itemsPublished;
-	}
-	public static function getUnpublished(&$params)
-	{
-		// recupere la connexion à la BD
-		$db = JFactory::getDbo();
-		$queryUnpublished = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE state = 0 ORDER BY modified DESC LIMIT ' . (int) $params->get('count');
-		$db->setQuery($queryUnpublished);
-		$itemsUnpublished = $db->loadObjectList();
-		foreach ($itemsUnpublished as &$itemUnpublished) {
-			$itemUnpublished->link = JRoute::_('index.php?option=com_content&task=article.edit&id=' . $itemUnpublished->id);
-		}
-		return $itemsUnpublished;
-	}
-	public static function getArchived(&$params)
+
+	public static function getItems($data)
 	{
+		//var_dump($data);die;
+		//	recuperation utilisateur connecter	
+		$user = JFactory::getUser();
+		$userid = $user->id;
+		$catids = $data->catidlist;
+		$limit = $data->count;
+		$nom_statut = $data->TypofBlock;
 		// recupere la connexion à la BD
 		$db = JFactory::getDbo();
-		$queryArchived = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE state = 2 ORDER BY modified DESC LIMIT ' . (int) $params->get('count');
-		$db->setQuery($queryArchived);
-		$itemsArchived = $db->loadObjectList();
-		foreach ($itemsArchived as &$itemArchived) {
-			$itemArchived->link = JRoute::_('index.php?option=com_flexicontent&task=article.edit&id=' . $itemArchived->id);
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id', 'a.title', 'a.created', 'a.created_by', 'a.modified', 'a.modified_by', 'a.featured', 'a.state', 'a.catid', 'b.name', 'c.title')))
+			->from($db->quoteName('#__content', 'a'))
+			->join(
+				'LEFT',
+				$db->quoteName('#__users', 'b') . 'ON' . $db->quoteName('a.created_by') . '=' . $db->quoteName('b.id')
+			) // recup utilisateur
+			->join(
+				'LEFT',
+				$db->quoteName('#__categories', 'c') . 'ON' . $db->quoteName('a.catid') . '=' . $db->quoteName('c.id') // recup categorie
+			);
+		// ici en fonction du statut
+		switch ($nom_statut) {
+
+			case ('fb'):
+				$featured = 1;
+				$query
+					->where($db->quoteName('a.featured') . '= :feature')
+					->bind(':feature', $featured, ParameterType::INTEGER);
+				break;
+
+			case ('pb'):
+				$state = 1;
+				$query
+					->where($db->quoteName('a.state') . '= :state')
+					->bind(':state', $state, ParameterType::INTEGER);
+				break;
+
+			case ('upb'):
+				$state = 0;
+				$query
+					->where($db->quoteName('a.state') . '= :state')
+					->bind(':state', $state, ParameterType::INTEGER);
+				break;
+
+			case ('ab'):
+				$state = 2;
+				$query
+					->where($db->quoteName('a.state') . '= :state')
+					->bind(':state', $state, ParameterType::INTEGER);
+				break;
+
+			case ('tb'):
+				$state = -2;
+				$query
+					->where($db->quoteName('a.state') . '= :state')
+					->bind(':state', $state, ParameterType::INTEGER);
+				break;
 		}
-		return $itemsArchived;
-	}
-	public static function getTrashed(&$params)
-	{
-		// recupere la connexion à la BD
-		$db = JFactory::getDbo();
-		$queryTrashed = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE state = -2 ORDER BY modified DESC LIMIT ' . (int) $params->get('count');
-		$db->setQuery($queryTrashed);
-		$itemsTrashed = $db->loadObjectList();
-		foreach ($itemsTrashed as &$itemTrashed) {
-			$itemTrashed->link = JRoute::_('index.php?option=com_content&task=article.edit&id=' . $itemTrashed->id);
+		//ici la categorie
+		$query->whereIn($db->quoteName('a.catid'), $catids, ParameterType::LARGE_OBJECT)
+		//ici order
+		->order('a.modified DESC')
+
+		//ici la limite
+		->setLimit($limit);
+
+		$db->setQuery($query);
+		$items = $db->loadObjectList();
+
+		foreach ($items as &$item) {
+			$item->link = JRoute::_('index.php?option=com_content&task=article.edit&id=' . $item->id);
 		}
-		return $itemsTrashed;
+		return $items;
 	}
+
 	public static function getUseritem(&$params)
 	{
 		$user = JFactory::getUser();
 		$userid = $user->id;
 		//recupére la connexion à la BD
 		$db = JFactory::getDbo();
-		$queryUseritem = 'SELECT id, title, catid, created, created_by, modified, modified_by, state FROM #__content WHERE created_by = ' . $user->id . ' ORDER BY modified DESC LIMIT ' . (int) $params->get('count');
+		$queryUseritem = 'SELECT id, title, catid, created, created_by, modified, modified_by, state FROM #__content WHERE created_by = ' . $user->id . ' ORDER BY modified DESC LIMIT 50';
 		$db->setQuery($queryUseritem);
 		$itemsUseritem = $db->loadObjectList();
 		foreach ($itemsUseritem as &$itemUseritem) {
@@ -120,25 +138,7 @@ public static function getUseritem(&$params)
 		}
 		return $itemsUseritem;
 	}
-	public static function getCustomlist(&$params)
-	{
-		$list_customblocks = $params->get('add_customblock');
-		if ($list_customblocks) {
-			$db = JFactory::getDbo();
-			// loop your result
-			foreach ($list_customblocks as $list_customblocks_idx => $customblock) {
-				//$catid = $customblock->catidlist;
-				$queryCustomlist = 'SELECT a.id, a.title, b.name , a.catid, a.created, a.created_by, a.modified, a.modified_by, a.featured FROM #__content  AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid= ' . $customblock->catidlist . ' AND state = 1 ORDER BY modified DESC LIMIT ' . (int) $params->get('count');
-				$db->setQuery($queryCustomlist);
-				$itemsCustomlist = $db->loadObjectList();
-				foreach ($itemsCustomlist as &$itemCustomlist) {
-					$itemCustomlist->link = JRoute::_('index.php?option=com_content&task=article.edit&id=' . $itemCustomlist->id);
-				}
-				$customblock->listitems = $itemsCustomlist;
-			}
-		}
-		return $list_customblocks;
-	}
+
 
 	public static function getIconFromPlugins(Registry $params, CMSApplication $application = null)
 	{
diff --git a/media/css/style.css b/media/css/style.css
index b75306a..e3c88c2 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -1,161 +1,205 @@
-
-ul.flex-wrap2, ul.flex-wrap {
+ul.flex-wrap2,
+ul.flex-wrap {
     grid-gap: 1rem;
     display: grid;
-    grid-template-columns: repeat(auto-fit,minmax(190px,1fr));
+    grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
 }
-.newlinegrid + li.quickicon.quickicon-single.col{
+
+.newlinegrid+li.quickicon.quickicon-single.col {
     grid-column-start: 1;
 }
+
 .breadcrumb {
     margin-bottom: 0rem;
 }
+
 .modulemessage {
     padding: 1.5rem;
 }
-.action{
+
+.action {
     margin-top: 20px;
     padding: .75rem 1rem;
 }
-.action.span12, .modulemessage.span12 {
-margin-left: 0 !important;
+
+.action.span12,
+.modulemessage.span12 {
+    margin-left: 0 !important;
 }
+
 button.itemlist {
-margin: 4px;
-max-width: 116px;
-min-height: 66px;
+    margin: 4px;
+    max-width: 116px;
+    min-height: 66px;
 }
+
 .quickicon-name.d-flex.align-items-center {
     text-align: center;
 }
+
 .block {
-min-height:155px !important;
-/*margin-left: -1px !important;
+    min-height: 155px !important;
+    /*margin-left: -1px !important;
 margin-right: 15px !important;*/
-flex: 1 1 auto;
+    flex: 1 1 auto;
 
 }
-.block > .row-striped{
-overflow-y: auto;
-overflow-x: hidden;
+
+.block>.row-striped {
+    overflow-y: auto;
+    overflow-x: hidden;
 }
-.adminlink{
-color:#000;
-font-weight:bold;
+
+.adminlink {
+    color: #000;
+    font-weight: bold;
 }
+
 h2.nav-header {
-border-bottom: 1px solid #E3E3E3;
+    border-bottom: 1px solid #E3E3E3;
 }
+
 /** max size for image **/
 .youritems img.fc_field_image {
-max-height: 80px !important;
+    max-height: 80px !important;
 }
+
 .info-bar.top.list-group-item {
-border-left: 0;
-border-right: 0;
-}
-/*.contentbloc{
-align-content:space-between;
-background: #edf2f7;
-background:var(--template-bg-dark-5);
-display: inline-flex;
-flex-wrap: wrap;
-gap: 1rem;
-width:100%;
-}*/
+    border-left: 0;
+    border-right: 0;
+    padding: 0px 20px;
+}
+
+.contentbloc {
+    align-content: space-between;
+    background: var(--template-bg-dark-5);
+    display: inline-flex;
+    flex-wrap: wrap;
+    gap: 1rem;
+    width: 100%;
+}
+
 .block.well.well-small {
-margin-right: 1%;
+    margin-right: 1%;
 }
+
 .action .btn.btn-default.btn-lg.itemlist {
-width: 107px;
-min-height: 75px;
-color: inherit;
-box-shadow: 0 1px 2px rgba(0,0,0,0.25);
-border-radius: 2px;
-transition: 0.3s;
+    width: 107px;
+    min-height: 75px;
+    color: inherit;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25);
+    border-radius: 2px;
+    transition: 0.3s;
 }
+
 .action .btn.btn-default.btn-lg.itemlist:hover {
-box-shadow: 0 1px 2px rgba(0,0,0,1);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 1);
 }
+
 .btn.btn-secondary.iconpicker {
-display: inline !important;
-min-height: 33px;
+    display: inline !important;
+    min-height: 33px;
 }
+
 .modulemessage {
-padding:.75rem 1rem;
+    padding: .75rem 1rem;
 }
+
 ul.j-links-group.nav.nav-list {
-padding-top: 13px;
+    padding-top: 13px;
 }
+
 .hasPopover {
-display: inline-block !important;
+    display: inline-block !important;
 }
+
 /** correction for advanced module manager and popover***/
-.control-label .hasPopover, .control-label .hasTooltip {
-display: block !important;
-} 
-.nav-tabs > li > a {
-display: block !important;
+.control-label .hasPopover,
+.control-label .hasTooltip {
+    display: block !important;
+}
+
+.nav-tabs>li>a {
+    display: block !important;
 }
+
 hr.mt-3.mb-3 {
-width: 100%;
+    width: 100%;
 }
+
 h3.module-title.nav-header {
-float:left;
+    float: left;
 }
+
 .headerblock {
-margin-bottom: 40px;
+    margin-bottom: 40px;
 }
+
 .iconpicker-popover {
-background: #fff !important;
+    background: #fff !important;
 }
 
 .quick-icons a .fa-1x {
-font-size: 1em !important; }
+    font-size: 1em !important;
+}
 
 .quick-icons a .fa-2x {
-font-size: 2em !important; }
+    font-size: 2em !important;
+}
 
 .quick-icons a .fa-3x {
-font-size: 3em !important; }
+    font-size: 3em !important;
+}
 
 .quick-icons a.fa-4x {
-font-size: 4em !important; }
+    font-size: 4em !important;
+}
 
 .quick-icons .fa-5x {
-font-size: 5em !important; }
+    font-size: 5em !important;
+}
 
 .quick-icons .fa-6x {
-font-size: 6em !important; }
+    font-size: 6em !important;
+}
 
 .quick-icons .fa-7x {
-font-size: 7em !important; }
+    font-size: 7em !important;
+}
 
 .quick-icons .fa-8x {
-font-size: 8em !important; }
+    font-size: 8em !important;
+}
 
 .quick-icons .fa-9x {
-font-size: 9em !important; }
+    font-size: 9em !important;
+}
 
 .quick-icons .fa-10x {
-font-size: 10em !important; }
+    font-size: 10em !important;
+}
+
 span.divider {
-padding: 10px;
+    padding: 10px;
 }
+
 .action .quick-icons .quickicon a {
-justify-content: center;
+    justify-content: center;
     align-items: center;
 }
-.sep{
-height: 2rem;
-/*background: #edf2f7;*/
-background:var(--template-bg-dark-5);
+
+.sep {
+    height: 2rem;
+    /*background: #edf2f7;*/
+    background: var(--template-bg-dark-5);
 }
-.card-body{
+
+.card-body {
     overflow-y: auto !important;
 }
-@media (max-width: 952px){
-    .contentbloc > .card {
+
+@media (max-width: 952px) {
+    .contentbloc>.card {
         width: 100% !important;
     }
-}
+}
\ No newline at end of file
diff --git a/mod_dashboard.php b/mod_dashboard.php
index 5afd26a..aec0ad4 100644
--- a/mod_dashboard.php
+++ b/mod_dashboard.php
@@ -1,33 +1,44 @@
 <?php
+
 /**
-* @version 2.6 stable $Id: default.php yannick berges
-* @package Joomla
-* @copyright (C) 2018 Berges Yannick - www.com3elles.com
-* @license GNU/GPL v2
+ * @version 3 stable $Id: default.php yannick berges
+ * @package Joomla
+ * @copyright (C) 2018 Berges Yannick - www.com3elles.com
+ * @license GNU/GPL v2
 
-* special thanks to my master Marc Studer
+ * special thanks to my master Marc Studer
+ * special thanks to Shane for helping
 
-* Joomla admin module by Com3elles is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-**/
+ * Joomla admin module by Com3elles is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ **/
 
 //blocage des accés directs sur ce script
 defined('_JEXEC') or die('Accés interdit');
-jimport( 'joomla.application.component.controller' );
+jimport('joomla.application.component.controller');
 JLoader::register('ModLatestActionsHelper', __DIR__ . '/helper.php');
 
 // Inclut les méthodes du script de soutien
-require_once dirname(__FILE__).'/helper.php';
-$listFeatured     = modDashboardHelper::getFeatured($params);
-$listPublished    = modDashboardHelper::getPublished($params);
-$listUnpublished  = modDashboardHelper::getUnpublished($params);
-$listArchived     = modDashboardHelper::getArchived($params);
-$listTrashed      = modDashboardHelper::getTrashed($params);
-$listUseritem     = modDashboardHelper::getUseritem($params);
-$listCustomlist   = modDashboardHelper::getCustomlist($params);
-$moduleclass_sfx  = htmlspecialchars($params->get('moduleclass_sfx'));
+require_once dirname(__FILE__) . '/helper.php';
+//$listFeatured     = modDashboardHelper::getFeatured($params);
+//$listPublished    = modDashboardHelper::getPublished($params);
+//$listUnpublished  = modDashboardHelper::getUnpublished($params);
+//$listArchived     = modDashboardHelper::getArchived($params);
+//$listTrashed      = modDashboardHelper::getTrashed($params);
+//$listUseritem     = modDashboardHelper::getUseritem($params);
+
+foreach ($params->get('add_customblock') as $customBlock) {
+    $items = modDashboardHelper::getItems($customBlock) ?? [];
+
+    $customBlock->items = $items;
+    // var_dump($customBlock);
+}
+
+
+//$listCustomlist   = modDashboardHelper::getCustomlist($params);
+//$moduleclass_sfx  = htmlspecialchars($params->get('moduleclass_sfx'));
 $systme_buttons   = modDashboardHelper::getIconFromPlugins($params);
 $actionlist       = modDashboardHelper::getActionlogList($params);
 
diff --git a/mod_dashboard.xml b/mod_dashboard.xml
index 0879da3..67f6a4d 100644
--- a/mod_dashboard.xml
+++ b/mod_dashboard.xml
@@ -2,10 +2,10 @@
 <extension type="module" version="4.0" client="administrator" method="upgrade">
 	<name>Admin Dashboard by Com3elles</name>
 	<author>Berges Yannick</author>
-	<creationDate>janvier 2022</creationDate>
+	<creationDate>2023</creationDate>
 	<authorEmail>yannick@com3elles.com</authorEmail>
 	<authorUrl>www.com3elles.com</authorUrl>
-	<version>2.8</version>
+	<version>3.0</version>
 	<copyright>Copyright (C) 2008 - 2022 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>MOD_DASHBOARD_INTRO</description>
@@ -31,23 +31,35 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic" addfieldpath="administrator/modules/mod_dashboard/elements/">
-				<field name="displayinfosystem" type="radio" default="1" label="MOD_DASHBOARD_DISPLAY_SYSTEM_INFO" description="MOD_DASHBOARD_DISPLAY_SYSTEM_INFO_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="displayinfosystem" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAY_SYSTEM_INFO"
+					description="MOD_DASHBOARD_DISPLAY_SYSTEM_INFO_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 
-				<field name="force_fullwidth" type="radio" default="1" label="MOD_DASHBOARD_FORCE_FULLWIDTH" description="MOD_DASHBOARD_FORCE_FULLWIDTH_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="force_fullwidth" type="radio" default="1"
+					label="MOD_DASHBOARD_FORCE_FULLWIDTH"
+					description="MOD_DASHBOARD_FORCE_FULLWIDTH_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 
-				<field name="displaycustomtext" type="radio" default="0" label="MOD_DASHBOARD_DISPLAY_CUSTOMTEXT" description="MOD_DASHBOARD_DISPLAY_CUSTOMTEXT_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="displaycustomtext" type="radio" default="0"
+					label="MOD_DASHBOARD_DISPLAY_CUSTOMTEXT"
+					description="MOD_DASHBOARD_DISPLAY_CUSTOMTEXT_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="customtext" 
-				label ="MOD_DASHBOARD_CUSTOMTEXT" description="MOD_DASHBOARD_CUSTOMTEXT_DESC" type="editor" width="200px" height="100px" buttons="false" filter="safehtml" showon="displaycustomtext:1" parentclass="span-6 stack"/>
-				<field name="iconsize" type="radio" default="fa-2x" label="JOOMLA_ICON_SIZE" description="JOOMLA_ICON_SIZE_DESC" class="btn-group" parentclass="span-2 stack">
+				<field name="customtext"
+					label="MOD_DASHBOARD_CUSTOMTEXT" description="MOD_DASHBOARD_CUSTOMTEXT_DESC"
+					type="editor" width="200px" height="100px" buttons="false" filter="safehtml"
+					showon="displaycustomtext:1" parentclass="span-6 stack" />
+				<field name="iconsize" type="radio" default="fa-2x" label="JOOMLA_ICON_SIZE"
+					description="JOOMLA_ICON_SIZE_DESC" class="btn-group" parentclass="span-2 stack">
 					<option value="fa-lg">Small</option>
 					<option value="fa-2x">2X</option>
 					<option value="fa-3x">3X</option>
@@ -58,195 +70,240 @@
 				</field>
 			</fieldset>
 
-			<fieldset name="tab_config" label="MOD_DASHBOARD_TAB_CONFIG" description="MOD_DASHBOARD_TAB_CONFIG_DESC">
+			<fieldset name="tab_config" label="MOD_DASHBOARD_TAB_CONFIG"
+				description="MOD_DASHBOARD_TAB_CONFIG_DESC">
 
-				<field name="displaycustomtab" type="radio" default="1" label="MOD_DASHBOARD_TABS_CUSTOM" description="MOD_DASHBOARD_TABS_CUSTOM_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="displaycustomtab" type="radio" default="1"
+					label="MOD_DASHBOARD_TABS_CUSTOM" description="MOD_DASHBOARD_TABS_CUSTOM_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="displaycreattab" type="radio" default="1" label="MOD_DASHBOARD_TABS_CREATE" description="MOD_DASHBOARD_TABS_CREATE_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="displaycreattab" type="radio" default="1"
+					label="MOD_DASHBOARD_TABS_CREATE" description="MOD_DASHBOARD_TABS_CREATE_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="displaymanagetab" type="radio" default="1" label="MOD_DASHBOARD_TABS_MANAGE" description="MOD_DASHBOARD_TABS_MANAGE_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="displaymanagetab" type="radio" default="1"
+					label="MOD_DASHBOARD_TABS_MANAGE" description="MOD_DASHBOARD_TABS_MANAGE_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="displayadmintab" type="radio" default="1" label="MOD_DASHBOARD_TABS_ADMIN" description="MOD_DASHBOARD_TABS_ADMIN_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="displayadmintab" type="radio" default="1"
+					label="MOD_DASHBOARD_TABS_ADMIN" description="MOD_DASHBOARD_TABS_ADMIN_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="displayfreetab" type="radio" default="1" label="JOOMLA_FREE_TABS_ADMIN" description="JOOMLA_FREE_TABS_ADMIN_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="displayfreetab" type="radio" default="1" label="JOOMLA_FREE_TABS_ADMIN"
+					description="JOOMLA_FREE_TABS_ADMIN_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="displayanalytics" type="radio" default="1" label="MOD_DASHBOARD_ANALYTICS_TABS_ADMIN" description="MOD_DASHBOARD_ANALYTICS_TABS_ADMIN_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="displayanalytics" type="radio" default="1"
+					label="MOD_DASHBOARD_ANALYTICS_TABS_ADMIN"
+					description="MOD_DASHBOARD_ANALYTICS_TABS_ADMIN_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 			</fieldset>
 
-			<fieldset name="block_config" label="MOD_DASHBOARD_BLOCK_CONFIG" description="MOD_DASHBOARD_BLOCK_CONFIG_DESC">
-				<field name="count" type="list" default="5" label="MOD_DASHBOARD_NBITEM" description="MOD_DASHBOARD_NBITEM" parentclass="span-2 stack">
-					<option value="1">1</option>
-					<option value="3">3</option>
-					<option value="5">5</option>
-					<option value="10">10</option>
-					<option value="15">15</option>
-					<option value="20">20</option>
-					<option value="50">50</option>
-					<option value="100">100</option>
-				</field>
-				<field name="forceheightblock" type="text" default="" size="50" label="MOD_DASHBOARD_BLOCKHEIGHT" description="MOD_DASHBOARD_BLOCKHEIGHT_DESC" parentclass="span-2 stack"/>
-				<field name="hiddefeatured" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBLOCK_FEATURED" description="MOD_DASHBOARD_DISPLAYBLOCK_FEATURED_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field name="featuredwidth" type="number" default="44" label="MOD_DASHBOARD_WIDTHCOL" description="MOD_DASHBOARD_WIDTHCOL_DESC" min="0" max="100" step="5" showon="hiddefeatured:1" parentclass="span-2-inline stack"/>
-				<field name="hiddepublished" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBLOCK_PUBLISHED" description="MOD_DASHBOARD_DISPLAYBLOCK_PUBLISHED_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field name="publishedwidth" type="number" default="44" label="MOD_DASHBOARD_WIDTHCOL" description="MOD_DASHBOARD_WIDTHCOL_DESC" min="0" max="100" step="5" showon="hiddepublished:1" parentclass="span-2-inline stack"/>
-				<field name="hiddeunpublished" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBLOCK_UNPUBLISHED" description="MOD_DASHBOARD_DISPLAYBLOCK_UNPUBLISHED_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field name="unpublishedwidth" type="number" default="44" label="MOD_DASHBOARD_WIDTHCOL" description="MOD_DASHBOARD_WIDTHCOL_DESC" min="0" max="100" step="5" showon="hiddeunpublished:1" parentclass="span-2-inline stack"/>
-				<field name="hiddearchived" type="radio" default="0" label="MOD_DASHBOARD_DISPLAYBLOCK_ARCHIVED" description="MOD_DASHBOARD_DISPLAYBLOCK_ARCHIVED_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field name="archivedwidth" type="number" default="44" label="MOD_DASHBOARD_WIDTHCOL" description="MOD_DASHBOARD_WIDTHCOL_DESC" min="0" max="100" step="5" showon="hiddearchived:1" parentclass="span-2-inline stack"/>
-				<field name="hiddeyouritem" type="radio" default="0" label="MOD_DASHBOARD_DISPLAYBLOCK_YOURITEM" description="MOD_DASHBOARD_DISPLAYBLOCK_YOURITEM_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field name="youritemwidth" type="number" default="44" label="MOD_DASHBOARD_WIDTHCOL" description="MOD_DASHBOARD_WIDTHCOL_DESC" min="0" max="100" step="5" showon="hiddeyouritem:1" parentclass="span-2-inline stack"/>
-				<field name="hiddetrashed" type="radio" default="0" label="MOD_DASHBOARD_DISPLAYBLOCK_TRASHED" description="MOD_DASHBOARD_DISPLAYBLOCK_TRASHED_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field name="trashedwidth" type="number" default="44" label="MOD_DASHBOARD_WIDTHCOL" description="MOD_DASHBOARD_WIDTHCOL_DESC" min="0" max="100" step="5" showon="hiddetrashed:1" parentclass="span-2-inline stack"/>
-				<field name="actionsloglist" type="radio" default="0" label="MOD_DASHBOARD_ADD_ACTIONSBLOCK" description="MOD_DASHBOARD_ADD_ACTIONSBLOCK_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field name="actionslogwidth" type="number" default="44" label="MOD_DASHBOARD_WIDTHCOL" description="MOD_DASHBOARD_WIDTHCOL_DESC" min="0" max="100" step="5" showon="actionsloglist:1" parentclass="span-2-inline stack"/>
-				<field name="countaction" type="list" default="5" label="MOD_DASHBOARD_NBITEM" description="MOD_DASHBOARD_NBITEM" showon="actionsloglist:1" parentclass="span-2-inline stack">
-					<option value="1">1</option>
-					<option value="3">3</option>
-					<option value="5">5</option>
-					<option value="10">10</option>
-					<option value="15">15</option>
-					<option value="20">20</option>
-					<option value="50">50</option>
-					<option value="100">100</option>
-				</field>
+			<fieldset name="block_config" label="MOD_DASHBOARD_BLOCK_CONFIG"
+				description="MOD_DASHBOARD_BLOCK_CONFIG_DESC">
 
-				<field name= "add_customblock" description= "MOD_DASHBOARD_ADD_CUSTOMBLOCK_DESC" type= "subform" label= "MOD_DASHBOARD_ADD_CUSTOMBLOCK" min= "0" max= "1000" required= "false" formsource= "administrator/modules/mod_dashboard/models/forms/addcustomblock.xml" multiple= "true" buttons= "add,remove,move" layout="joomla.form.field.subform.repeatable" groupByFieldset="false" parentclass="span-6 stack"/>
+				<field name="add_customblock" description="MOD_DASHBOARD_ADD_CUSTOMBLOCK_DESC"
+					type="subform" label="MOD_DASHBOARD_ADD_CUSTOMBLOCK" min="0" max="1000"
+					required="false"
+					formsource="administrator/modules/mod_dashboard/models/forms/addcustomblock.xml"
+					multiple="true" buttons="add,remove,move"
+					layout="joomla.form.field.subform.repeatable" groupByFieldset="false"
+					parentclass="span-6 stack" />
 			</fieldset>
-			<fieldset name="custom_tab" label="MOD_DASHBOARD_CUSTOM_TAB" description="MOD_DASHBOARD_CUSTOM_TAB_DESC">
-				<field name="free_tab" description= "Add tab" type= "subform" label= "Add tab" min= "0" max= "1000" required= "false" formsource= "administrator/modules/mod_dashboard/models/forms/freebutton.xml" multiple= "true" buttons= "add,remove,move" layout="joomla.form.field.subform.repeatable" groupByFieldset="false" parentclass="span-6 stack"/>
+			<fieldset name="custom_tab" label="MOD_DASHBOARD_CUSTOM_TAB"
+				description="MOD_DASHBOARD_CUSTOM_TAB_DESC">
+				<field name="free_tab" description="Add tab" type="subform" label="Add tab" min="0"
+					max="1000" required="false"
+					formsource="administrator/modules/mod_dashboard/models/forms/freebutton.xml"
+					multiple="true" buttons="add,remove,move"
+					layout="joomla.form.field.subform.repeatable" groupByFieldset="false"
+					parentclass="span-6 stack" />
 			</fieldset>
-			<fieldset name="creation_tab" label="MOD_DASHBOARD_CREATION_TAB" description="MOD_DASHBOARD_CREATION_TAB_DESC">
-				<field name="hiddebuttonadditem" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_ADDITEM" description="MOD_DASHBOARD_DISPLAYBUTTON_ADDITEM_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+			<fieldset name="creation_tab" label="MOD_DASHBOARD_CREATION_TAB"
+				description="MOD_DASHBOARD_CREATION_TAB_DESC">
+				<field name="hiddebuttonadditem" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_ADDITEM"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_ADDITEM_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonaddcategory" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_ADDCATEGORY" description="MOD_DASHBOARD_DISPLAYBUTTON_ADDCATEGORY_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonaddcategory" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_ADDCATEGORY"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_ADDCATEGORY_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonaddtag" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_ADDTAG" description="MOD_DASHBOARD_DISPLAYBUTTON_ADDTAG_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonaddtag" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_ADDTAG"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_ADDTAG_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonadduser" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_ADDUSER" description="MOD_DASHBOARD_DISPLAYBUTTON_ADDUSER_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonadduser" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_ADDUSER"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_ADDUSER_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonaddgroup" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_ADDGROUP" description="MOD_DASHBOARD_DISPLAYBUTTON_ADDGROUP_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonaddgroup" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_ADDGROUP"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_ADDGROUP_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 			</fieldset>
-			<fieldset name="gestion_tab" label="MOD_DASHBOARD_GESTION_TAB" description="MOD_DASHBOARD_GESTION_TAB_DESC">
-				<field name="hiddebuttonmanageitems" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_MANAGEITEMS" description="MOD_DASHBOARD_DISPLAYBUTTON_MANAGEITEMS_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+			<fieldset name="gestion_tab" label="MOD_DASHBOARD_GESTION_TAB"
+				description="MOD_DASHBOARD_GESTION_TAB_DESC">
+				<field name="hiddebuttonmanageitems" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_MANAGEITEMS"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_MANAGEITEMS_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonmanagecategories" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_BUTTONMANAGECATEGORIES" description="MOD_DASHBOARD_DISPLAYBUTTON_BUTTONMANAGECATEGORIES_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonmanagecategories" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_BUTTONMANAGECATEGORIES"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_BUTTONMANAGECATEGORIES_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 
-				<field name="hiddebuttonmanagetags" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGETAGS" description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGETAGS_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonmanagetags" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGETAGS"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGETAGS_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 
-				<field name="hiddebuttonmanageauthors" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEAUTHORS" description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEAUTHORS_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonmanageauthors" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEAUTHORS"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEAUTHORS_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonmanagegroups" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEGROUPS" description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEGROUPS_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonmanagegroups" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEGROUPS"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEGROUPS_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonmanagefiles" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEFILES" description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEFILES_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonmanagefiles" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEFILES"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONMANAGEFILES_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 			</fieldset>
-			<fieldset name="administration_tab" label="MOD_DASHBOARD_ADMIN_TAB" description="MOD_DASHBOARD_ADMIN_TAB_DESC">
-				<field name="hiddebuttonprivacy" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_PRIVACY" description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_PRIVACY_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+			<fieldset name="administration_tab" label="MOD_DASHBOARD_ADMIN_TAB"
+				description="MOD_DASHBOARD_ADMIN_TAB_DESC">
+				<field name="hiddebuttonprivacy" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_PRIVACY"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_PRIVACY_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonlogs" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_LOGS" description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_LOG_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonlogs" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_LOGS"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_LOG_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonmanagefieldsarticle" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONU_ARTICLE_FIELD" description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_ARTICLE_FIELdD_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonmanagefieldsarticle" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONU_ARTICLE_FIELD"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_ARTICLE_FIELdD_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonmanagefieldsusers" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONU_USER_FIELD" description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_USER_FIELD_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonmanagefieldsusers" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONU_USER_FIELD"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTON_USER_FIELD_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-				<field name="hiddebuttonadmin" type="radio" default="1" label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONADMIN" description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONADMIN_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+				<field name="hiddebuttonadmin" type="radio" default="1"
+					label="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONADMIN"
+					description="MOD_DASHBOARD_DISPLAYBUTTON_HIDDEBUTTONADMIN_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 
 			</fieldset>
 
-			<fieldset name="analytics_config" label="MOD_DASHBOARD_ANALYTICS_CONFIG" description="MOD_DASHBOARD_ANALYTICS_CONFIG_DESC">
-			<field name="analytics_tabname" type="text" default="MOD_DASHBOARD_TAB_ANALYTICS" label="MOD_DASHBOARD_ANALYTICS_TAB_NAME" description="MOD_DASHBOARD_ANALYTICS_TAB_NAME_DESC" parentclass="span-5 stack"/>
-				<field name="analytics_siteid" type="text" default="1" label="MOD_DASHBOARD_SITEID" description="MOD_DASHBOARD_SITEID_DESC" parentclass="span-2 stack"/>
-				<field name="analytics_site_url" type="text" default="" label="MOD_DASHBOARD_SITEURL" description="MOD_DASHBOARD_SITEURL_DESC" parentclass="span-2 stack"/>
-				<field name="analytics_use_token" type="radio" default="0" label="MOD_DASHBOARD_ANALYTICS_USE_TOKEN" description="MOD_DASHBOARD_ANALYTICS_USE_TOKEN_DESC" layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field name="analytics_site_token_auth" type="text" default="" label="MOD_DASHBOARD_TOKEN" description="MOD_DASHBOARD_TOKEN_DESC" parentclass="span-2 stack"/>
-				<field name="analytics_period" type="text" default="week" label="MOD_DASHBOARD_ANALYTICS_PERIOD" description="MOD_DASHBOARD_ANALYTICS_PERIOD_DESC" parentclass="span-2 stack"/>
-				<field name="analytics_date" type="text" default="yesterday" label="MOD_DASHBOARD_ANALYTICS_DATE" description="MOD_DASHBOARD_ANALYTICS_DATE_DESC" parentclass="span-2 stack"/>
-				<field name="analytics_height" type="text" default="500" label="MOD_DASHBOARD_ANALYTICS_HEIGHT" description="MOD_DASHBOARD_ANALYTICS_HEIGHT_DESC" parentclass="span-2 stack"/>
-				<field name="analytics_button" type="text" default="MOD_DASHBOARD_LINK_ANALYTICS" label="MOD_DASHBOARD_ANALYTICS_LINK" description="MOD_DASHBOARD_ANALYTICS_LINK_DESC" parentclass="span-5 stack"/>
+			<fieldset name="analytics_config" label="MOD_DASHBOARD_ANALYTICS_CONFIG"
+				description="MOD_DASHBOARD_ANALYTICS_CONFIG_DESC">
+				<field name="analytics_tabname" type="text" default="MOD_DASHBOARD_TAB_ANALYTICS"
+					label="MOD_DASHBOARD_ANALYTICS_TAB_NAME"
+					description="MOD_DASHBOARD_ANALYTICS_TAB_NAME_DESC" parentclass="span-5 stack" />
+				<field name="analytics_siteid" type="text" default="1" label="MOD_DASHBOARD_SITEID"
+					description="MOD_DASHBOARD_SITEID_DESC" parentclass="span-2 stack" />
+				<field name="analytics_site_url" type="text" default=""
+					label="MOD_DASHBOARD_SITEURL" description="MOD_DASHBOARD_SITEURL_DESC"
+					parentclass="span-2 stack" />
+				<field name="analytics_use_token" type="radio" default="0"
+					label="MOD_DASHBOARD_ANALYTICS_USE_TOKEN"
+					description="MOD_DASHBOARD_ANALYTICS_USE_TOKEN_DESC"
+					layout="joomla.form.field.radio.switcher" parentclass="span-2 stack">
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field name="analytics_site_token_auth" type="text" default=""
+					label="MOD_DASHBOARD_TOKEN" description="MOD_DASHBOARD_TOKEN_DESC"
+					parentclass="span-2 stack" />
+				<field name="analytics_period" type="text" default="week"
+					label="MOD_DASHBOARD_ANALYTICS_PERIOD"
+					description="MOD_DASHBOARD_ANALYTICS_PERIOD_DESC" parentclass="span-2 stack" />
+				<field name="analytics_date" type="text" default="yesterday"
+					label="MOD_DASHBOARD_ANALYTICS_DATE"
+					description="MOD_DASHBOARD_ANALYTICS_DATE_DESC" parentclass="span-2 stack" />
+				<field name="analytics_height" type="text" default="500"
+					label="MOD_DASHBOARD_ANALYTICS_HEIGHT"
+					description="MOD_DASHBOARD_ANALYTICS_HEIGHT_DESC" parentclass="span-2 stack" />
+				<field name="analytics_button" type="text" default="MOD_DASHBOARD_LINK_ANALYTICS"
+					label="MOD_DASHBOARD_ANALYTICS_LINK"
+					description="MOD_DASHBOARD_ANALYTICS_LINK_DESC" parentclass="span-5 stack" />
 			</fieldset>
 
 			<fieldset name="advanced">
-				<field name="layout" type="modulelayout" label="JFIELD_ALT_LAYOUT_LABEL" class="custom-select" />
+				<field name="layout" type="modulelayout" label="JFIELD_ALT_LAYOUT_LABEL"
+					class="custom-select" />
 
-				<field name="moduleclass_sfx" type="textarea" rows="3" label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL" description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
+				<field name="moduleclass_sfx" type="textarea" rows="3"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
 			</fieldset>
 		</fields>
 	</config>
 
 	<updateservers>
-		<server type="extension" priority="1" name="Dashboard module update">https://raw.githubusercontent.com/micker/mod_dashboard/v2/update.xml</server>
+		<server type="extension" priority="1" name="Dashboard module update">
+			https://raw.githubusercontent.com/micker/mod_dashboard/v2/update.xml</server>
 	</updateservers>
-</extension>
+</extension>
\ No newline at end of file
diff --git a/models/forms/addcustomblock.xml b/models/forms/addcustomblock.xml
index 179031e..7da4ab9 100644
--- a/models/forms/addcustomblock.xml
+++ b/models/forms/addcustomblock.xml
@@ -1,14 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-  <field name="nameblockcustom" type="text" label="MOD_DASHBOARD_BLOCKCUSTOM" description="MOD_DASHBOARD_BLOCKCUSTOM_DESC"/>
-  <field name="catidlist" type="category" extension="com_content" multiple="false" label="MOD_DASHBOARD_CAT" description="MOD_DASHBOARD_CAT_DESC" class="advancedSelect" />
-  <field name="displautblock" label="MOD_DASHBOARD_DISPLAY_AUTHOR" type="radio" default="1" layout="joomla.form.field.radio.switcher">
+  <field name="TypofBlock" label="Type of block" description="" type="list" default="0">
+    <option value="fb">MOD_DASHBOARD_DISPLAYBLOCK_FEATURED</option>
+    <option value="pb">MOD_DASHBOARD_DISPLAYBLOCK_PUBLISHED</option>
+    <option value="cb">MOD_DASHBOARD_BLOCKCUSTOM_DESC</option>
+    <option value="ub">MOD_DASHBOARD_DISPLAYBLOCK_YOURITEM</option>
+    <option value="upb">MOD_DASHBOARD_DISPLAYBLOCK_UNPUBLISHED</option>
+    <option value="ab">MOD_DASHBOARD_DISPLAYBLOCK_ARCHIVED</option>
+    <option value="tb">MOD_DASHBOARD_DISPLAYBLOCK_TRASHED</option>
+    <option value="alb">MOD_DASHBOARD_ADD_ACTIONSBLOCK</option>
+  </field>
+
+
+  <!-- Valeur par defaut -->
+  <field name="nameblockcustom" type="text" label="MOD_DASHBOARD_BLOCKCUSTOM"
+    description="MOD_DASHBOARD_BLOCKCUSTOM_DESC" />
+  <field name="catidlist" type="category" extension="com_content" multiple="true"
+    label="MOD_DASHBOARD_CAT" description="MOD_DASHBOARD_CAT_DESC"
+    layout="joomla.form.field.list-fancy-select" showon="TypofBlock:cb" />
+  <field name="displautblock" label="MOD_DASHBOARD_DISPLAY_AUTHOR" type="radio" default="1"
+    layout="joomla.form.field.radio.switcher">
     <option value="0">JNO</option>
-        <option value="1">JYES</option>
+    <option value="1">JYES</option>
   </field>
-  <field name="displdateblock" label="MOD_DASHBOARD_DISPLAY_DATE" type="radio" default="1" layout="joomla.form.field.radio.switcher">
+  <field name="displdateblock" label="MOD_DASHBOARD_DISPLAY_DATE" type="radio" default="1"
+    layout="joomla.form.field.radio.switcher">
     <option value="0">JNO</option>
-        <option value="1">JYES</option>
+    <option value="1">JYES</option>
+  </field>
+  <field name="iconbutton" type="iconpicker" default="" label="MOD_DASHBOARD_ICON"
+    description="MOD_DASHBOARD_ICON_DESC" />
+  <field name="coloricon" type="color" default="" format="rgba" label="MOD_DASHBOARD_ICON_COLOR"
+    description="MOD_DASHBOARD_ICON_COLOR_DESC" />
+  <field name="count" type="list" default="5" label="MOD_DASHBOARD_NBITEM"
+    description="MOD_DASHBOARD_NBITEM" parentclass="span-2 stack">
+    <option value="1">1</option>
+    <option value="3">3</option>
+    <option value="5">5</option>
+    <option value="10">10</option>
+    <option value="15">15</option>
+    <option value="20">20</option>
+    <option value="50">50</option>
+    <option value="100">100</option>
   </field>
-  <field name="width" type="number" default="45" label="MOD_DASHBOARD_WIDTHCOL" description="MOD_DASHBOARD_WIDTHCOL_DESC" min="0" max="100" step="5" />
-</form>
+  <field name="forceheightblock" type="text" default="" size="50" label="MOD_DASHBOARD_BLOCKHEIGHT"
+    description="MOD_DASHBOARD_BLOCKHEIGHT_DESC" parentclass="span-2 stack" />
+  <field name="width" type="number" default="45" label="MOD_DASHBOARD_WIDTHCOL"
+    description="MOD_DASHBOARD_WIDTHCOL_DESC" min="0" max="100" step="5" />
+</form>
\ No newline at end of file
diff --git a/models/forms/freebutton.xml b/models/forms/freebutton.xml
index 21555bf..219e10e 100644
--- a/models/forms/freebutton.xml
+++ b/models/forms/freebutton.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<field name="freenametab" type="text" default="MOD_DASHBOARD_FREE_TAB_NAME" label="MOD_DASHBOARD_FREE_TAB_NAME_2" description="MOD_DASHBOARD_FREE_TAB_NAME_2_DESC" />
-	<field name="free_button" description="Add button" type= "subform" label="Add button" min="0" max="1000" required="false" formsource="administrator/modules/mod_dashboard/models/forms/freebuttonchild.xml" multiple="true" buttons="add,remove,move" layout="joomla.form.field.subform.repeatable" groupByFieldset="false"/>
-</form>
+	<field name="freenametab" type="text" default="MOD_DASHBOARD_FREE_TAB_NAME"
+		label="MOD_DASHBOARD_FREE_TAB_NAME_2" description="MOD_DASHBOARD_FREE_TAB_NAME_2_DESC" />
+	<field name="free_button" description="Add button" type="subform" label="Add button" min="0"
+		max="1000" required="false"
+		formsource="administrator/modules/mod_dashboard/models/forms/freebuttonchild.xml"
+		multiple="true" buttons="add,remove,move" layout="joomla.form.field.subform.repeatable"
+		groupByFieldset="false" />
+</form>
\ No newline at end of file
diff --git a/models/forms/freebuttonchild.xml b/models/forms/freebuttonchild.xml
index d50a253..24631c9 100644
--- a/models/forms/freebuttonchild.xml
+++ b/models/forms/freebuttonchild.xml
@@ -1,39 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<field name="displayButtonTypeOption" label="Type of button" description="MOD_DASHBOARD_DISPLAY_LINE_DESC" type="list" default="0" class="">
+	<field name="displayButtonTypeOption" label="Type of button"
+		description="MOD_DASHBOARD_DISPLAY_LINE_DESC" type="list" default="0" class="">
 		<option value="1">Add item</option>
 		<option value="2">Edit item</option>
 		<option value="3">Link to categorie</option>
 		<option value="4">Custom button</option>
 
 	</field>
-<!--Add item -->
-	<field name="catid" type="category" extension="com_content" multiple="false" label="MOD_DASHBOARD_CAT" description="MOD_DASHBOARD_CAT_DESC" showon="displayButtonTypeOption:1" />
+	<!--Add
+	item -->
+	<field name="catid" type="category" extension="com_content" multiple="false"
+		label="MOD_DASHBOARD_CAT" description="MOD_DASHBOARD_CAT_DESC"
+		showon="displayButtonTypeOption:1" />
 
-<!--Edit item -->
-  <field name="itemid" type="text" size="5" label="MOD_DASHBOARD_ITEM" description="MOD_DASHBOARD_ITEM_DESC" showon="displayButtonTypeOption:2"/>
+	<!--Edit
+	item -->
+	<field name="itemid" type="text" size="5" label="MOD_DASHBOARD_ITEM"
+		description="MOD_DASHBOARD_ITEM_DESC" showon="displayButtonTypeOption:2" />
 
-<!--Link to categorie-->
-	<field name="catidlist" type="category" extension="com_content" multiple="false" label="MOD_DASHBOARD_CAT" description="MOD_DASHBOARD_CAT_DESC" showon="displayButtonTypeOption:3" />
-	<field name="displayauthoronly" label="MOD_DASHBOARD_DISPLAY_AUTHOR_ONLY" description="MOD_DASHBOARD_DISPLAY_AUTHOR_ONLY_DESC" type="radio" default="0" layout="joomla.form.field.radio.switcher" showon="displayButtonTypeOption:3">
+	<!--Link
+	to categorie-->
+	<field name="catidlist" type="category" extension="com_content" multiple="false"
+		label="MOD_DASHBOARD_CAT" description="MOD_DASHBOARD_CAT_DESC"
+		showon="displayButtonTypeOption:3" />
+	<field name="displayauthoronly" label="MOD_DASHBOARD_DISPLAY_AUTHOR_ONLY"
+		description="MOD_DASHBOARD_DISPLAY_AUTHOR_ONLY_DESC" type="radio" default="0"
+		layout="joomla.form.field.radio.switcher" showon="displayButtonTypeOption:3">
 		<option value="0">JNO</option>
 		<option value="1">JYES</option>
 	</field>
-<!--Free button-->
-	<field name="linkbutton" type="text" label="MOD_DASHBOARD_FREE_LINK" description="MOD_DASHBOARD_FREE_LINK_DESC" showon="displayButtonTypeOption:4" />
-<!--common option-->
-	<field name="button_name" label="MOD_DASHBOARD_NAME_BUTTON" description="MOD_DASHBOARD_NAME_BUTTON_DESC" size="30" type="text"/>
-	<field name="iconbutton" type="iconpicker" default="" label="MOD_DASHBOARD_ICON" description="MOD_DASHBOARD_ICON_DESC" />
-	<field name="coloricon" type="color" default="" format="rgba" label="MOD_DASHBOARD_ICON_COLOR" description="MOD_DASHBOARD_ICON_COLOR_DESC"/>
-		<field name="button_lang" type="contentlanguage" label="MOD_DASHBOARD_LANG" description="MOD_DASHBOARD_LANG_DESC" class="span12 small">
+	<!--Free
+	button-->
+	<field name="linkbutton" type="text" label="MOD_DASHBOARD_FREE_LINK"
+		description="MOD_DASHBOARD_FREE_LINK_DESC" showon="displayButtonTypeOption:4" />
+	<!--common
+	option-->
+	<field name="button_name" label="MOD_DASHBOARD_NAME_BUTTON"
+		description="MOD_DASHBOARD_NAME_BUTTON_DESC" size="30" type="text" />
+	<field name="iconbutton" type="iconpicker" default="" label="MOD_DASHBOARD_ICON"
+		description="MOD_DASHBOARD_ICON_DESC" />
+	<field name="coloricon" type="color" default="" format="rgba" label="MOD_DASHBOARD_ICON_COLOR"
+		description="MOD_DASHBOARD_ICON_COLOR_DESC" />
+	<field name="button_lang" type="contentlanguage" label="MOD_DASHBOARD_LANG"
+		description="MOD_DASHBOARD_LANG_DESC" class="span12 small">
 		<option value="*">JALL</option>
 	</field>
-	<field name="targetlink" label="MOD_DASHBOARD_TARGETLINK" description="MOD_DASHBOARD_TARGETLINK_DESC" type="radio" default="_self" layout="joomla.form.field.radio.switcher">
+	<field name="targetlink" label="MOD_DASHBOARD_TARGETLINK"
+		description="MOD_DASHBOARD_TARGETLINK_DESC" type="radio" default="_self"
+		layout="joomla.form.field.radio.switcher">
 		<option value="_self">MOD_DASHBOARD_SELF</option>
 		<option value="_blank">MOD_DASHBOARD_BLANK</option>
 	</field>
-	<field name="displayline" label="MOD_DASHBOARD_DISPLAY_LINE" description="MOD_DASHBOARD_DISPLAY_LINE_DESC" type="radio" default="0" layout="joomla.form.field.radio.switcher">
+	<field name="displayline" label="MOD_DASHBOARD_DISPLAY_LINE"
+		description="MOD_DASHBOARD_DISPLAY_LINE_DESC" type="radio" default="0"
+		layout="joomla.form.field.radio.switcher">
 		<option value="0">JNO</option>
-				<option value="1">JYES</option>
+		<option value="1">JYES</option>
 	</field>
-</form>
+</form>
\ No newline at end of file
diff --git a/tmpl/default.php b/tmpl/default.php
index 03730d1..ce16e36 100644
--- a/tmpl/default.php
+++ b/tmpl/default.php
@@ -1,12 +1,13 @@
 <?php
 
 /**
- * @version 0.5.0 stable $Id: default.php yannick berges
+ * @version 3 stable $Id: default.php yannick berges
  * @package Joomla
  * @copyright (C) 2018 Berges Yannick - www.com3elles.com
  * @license GNU/GPL v2
 
  * special thanks to my master Marc Studer
+ * special thanks to Shane for helping
 
  * JOOMLA Admin module by Com3elles is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,6 +25,10 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\Registry\Registry;
+use Joomla\CMS\Helper\ModuleHelper;
+
+define('DS', DIRECTORY_SEPARATOR);
+const BASE_PATH_SITE = JPATH_ADMINISTRATOR . DS . 'modules' . DS . 'mod_dashboard';
 
 $document = JFactory::getDocument();
 $app       = JFactory::getApplication();
@@ -33,8 +38,13 @@
 
 //JHTML::_('behavior.modal');
 //JHtml::_('stylesheet', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css');
-JHtml::_('stylesheet', 'media/mod_dashboard/css/style.css');
-JHtml::_('stylesheet', 'media/mod_dashboard/css/bootstrap-iconpicker.css');
+
+$wa = \Joomla\CMS\Factory::getApplication()->getDocument()->getWebAssetManager();
+$wa->registerStyle('mod_dashboard.style', 'media/mod_dashboard/css/style.css');
+$wa->registerStyle('mod_dashboard.style2', 'media/mod_dashboard/css/bootstrap-iconpicker.css');
+$wa->useStyle('mod_dashboard.style');
+
+
 
 $force_fullwidth     = $params->get('force_fullwidth', '1');
 
@@ -46,14 +56,6 @@
 }
 
 //module config
-$hiddefeatured       = $params->get('hiddefeatured', '1');
-$hiddepublished      = $params->get('hiddepublished', '1');
-$hiddeunpublished    = $params->get('hiddeunpublished', '1');
-$hiddearchived       = $params->get('hiddearchived', '1');
-$hiddeyouritem       = $params->get('hiddeyouritem', '1');
-$hiddetrashed        = $params->get('hiddetrashed', '1');
-$actionsloglist	     = $params->get('actionsloglist', '1');
-$column              = $params->get('column', '4');
 $displaycustomtab    = $params->get('displaycustomtab', '1');
 $displaycreattab     = $params->get('displaycreattab', '1');
 $displaymanagetab    = $params->get('displaymanagetab', '1');
@@ -64,14 +66,10 @@
 $displaycustomtext   = $params->get('displaycustomtext', '');
 $customtext          = $params->get('customtext', '');
 $displayinfosystem   = $params->get('displayinfosystem', '1');
-$featurewidth      = $params->get('featuredwidth', '48');
-$publishedwidth      = $params->get('publishedwidth', '48');
-$unpublishedwidth    = $params->get('unpublishedwidth', '48');
-$youritemwidth       = $params->get('youritemwidth', '48');
-$trashedwidth     = $params->get('trashedlogwidth', '48');
-$archivedwidth       = $params->get('archivedwidth', '48');
-$actionslogwidth     = $params->get('actionslogwidth', '48');
 $iconsize     = $params->get('iconsize', 'fa-2x');
+$moduleclass_sfx = $params->get('moduleclass_sfx');
+
+$blockwidth = '45';
 
 
 //customtab
@@ -102,7 +100,7 @@
 
 //Analytics tab
 $displayanalytics      = $params->get('displayanalytics');
-$analytics_url = $params->get('analytics_site_url'); 
+$analytics_url = $params->get('analytics_site_url');
 $analytics_siteid =  $params->get('analytics_siteid');
 $analytics_period = $params->get('analytics_period', 'week');
 $analytics_date = $params->get('analytics_date', 'yesterday');
@@ -155,7 +153,8 @@
 
 				<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'general')); ?>
 				<?php if ($displaycustomtab) : ?>
-					<?php //echo HTMLHelper::_('uitab.addTab', 'myTab', 'custom', Text::_($nametab)); ?>
+					<?php //echo HTMLHelper::_('uitab.addTab', 'myTab', 'custom', Text::_($nametab)); 
+					?>
 					<?php
 					$list_freebuttons = $params->get('free_tab');
 					if ($list_freebuttons) : ?>
@@ -168,30 +167,30 @@
 										<ul class="nav flex-wrap">
 											<?php foreach ($free_tab->free_button as $free_button_idx => $free_button) : ?>
 												<li class="quickicon quickicon-single col <?php echo $free_button->displayline ? 'newlinegrid' : ''; ?>">
-												<!-- ici boucle de calcul des liens -->
-												<?php if ($free_button->displayauthoronly == 1) {
-												$filter_byauthor = '&amp;filter[author_id]=' . $user->id;
-											} else {
-												$filter_byauthor = '';
-											}
-											?>
-												<?php 
-												switch ($free_button->displayButtonTypeOption) {
-													case 1://add item
-														$url_button ="index.php?option=com_content&view=article&layout=edit&catid=$free_button->catid&language=$free_button->button_lang";
-													break;
-													case 2://edit item
-														$url_button ="index.php?option=com_content&task=article.edit&id=$free_button->itemid";
-													break;
-													case 3://cat link
-														$url_button ="index.php?option=com_content&view=articles&filter[category_id]=$free_button->catidlist&filter[language]=$free_button->button_lang $filter_byauthor";
-													break;
-													case 4://custom link
-														$url_button = $free_button->linkbutton;
-													break;
-												}
-												?>
-												<a href="<?php echo $url_button; ?>" target="<?php echo $free_button->targetlink; ?>">
+													<!-- ici boucle de calcul des liens -->
+													<?php if ($free_button->displayauthoronly == 1) {
+														$filter_byauthor = '&amp;filter[author_id]=' . $user->id;
+													} else {
+														$filter_byauthor = '';
+													}
+													?>
+													<?php
+													switch ($free_button->displayButtonTypeOption) {
+														case 1: //add item
+															$url_button = "index.php?option=com_content&view=article&layout=edit&catid=$free_button->catid&language=$free_button->button_lang";
+															break;
+														case 2: //edit item
+															$url_button = "index.php?option=com_content&task=article.edit&id=$free_button->itemid";
+															break;
+														case 3: //cat link
+															$url_button = "index.php?option=com_content&view=articles&filter[category_id]=$free_button->catidlist&filter[language]=$free_button->button_lang $filter_byauthor";
+															break;
+														case 4: //custom link
+															$url_button = $free_button->linkbutton;
+															break;
+													}
+													?>
+													<a href="<?php echo $url_button; ?>" target="<?php echo $free_button->targetlink; ?>">
 														<div class="quickicon-icon d-flex align-items-end big">
 															<i class="fas 
 						<?php if (!empty($free_button->iconbutton)) {
@@ -212,7 +211,7 @@
 														</div>
 													</a>
 												</li>
-												
+
 											<?php endforeach; ?>
 										</ul>
 									</nav>
@@ -221,7 +220,8 @@
 							<?php echo HTMLHelper::_('uitab.endTab'); ?>
 						<?php endforeach; ?>
 					<?php endif; ?>
-					<?php //echo HTMLHelper::_('uitab.endTab'); ?>
+					<?php //echo HTMLHelper::_('uitab.endTab'); 
+					?>
 				<?php endif; ?>
 				<?php if ($displaycreattab) : ?>
 					<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'create', Text::_('MOD_DASHBOARD_TAB_CREATE_D')); ?>
@@ -461,26 +461,26 @@
 				<?php endif; ?>
 
 				<?php if ($displayfreetab) : ?>
-					
+
 				<?php endif; ?>
 
 				<?php if ($displayanalytics && $analytics_url) : ?>
 					<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'create', Text::_($analytics_tab_name)); ?>
 					<div class="row">
 						<div class="col-lg-12">
-						<div style="float:right"><a href="<?php echo $analytics_url; ?>" target="_blank" class="btn btn-primary"><?php echo Text::_($analytics_button_name); ?></a></div>
-							<?php if($analytics_token_auth && $analytics_use_token_auth == 1 ) : ?>
-						<iframe src="<?php echo $analytics_url; ?>/index.php?module=Widgetize&action=iframe&moduleToWidgetize=Dashboard&actionToWidgetize=index&idSite=<?php echo $analytics_siteid; ?>&period=<?php echo $analytics_period; ?>&date=<?php echo $analytics_date; ?>&token_auth=<?php echo $analytics_token_auth; ?>" frameborder="0" marginheight="0" marginwidth="0" width="100%" height="<?php echo $analytics_height;?>px"></iframe>
-						<?php elseif ($analytics_use_token_auth == 0 ) : ?>
-							<iframe src="<?php echo $analytics_url; ?>/index.php?module=Widgetize&action=iframe&moduleToWidgetize=Dashboard&actionToWidgetize=index&idSite=<?php echo $analytics_siteid; ?>&period=<?php echo $analytics_period; ?>&date=<?php echo $analytics_date; ?>" frameborder="0" marginheight="0" marginwidth="0" width="100%" height="<?php echo $analytics_height;?>px"></iframe>
+							<div style="float:right"><a href="<?php echo $analytics_url; ?>" target="_blank" class="btn btn-primary"><?php echo Text::_($analytics_button_name); ?></a></div>
+							<?php if ($analytics_token_auth && $analytics_use_token_auth == 1) : ?>
+								<iframe src="<?php echo $analytics_url; ?>/index.php?module=Widgetize&action=iframe&moduleToWidgetize=Dashboard&actionToWidgetize=index&idSite=<?php echo $analytics_siteid; ?>&period=<?php echo $analytics_period; ?>&date=<?php echo $analytics_date; ?>&token_auth=<?php echo $analytics_token_auth; ?>" frameborder="0" marginheight="0" marginwidth="0" width="100%" height="<?php echo $analytics_height; ?>px"></iframe>
+							<?php elseif ($analytics_use_token_auth == 0) : ?>
+								<iframe src="<?php echo $analytics_url; ?>/index.php?module=Widgetize&action=iframe&moduleToWidgetize=Dashboard&actionToWidgetize=index&idSite=<?php echo $analytics_siteid; ?>&period=<?php echo $analytics_period; ?>&date=<?php echo $analytics_date; ?>" frameborder="0" marginheight="0" marginwidth="0" width="100%" height="<?php echo $analytics_height; ?>px"></iframe>
 							<?php else : ?>
-							<?php echo Text::_('MOD_DASHBOARD_TOKEN_MESSAGE'); ?>
-						<?php endif; ?>
+								<?php echo Text::_('MOD_DASHBOARD_TOKEN_MESSAGE'); ?>
+							<?php endif; ?>
 
+						</div>
 					</div>
-							</div>
-							<?php echo HTMLHelper::_('uitab.endTab'); ?>
-							<?php endif; ?>
+					<?php echo HTMLHelper::_('uitab.endTab'); ?>
+				<?php endif; ?>
 
 
 				<?php echo HTMLHelper::_('uitab.endTabSet'); ?>
@@ -488,497 +488,194 @@
 
 			</div>
 	</div>
+	<?php if (!empty($params->get('add_customblock'))) : ?>
+		<div class="sep"></div>
 
-	<div class="sep"></div>
+		<div class="contentbloc">
 
-	<div class="contentbloc">
+			<?php foreach ($params->get('add_customblock') as $block) : ?>
 
-		<?php if ($hiddefeatured) : ?>
-			<div class="block featured card" style="width:<?php echo $featurewidth; ?>%">
-				<div class="card-header">
-					<?php $show_all_link = 'index.php?option=com_content&amp;view=featured'; ?>
-					<div class="module-actions">
-						<a href='<?php echo $show_all_link ?>' class='adminlink'>
+				<?php if ($block->TypofBlock != 'alb') : ?>
+					<div class="block <?php echo $block->nameblockcustom; ?> card" style="width:<?php echo $block->width; ?>%">
+						<div class="card-header">
 							<?php
-							echo Text::_('MOD_DASHBOARD_ALL');
-							echo "</a></div>";	?>
-							<h3 class="module-title"><i class="fas fa-star featured"></i>
-								<?php echo Text::_('MOD_DASHBOARD_FEATURED'); ?></h3>
-					</div>
-					<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
-
-						<table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
-							<thead>
-								<tr>
-									<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
-									<th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
-									<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
-								</tr>
-							</thead>
-							<tbody>
-								<?php foreach ($listFeatured as $itemFeatured) :
-									$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemFeatured->id);
-									$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemFeatured->checked_out == $userId || $itemFeatured->checked_out == 0;
-									$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemFeatured->id) && $itemFeatured->created_by == $userId;
-									$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemFeatured->id) && $canCheckin;
-									if ($canChange) :
-								?>
-										<tr>
-											<td>
-												<a href="<?php echo $itemFeatured->link; ?>"><?php echo $itemFeatured->title; ?>
-													<i class="fa fa-edit"></i></a>
-											</td>
-											<td>
-												<span class="small">
-													<i class="fa fa-user"></i>
-													<?php echo $itemFeatured->name; ?>
-													</small>
-												</span>
-											</td>
-											<td>
-												<span class="small">
-													<i class="fas fa-calendar"></i>
-													<?php echo JHtml::date($itemFeatured->modified, 'd M Y'); ?>
-												</span>
-											</td>
-										</tr>
-
-									<?php endif; ?>
-								<?php endforeach; ?>
-							</tbody>
-						</table>
-					</div>
-				</div>
-			<?php endif; ?>
-			<?php if ($hiddepublished) : ?>
-				<div class="block published card" style="width:<?php echo $publishedwidth; ?>%">
-					<div class="card-header">
-
-						<?php $show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[published]=1'; ?>
-						<div class="module-actions">
-							<a href='<?php echo $show_all_link ?>' class='adminlink'>
-								<?php
-								echo Text::_('MOD_DASHBOARD_ALL');
-								echo "</a></div>";	?>
-								<h3 class="module-title "><i class="fa fa-check"></i>
-									<?php echo Text::_('MOD_DASHBOARD_PUBLISHED'); ?></h3>
-
+							//var_dump($block->catidlist);
+							//$catidslist = implode(",", $block->catidlist );
+							foreach ($block->catidlist as $catidfilter) {
+								$catidslist[] = '&filter[category_id][]=' . $catidfilter;
+							}
+							//var_dump($catidslist);die;
+							switch ($block->TypofBlock) {
+								case ('fb'):
+									$show_all_link = 'index.php?option=com_content&view=featured' . implode('', $catidslist);
+									break;
+								case ('pb'):
+									$show_all_link = 'index.php?option=com_content&view=articles&filter[published]=1' . implode('', $catidslist);
+									break;
+								case ('upb'):
+									$show_all_link = 'index.php?option=com_content&view=articles&filter[published]=0' . implode('', $catidslist);
+									break;
+								case ('ab'):
+									$show_all_link = 'index.php?option=com_content&view=articles&filter[published]=2' . implode('', $catidslist);
+									break;
+								case ('tb'):
+									$show_all_link = 'index.php?option=com_content&view=articles&filter[published]=-2' . implode('', $catidslist);
+									break;
+								case ('ub'):
+									$show_all_link = 'index.php?option=com_content&view=articles&filter[author_id]=' . $user->id . implode('', $catidslist);
+									break;
+								case ('cb'):
+									$show_all_link = 'index.php?option=com_content&view=articles&filter[author_id]=' . $user->id . implode('', $catidslist);
+									break;
+							}
 
-						</div>
-						<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
-
-							<table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
-								<thead>
-									<tr>
-										<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
-										<th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
-										<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
-									</tr>
-								</thead>
-								<tbody>
-									<?php foreach ($listPublished as $itemPublished) :
-										$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemPublished->id);
-										$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemPublished->checked_out == $userId || $itemPublished->checked_out == 0;
-										$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemPublished->id) && $itemPublished->created_by == $userId;
-										$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemPublished->id) && $canCheckin;
-										if ($canChange) :
-									?>
-											<tr>
-												<td>
-													<a href="<?php echo $itemPublished->link; ?>"><?php echo $itemPublished->title; ?>
-														<i class="fa fa-edit"></i></a>
-												</td>
-												<td>
-													<span class="small">
-														<i class="fa fa-user"></i>
-														<?php echo $itemPublished->name; ?>
-														</small>
-													</span>
-												</td>
-												<td>
-													<span class="small">
-														<i class="fas fa-calendar"></i>
-														<?php echo JHtml::date($itemPublished->modified, 'd M Y'); ?>
-													</span>
-												</td>
-
-											</tr>
-										<?php endif; ?>
-									<?php endforeach; ?>
-								</tbody>
-							</table>
-						</div>
-					</div>
-				<?php endif; ?>
-
-				<?php if ($hiddeunpublished) : ?>
-
-					<div class="block unpublished card" style="width:<?php echo $unpublishedwidth; ?>%">
-						<div class="card-header">
-							<?php $show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[published]=0'; ?>
+							?>
 							<div class="module-actions">
 								<a href='<?php echo $show_all_link ?>' class='adminlink'>
 									<?php
 									echo Text::_('MOD_DASHBOARD_ALL');
-									echo "</a></div>";	?>
-									<h3 class="module-title"><i class="fa fa-thumbs-down"></i>
-										<?php echo Text::_('MOD_DASHBOARD_UNPUBLISHED'); ?></h3>
-
+									echo "</a></div>";    ?>
+									<h3 class="module-title">
+										<i class="fas 
+						<?php if (!empty($block->iconbutton)) {
+							echo $block->iconbutton;
+						} else {
+							echo 'fa-star';
+						}
+						?>  
+								" <?php if (!empty($block->coloricon)) {
+										echo 'style="color:' . $block->coloricon . ';"';
+									} else {
+									}
+									?>></i>
+										<?php echo $block->nameblockcustom; ?>
+									</h3>
 							</div>
+							<div class="card-body" style="height:<?php echo $block->forceheightblock; ?>">
 
-							<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
-
-								<table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
+								<table class="table" id="<?php echo str_replace(' ', '', $block->nameblockcustom); ?>">
 									<thead>
 										<tr>
 											<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+											<th scope="col" class="w-20"><?php echo Text::_('JCATEGORY'); ?></th>
 											<th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
 											<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
 										</tr>
 									</thead>
 									<tbody>
-										<?php foreach ($listUnpublished as $itemUnpublished) :
-											$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemUnpublished->id);
-											$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemUnpublished->checked_out == $userId || $itemUnpublished->checked_out == 0;
-											// $canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemUnpublished->id) && $$itemUnpublished->created_by == $userId;
-											$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemUnpublished->id) && $canCheckin;
+										<?php foreach ($block->items as $item) :
+											$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $item->id);
+											$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+											$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $item->id) && $item->created_by == $userId;
+											$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
 											if ($canChange) :
 										?>
 												<tr>
 													<td>
-														<a href="<?php echo $itemUnpublished->link; ?>"><?php echo $itemUnpublished->title; ?>
+														<a href="<?php echo $item->link; ?>"><?php echo $item->title; ?>
 															<i class="fa fa-edit"></i></a>
 													</td>
 													<td>
 														<span class="small">
-															<i class="fa fa-user"></i> <?php echo $itemUnpublished->name; ?></small>
+															<i class="fa fa-folder"></i>
+															<?php echo $item->title; ?>
+															</small>
+														</span>
+													</td>
+
+													<td>
+														<span class="small">
+															<i class="fa fa-user"></i>
+															<?php echo $item->name; ?>
+															</small>
 														</span>
 													</td>
 													<td>
 														<span class="small">
 															<i class="fas fa-calendar"></i>
-															<?php echo JHtml::date($itemUnpublished->modified, 'd M Y'); ?>
+															<?php echo JHtml::date($item->modified, 'd M Y'); ?>
 														</span>
 													</td>
 												</tr>
+
 											<?php endif; ?>
 										<?php endforeach; ?>
-									<tbody>
+									</tbody>
 								</table>
 							</div>
 						</div>
-					<?php endif; ?>
-					<?php if ($hiddearchived) : ?>
-						<div class="block archived card" style="width:<?php echo $archivedwidth; ?>%">
-							<div class="card-header">
-								<?php $show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[published]=2'; ?>
-								<div class="module-actions">
-									<a href='<?php echo $show_all_link ?>' class='adminlink'>
-										<?php
-										echo Text::_('MOD_DASHBOARD_ALL');
-										echo "</a></div>";	?>
-										<h3 class="module-title"><i class="fa fa-archive"></i>
-											<?php echo Text::_('MOD_DASHBOARD_ARCHIVED'); ?></h3>
 
-								</div>
-								<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
-
-									<table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
-										<thead>
-											<tr>
-												<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
-												<th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
-												<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
-											</tr>
-										</thead>
-										<tbody>
-											<?php foreach ($listArchived as $itemArchived) :
-												$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemArchived->id);
-												$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemArchived->checked_out == $userId || $itemArchived->checked_out == 0;
-												$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemArchived->id) && $itemArchived->created_by == $userId;
-												$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemArchived->id) && $canCheckin;
-												if ($canChange) :
-											?>
-													<tr>
-														<td>
-															<a href="<?php echo $itemArchived->link; ?>"><?php echo $itemArchived->title; ?>
-																<i class="fa fa-edit"></i></a>
-														</td>
-														<td>
-															<span class="small">
-																<i class="fa fa-user"></i>
-																<?php echo $itemArchived->name; ?>
-															</span>
-														</td>
-														<td>
-															<span class="small"> <i class="fas fa-calendar"></i>
-																<?php echo JHtml::date($itemArchived->modified, 'd M Y'); ?></span>
-														</td>
-													</tr>
-								</div>
-							<?php endif; ?>
-						<?php endforeach; ?>
-						</tbody>
-						</table>
-							</div>
-						</div>
 					<?php endif; ?>
-					<?php if ($hiddeyouritem) : ?>
-						<div class="block youritems card" style="width:<?php echo $youritemwidth; ?>%">
+					<?php if ($block->TypofBlock == 'alb') : ?>
+						<div class="block actionlog card" style="width:<?php echo $block->width; ?>%">
 							<div class="card-header">
-								<div class="module-actions">
-									<?php $show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[author_id]=' . $user->id; //TODO add user id
-									?>
+								<div class="module-actions"> <?php $show_all_link = 'index.php?option=com_actionlogs'; ?>
 									<a href='<?php echo $show_all_link ?>' class='adminlink'>
 										<?php
 										echo Text::_('MOD_DASHBOARD_ALL');
 										echo "</a></div>";	?>
-
-										<?php $user = JFactory::getUser();		?>
-										<h3 class="module-title">
-											<i class="fa fa-user"></i>
-											<?php echo Text::_('JOOMLA_YOUR_ITEM'); ?> : <?php echo $user->name; ?>
+										<h3 class="module-title ">
+											<i class="fas 
+						<?php if (!empty($block->iconbutton)) {
+							echo $block->iconbutton;
+						} else {
+							echo 'fa-star';
+						}
+						?>  
+								" <?php if (!empty($block->coloricon)) {
+										echo 'style="color:' . $block->coloricon . ';"';
+									} else {
+									}
+									?>></i>
+											<?php echo $block->nameblockcustom; ?>
 										</h3>
-
-								</div>
-								<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
-
-									<table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
-										<thead>
-											<tr>
-												<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
-												<th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
-												<th scope="col" class="w-20"><?php echo Text::_('JSTATES'); ?></th>
-												<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
-											</tr>
-										</thead>
-										<tbody>
-											<?php foreach ($listUseritem as $itemUseritem) :
-												$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemUseritem->id);
-												$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemUseritem->checked_out == $userId || $itemUseritem->checked_out == 0;
-												$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemUseritem->id) && $itemUseritem->created_by == $userId;
-												$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemUseritem->id) && $canCheckin;
-												if ($canChange) :
-
-											?>
-													<tr>
-														<td>
-															<a href="<?php echo $itemUseritem->link; ?>"><?php echo $itemUseritem->title; ?>
-																<i class="fa fa-edit"></i></a>
-														</td>
-														<td>
-															<span class="small">
-																<i class="fa fa-user"></i>
-
-																<small class="hasTooltip" title="" data-original-title="<?php echo JHtml::tooltipText('MOD_DASHBOARD_CREATED_BY') . " " . $user->name; ?>"><?php echo $user->name; ?>
-																</small>
-															</span>
-														</td>
-														<td>
-															<?php echo $itemUseritem->state; ?>
-														</td>
-														<td>
-															<span class="small">
-																<i class="fas fa-calendar"></i>
-																<?php echo JHtml::date($itemUseritem->modified, 'd M Y'); ?>
-															</span>
-														</td>
-
-													</tr>
-												<?php endif; ?>
-											<?php endforeach; ?>
-										</tbody>
-									</table>
 								</div>
-							</div>
-						<?php endif; ?>
-						<?php if ($hiddetrashed) : ?>
-							<div class="block trashed card" style="width:<?php echo $trashedwidth; ?>%">
-								<div class="card-header">
-
-									<?php
-									$show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[published]=-2'; ?>
-									<div class="module-actions">
-										<a href='<?php echo $show_all_link ?>' class='adminlink'>
-											<?php
-											echo Text::_('MOD_DASHBOARD_ALL');
-											echo "</a></div>";	?>
-
-											<h3 class="module-title "><i class="fa fa-trash"></i>
-												<?php echo Text::_('MOD_DASHBOARD_TRASHED'); ?></h3>
+								<div class="card-body" style="height:<?php echo $block->forceheightblock; ?>">
 
-									</div>
-									<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
 
-										<table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
+									<?php if (count($actionlist)) : ?>
+										<table class="table">
 											<thead>
 												<tr>
-													<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
-													<th scope="col" class="w-40"><?php echo Text::_('JAUTHOR'); ?></th>
+													<th scope="col" class="w-80"><?php echo Text::_('MOD_LATESTACTIONS_ACTION'); ?></th>
+													<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
 												</tr>
 											</thead>
 											<tbody>
-												<?php foreach ($listTrashed as $itemTrashed) :
-													$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemTrashed->id);
-													$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemTrashed->checked_out == $userId || $itemTrashed->checked_out == 0;
-													$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemTrashed->id) && $itemTrashed->created_by == $userId;
-													$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemTrashed->id) && $canCheckin;
-													if ($canChange) :
-												?>
-														<tr>
-															<td>
-																<a href="<?php echo $itemTrashed->link; ?>"><?php echo $itemTrashed->title; ?>
-																	<i class="fa fa-edit"></i></a>
-															</td>
-															<td>
-																<span class="small">
-																	<i class="fa fa-user"></i><?php echo $user->name; ?>
-																</span>
-															</td>
-															<td>
-																<span class="small">
-																	<i class="fas fa-calendar"></i>
-																	<?php echo JHtml::date($itemTrashed->modified, 'd M Y'); ?>
-																</span>
-															</td>
-														</tr>
-													<?php endif; ?>
+												<?php foreach ($actionlist as $i => $item) : ?>
+													<tr>
+														<td>
+															<?php echo $item->message; ?>
+														</td>
+														<td>
+															<div class="small">
+																<span class="fas fa-calendar" aria-hidden="true"></span>
+																<?php echo JHtml::_('date', $item->log_date, Text::_('DATE_FORMAT_LC5')); ?>
+															</div>
+														</td>
+													</tr>
+
 												<?php endforeach; ?>
 											</tbody>
 										</table>
-									</div>
-								</div>
-							<?php endif; ?>
-
-							<?php if ($actionsloglist) : ?>
-								<div class="block actionlog card" style="width:<?php echo $actionslogwidth; ?>%">
-									<div class="card-header">
-										<div class="module-actions"> <?php $show_all_link = 'index.php?option=com_actionlogs'; ?>
-											<a href='<?php echo $show_all_link ?>' class='adminlink'>
-												<?php
-												echo Text::_('MOD_DASHBOARD_ALL');
-												echo "</a></div>";	?>
-												<h3 class="module-title ">
-													<i class="fa fa-list-alt"></i>
-													<?php echo Text::_('MOD_DASHBOARD_ACTIONLOGS_BLOCK_NAME'); ?> :
-												</h3>
-										</div>
-										<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
-
-
-											<?php if (count($actionlist)) : ?>
-												<table class="table">
-													<thead>
-														<tr>
-															<th scope="col" class="w-80"><?php echo Text::_('MOD_LATESTACTIONS_ACTION'); ?></th>
-															<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
-														</tr>
-													</thead>
-													<tbody>
-														<?php foreach ($actionlist as $i => $item) : ?>
-															<tr>
-																<td>
-																	<?php echo $item->message; ?>
-																</td>
-																<td>
-																	<div class="small">
-																		<span class="fas fa-calendar" aria-hidden="true"></span>
-																		<?php echo JHtml::_('date', $item->log_date, Text::_('DATE_FORMAT_LC5')); ?>
-																	</div>
-																</td>
-															</tr>
-
-														<?php endforeach; ?>
-													</tbody>
-												</table>
-											<?php else : ?>
-												<div class="row-fluid">
-													<div class="span12">
-														<div class="alert">
-															<?php echo Text::_('MOD_LATEST_ACTIONS_NO_MATCHING_RESULTS'); ?>
-														</div>
-													</div>
+									<?php else : ?>
+										<div class="row-fluid">
+											<div class="span12">
+												<div class="alert">
+													<?php echo Text::_('MOD_LATEST_ACTIONS_NO_MATCHING_RESULTS'); ?>
 												</div>
-											<?php endif; ?>
+											</div>
 										</div>
-									</div>
-								<?php endif; ?>
+									<?php endif; ?>
+								</div>
+							</div>
 
+						<?php endif; ?>
 
 
-								<?php if ($listCustomlist) : ?>
-									<?php
-									foreach ($listCustomlist as $listCustomlist_idx => $customblock) : ?>
-										<div class="block <?php echo $customblock->catidlist; ?> card" style="width:<?php echo $customblock->width; ?>%">
-											<div class="card-header">
-												<div class="module-actions">
-													<?php $show_all_link = 'index.php?option=com_content&filter_category_id=' . $customblock->catidlist; ?>
-
-													<a href='<?php echo $show_all_link ?>' class='adminlink'>
-														<?php
-														echo Text::_('MOD_DASHBOARD_ALL');
-														echo "</a></div>";	?>
-														<h3 class="module-title ">
-															<i class="fa fa-user"></i>
-															<?php echo Text::_($customblock->nameblockcustom); ?> :
-														</h3>
-												</div>
-												<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
-
-													<table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
-														<thead>
-															<tr>
-																<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
-																<?php if ($customblock->displautblock) : ?>
-																	<th scope="col" class="w-40"><?php echo Text::_('JAUTHOR'); ?></th>
-																<?php endif; ?>
-																<?php if ($customblock->displdateblock) : ?>
-																	<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
-																<?php endif; ?>
-															</tr>
-														</thead>
-														<tbody>
-
-															<?php foreach ($customblock->listitems as $itemcustomblock) :
-																$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemcustomblock->id);
-																$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemcustomblock->checked_out == $userId || $itemcustomblock->checked_out == 0;
-																$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemcustomblock->id) && $itemcustomblock->created_by == $userId;
-																$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemcustomblock->id) && $canCheckin;
-																if ($canChange) :
-															?>
-																	<tr>
-																		<td>
-																			<a href="<?php echo $itemcustomblock->link; ?>"><?php echo $itemcustomblock->title; ?>
-																				<i class="fa fa-edit"></i></a>
-																		</td>
-																		<?php if ($customblock->displautblock) : ?>
-																			<td>
-																				<span class="small">
-																					<i class="fa fa-user"></i>
-
-																					<small><?php echo $itemcustomblock->name; ?>
-																					</small>
-																				</span>
-																			</td>
-																		<?php endif; ?>
-																		<?php if ($customblock->displdateblock) : ?>
-																			<td>
-																				<span class="small">
-																					<i class="fas fa-calendar"></i>
-																					<?php echo JHtml::date($itemcustomblock->modified, 'd M Y'); ?>
-																				</span>
-																			</td>
-																		<?php endif; ?>
-																	<?php endif; ?>
-																<?php endforeach; ?>
-																	</tr>
-														</tbody>
-													</table>
-												</div>
-											</div>
-										<?php endforeach; ?>
-									<?php endif; ?>
-										</div>
+					<?php endforeach; ?>
 
-								</div>
+						</div>
 
+					</div>
+				<?php endif; ?>
\ No newline at end of file
diff --git a/tmpl/inc/actionlog.php b/tmpl/inc/actionlog.php
new file mode 100644
index 0000000..583fa68
--- /dev/null
+++ b/tmpl/inc/actionlog.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * @version 0.5.0 stable $Id: default.php yannick berges
+ * @package Joomla
+ * @copyright (C) 2018 Berges Yannick - www.com3elles.com
+ * @license GNU/GPL v2
+
+ * special thanks to my master Marc Studer
+
+ * JOOMLA Admin module by Com3elles is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ **/
+
+//blocage des accés directs sur ce script
+defined('_JEXEC') or die('Accés interdit');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Helper\ModuleHelper;
+
+$displayData = $displayData ?? [];
+$blockwidth = $displayData['blockwidth'];
+$forceheightblock = $displayData['forceheightblock'];
+$module_id = $displayData['module_id'];
+$module_title = $displayData['module_title'];
+$actionlist = $displayData['actionlist'];
+//var_dump ($listFeatured);
+
+$document = JFactory::getDocument();
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+?>
+<div class="block actionlog card" style="width:<?php echo $blockwidth; ?>%">
+									<div class="card-header">
+										<div class="module-actions"> <?php $show_all_link = 'index.php?option=com_actionlogs'; ?>
+											<a href='<?php echo $show_all_link ?>' class='adminlink'>
+												<?php
+												echo Text::_('MOD_DASHBOARD_ALL');
+												echo "</a></div>";	?>
+												<h3 class="module-title ">
+													<i class="fa fa-list-alt"></i>
+													<?php echo Text::_('MOD_DASHBOARD_ACTIONLOGS_BLOCK_NAME'); ?> :
+												</h3>
+										</div>
+										<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
+
+
+											<?php if (count($actionlist)) : ?>
+												<table class="table">
+													<thead>
+														<tr>
+															<th scope="col" class="w-80"><?php echo Text::_('MOD_LATESTACTIONS_ACTION'); ?></th>
+															<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
+														</tr>
+													</thead>
+													<tbody>
+														<?php foreach ($actionlist as $i => $item) : ?>
+															<tr>
+																<td>
+																	<?php echo $item->message; ?>
+																</td>
+																<td>
+																	<div class="small">
+																		<span class="fas fa-calendar" aria-hidden="true"></span>
+																		<?php echo JHtml::_('date', $item->log_date, Text::_('DATE_FORMAT_LC5')); ?>
+																	</div>
+																</td>
+															</tr>
+
+														<?php endforeach; ?>
+													</tbody>
+												</table>
+											<?php else : ?>
+												<div class="row-fluid">
+													<div class="span12">
+														<div class="alert">
+															<?php echo Text::_('MOD_LATEST_ACTIONS_NO_MATCHING_RESULTS'); ?>
+														</div>
+													</div>
+												</div>
+											<?php endif; ?>
+										</div>
+									</div>
\ No newline at end of file
diff --git a/tmpl/inc/archived.php b/tmpl/inc/archived.php
new file mode 100644
index 0000000..7f54ccb
--- /dev/null
+++ b/tmpl/inc/archived.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * @version 0.5.0 stable $Id: default.php yannick berges
+ * @package Joomla
+ * @copyright (C) 2018 Berges Yannick - www.com3elles.com
+ * @license GNU/GPL v2
+
+ * special thanks to my master Marc Studer
+
+ * JOOMLA Admin module by Com3elles is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ **/
+
+//blocage des accés directs sur ce script
+defined('_JEXEC') or die('Accés interdit');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Helper\ModuleHelper;
+
+$displayData = $displayData ?? [];
+$blockwidth = $displayData['blockwidth'];
+$forceheightblock = $displayData['forceheightblock'];
+$module_id = $displayData['module_id'];
+$module_title = $displayData['module_title'];
+$listArchived = $displayData['listArchived'];
+//var_dump ($listFeatured);
+
+$document = JFactory::getDocument();
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+?>
+<div class="block archived card" style="width:<?php echo $blockwidth; ?>%">
+	<div class="card-header">
+		<?php $show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[published]=2'; ?>
+		<div class="module-actions">
+			<a href='<?php echo $show_all_link ?>' class='adminlink'>
+				<?php
+				echo Text::_('MOD_DASHBOARD_ALL');
+				echo "</a></div>";	?>
+				<h3 class="module-title"><i class="fa fa-archive"></i>
+					<?php echo Text::_('MOD_DASHBOARD_ARCHIVED'); ?></h3>
+
+		</div>
+		<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
+
+			<table class="table" id="<?php echo str_replace(' ', '', $module_title) . $module_id; ?>">
+				<thead>
+					<tr>
+						<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+						<th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
+						<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
+					</tr>
+				</thead>
+				<tbody>
+					<?php foreach ($listArchived as $itemArchived) :
+						$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemArchived->id);
+						$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemArchived->checked_out == $userId || $itemArchived->checked_out == 0;
+						$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemArchived->id) && $itemArchived->created_by == $userId;
+						$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemArchived->id) && $canCheckin;
+						if ($canChange) :
+					?>
+							<tr>
+								<td>
+									<a href="<?php echo $itemArchived->link; ?>"><?php echo $itemArchived->title; ?>
+										<i class="fa fa-edit"></i></a>
+								</td>
+								<td>
+									<span class="small">
+										<i class="fa fa-user"></i>
+										<?php echo $itemArchived->name; ?>
+									</span>
+								</td>
+								<td>
+									<span class="small"> <i class="fas fa-calendar"></i>
+										<?php echo JHtml::date($itemArchived->modified, 'd M Y'); ?></span>
+								</td>
+							</tr>
+		</div>
+	<?php endif; ?>
+<?php endforeach; ?>
+</tbody>
+</table>
+	</div>
+</div>
\ No newline at end of file
diff --git a/tmpl/inc/custom.php b/tmpl/inc/custom.php
new file mode 100644
index 0000000..8b306d3
--- /dev/null
+++ b/tmpl/inc/custom.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * @version 0.5.0 stable $Id: default.php yannick berges
+ * @package Joomla
+ * @copyright (C) 2018 Berges Yannick - www.com3elles.com
+ * @license GNU/GPL v2
+
+ * special thanks to my master Marc Studer
+
+ * JOOMLA Admin module by Com3elles is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ **/
+
+//blocage des accés directs sur ce script
+defined('_JEXEC') or die('Accés interdit');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Helper\ModuleHelper;
+
+$displayData = $displayData ?? [];
+$blockwidth = $displayData['blockwidth'];
+$forceheightblock = $displayData['forceheightblock'];
+$module_id = $displayData['module_id'];
+$module_title = $displayData['module_title'];
+$customblock = $displayData['customlist'];
+//var_dump ($customblock);
+
+$document = JFactory::getDocument();
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+?>
+				<div class="block <?php echo $customblock->catidlist; ?> card" style="width:<?php echo $blockwidth; ?>%">
+					<div class="card-header">
+						<div class="module-actions">
+							<?php $show_all_link = 'index.php?option=com_content&filter_category_id=' . $customblock->catidlist; ?>
+
+							<a href='<?php echo $show_all_link ?>' class='adminlink'>
+								<?php
+								echo Text::_('MOD_DASHBOARD_ALL');
+								echo "</a></div>";	?>
+								<h3 class="module-title ">
+									<i class="fa fa-user"></i>
+									<?php echo Text::_($customblock->nameblockcustom); ?> :
+								</h3>
+						</div>
+						<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
+
+							<table class="table" id="<?php echo str_replace(' ', '', $module_title) . $module_id; ?>">
+								<thead>
+									<tr>
+										<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+										<?php if ($customblock->displautblock) : ?>
+											<th scope="col" class="w-40"><?php echo Text::_('JAUTHOR'); ?></th>
+										<?php endif; ?>
+										<?php if ($customblock->displdateblock) : ?>
+											<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
+										<?php endif; ?>
+									</tr>
+								</thead>
+								<tbody>
+
+									<?php foreach ($customblock->listitems as $itemcustomblock) :
+										$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemcustomblock->id);
+										$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemcustomblock->checked_out == $userId || $itemcustomblock->checked_out == 0;
+										$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemcustomblock->id) && $itemcustomblock->created_by == $userId;
+										$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemcustomblock->id) && $canCheckin;
+										if ($canChange) :
+									?>
+											<tr>
+												<td>
+													<a href="<?php echo $itemcustomblock->link; ?>"><?php echo $itemcustomblock->title; ?>
+														<i class="fa fa-edit"></i></a>
+												</td>
+												<?php if ($customblock->displautblock) : ?>
+													<td>
+														<span class="small">
+															<i class="fa fa-user"></i>
+
+															<small><?php echo $itemcustomblock->name; ?>
+															</small>
+														</span>
+													</td>
+												<?php endif; ?>
+												<?php if ($customblock->displdateblock) : ?>
+													<td>
+														<span class="small">
+															<i class="fas fa-calendar"></i>
+															<?php echo JHtml::date($itemcustomblock->modified, 'd M Y'); ?>
+														</span>
+													</td>
+												<?php endif; ?>
+											<?php endif; ?>
+										<?php endforeach; ?>
+											</tr>
+								</tbody>
+							</table>
+						</div>
+					</div>
diff --git a/tmpl/inc/features.php b/tmpl/inc/features.php
new file mode 100644
index 0000000..dd22cc8
--- /dev/null
+++ b/tmpl/inc/features.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * @version 0.5.0 stable $Id: default.php yannick berges
+ * @package Joomla
+ * @copyright (C) 2018 Berges Yannick - www.com3elles.com
+ * @license GNU/GPL v2
+
+ * special thanks to my master Marc Studer
+
+ * JOOMLA Admin module by Com3elles is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ **/
+
+//blocage des accés directs sur ce script
+defined('_JEXEC') or die('Accés interdit');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Helper\ModuleHelper;
+
+$displayData = $displayData ?? [];
+$blockwidth = $displayData['blockwidth'];
+$forceheightblock = $displayData['forceheightblock'];
+$module_id = $displayData['module_id'];
+$module_title = $displayData['module_title'];
+$listFeatured = $displayData['listfeatured'];
+//var_dump ($listFeatured);
+
+$document = JFactory::getDocument();
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+?>
+
+
+<div class="block featured card" style="width:<?php echo $blockwidth; ?>%">
+    <div class="card-header">
+        <?php $show_all_link = 'index.php?option=com_content&amp;view=featured'; ?>
+        <div class="module-actions">
+            <a href='<?php echo $show_all_link ?>' class='adminlink'>
+                <?php
+                echo Text::_('MOD_DASHBOARD_ALL');
+                echo "</a></div>";    ?>
+                <h3 class="module-title"><i class="fas fa-star featured"></i>
+                    <?php echo Text::_('MOD_DASHBOARD_FEATURED'); ?></h3>
+        </div>
+        <div class="card-body" style="height:<?php echo $forceheightblock; ?>">
+
+            <table class="table" id="<?php echo str_replace(' ', '', $module_title) . $module_id; ?>">
+                <thead>
+                    <tr>
+                        <th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+                        <th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
+                        <th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($listFeatured as $itemFeatured) :
+                        $canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemFeatured->id);
+                        $canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemFeatured->checked_out == $userId || $itemFeatured->checked_out == 0;
+                        $canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemFeatured->id) && $itemFeatured->created_by == $userId;
+                        $canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemFeatured->id) && $canCheckin;
+                        if ($canChange) :
+                    ?>
+                            <tr>
+                                <td>
+                                    <a href="<?php echo $itemFeatured->link; ?>"><?php echo $itemFeatured->title; ?>
+                                        <i class="fa fa-edit"></i></a>
+                                </td>
+                                <td>
+                                    <span class="small">
+                                        <i class="fa fa-user"></i>
+                                        <?php echo $itemFeatured->name; ?>
+                                        </small>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="small">
+                                        <i class="fas fa-calendar"></i>
+                                        <?php echo JHtml::date($itemFeatured->modified, 'd M Y'); ?>
+                                    </span>
+                                </td>
+                            </tr>
+
+                        <?php endif; ?>
+                    <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+    </div>
\ No newline at end of file
diff --git a/tmpl/inc/index.html b/tmpl/inc/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/tmpl/inc/published.php b/tmpl/inc/published.php
new file mode 100644
index 0000000..884b152
--- /dev/null
+++ b/tmpl/inc/published.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * @version 0.5.0 stable $Id: default.php yannick berges
+ * @package Joomla
+ * @copyright (C) 2018 Berges Yannick - www.com3elles.com
+ * @license GNU/GPL v2
+
+ * special thanks to my master Marc Studer
+
+ * JOOMLA Admin module by Com3elles is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ **/
+
+//blocage des accés directs sur ce script
+defined('_JEXEC') or die('Accés interdit');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Helper\ModuleHelper;
+
+$displayData = $displayData ?? [];
+$blockdwidth = $displayData['blockwidth'];
+$forceheightblock = $displayData['forceheightblock'];
+$module_id = $displayData['module_id'];
+$module_title = $displayData['module_title'];
+$listPublished = $displayData['listPublished'];
+//var_dump ($listFeatured);
+
+$document = JFactory::getDocument();
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+?>
+
+<div class="block published card" style="width:<?php echo $blockdwidth; ?>%">
+    <div class="card-header">
+
+        <?php $show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[published]=1'; ?>
+        <div class="module-actions">
+            <a href='<?php echo $show_all_link ?>' class='adminlink'>
+                <?php
+                echo Text::_('MOD_DASHBOARD_ALL');
+                echo "</a></div>";    ?>
+                <h3 class="module-title "><i class="fa fa-check"></i>
+                    <?php echo Text::_('MOD_DASHBOARD_PUBLISHED'); ?></h3>
+
+
+        </div>
+        <div class="card-body" style="height:<?php echo $forceheightblock; ?>">
+
+            <table class="table" id="<?php echo str_replace(' ', '', $module_title) . $module_id; ?>">
+                <thead>
+                    <tr>
+                        <th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+                        <th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
+                        <th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($listPublished as $itemPublished) :
+                        $canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemPublished->id);
+                        $canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemPublished->checked_out == $userId || $itemPublished->checked_out == 0;
+                        $canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemPublished->id) && $itemPublished->created_by == $userId;
+                        $canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemPublished->id) && $canCheckin;
+                        if ($canChange) :
+                    ?>
+                            <tr>
+                                <td>
+                                    <a href="<?php echo $itemPublished->link; ?>"><?php echo $itemPublished->title; ?>
+                                        <i class="fa fa-edit"></i></a>
+                                </td>
+                                <td>
+                                    <span class="small">
+                                        <i class="fa fa-user"></i>
+                                        <?php echo $itemPublished->name; ?>
+                                        </small>
+                                    </span>
+                                </td>
+                                <td>
+                                    <span class="small">
+                                        <i class="fas fa-calendar"></i>
+                                        <?php echo JHtml::date($itemPublished->modified, 'd M Y'); ?>
+                                    </span>
+                                </td>
+
+                            </tr>
+                        <?php endif; ?>
+                    <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+    </div>
\ No newline at end of file
diff --git a/tmpl/inc/trashed.php b/tmpl/inc/trashed.php
new file mode 100644
index 0000000..1ce1367
--- /dev/null
+++ b/tmpl/inc/trashed.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * @version 0.5.0 stable $Id: default.php yannick berges
+ * @package Joomla
+ * @copyright (C) 2018 Berges Yannick - www.com3elles.com
+ * @license GNU/GPL v2
+
+ * special thanks to my master Marc Studer
+
+ * JOOMLA Admin module by Com3elles is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ **/
+
+//blocage des accés directs sur ce script
+defined('_JEXEC') or die('Accés interdit');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Helper\ModuleHelper;
+
+$displayData = $displayData ?? [];
+$blockwidth = $displayData['blockwidth'];
+$forceheightblock = $displayData['forceheightblock'];
+$module_id = $displayData['module_id'];
+$module_title = $displayData['module_title'];
+$listTrashed = $displayData['listTrashed'];
+//var_dump ($listFeatured);
+
+$document = JFactory::getDocument();
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+?>
+<div class="block trashed card" style="width:<?php echo $blockwidth; ?>%">
+	<div class="card-header">
+
+		<?php
+		$show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[published]=-2'; ?>
+		<div class="module-actions">
+			<a href='<?php echo $show_all_link ?>' class='adminlink'>
+				<?php
+				echo Text::_('MOD_DASHBOARD_ALL');
+				echo "</a></div>";	?>
+
+				<h3 class="module-title "><i class="fa fa-trash"></i>
+					<?php echo Text::_('MOD_DASHBOARD_TRASHED'); ?></h3>
+
+		</div>
+		<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
+
+			<table class="table" id="<?php echo str_replace(' ', '', $module_title) . $module_id; ?>">
+				<thead>
+					<tr>
+						<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+						<th scope="col" class="w-40"><?php echo Text::_('JAUTHOR'); ?></th>
+					</tr>
+				</thead>
+				<tbody>
+					<?php foreach ($listTrashed as $itemTrashed) :
+						$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemTrashed->id);
+						$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemTrashed->checked_out == $userId || $itemTrashed->checked_out == 0;
+						$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemTrashed->id) && $itemTrashed->created_by == $userId;
+						$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemTrashed->id) && $canCheckin;
+						if ($canChange) :
+					?>
+							<tr>
+								<td>
+									<a href="<?php echo $itemTrashed->link; ?>"><?php echo $itemTrashed->title; ?>
+										<i class="fa fa-edit"></i></a>
+								</td>
+								<td>
+									<span class="small">
+										<i class="fa fa-user"></i><?php echo $user->name; ?>
+									</span>
+								</td>
+								<td>
+									<span class="small">
+										<i class="fas fa-calendar"></i>
+										<?php echo JHtml::date($itemTrashed->modified, 'd M Y'); ?>
+									</span>
+								</td>
+							</tr>
+						<?php endif; ?>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/tmpl/inc/unpublished.php b/tmpl/inc/unpublished.php
new file mode 100644
index 0000000..a191350
--- /dev/null
+++ b/tmpl/inc/unpublished.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * @version 0.5.0 stable $Id: default.php yannick berges
+ * @package Joomla
+ * @copyright (C) 2018 Berges Yannick - www.com3elles.com
+ * @license GNU/GPL v2
+
+ * special thanks to my master Marc Studer
+
+ * JOOMLA Admin module by Com3elles is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ **/
+
+//blocage des accés directs sur ce script
+defined('_JEXEC') or die('Accés interdit');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Helper\ModuleHelper;
+
+$displayData = $displayData ?? [];
+$blockwidth = $displayData['blockwidth'];
+$forceheightblock = $displayData['forceheightblock'];
+$module_id = $displayData['module_id'];
+$module_title = $displayData['module_title'];
+$listUnpublished = $displayData['listUnpublished'];
+//var_dump ($listFeatured);
+
+$document = JFactory::getDocument();
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+?>
+<div class="block unpublished card" style="width:<?php echo $blockwidth; ?>%">
+	<div class="card-header">
+		<?php $show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[published]=0'; ?>
+		<div class="module-actions">
+			<a href='<?php echo $show_all_link ?>' class='adminlink'>
+				<?php
+				echo Text::_('MOD_DASHBOARD_ALL');
+				echo "</a></div>";	?>
+				<h3 class="module-title"><i class="fa fa-thumbs-down"></i>
+					<?php echo Text::_('MOD_DASHBOARD_UNPUBLISHED'); ?></h3>
+
+		</div>
+
+		<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
+
+			<table class="table" id="<?php echo str_replace(' ', '', $module_title) . $module_id; ?>">
+				<thead>
+					<tr>
+						<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+						<th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
+						<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
+					</tr>
+				</thead>
+				<tbody>
+					<?php foreach ($listUnpublished as $itemUnpublished) :
+						$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemUnpublished->id);
+						$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemUnpublished->checked_out == $userId || $itemUnpublished->checked_out == 0;
+						// $canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemUnpublished->id) && $$itemUnpublished->created_by == $userId;
+						$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemUnpublished->id) && $canCheckin;
+						if ($canChange) :
+					?>
+							<tr>
+								<td>
+									<a href="<?php echo $itemUnpublished->link; ?>"><?php echo $itemUnpublished->title; ?>
+										<i class="fa fa-edit"></i></a>
+								</td>
+								<td>
+									<span class="small">
+										<i class="fa fa-user"></i> <?php echo $itemUnpublished->name; ?></small>
+									</span>
+								</td>
+								<td>
+									<span class="small">
+										<i class="fas fa-calendar"></i>
+										<?php echo JHtml::date($itemUnpublished->modified, 'd M Y'); ?>
+									</span>
+								</td>
+							</tr>
+						<?php endif; ?>
+					<?php endforeach; ?>
+				<tbody>
+			</table>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/tmpl/inc/useritem.php b/tmpl/inc/useritem.php
new file mode 100644
index 0000000..0ba9c5a
--- /dev/null
+++ b/tmpl/inc/useritem.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * @version 0.5.0 stable $Id: default.php yannick berges
+ * @package Joomla
+ * @copyright (C) 2018 Berges Yannick - www.com3elles.com
+ * @license GNU/GPL v2
+
+ * special thanks to my master Marc Studer
+
+ * JOOMLA Admin module by Com3elles is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ **/
+
+//blocage des accés directs sur ce script
+defined('_JEXEC') or die('Accés interdit');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Helper\ModuleHelper;
+
+$displayData = $displayData ?? [];
+$blockwidth = $displayData['blockwidth'];
+$forceheightblock = $displayData['forceheightblock'];
+$module_id = $displayData['module_id'];
+$module_title = $displayData['module_title'];
+$listUseritem = $displayData['listUseritem'];
+//var_dump ($listFeatured);
+
+$document = JFactory::getDocument();
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+?>
+<div class="block youritems card" style="width:<?php echo $blockwidth; ?>%">
+	<div class="card-header">
+		<div class="module-actions">
+			<?php $show_all_link = 'index.php?option=com_content&amp;view=articles&amp;filter[author_id]=' . $user->id; //TODO add user id
+			?>
+			<a href='<?php echo $show_all_link ?>' class='adminlink'>
+				<?php
+				echo Text::_('MOD_DASHBOARD_ALL');
+				echo "</a></div>";	?>
+
+				<?php $user = JFactory::getUser();		?>
+				<h3 class="module-title">
+					<i class="fa fa-user"></i>
+					<?php echo Text::_('JOOMLA_YOUR_ITEM'); ?> : <?php echo $user->name; ?>
+				</h3>
+
+		</div>
+		<div class="card-body" style="height:<?php echo $forceheightblock; ?>">
+
+			<table class="table" id="<?php echo str_replace(' ', '', $module_title) . $module_id; ?>">
+				<thead>
+					<tr>
+						<th scope="col" class="w-40"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+						<th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
+						<th scope="col" class="w-20"><?php echo Text::_('JSTATES'); ?></th>
+						<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
+					</tr>
+				</thead>
+				<tbody>
+					<?php foreach ($listUseritem as $itemUseritem) :
+						$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $itemUseritem->id);
+						$canCheckin = $user->authorise('core.manage',     'com_checkin') || $itemUseritem->checked_out == $userId || $itemUseritem->checked_out == 0;
+						$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $itemUseritem->id) && $itemUseritem->created_by == $userId;
+						$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $itemUseritem->id) && $canCheckin;
+						if ($canChange) :
+
+					?>
+							<tr>
+								<td>
+									<a href="<?php echo $itemUseritem->link; ?>"><?php echo $itemUseritem->title; ?>
+										<i class="fa fa-edit"></i></a>
+								</td>
+								<td>
+									<span class="small">
+										<i class="fa fa-user"></i>
+
+										<small class="hasTooltip" title="" data-original-title="<?php echo JHtml::tooltipText('MOD_DASHBOARD_CREATED_BY') . " " . $user->name; ?>"><?php echo $user->name; ?>
+										</small>
+									</span>
+								</td>
+								<td>
+									<?php echo $itemUseritem->state; ?>
+								</td>
+								<td>
+									<span class="small">
+										<i class="fas fa-calendar"></i>
+										<?php echo JHtml::date($itemUseritem->modified, 'd M Y'); ?>
+									</span>
+								</td>
+
+							</tr>
+						<?php endif; ?>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
\ No newline at end of file