diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php index bdeb2b810..fb5724ff0 100644 --- a/application/views/templates/FHC-Footer.php +++ b/application/views/templates/FHC-Footer.php @@ -34,19 +34,12 @@ // Axios V0.27 if ($axios027 === true) generateJSsInclude('vendor/axios/axios/dist/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) { @@ -62,6 +55,13 @@ // NOTE: keep it after jQuery includes if ($jquerytreetable3 === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js'); + // Bootstrap 3 JS + // NOTE: to be kept after jQuery! + 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'); + // Moment JS if ($momentjs2 === true) { diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php index a85e60bec..92e1ca3f8 100644 --- a/application/views/templates/FHC-Header.php +++ b/application/views/templates/FHC-Header.php @@ -30,12 +30,6 @@ // -------------------------------------------------------------------------------------------------------- // From vendor folder - // Bootstrap 3 CSS - if ($bootstrap3 === true) generateCSSsInclude('vendor/twbs/bootstrap3/dist/css/bootstrap.min.css'); - - // Bootstrap 5 CSS - if ($bootstrap5 === true) generateCSSsInclude('vendor/twbs/bootstrap5/dist/css/bootstrap.min.css'); - // Securimage CSS if ($captcha3 === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css'); @@ -56,6 +50,12 @@ // jQuery treetable if ($jquerytreetable3 === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css'); + // Bootstrap 3 CSS + if ($bootstrap3 === true) generateCSSsInclude('vendor/twbs/bootstrap3/dist/css/bootstrap.min.css'); + + // Bootstrap 5 CSS + if ($bootstrap5 === true) generateCSSsInclude('vendor/twbs/bootstrap5/dist/css/bootstrap.min.css'); + // PivotUI CSS if ($pivotui2 === true) generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');