diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php index cfbec86db..6c6f58b8f 100644 --- a/application/views/templates/FHC-Common.php +++ b/application/views/templates/FHC-Common.php @@ -7,6 +7,7 @@ // By default set the parameters to false // External resources + $axios027 = isset($axios027) ? $axios027 : false; $bootstrap3 = isset($bootstrap3) ? $bootstrap3 : false; $bootstrap5 = isset($bootstrap5) ? $bootstrap5 : false; $captcha3 = isset($captcha3) ? $captcha3 : false; diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php index 2cbaf5753..70f2f6b3f 100644 --- a/application/views/templates/FHC-Footer.php +++ b/application/views/templates/FHC-Footer.php @@ -31,9 +31,22 @@ // -------------------------------------------------------------------------------------------------------- // From vendor folder + // Axios V0.27 + if ($axios027 === true) generateJSsInclude('vendor/axios/axios/axios.min.js'); + + // Bootstrap 5 JS + if ($bootstrap5 === true) generateJSsInclude('vendor/twbs/bootstrap5/dist/js/bootstrap.min.js'); + + // Securimage JS + if ($captcha3 === true) generateJSsInclude('vendor/dapphp/securimage/securimage.js'); + // jQuery V3 if ($jquery3 === true) generateJSsInclude('vendor/components/jquery/jquery.min.js'); + // Bootstrap 3 JS + // NOTE: to be kept after jQuery! + if ($bootstrap3 === true) generateJSsInclude('vendor/twbs/bootstrap3/dist/js/bootstrap.min.js'); + // jQuery UI if ($jqueryui1 === true) { @@ -49,15 +62,6 @@ // NOTE: keep it after jQuery includes if ($jquerytreetable3 === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js'); - // Bootstrap 3 JS - if ($bootstrap3 === true) generateJSsInclude('vendor/twbs/bootstrap3/dist/js/bootstrap.min.js'); - - // Bootstrap 5 JS - if ($bootstrap5 === true) generateJSsInclude('vendor/twbs/bootstrap5/dist/js/bootstrap.min.js'); - - // Securimage JS - if ($captcha3 === true) generateJSsInclude('vendor/dapphp/securimage/securimage.js'); - // Moment JS if ($momentjs2 === true) { diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php index 228856091..6390a5115 100644 --- a/application/views/templates/FHC-Header.php +++ b/application/views/templates/FHC-Header.php @@ -36,11 +36,8 @@ // Bootstrap 5 CSS if ($bootstrap5 === true) generateCSSsInclude('vendor/twbs/bootstrap5/dist/css/bootstrap.min.css'); - // jQuery UI CSS - if ($jqueryui1 === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css'); - - // jQuery treetable - if ($jquerytreetable3 === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css'); + // Securimage CSS + if ($captcha3 === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css'); // Font Awesome 4 CSS free icons if ($fontawesome4 === true) generateCSSsInclude('vendor/fortawesome/font-awesome4/css/font-awesome.min.css'); @@ -53,6 +50,12 @@ generateCSSsInclude('vendor/fortawesome/font-awesome6/css/brands.min.css'); } + // jQuery UI CSS + if ($jqueryui1 === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css'); + + // jQuery treetable + if ($jquerytreetable3 === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css'); + // PivotUI CSS if ($pivotui2 === true) generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css'); @@ -63,9 +66,6 @@ generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css'); } - // Securimage CSS - if ($captcha3 === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css'); - // Table sorter CSS if ($tablesorter2 === true) generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css');