blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 17:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bootstrap sometimes needs jQuery!

Browse Source
This commit is contained in:
Paolo
2019-02-05 15:26:38 +01:00
parent 8ccb94af38
commit 6b6e030b69
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/templates/FHC-Header.php
+6 -6
View File
@@ -46,12 +46,12 @@
// --------------------------------------------------------------------------------------------------------
// From vendor folder
// Bootstrap CSS
if ($bootstrap === true) generateCSSsInclude('vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
// jQuery UI CSS
if ($jqueryui === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
// Bootstrap CSS
if ($bootstrap === true) generateCSSsInclude('vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
// jQuery treetable
if ($jquerytreetable === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css');
@@ -111,9 +111,6 @@
// --------------------------------------------------------------------------------------------------------
// From vendor folder
// Bootstrap JS
if ($bootstrap === true) generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js');
// jQuery V3
if ($jquery === true) generateJSsInclude('vendor/components/jquery/jquery.min.js');
@@ -124,6 +121,9 @@
generateJSsInclude('vendor/components/jqueryui/ui/i18n/datepicker-de.js'); // datepicker german language file
}
// Bootstrap JS
if ($bootstrap === true) generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js');
// jQuery treetable
// NOTE: keep it after jQuery includes
if ($jquerytreetable === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js');