blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 00:54:27 +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/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) : ?>