[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[20589] trunk

[<se...@us...>]

Revision: 20589
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20589&view=rev
Author:   sept_7
Date:     2009-08-05 16:20:21 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
[FIX] fix cssmenu decision for the left columns... avoid hysteresis of
module_type parameter...

Modified Paths:
--------------
    trunk/lib/modules/modlib.php
    trunk/lib/smarty_tiki/block.tikimodule.php
    trunk/templates/module.tpl

Modified: trunk/lib/modules/modlib.php
===================================================================
--- trunk/lib/modules/modlib.php	2009-08-05 16:00:40 UTC (rev 20588)
+++ trunk/lib/modules/modlib.php	2009-08-05 16:20:21 UTC (rev 20589)
@@ -538,13 +538,12 @@
 	function get_user_module_content( $name ) {
 		global $tikilib, $smarty;
 
+		$smarty->assign('module_type','module');
 		$info = $tikilib->get_user_module( $name );
 		if (!empty($info)) {
 			// test if we have a menu
 			if (strpos($info['data'],'{menu ') === 0 and strpos($info['data'],"css=y")) {
 				$smarty->assign('module_type','cssmenu');
-			} else {
-				$smarty->assign('module_type','module');
 			}
 
 			$smarty->assign('user_title', tra($info['title']));

Modified: trunk/lib/smarty_tiki/block.tikimodule.php
===================================================================
--- trunk/lib/smarty_tiki/block.tikimodule.php	2009-08-05 16:00:40 UTC (rev 20588)
+++ trunk/lib/smarty_tiki/block.tikimodule.php	2009-08-05 16:20:21 UTC (rev 20589)
@@ -64,7 +64,8 @@
 	$smarty->assign('module_nobox', $nobox);
 	$smarty->assign('module_notitle', $notitle);
 	$smarty->assign('module_decorations', $decorations);
-	if (isset($type)) $smarty->assign('module_type', $type);
+	if ( empty($type) ) $type = "module";
+	$smarty->assign('module_type', $type);
 	$smarty->assign_by_ref('module_content', $content);
 	return $smarty->fetch('module.tpl');
 }

Modified: trunk/templates/module.tpl
===================================================================
--- trunk/templates/module.tpl	2009-08-05 16:00:40 UTC (rev 20588)
+++ trunk/templates/module.tpl	2009-08-05 16:20:21 UTC (rev 20589)
@@ -2,7 +2,7 @@
 {* Module layout with controls *}
 {if $module_nobox neq 'y'}
 {if $prefs.feature_layoutshadows}<div class="box-shadow">{$prefs.box_shadow_start}{/if}
-	<div class="box box-{$module_name|escape}{if $module_type == 'cssmenu'} cssmenubox{/if}"{if $module_params.overflow == 'y'} style="overflow:visible !important"{/if}>
+	<div class="box box-{$module_name|escape}{if $module_type eq 'cssmenu'} cssmenubox{/if}"{if $module_params.overflow == 'y'} style="overflow:visible !important"{/if}>
 	{if $module_decorations ne 'n'}
 		<h3 class="box-title clearfix"{if !empty($module_params.bgcolor)} style="background-color:{$module_params.bgcolor};"{/if}>
 		{if $user and $prefs.user_assigned_modules == 'y' and $prefs.feature_modulecontrols eq 'y'}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.