Merging local with github branch messed up.

Back out local changes not yet integrated

3 files changed, 26 insertions, 19 deletions

diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index c89c705..ebb4476 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -34,20 +34,20 @@ if( !$gBitThemes->getStyle() ) {
 $gBitSmarty->assignByRef( 'gBitThemes', $gBitThemes );
 
 // load some core javascript files
-$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/bitweaver.js', TRUE, 1 );
-$gBitThemes->loadAjax( $gBitSystem->getConfig( 'themes_jquery_hosting', 'jquerylocal' ) );
+$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/bitweaver.js', TRUE, 1 );
+$gBitThemes->loadAjax( $gBitSystem->getConfig( 'themes_jquery_hosting', 'jquery' ) );
 
 if( !$gBitSystem->isFeatureActive( 'site_disable_fat' )) {
-	$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/libs/fat.js', TRUE, 50 );
+	$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/fat.js', TRUE, 50 );
 }
 
 if( $gBitSystem->isFeatureActive( 'site_top_bar_js' ) && $gBitSystem->isFeatureActive( 'site_top_bar_dropdown' )) {
-	$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/libs/fsmenu.js', TRUE, 60 );
+	$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/fsmenu.js', TRUE, 60 );
 }
 
 if( $gBitSystem->isFeatureActive( 'site_fancy_zoom' )) {
-	$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/fancyzoom/js-global/FancyZoom.js', TRUE, 80 );
-	$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/fancyzoom/js-global/FancyZoomHTML.js', TRUE, 81 );
+	$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/fancyzoom/js-global/FancyZoom.js', TRUE, 80 );
+	$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/fancyzoom/js-global/FancyZoomHTML.js', TRUE, 81 );
 	$gBitSystem->setOnloadScript( 'setupZoom();' );
 }
 
@@ -57,5 +57,5 @@ $gBitSystem->mOnload[] = 'BitBase.setupShowHide();';
 // styles formerly included inline (kernel, themes). hopefully not needed anymore sometime in the future
 //$gBitThemes->loadCss( THEMES_PKG_PATH.'css/inline.css' );
 
-$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/libs/jquery.innerfade.js', FALSE, 700, FALSE );
-$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/libs/overlib.js', FALSE, 701, FALSE );
+$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/block.bitmodule.php b/smartyplugins/block.bitmodule.php
index 7ce7634..b3cbfbb 100644
--- a/smartyplugins/block.bitmodule.php
+++ b/smartyplugins/block.bitmodule.php
@@ -8,7 +8,7 @@
 /**
  * \brief Smarty {bitmodule}{/bitmodule} block handler
  *
- * To make a module it is enough to place something like following
+ * To make a module it is enough to place smth like following
  * into corresponding mod-name.tpl file:
  * \code
  *  {bitmodule name="module_name" title="Module title"}
@@ -26,13 +26,13 @@ error was used only in case the name was not there.
 I fixed that error case. -- mose
  
  */
-function smarty_block_bitmodule( $pParams, $pContent, &$gBitX) {
-	global $gBitSmarty;
+function smarty_block_bitmodule( $pParams, $pContent, &$gBitSmarty) {
 	if( empty( $pContent )) {
 		return '';
 	} else {
 		$pParams['data'] = $pContent;
 	}
+
 //	if( empty( $pParams['title'] )) {
 //		$pParams['title'] = substr( $pContent, 0, 12 )."…";
 //	}
@@ -41,11 +41,18 @@ function smarty_block_bitmodule( $pParams, $pContent, &$gBitX) {
 //		$pParams['name'] = preg_replace( "/[^-_a-zA-Z0-9]/", "", $pParams['title'] );
 //	}
 
+	// this is outdated and will not work with our serialised cookies - xing
+	/*
+	if( $_COOKIE[$name] == 'c' ) {
+		$pParams['toggle_state'] = 'none';
+	} else {
+		$pParams['toggle_state'] = 'block';
+	}
+	 */
+	
 	$pParams['name'] = preg_replace( "/[^a-zA-Z0-9\\-\\_]/", "", $pParams['name'] );
+	
 	$gBitSmarty->assign( 'modInfo', $pParams );
-//	vd( $gBitSmarty->getTemplateVars() );
-//	vd($gBitX->getTemplateVars());
-	$module = $gBitX->fetch('bitpackage:themes/module.tpl');
-//	vd($module);
-	return $module;
-}
\ No newline at end of file
+	return $gBitSmarty->fetch('bitpackage:themes/module.tpl');
+}
+?>
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index 42153e5..9d07953 100644
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -2,10 +2,10 @@
 {foreach from=$gBitThemes->mRawFiles.css item=cssFile}
 	<link rel="stylesheet" title="{$style}" type="text/css" href="{$cssFile}" media="all" />
 {/foreach}
-{*
+
 {foreach from=$gBitThemes->mRawFiles.js item=jsFile}
 	<script src="{$jsFile}" type="text/javascript"></script>
-{/foreach}  *}
+{/foreach} 
 {if $gBitThemes->mStyles.joined_css}
 	<link rel="stylesheet" title="{$style}" type="text/css" href="{$gBitThemes->mStyles.joined_css}" media="all" />
 {/if}