Merge branch 'bhdev_tabulator6' into merge_FHC4_C4

application/views/templates/FHC-Common.php

@@ -23,6 +23,7 @@
 	$tablesorter2 = isset($tablesorter2) ? $tablesorter2 : false;
 	$tabulator4 = isset($tabulator4) ? $tabulator4 : false;
 	$tabulator5 = isset($tabulator5) ? $tabulator5 : false;
+	$tabulator6 = isset($tabulator6) ? $tabulator6 : false;
 	$tabulator5JQuery = isset($tabulator5JQuery) ? $tabulator5JQuery : false;
 	$tinymce3 = isset($tinymce3) ? $tinymce3 : false;
 	$tinymce5 = isset($tinymce5) ? $tinymce5 : false;

application/views/templates/FHC-Footer.php

@@ -104,6 +104,8 @@
 	if ($tabulator5 === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js');
 	// Tabulator 5 JQuery
 	if ($tabulator5JQuery === true) generateJSsInclude('public/js/tabulator/jquery_wrapper.js');
+	// Tabulator 6 JS
+	if ($tabulator6 === true) generateJSsInclude('vendor/olifolkerd/tabulator6/dist/js/tabulator.min.js');
 	// Tinymce 3 JS
 	if ($tinymce3 === true) generateJSsInclude('include/tiny_mce/tiny_mce.js');
 

application/views/templates/FHC-Header.php

@@ -79,6 +79,9 @@
 
 			// Tabulator 5 CSS
 			if ($tabulator5 === true) generateCSSsInclude('public/css/Tabulator5.css');
+			
+			// Tabulator 6 CSS
+			if ($tabulator6 === true) generateCSSsInclude('public/css/Tabulator6.css');
 
 			// Tinymce 5 CSS
 			if ($tinymce5 === true) generateCSSsInclude('public/css/TinyMCE5.css');

composer.json

@@ -237,6 +237,17 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+				"name": "olifolkerd/tabulator6",
+				"version": "6.3.1",
+				"dist": {
+					"url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/6.3.1.zip",
+					"type": "zip"
+				}
+			}
+		},
 		{
 			"type": "package",
 			"package": {
@@ -440,6 +451,7 @@
 
 		"olifolkerd/tabulator4": "4.9.*",
 		"olifolkerd/tabulator5": "5.5.*",
+		"olifolkerd/tabulator6": "6.3.*",
 
 		"phpseclib/phpseclib": "2.0.*",
 

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d6cd19af6c321a0bf24efde2d65e1361",
+    "content-hash": "4d532e48e895cb864fb89170e18e2a3d",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1529,6 +1529,15 @@
             },
             "type": "library"
         },
+        {
+            "name": "olifolkerd/tabulator6",
+            "version": "6.3.1",
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/6.3.1.zip"
+            },
+            "type": "library"
+        },
         {
             "name": "phpseclib/phpseclib",
             "version": "2.0.48",

public/css/Tabulator6.css

@@ -0,0 +1 @@
+@import '../../vendor/olifolkerd/tabulator6/dist/css/tabulator_simple.min.css';