Index: trunk/blocks/calender_block.php
===================================================================
--- trunk/blocks/calender_block.php	(revision 109)
+++ trunk/blocks/calender_block.php	(revision 109)
@@ -0,0 +1,47 @@
+<?php
+if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
+$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+
+eval( '
+function b_'.$mydirname.'_calender_show($options){
+	return _b_calender_show($options) ;
+}
+function b_'.$mydirname.'_calender_edit($options){
+	return _b_calender_edit($options) ;
+}
+' ) ;
+	
+if( ! defined( 'XPRESS_CALENDAR_BLOCK_INCLUDED' ) ) {
+	define( 'XPRESS_CALENDAR_BLOCK_INCLUDED' , 1 ) ;
+
+	function _b_calender_edit($options)
+	{
+		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+		$sun_color = empty( $options[1] ) ? '#DB0000' : $options[1] ;
+		$sat_color = empty( $options[2] ) ? '#004D99' : $options[2] ;
+		$this_template = empty( $options[3] ) ? 'db:'.$mydirname.'_calender_block.html' : trim( $options[3] );
+		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+		
+		require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
+
+		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
+		$form .= _MB_XPRESS_SUN_COLOR .": <input type='text' name='options[1]' value='" . $sun_color . "' /><br />\n";
+		$form .= _MB_XPRESS_SAT_COLOR .": <input type='text' name='options[2]' value='" . $sat_color . "' /><br />\n";
+
+		return $form;
+	}
+
+	function _b_calender_show($options)
+	{
+		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+		$block_function_name = basename( __FILE__ );
+		
+		require_once $mydirpath.'/include/xpress_block_render.php';
+		return xpress_block_render($mydirname,$block_function_name,$options);
+
+	}
+	
+}
+
+?>
Index: trunk/blocks/popular_posts_block.php
===================================================================
--- trunk/blocks/popular_posts_block.php	(revision 109)
+++ trunk/blocks/popular_posts_block.php	(revision 109)
@@ -0,0 +1,60 @@
+<?php
+if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
+$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+
+eval( '
+function b_'.$mydirname.'_popular_show($options){
+	return _b_popular_show($options) ;
+}
+function b_'.$mydirname.'_popular_edit($options){
+	return _b_popular_edit($options) ;
+}
+' ) ;
+
+if( ! defined( 'XPRESS_POPULAR_BLOCK_INCLUDED' ) ) {
+	define( 'XPRESS_POPULAR_BLOCK_INCLUDED' , 1 ) ;
+	function _b_popular_edit($options)
+	{
+		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+		$disp_count = empty( $options[1] ) ? '10' : $options[1] ;
+		$show_month_range = empty( $options[2] ) ? '0' : $options[2] ;
+		$tag_select = $options[3] ;
+		$selected = array_slice($options, 4); // get allowed cats
+		$this_template = empty( $options[5] ) ? 'db:'.$mydirname.'_block_popular.html' : trim( $options[5] );
+		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+		
+		require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
+
+		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
+		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[1]' value='" . $disp_count . "' /><br />\n";
+		$form .= _MB_MONTH_RANGE .": <input type='text' name='options[2]' value='" . $show_month_range . "' /><br />\n";
+		$form .= "<br />\n";
+
+		$form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[3]' value='" . $tag_select . "' /><br />\n";	
+	    $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
+	    $isAll = (count($selected)==0||empty($selected[0]))?true:false;
+	    $form .= "<br />&nbsp;&nbsp;<select name=\"options[]\" multiple=\"multiple\">";
+	    $form .= "<option value=\"0\" ";
+	    if ($isAll) $form .= " selected=\"selected\"";
+	    $form .= ">"._MB_XPRESS_ALL ."</option>";
+		ob_start();
+		dropdown_cats_options('ID','asc',$selected);
+		$list_str = ob_get_contents();
+		ob_end_clean();
+	    $form .= $list_str. "</select><br />";
+//	    $form .="<br /><input type='text' size='60' name='options[5]' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
+
+		return $form;
+	}
+
+	function _b_popular_show($options)
+	{
+		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+		$block_function_name = basename( __FILE__ );
+		
+		require_once $mydirpath.'/include/xpress_block_render.php';
+		return xpress_block_render($mydirname,$block_function_name,$options);
+	}
+}
+?>
Index: trunk/blocks/recent_comments_block.php
===================================================================
--- trunk/blocks/recent_comments_block.php	(revision 100)
+++ trunk/blocks/recent_comments_block.php	(revision 109)
@@ -21,5 +21,5 @@
 		$disp_length = empty( $options[2] ) ? '30' : $options[2] ;
 	    $selected = array_slice($options,3); // get allowed cats
-		$this_template = empty( $options[4] ) ? 'db:'.$mydirname.'_block_recent_comments.html' : trim( $options[4] );
+		$this_template = empty( $options[4] ) ? 'db:'.$mydirname.'_recent_comments_block.html' : trim( $options[4] );
 		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
 
Index: trunk/blocks/recent_posts_content_block.php
===================================================================
--- trunk/blocks/recent_posts_content_block.php	(revision 100)
+++ trunk/blocks/recent_posts_content_block.php	(revision 109)
@@ -23,5 +23,5 @@
 		$tag_select = $options[4] ;
 	    $selected = array_slice($options,5); // get allowed cats
-		$this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_block_recent_posts_content.html' : trim( $options[5] );
+		$this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_recent_posts_content_block.html' : trim( $options[5] );
 
 		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
Index: trunk/blocks/recent_posts_list_block.php
===================================================================
--- trunk/blocks/recent_posts_list_block.php	(revision 100)
+++ trunk/blocks/recent_posts_list_block.php	(revision 109)
@@ -22,5 +22,5 @@
 		$tag_select = $options[4] ;
 		$selected = array_slice($options,5); // get allowed cats
-		$this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_block_posts.html' : trim( $options[6] );
+		$this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_recent_posts_list_block.html' : trim( $options[6] );
 		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;