Index: trunk/include/xpress_block_render.php =================================================================== --- trunk/include/xpress_block_render.php (revision 164) +++ trunk/include/xpress_block_render.php (revision 165) @@ -77,11 +77,43 @@ return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/block_style.css'; } + + function get_stylesheet_url($mydirname) + { + global $xoops_config; + $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname; + $select_theme = get_xpress_theme_name($mydirname); + $style_file = $mydirpath . '/wp-content/themes/' . $select_theme . '/style.css'; + if (file_exists($style_file)) + return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/' . $select_theme . '/style.css'; + else + return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/style.css'; + } + + function xpress_get_plugin_css($mydirname = '') + { + $this_url = '/modules/'. $mydirname; + $call_url = $_SERVER['REQUEST_URI']; + if (!strstr($call_url,$this_url)){ + global $xoops_config; + + // Module Main CSS + $output = "\n".''; + + // hotDate + $output .= "\n".''; + return $output; + } + return ''; + } function xpress_block_css_set($mydirname = '') { $style_url = get_block_stylesheet_url($mydirname); - + $tplVars =& $GLOBALS['xoopsTpl']->get_template_vars(); $csslink = "\n".''; + // Module Main CSS Plugin Css + $csslink .= xpress_get_plugin_css($mydirname); + if(array_key_exists('xoops_block_header', $tplVars)) { if (!strstr($tplVars['xoops_block_header'],$csslink)) { Index: trunk/templates/source/recent_posts_content_block.html =================================================================== --- trunk/templates/source/recent_posts_content_block.html (revision 164) +++ trunk/templates/source/recent_posts_content_block.html (revision 165) @@ -21,4 +21,5 @@ <{$content.comment_link}> // Displays a link to the comments popup window if comments_popup_script() is used, otherwise it displays a normal link to comments. <{$content.trackback_url}> // Displays the trackback URL for the current post. + <{$content.all_in_one}> // Displays the xpress_default theme render. <{/foreach}> // End of Loop ************************* End of usage ************************ *}> @@ -30,15 +31,5 @@ Index: trunk/wp-content/plugins/xpressme/include/custom_functions.php =================================================================== --- trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 164) +++ trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 165) @@ -1,3 +1,38 @@ ' . "\n"; + + if (function_exists('hotDates')) { + ob_start(); + hotDates(); + $output .= ob_get_contents(); + ob_end_clean(); + } + $output .= '
' . "\n"; + $output .= '

'; + ob_start(); + the_title(); + $output .= ob_get_contents(); + ob_end_clean(); + $output .= '

' . "\n"; + $output .= '
' . "\n"; + $output .= '' . "\n"; + + if (empty($show)) + return $output; + else + echo $output; + +} + function xpress_selected_author($show=true ) { $output = ''; Index: trunk/wp-content/themes/xpress_default/blocks/block_style.css =================================================================== --- trunk/wp-content/themes/xpress_default/blocks/block_style.css (revision 164) +++ trunk/wp-content/themes/xpress_default/blocks/block_style.css (revision 165) @@ -337,2 +337,4 @@ } + + Index: trunk/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php =================================================================== --- trunk/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php (revision 164) +++ trunk/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php (revision 165) @@ -45,8 +45,5 @@ ob_end_clean(); - ob_start(); - the_title(); - $title = ob_get_contents(); - ob_end_clean(); + $title = xpress_the_title(false); ob_start(); @@ -104,4 +101,48 @@ $comments_popup_link = ob_get_contents(); ob_end_clean(); + +// all_in_one + ob_start(); +?> +
+
+ +
+

+
+
+
+ +
+
+
+ID,__('Views :%d', 'xpress'),false) . ')'; + echo ' | '; + // echo the_tags(__('Tags:', 'xpress') . ' ', ', ', ' | '); + printf(__('Posted in %s', 'xpress'), get_the_category_list(', ')); + echo ' | '; + edit_post_link(__('Edit', 'xpress'), '', ' | '); + comments_popup_link(__('No Comments »', 'xpress'), __('1 Comment »', 'xpress'), __('% Comments »', 'xpress'), '', __('Comments Closed', 'xpress') ); +?> +
+
+' . $title . ''; @@ -127,5 +168,6 @@ 'post_views' => $post_viwes, 'comment_link' => $comments_popup_link , - 'trackback_url' => $trackback_url + 'trackback_url' => $trackback_url , + 'all_in_one' => $all_in_one ); @@ -137,3 +179,4 @@ return $block ; } + ?> Index: trunk/wp-content/themes/xpress_default/index.php =================================================================== --- trunk/wp-content/themes/xpress_default/index.php (revision 164) +++ trunk/wp-content/themes/xpress_default/index.php (revision 165) @@ -30,5 +30,5 @@
- +
Index: trunk/xoops_version.php =================================================================== --- trunk/xoops_version.php (revision 164) +++ trunk/xoops_version.php (revision 165) @@ -31,5 +31,5 @@ $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XPRESS_NAME') ; $modversion['description'] = constant( '_MI_XPRESS_DESC'); -$modversion['version'] = "0.27"; +$modversion['version'] = "0.28"; $modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://www.toemon.com) ;"; $modversion['author'] = "toemon (http://www.toemon.com)"; @@ -40,5 +40,5 @@ // status -$modversion['codename'] = "r164"; +$modversion['codename'] = "r165"; // onInstall, onUpdate, onUninstall