diff options
| author | lsces <lester@lsces.co.uk> | 2013-09-23 20:29:47 +0100 |
|---|---|---|
| committer | lsces <lester@lsces.co.uk> | 2013-09-23 20:29:47 +0100 |
| commit | 453076e03337e84bd51e94623872207d4e6377ae (patch) | |
| tree | 12cbc5fe4a2429e20e3571d92d90df79338d02f4 | |
| parent | 4d48f5e390502684f06a3af7cf046294011eabaa (diff) | |
| download | themes-colourstrap_fork.tar.gz themes-colourstrap_fork.tar.bz2 themes-colourstrap_fork.zip | |
Fork to handle other themes than raw bootstrapcolourstrap_fork
| -rw-r--r-- | BitThemes.php | 4 | ||||
| -rw-r--r-- | bit_setup_inc.php | 8 | ||||
| -rw-r--r-- | smartyplugins/function.booticon.php | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/BitThemes.php b/BitThemes.php index dda3d5e..2bddc74 100644 --- a/BitThemes.php +++ b/BitThemes.php @@ -1490,7 +1490,7 @@ class BitThemes extends BitSingleton { $jquerySrc = $protocol.'://ajax.googleapis.com/ajax/libs/jquery/'.$jqueryVersion.'/jquery.js'; $this->mRawFiles['js'][] = $jquerySrc; // boostrap needs to load after jquery - $boostrapSrc = CONFIG_PKG_PATH.'themes/bootstrap/js/bootstrap.min.js'; + $boostrapSrc = CONFIG_PKG_PATH.'js/bootstrap.min.js'; if( file_exists( $boostrapSrc ) ) { $this->mRawFiles['js'][] = $boostrapSrc; } @@ -1500,7 +1500,7 @@ class BitThemes extends BitSingleton { $jquerySrc = $protocol.'://ajax.googleapis.com/ajax/libs/jquery/'.$jqueryVersion.'/jquery.js'; $this->mRawFiles['js'][] = $jquerySrc; // boostrap needs to load after jquery - $boostrapSrc = CONFIG_PKG_PATH.'themes/bootstrap/js/bootstrap.js'; + $boostrapSrc = CONFIG_PKG_PATH.'js/bootstrap.js'; if( file_exists( $boostrapSrc ) ) { $this->mRawFiles['js'][] = $boostrapSrc; } diff --git a/bit_setup_inc.php b/bit_setup_inc.php index ed30bfe..1bf967e 100644 --- a/bit_setup_inc.php +++ b/bit_setup_inc.php @@ -35,6 +35,7 @@ $gBitSmarty->assign_by_ref( 'gBitThemes', $gBitThemes ); // load some core javascript files $gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/bitweaver.js', TRUE, 1 ); +$gBitThemes->loadAjax( 'jquery' ); if( !$gBitSystem->isFeatureActive( 'site_disable_fat' )) { $gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/libs/fat.js', TRUE, 50 ); @@ -52,8 +53,9 @@ if( $gBitSystem->isFeatureActive( 'site_fancy_zoom' )) { $gBitSystem->mOnload[] = 'BitBase.setupShowHide();'; -$gBitThemes->loadCss( THEMES_PKG_PATH.'css/dropmenu.css' ); +//$gBitThemes->loadCss( THEMES_PKG_PATH.'css/dropmenu.css' ); // styles formerly included inline (kernel, themes). hopefully not needed anymore sometime in the future -$gBitThemes->loadCss( THEMES_PKG_PATH.'css/inline.css' ); +//$gBitThemes->loadCss( THEMES_PKG_PATH.'css/inline.css' ); -$gBitThemes->loadAjax( 'jquery' ); +$gBitThemes->loadJavascript( CONFIG_PKG_PATH.'js/jquery.innerfade.js', FALSE, 700, FALSE ); +$gBitThemes->loadJavascript( CONFIG_PKG_PATH.'js/overlib.js', FALSE, 701, FALSE ); diff --git a/smartyplugins/function.booticon.php b/smartyplugins/function.booticon.php index 5a68492..0074d87 100644 --- a/smartyplugins/function.booticon.php +++ b/smartyplugins/function.booticon.php @@ -36,17 +36,17 @@ function smarty_function_booticon( $pParams, $pFile ) { $outstr .= '>'; } - $outstr .= '<i class="'.$pParams['iname']; + $outstr .= '<div class="'.$pParams['iname']; if( isset( $pParams["iclass"] ) ) { $outstr .= ' '.$pParams["iclass"].''; } $outstr .= '"'; - + if( isset( $pParams["id"] ) ) { $outstr .= ' id="'.$pParams['id'].'"'; } - $outstr .= '></i>'; + $outstr .= '></div>'; if( !empty( $pParams['ilocation'] ) ) { if( $pParams['ilocation'] == 'menu' && isset( $pParams['iexplain'] ) ) { |