Merge pull request #121 from Gautham/Dev

Remove date() Warnings during Static Generation
This commit is contained in:
Denis Kisselev 2014-02-19 10:50:01 -08:00
commit 9e7b58a814
3 changed files with 223 additions and 215 deletions

View File

@ -22,7 +22,8 @@ $(function () {
}); });
//Fix GitHub Ribbon overlapping Scrollbar //Fix GitHub Ribbon overlapping Scrollbar
if ($('article')[0].scrollHeight > $('.right-column').height()) $('#github-ribbon')[0].style.right = '16px' var t = $('#github-ribbon');
if (t[0] && $('article')[0].scrollHeight > $('.right-column').height()) t[0].style.right = '16px';
//Toggle Code Block Visibility //Toggle Code Block Visibility
function toggleCodeBlocks() { function toggleCodeBlocks() {

View File

@ -29,6 +29,13 @@ if (isset($_SERVER['SCRIPT_NAME']))
$base_url = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'] , '/')); // find the full URL to this application from server root $base_url = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'] , '/')); // find the full URL to this application from server root
} }
// Hide annoying date() Warnings due to no Timezone being set.
if( ! ini_get('date.timezone') )
{
date_default_timezone_set('GMT');
}
function get_base_url() function get_base_url()
{ {
global $base_url; global $base_url;
@ -565,7 +572,7 @@ function clean_copy_assets($path){
} else { } else {
$unnecessaryJs = array('./js/less.min.js'); $unnecessaryJs = array('./js/less.min.js');
@mkdir($path.'/css'); @mkdir($path.'/css');
@copy('./css/daux-'.$options['theme'].'.css', $path.'/css/daux-'.$options['theme'].'.css'); @copy('./css/daux-'.$options['theme'].'.min.css', $path.'/css/daux-'.$options['theme'].'.min.css');
$unnecessaryImgs = array_diff($unnecessaryImgs, array('./img/favicon-'.$options['theme'].'.png')); $unnecessaryImgs = array_diff($unnecessaryImgs, array('./img/favicon-'.$options['theme'].'.png'));
} }
copy_recursive('./img', $path.'/', $unnecessaryImgs); copy_recursive('./img', $path.'/', $unnecessaryImgs);

View File

@ -21,7 +21,7 @@
</style> </style>
<script src="<?php echo $base_url ?>/js/less.min.js"></script> <script src="<?php echo $base_url ?>/js/less.min.js"></script>
<?php } else { ?> <?php } else { ?>
<link rel="stylesheet" href="<?php echo $base_url ?>/css/daux-<?php echo $options['theme'];?>.css"> <link rel="stylesheet" href="<?php echo $base_url ?>/css/daux-<?php echo $options['theme'];?>.min.css">
<?php } ?> <?php } ?>
<link rel="stylesheet" href="<?php echo $base_url ?>/css/full-doc.css"> <link rel="stylesheet" href="<?php echo $base_url ?>/css/full-doc.css">