blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-18 12:39:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of https://github.com/FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets

Browse Source
This commit is contained in:
Cris
2022-08-11 14:59:06 +02:00
parent f85dd2fd2e 1103bb7aa1
commit 08b1047b09
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/infocenter.php
+2 -1
View File
@@ -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);
application/views/templates/FHC-Footer.php
+8 -7
View File
@@ -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)
{
@@ -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
application/views/templates/FHC-Header.php
+6 -6
View File
@@ -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');