From 00dbedc040c402423a5458ecf468897711fdf254 Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Fri, 5 Jan 2018 12:45:58 +0100
Subject: [PATCH] added jqueryui, bootstrap, fontawesome, datatables (new
 tablesorter)

---
 application/views/templates/FHC-Header.php |  38 ++++-
 composer.json                              |  31 +++-
 composer.lock                              | 158 +++++++++++++++++++--
 3 files changed, 207 insertions(+), 20 deletions(-)

diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index 4b4dcc511..f55048fdc 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -9,6 +9,10 @@ $customJSs = isset($customJSs) ? $customJSs : null;
 
 // By default set the parameters to false
 $jquery3 = isset($jquery3) ? $jquery3 : false;
+$jqueryui = isset($jqueryui) ? $jqueryui : false;
+$bootstrap = isset($bootstrap) ? $bootstrap : false;
+$fontawesome= isset($fontawesome) ? $fontawesome : false;
+$datatables= isset($datatables) ? $datatables : false;
 $tablesorter = isset($tablesorter) ? $tablesorter : false;
 
 /**
@@ -80,24 +84,46 @@ function _generateJSsInclude($JSs)
 
 		<meta charset="UTF-8">
 
-		<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url('skin/images/Vilesci.ico'); ?>" />
-		<link rel="stylesheet"    type="text/css"     href="<?php echo base_url('skin/vilesci.css'); ?>" />
-
 		<?php
 			// --------------------------------------------------------------------------------------------------------
 			// CSS
 
-			// Eventually required CSS
-			_generateCSSsInclude($customCSSs); // Eventually required CSS
-
+			// jQuery UI CSS
+			if ($jqueryui === true) _generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
+			// bootstrap CSS
+			if ($bootstrap === true) _generateCSSsInclude('vendor/components/bootstrap/css/bootstrap.min.css');
+			// font awesome CSS
+			if ($fontawesome === true) _generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
+			// datatables CSS
+			if ($datatables === true)
+			{
+				_generateCSSsInclude('vendor/datatables/datatables/media/css/jquery.dataTables.min.css');
+				_generateCSSsInclude('vendor/datatables/datatables/media/css/dataTables.bootstrap.min.css');
+			}
 			// Table sorter CSS
 			if ($tablesorter === true) _generateCSSsInclude('skin/tablesort.css');
 
+			// Eventually required CSS
+			_generateCSSsInclude($customCSSs); // Eventually required CSS
+
 			// --------------------------------------------------------------------------------------------------------
 			// Javascripts
 
 			// JQuery V3
 			if ($jquery3 === true) _generateJSsInclude('vendor/components/jquery/jquery.min.js');
+			// JQuery UI
+			if ($jqueryui === true) _generateJSsInclude('vendor/components/jqueryui/jquery-ui.min.js');
+			// bootstrap JS
+			if ($bootstrap === true) _generateJSsInclude('vendor/components/bootstrap/js/bootstrap.min.js');
+			// datatables JS
+			if ($datatables === true)
+			{
+			 	_generateJSsInclude('vendor/datatables/datatables/media/js/jquery.dataTables.js');
+				_generateJSsInclude('vendor/datatables/datatables/media/js/dataTables.bootstrap.min.js');
+				_generateJSsInclude('vendor/moment/moment/min/moment.min.js');
+				_generateJSsInclude('vendor/datatables/plugins/sorting/datetime-moment.js');
+
+			}
 			// Table sorter JS
 			if ($tablesorter === true) _generateJSsInclude('vendor/christianbach/tablesorter/jquery.tablesorter.min.js');
 
diff --git a/composer.json b/composer.json
index 40404beca..f0fea90e5 100644
--- a/composer.json
+++ b/composer.json
@@ -185,6 +185,30 @@
 					"reference": "b15ea33268b587d986371c0b6f215c36ffbb860c"
 				}
 			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "datatables/plugins",
+				"version": "3.3.7",
+				"source": {
+					"url": "https://github.com/DataTables/Plugins.git",
+					"type": "git",
+					"reference": "master"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "BlackrockDigital/startbootstrap-sb-admin-2",
+				"version": "3.3.7",
+				"source": {
+					"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2.git",
+					"type": "git",
+					"reference": "master"
+				}
+			}
 		}
 	],
 	"require": {
@@ -222,7 +246,12 @@
 		"jquery/sizzle": "^1.0",
 		"tomazdragar/SimpleCropper": "^1.0",
 		"nicolaskruchten/pivottable": "^2.15.0",
-		"jquery-archive/jquery-metadata": "^1.0"
+		"jquery-archive/jquery-metadata": "^1.0",
+		"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
+		"components/font-awesome": "^4.7",
+		"moment/moment": "^2.20",
+		"datatables/datatables": "^1.10",
+		"datatables/plugins": "^3.3"
 	},
 	"require-dev": {
 		"squizlabs/php_codesniffer": "2.*"
diff --git a/composer.lock b/composer.lock
index 9fa4855d9..ffe6ab4f9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,9 +4,19 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "e528bc5e31312080d7db9b1b3ae4033b",
-    "content-hash": "69612123f7b612e61cf1e0368e01ee27",
+    "hash": "28942746c1b00b590a3d3cb43cd21606",
+    "content-hash": "2c99452d2bf338a1d1e3462197ab25b7",
     "packages": [
+        {
+            "name": "BlackrockDigital/startbootstrap-sb-admin-2",
+            "version": "3.3.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2.git",
+                "reference": "master"
+            },
+            "type": "library"
+        },
         {
             "name": "alvaro-prieto/colResizable",
             "version": "1.6",
@@ -462,6 +472,41 @@
             ],
             "time": "2015-06-17 06:08:09"
         },
+        {
+            "name": "components/font-awesome",
+            "version": "4.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/components/font-awesome.git",
+                "reference": "885308b939369d147bec93174722786bc2c4eedd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/components/font-awesome/zipball/885308b939369d147bec93174722786bc2c4eedd",
+                "reference": "885308b939369d147bec93174722786bc2c4eedd",
+                "shasum": ""
+            },
+            "type": "component",
+            "extra": {
+                "component": {
+                    "styles": [
+                        "css/font-awesome.css"
+                    ],
+                    "files": [
+                        "css/font-awesome.min.css",
+                        "css/font-awesome.css.map",
+                        "fonts/*"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT",
+                "OFL-1.1"
+            ],
+            "description": "The iconic font designed for use with Twitter Bootstrap.",
+            "time": "2016-10-25 10:56:23"
+        },
         {
             "name": "components/jquery",
             "version": "2.1.4",
@@ -635,6 +680,39 @@
             "description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.",
             "time": "2016-09-16 05:47:55"
         },
+        {
+            "name": "datatables/datatables",
+            "version": "1.10.16",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DataTables/DataTables.git",
+                "reference": "75a665f64f02982c0f4666b15a25c4670e5e6b18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/DataTables/DataTables/zipball/75a665f64f02982c0f4666b15a25c4670e5e6b18",
+                "reference": "75a665f64f02982c0f4666b15a25c4670e5e6b18",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "DataTables is a plug-in for the jQuery Javascript library. It is a highly flexible tool, based upon the foundations of progressive enhancement, which will add advanced interaction controls to any HTML table.",
+            "homepage": "http://www.datatables.net/",
+            "time": "2017-08-31 13:52:17"
+        },
+        {
+            "name": "datatables/plugins",
+            "version": "3.3.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DataTables/Plugins.git",
+                "reference": "master"
+            },
+            "type": "library"
+        },
         {
             "name": "easyrdf/easyrdf",
             "version": "0.9.1",
@@ -1198,6 +1276,60 @@
             ],
             "time": "2016-10-10 08:57:56"
         },
+        {
+            "name": "moment/moment",
+            "version": "2.20.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/moment/moment.git",
+                "reference": "03073778ec18ee38e179208cd1af899e8d1848dc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/moment/moment/zipball/03073778ec18ee38e179208cd1af899e8d1848dc",
+                "reference": "03073778ec18ee38e179208cd1af899e8d1848dc",
+                "shasum": ""
+            },
+            "require": {
+                "robloach/component-installer": "*"
+            },
+            "type": "component",
+            "extra": {
+                "component": {
+                    "scripts": [
+                        "moment.js"
+                    ],
+                    "files": [
+                        "min/*.js",
+                        "locale/*.js"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Tim Wood",
+                    "email": "washwithcare@gmail.com"
+                }
+            ],
+            "description": "Parse, validate, manipulate, and display dates in JavaScript.",
+            "homepage": "https://github.com/moment/moment",
+            "keywords": [
+                "date",
+                "ender",
+                "format",
+                "i18n",
+                "l10n",
+                "moment",
+                "parse",
+                "time",
+                "validate"
+            ],
+            "time": "2017-12-19 04:36:30"
+        },
         {
             "name": "netcarver/textile",
             "version": "v3.6.0",
@@ -1840,16 +1972,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.5.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
+                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
-                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
+                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
                 "shasum": ""
             },
             "require": {
@@ -1861,7 +1993,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5-dev"
+                    "dev-master": "1.6-dev"
                 }
             },
             "autoload": {
@@ -1895,7 +2027,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-14 15:44:48"
+            "time": "2017-10-11 12:05:26"
         },
         {
             "name": "symfony/process",
@@ -2008,16 +2140,16 @@
         },
         {
             "name": "tinymce/tinymce",
-            "version": "4.7.1",
+            "version": "4.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tinymce/tinymce-dist.git",
-                "reference": "4fd91026d3765fee9b148b5e684b014a8e18ead1"
+                "reference": "2639396a6d5eb8db7457ed4f6de6f5d15303ef52"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/4fd91026d3765fee9b148b5e684b014a8e18ead1",
-                "reference": "4fd91026d3765fee9b148b5e684b014a8e18ead1",
+                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/2639396a6d5eb8db7457ed4f6de6f5d15303ef52",
+                "reference": "2639396a6d5eb8db7457ed4f6de6f5d15303ef52",
                 "shasum": ""
             },
             "type": "component",
@@ -2050,7 +2182,7 @@
                 "tinymce",
                 "wysiwyg"
             ],
-            "time": "2017-10-09 13:17:31"
+            "time": "2017-11-07 12:44:31"
         },
         {
             "name": "tomazdragar/SimpleCropper",