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

- Now composer install version >3 of components/jquery

Browse Source 
- Added new entry in composer to install the version 2 of jquery
- Updated all the paths for jquery2
- Changed name of parameter jquery3 to jquery in FHC-Header
- Updated pages that use FHC-Header
- Removed components/bootstrap from composer
- Added twbs/bootstrap to composer
- Updated pages that use bootstrap with the correct path
This commit is contained in:
Paolo
2018-01-24 17:10:08 +01:00
parent 1ad45e4802
commit 6456ad7b06
7 changed files with 180 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/infocenter.php
+1 -1
View File
@@ -3,7 +3,7 @@
'templates/FHC-Header',
array(
'title' => 'Info Center',
'jquery3' => true,
'jquery' => true,
'bootstrap' => true,
'fontawesome' => true,
'sbadmintemplate' => true,
application/views/system/infocenter/infocenterDetails.php
+12 -1
View File
@@ -1,5 +1,16 @@
<?php
$this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', 'jquery3' => true, 'bootstrap' => true, 'fontawesome' => true, 'bootstrapdatepicker' => true, 'datatables' => true, 'sbadmintemplate' => true));
$this->load->view(
'templates/FHC-Header',
array(
'title' => 'InfocenterDetails',
'jquery' => true,
'bootstrap' => true,
'fontawesome' => true,
'bootstrapdatepicker' => true,
'datatables' => true,
'sbadmintemplate' => true
)
);
?>
<body>
<div id="wrapper">
application/views/templates/FHC-Header.php
+8 -6
View File
@@ -8,7 +8,7 @@ $customCSSs = isset($customCSSs) ? $customCSSs : null;
$customJSs = isset($customJSs) ? $customJSs : null;
// By default set the parameters to false
$jquery3 = isset($jquery3) ? $jquery3 : false;
$jquery = isset($jquery) ? $jquery : false;
$jqueryui = isset($jqueryui) ? $jqueryui : false;
$bootstrap = isset($bootstrap) ? $bootstrap : false;
$fontawesome = isset($fontawesome) ? $fontawesome : false;
@@ -93,7 +93,7 @@ function _generateJSsInclude($JSs)
// jQuery UI CSS
if ($jqueryui === true) _generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
// bootstrap CSS
if ($bootstrap === true) _generateCSSsInclude('vendor/components/bootstrap/css/bootstrap.min.css');
if ($bootstrap === true) _generateCSSsInclude('vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
// font awesome CSS
if ($fontawesome === true) _generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
// bootstrap datepicker CSS
@@ -103,7 +103,8 @@ function _generateJSsInclude($JSs)
// Table sorter CSS
if ($tablesorter === true) _generateCSSsInclude('skin/tablesort.css');
// sb admin template CSS
if ($sbadmintemplate === true){
if ($sbadmintemplate === true)
{
_generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
_generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
}
@@ -115,13 +116,14 @@ function _generateJSsInclude($JSs)
// Javascripts
// JQuery V3
if ($jquery3 === true) _generateJSsInclude('vendor/components/jquery/jquery.min.js');
if ($jquery === true) _generateJSsInclude('vendor/components/jquery/jquery.min.js');
// JQuery UI
if ($jqueryui === true) _generateJSsInclude('vendor/components/jqueryui/jquery-ui.min.js');
// bootstrap JS
if ($bootstrap === true) _generateJSsInclude('vendor/components/bootstrap/js/bootstrap.min.js');
if ($bootstrap === true) _generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js');
// bootstrap datepicker JS
if ($bootstrapdatepicker === true){
if ($bootstrapdatepicker === true)
{
_generateJSsInclude('vendor/eternicode/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js');
_generateJSsInclude('vendor/eternicode/bootstrap-datepicker/dist/locales/bootstrap-datepicker.de.min.js');
}
application/views/templates/header.php
+5 -5
View File
@@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
!isset($jqueryV1) ? $jqueryV1 = false : $jqueryV1 = $jqueryV1;
!isset($jqueryCurrent) ? $jqueryCurrent = false : $jqueryCurrent = $jqueryCurrent;
!isset($jqueryV2) ? $jqueryV2 = false : $jqueryV2 = $jqueryV2;
!isset($jqueryui) ? $jqueryui = false : $jqueryui = $jqueryui;
!isset($jquery_checkboxes) ? $jquery_checkboxes = false : $jquery_checkboxes = $jquery_checkboxes;
!isset($jquery_custom) ? $jquery_custom = false : $jquery_custom = $jquery_custom;
@@ -25,9 +25,9 @@ if($datepicker)
$jqueryui = true;
if($jqueryui)
$jqueryCurrent = true;
$jqueryV2 = true;
if($jqueryV1 && $jqueryCurrent)
if($jqueryV1 && $jqueryV2)
show_error("Two JQuery versions used: composer and include folder version");
?>
@@ -47,8 +47,8 @@ if($jqueryV1 && $jqueryCurrent)
<script type="text/javascript" src="<?php echo base_url('vendor/christianbach/tablesorter/jquery.tablesorter.min.js'); ?>"></script>
<?php endif ?>
<?php if($jqueryCurrent) : ?>
<script type="text/javascript" src="<?php echo base_url('vendor/components/jquery/jquery.min.js'); ?>"></script>
<?php if($jqueryV2) : ?>
<script type="text/javascript" src="<?php echo base_url('vendor/jquery/jqueryV2/jquery-2.2.4.min.js'); ?>"></script>
<?php endif ?>
<?php if($jqueryui) : ?>