mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-23 18:02:18 +00:00
Merge branch 'master' into udf
This commit is contained in:
@@ -3,6 +3,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
|
||||
!isset($jquery) ? $jquery = false : $jquery = $jquery;
|
||||
!isset($jqueryComposer) ? $jqueryComposer = false : $jqueryComposer = $jqueryComposer;
|
||||
!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;
|
||||
!isset($tablesort) ? $tablesort = false : $tablesort = $tablesort;
|
||||
@@ -14,9 +16,20 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
|
||||
!isset($jsonforms) ? $jsonforms = false : $jsonforms = $jsonforms;
|
||||
!isset($textile) ? $textile = false : $textile = $textile;
|
||||
!isset($widgetsCSS) ? $widgetsCSS = false : $widgetsCSS = $widgetsCSS;
|
||||
!isset($datepicker) ? $datepicker = false : $datepicker = $datepicker;
|
||||
|
||||
if ($tablesort || $jquery_checkboxes || $jquery_custom)
|
||||
$jquery = true;
|
||||
|
||||
if($datepicker)
|
||||
$jqueryui = true;
|
||||
|
||||
if($jqueryui)
|
||||
$jqueryComposer = true;
|
||||
|
||||
if($jquery && $jqueryComposer)
|
||||
show_error("Two JQuery versions used: composer and includefolderversion");
|
||||
|
||||
?>
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
@@ -33,6 +46,15 @@ if ($tablesort || $jquery_checkboxes || $jquery_custom)
|
||||
<script type="text/javascript" src="<?php echo base_url('include/js/jquery1.9.min.js'); ?>"></script>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($jqueryComposer) : ?>
|
||||
<script type="text/javascript" src="<?php echo base_url('vendor/components/jquery/jquery.min.js'); ?>"></script>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($jqueryui) : ?>
|
||||
<script type="text/javascript" src="<?php echo base_url('vendor/components/jqueryui/jquery-ui.min.js'); ?>"></script>
|
||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url('vendor/components/jqueryui/themes/base/jquery-ui.min.css'); ?>" />
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($jquery_checkboxes) : ?>
|
||||
<script type="text/javascript" src="<?php echo base_url('include/js/jquery.checkboxes-1.0.7.min.js'); ?>"></script>
|
||||
<?php endif ?>
|
||||
@@ -54,6 +76,19 @@ if ($tablesort || $jquery_checkboxes || $jquery_custom)
|
||||
});
|
||||
</script>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($datepicker && !empty($datepickerclass)) : ?>
|
||||
<script language="Javascript" type="text/javascript">
|
||||
$(document).ready(function()
|
||||
{
|
||||
$(".<?php echo $datepickerclass; ?>").datepicker(
|
||||
{
|
||||
dateFormat:"dd.mm.yy"
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if($tinymce) : ?>
|
||||
<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce/tinymce.min.js');?>"></script>
|
||||
<?php endif ?>
|
||||
|
||||
Reference in New Issue
Block a user