ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Chart.js v 1.0.1 beta-4

This commit is contained in:
Kyle Johnson 2014-11-24 20:09:22 +00:00
parent c8ab231cef
commit 3e10ab10ac
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/skins/bootstrap/includes/functions.php
View File

@ -29,7 +29,7 @@ function xhtmlHeaders( $file, $title )
$stateJsFile = getSkinFile( 'views/js/state.js'); $stateJsFile = getSkinFile( 'views/js/state.js');
$bootstrapCssFile = getSkinFile( 'css/bootstrap.css' ); $bootstrapCssFile = getSkinFile( 'css/bootstrap.css' );
$bootstrapJsFile = getSkinFile( 'js/bootstrap.min.js' ); $bootstrapJsFile = getSkinFile( 'js/bootstrap.min.js' );
$ChartJsFile = getSkinFile( 'js/Chart.min.js' );
$basename = basename( $file, '.php' ); $basename = basename( $file, '.php' );
$viewCssFile = getSkinFile( 'views/css/'.$basename.'.css' ); $viewCssFile = getSkinFile( 'views/css/'.$basename.'.css' );
$viewCssPhpFile = getSkinFile( 'views/css/'.$basename.'.css.php' ); $viewCssPhpFile = getSkinFile( 'views/css/'.$basename.'.css.php' );
@ -77,6 +77,7 @@ function xhtmlHeaders( $file, $title )
<script src="<?= getSkinFile('js/controllers.js'); ?>"></script> <script src="<?= getSkinFile('js/controllers.js'); ?>"></script>
<script type="text/javascript" src="<?= $jqueryJsFile ?>"></script> <script type="text/javascript" src="<?= $jqueryJsFile ?>"></script>
<script type="text/javascript" src="<?= $bootstrapJsFile ?>"></script> <script type="text/javascript" src="<?= $bootstrapJsFile ?>"></script>
<script type="text/javascript" src="<?= $ChartJsFile ?>"></script>
<script type="text/javascript" src="tools/mootools/mootools-core.js"></script> <script type="text/javascript" src="tools/mootools/mootools-core.js"></script>
<script type="text/javascript" src="tools/mootools/mootools-more.js"></script> <script type="text/javascript" src="tools/mootools/mootools-more.js"></script>
<script type="text/javascript" src="js/mootools.ext.js"></script> <script type="text/javascript" src="js/mootools.ext.js"></script>

11
web/skins/bootstrap/js/Chart.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long