From d7fb91371e52161c8546e9f7a56d59e91eeda5db Mon Sep 17 00:00:00 2001 From: ma0048 Date: Thu, 11 Aug 2022 14:34:32 +0200 Subject: [PATCH 1/2] added missing includes for infocenter --- application/views/system/infocenter/infocenter.php | 3 ++- application/views/templates/FHC-Footer.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php index 47c154d81..0b7a20c2c 100644 --- a/application/views/system/infocenter/infocenter.php +++ b/application/views/system/infocenter/infocenter.php @@ -18,7 +18,8 @@ 'global' => array('mailAnXversandt'), 'ui' => array('bitteEintragWaehlen') ), - 'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css') + 'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'), + 'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js') ); $this->load->view('templates/FHC-Header', $includesArray); diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php index bdeb2b810..b4cb4bcca 100644 --- a/application/views/templates/FHC-Footer.php +++ b/application/views/templates/FHC-Footer.php @@ -87,6 +87,7 @@ { 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 4 JS From d95cbb39e37b5dcfc95ce7cc4c5f67942cffcf95 Mon Sep 17 00:00:00 2001 From: Paolo Date: Thu, 11 Aug 2022 14:46:28 +0200 Subject: [PATCH 2/2] Reverted bootstrap and jquery include order --- application/views/templates/FHC-Footer.php | 14 +++++++------- application/views/templates/FHC-Header.php | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) 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');