mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 16:44:28 +00:00
- Changed composer.json and updated composer.lock
- Added new PostgreSQL types in application/core/DB_Model.php - Updated the includes in application/views/* - Added new view template application/views/templates/FHC-Common.php - Moved JS includes in application/views/templates/FHC-Footer.php - Updated JS and CSS includes in application/views/templates/FHC-Footer.php and application/views/templates/FHC-Header.php - Updated public/js/bootstrapper.js - Changed global variable names in application/views/templates/FHC-Common.php to include the version of the included source
This commit is contained in:
Paolo
@@ -1,45 +1,17 @@
|
||||
<?php
|
||||
|
||||
if (! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
// Retrieves the name of the index page, the URL path of the called controller and the called controller
|
||||
// NOTE: placed here because it doesn't work inside functions
|
||||
$indexPage = $this->config->item('index_page');
|
||||
$calledPath = $this->router->directory.$this->router->class;
|
||||
$calledMethod = $this->router->method;
|
||||
// Defines the includes variables
|
||||
require('FHC-Common.php');
|
||||
|
||||
// All the following variables are used only in this view
|
||||
// By default set the parameters to null
|
||||
$title = isset($title) ? $title : null;
|
||||
$refresh = isset($refresh) ? $refresh : null;
|
||||
$customCSSs = isset($customCSSs) ? $customCSSs : null;
|
||||
$customJSs = isset($customJSs) ? $customJSs : null;
|
||||
$phrases = isset($phrases) ? $phrases : null;
|
||||
|
||||
// By default set the parameters to false
|
||||
$addons = isset($addons) ? $addons : false;
|
||||
$ajaxlib = isset($ajaxlib) ? $ajaxlib : false;
|
||||
$bootstrap = isset($bootstrap) ? $bootstrap : false;
|
||||
$captcha = isset($captcha) ? $captcha : false;
|
||||
$dialoglib = isset($dialoglib) ? $dialoglib : false;
|
||||
$filterwidget = isset($filterwidget) ? $filterwidget : false;
|
||||
$fontawesome = isset($fontawesome) ? $fontawesome : false;
|
||||
$jquery = isset($jquery) ? $jquery : false;
|
||||
$jqueryui = isset($jqueryui) ? $jqueryui : false;
|
||||
$jquerycheckboxes = isset($jquerycheckboxes) ? $jquerycheckboxes : false;
|
||||
$jquerytreetable = isset($jquerytreetable) ? $jquerytreetable : false;
|
||||
$momentjs = isset($momentjs) ? $momentjs : false;
|
||||
$navigationwidget = isset($navigationwidget) ? $navigationwidget : false;
|
||||
$pivotui = isset($pivotui) ? $pivotui : false;
|
||||
$sbadmintemplate = isset($sbadmintemplate) ? $sbadmintemplate : false;
|
||||
$tablesorter = isset($tablesorter) ? $tablesorter : false;
|
||||
$tablewidget = isset($tablewidget) ? $tablewidget : false;
|
||||
$tabulator = isset($tabulator) ? $tabulator : false;
|
||||
$tinymce = isset($tinymce) ? $tinymce : false;
|
||||
$udfs = isset($udfs) ? $udfs : false;
|
||||
$widgets = isset($widgets) ? $widgets : false;
|
||||
?>
|
||||
|
||||
<!-- Header start -->
|
||||
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
@@ -58,47 +30,64 @@
|
||||
// --------------------------------------------------------------------------------------------------------
|
||||
// From vendor folder
|
||||
|
||||
// jQuery UI CSS
|
||||
if ($jqueryui === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
|
||||
// Bootstrap 3 CSS
|
||||
if ($bootstrap3 === true) generateCSSsInclude('vendor/twbs/bootstrap3/dist/css/bootstrap.min.css');
|
||||
|
||||
// Bootstrap CSS
|
||||
if ($bootstrap === true) generateCSSsInclude('vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
|
||||
// Bootstrap 5 CSS
|
||||
if ($bootstrap5 === true) generateCSSsInclude('vendor/twbs/bootstrap5/css/bootstrap.min.css');
|
||||
|
||||
// jQuery UI CSS
|
||||
if ($jqueryui1 === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
|
||||
|
||||
// jQuery treetable
|
||||
if ($jquerytreetable === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css');
|
||||
if ($jquerytreetable3 === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css');
|
||||
|
||||
// Font Awesome CSS
|
||||
if ($fontawesome === true) generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
|
||||
// Font Awesome 4 CSS free icons
|
||||
if ($fontawesome4 === true) generateCSSsInclude('vendor/fortawesome/font-awesome4/css/font-awesome.min.css');
|
||||
|
||||
// Font Awesome 6 CSS free icons
|
||||
if ($fontawesome6 === true)
|
||||
{
|
||||
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/fontawesome.min.css');
|
||||
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/solid.min.css');
|
||||
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/brands.min.css');
|
||||
}
|
||||
|
||||
// PivotUI CSS
|
||||
if ($pivotui === true) generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
|
||||
if ($pivotui2 === true) generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
|
||||
|
||||
// SB Admin 2 template CSS
|
||||
if ($sbadmintemplate === true)
|
||||
if ($sbadmintemplate3 === true)
|
||||
{
|
||||
generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
|
||||
generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
|
||||
}
|
||||
|
||||
// Securimage CSS
|
||||
if ($captcha === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css');
|
||||
if ($captcha3 === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css');
|
||||
|
||||
// Table sorter CSS
|
||||
if ($tablesorter === true)
|
||||
if ($tablesorter2 === true)
|
||||
{
|
||||
generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css');
|
||||
generateCSSsInclude('vendor/mottie/tablesorter/dist/css/jquery.tablesorter.pager.min.css');
|
||||
}
|
||||
|
||||
// Tabulator CSS
|
||||
if ($tabulator === true)
|
||||
// Tabulator 4 CSS
|
||||
if ($tabulator4 === true)
|
||||
{
|
||||
generateCSSsInclude('vendor/olifolkerd/tabulator/dist/css/bootstrap/tabulator_bootstrap.min.css');
|
||||
generateCSSsInclude('vendor/olifolkerd/tabulator4/dist/css/bootstrap/tabulator_bootstrap.min.css');
|
||||
generateCSSsInclude('public/css/Tabulator.css');
|
||||
}
|
||||
|
||||
// Tinymce CSS
|
||||
if ($tinymce === true) generateCSSsInclude('public/css/TinyMCE.css');
|
||||
// Tabulator 5 CSS
|
||||
if ($tabulator5 === true) generateCSSsInclude('vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
|
||||
|
||||
// Tinymce 4 CSS
|
||||
if ($tinymce4 === true) generateCSSsInclude('public/css/TinyMCE4.css');
|
||||
|
||||
// Tinymce 5 CSS
|
||||
if ($tinymce5 === true) generateCSSsInclude('public/css/TinyMCE5.css');
|
||||
|
||||
// --------------------------------------------------------------------------------------------------------
|
||||
// From public folder
|
||||
@@ -109,9 +98,15 @@
|
||||
// DialogLib CSS
|
||||
if ($dialoglib === true) generateCSSsInclude('public/css/DialogLib.css');
|
||||
|
||||
// VUE FilterWidget CSS
|
||||
if ($filtercomponent === true) generateCSSsInclude('public/css/FilterComponent.css');
|
||||
|
||||
// FilterWidget CSS
|
||||
if ($filterwidget === true) generateCSSsInclude('public/css/FilterWidget.css');
|
||||
|
||||
// VUE NavigationWidget CSS
|
||||
if ($navigationcomponent === true) generateCSSsInclude('public/css/NavigationComponent.css');
|
||||
|
||||
// NavigationWidget CSS
|
||||
if ($navigationwidget === true) generateCSSsInclude('public/css/NavigationWidget.css');
|
||||
|
||||
@@ -120,117 +115,9 @@
|
||||
|
||||
// Eventually required CSS
|
||||
generateCSSsInclude($customCSSs); // Eventually required CSS
|
||||
|
||||
|
||||
// --------------------------------------------------------------------------------------------------------
|
||||
// Javascripts
|
||||
|
||||
// Generates the global object to pass useful parameters to other javascripts
|
||||
// NOTE: must be called before any other JS include
|
||||
generateJSDataStorageObject($indexPage, $calledPath, $calledMethod);
|
||||
|
||||
// Generates the global object to pass phrases to javascripts
|
||||
// NOTE: must be called before including the PhrasesLib.js
|
||||
if ($phrases != null) generateJSPhrasesStorageObject($phrases);
|
||||
|
||||
// --------------------------------------------------------------------------------------------------------
|
||||
// From vendor folder
|
||||
|
||||
// jQuery V3
|
||||
if ($jquery === true) generateJSsInclude('vendor/components/jquery/jquery.min.js');
|
||||
|
||||
// jQuery UI
|
||||
if ($jqueryui === true)
|
||||
{
|
||||
generateJSsInclude('vendor/components/jqueryui/jquery-ui.min.js');
|
||||
generateJSsInclude('vendor/components/jqueryui/ui/i18n/datepicker-de.js'); // datepicker german language file
|
||||
}
|
||||
|
||||
// jQuery checkboxes
|
||||
// NOTE: keep it after jQuery includes
|
||||
if ($jquerycheckboxes === true) generateJSsInclude('vendor/rmariuzzo/jquery-checkboxes/dist/jquery.checkboxes-1.0.7.min.js');
|
||||
// jQuery treetable
|
||||
// NOTE: keep it after jQuery includes
|
||||
if ($jquerytreetable === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js');
|
||||
|
||||
// Bootstrap JS
|
||||
if ($bootstrap === true) generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js');
|
||||
|
||||
// SB Admin 2 template JS
|
||||
if ($sbadmintemplate === true)
|
||||
{
|
||||
generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
|
||||
generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
|
||||
generateBackwardCompatibleJSMsIe('vendor/afarkas/html5shiv/dist/html5shiv.min.js');
|
||||
generateBackwardCompatibleJSMsIe('vendor/scottjehl/Respond/dest/respond.min.js');
|
||||
}
|
||||
|
||||
// Securimage JS
|
||||
if ($captcha === true) generateJSsInclude('vendor/dapphp/securimage/securimage.js');
|
||||
|
||||
// Moment JS
|
||||
if ($momentjs === true)
|
||||
{
|
||||
generateJSsInclude('vendor/moment/momentjs/min/moment.min.js');
|
||||
generateJSsInclude('vendor/moment/momentjs/locale/de-at.js');
|
||||
generateJSsInclude('vendor/moment/momentjs/locale/en-ie.js');
|
||||
}
|
||||
|
||||
// PivotUI JS
|
||||
if ($pivotui === true) generateJSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.js');
|
||||
|
||||
// Table sorter JS
|
||||
if ($tablesorter === true)
|
||||
{
|
||||
generateJSsInclude('vendor/mottie/tablesorter/dist/js/jquery.tablesorter.min.js');
|
||||
generateJSsInclude('vendor/mottie/tablesorter/dist/js/jquery.tablesorter.widgets.min.js');
|
||||
generateJSsInclude('vendor/mottie/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js');
|
||||
}
|
||||
|
||||
// Tabulator JS
|
||||
if ($tabulator === true)
|
||||
{
|
||||
generateJSsInclude('vendor/olifolkerd/tabulator/dist/js/tabulator.min.js');
|
||||
generateJSsInclude('vendor/olifolkerd/tabulator/dist/js/jquery_wrapper.min.js');
|
||||
}
|
||||
|
||||
// Tinymce JS
|
||||
if ($tinymce === true) generateJSsInclude('vendor/tinymce/tinymce/tinymce.min.js');
|
||||
|
||||
// --------------------------------------------------------------------------------------------------------
|
||||
// From public folder
|
||||
|
||||
// DialogLib JS
|
||||
// NOTE: must be called before including others JS libraries that use it
|
||||
if ($dialoglib === true) generateJSsInclude('public/js/DialogLib.js');
|
||||
|
||||
// AjaxLib JS
|
||||
// NOTE: must be called before including others JS libraries that use it
|
||||
if ($ajaxlib === true) generateJSsInclude('public/js/AjaxLib.js');
|
||||
|
||||
// FilterWidget JS
|
||||
if ($filterwidget === true) generateJSsInclude('public/js/FilterWidget.js');
|
||||
|
||||
// NavigationWidget JS
|
||||
if ($navigationwidget === true) generateJSsInclude('public/js/NavigationWidget.js');
|
||||
|
||||
// PhrasesLib JS
|
||||
if ($phrases != null) generateJSsInclude('public/js/PhrasesLib.js');
|
||||
|
||||
// TableWidget JS
|
||||
if ($tablewidget === true) generateJSsInclude('public/js/TableWidget.js');
|
||||
|
||||
// User Defined Fields
|
||||
if ($udfs === true) generateJSsInclude('public/js/UDFWidget.js');
|
||||
|
||||
// Load addon hooks JS
|
||||
// NOTE: keep it as the last but one
|
||||
if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
|
||||
|
||||
// Eventually required JS
|
||||
// NOTE: keep it as the latest
|
||||
generateJSsInclude($customJSs);
|
||||
?>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<!-- Header end -->
|
||||
|
||||
|
||||
Reference in New Issue
Block a user