Changeset 165 for trunk

Timestamp:

Apr 8, 2009, 12:45:03 AM (16 years ago)

Author:

toemon

Message:

Bump Ver0.28 #53 最近の記事内容ブロックのデザイン調整

モジュール外にブロックを配置したとき、ブロックCSSとして、テーマ内のstyle.cssとhotdateプラグインのCSSを取り込むようにした。　include/xpress_block_render.php xpress_get_plugin_css()
xpress_defaultのコンテンツ出力と同じ表示を行う　all_in_oneタグを追加

Location:

trunk

Files:

• include/xpress_block_render.php (modified) (1 diff)
• templates/source/recent_posts_content_block.html (modified) (2 diffs)
• wp-content/plugins/xpressme/include/custom_functions.php (modified) (1 diff)
• wp-content/themes/xpress_default/blocks/block_style.css (modified) (1 diff)
• wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php (modified) (4 diffs)
• wp-content/themes/xpress_default/index.php (modified) (1 diff)
• xoops_version.php (modified) (2 diffs)

trunk/include/xpress_block_render.php

@@ -77 +77 @@
                         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".'<style type="text/css">@import url('.get_stylesheet_url($mydirname).');</style>';
+                        
+                        // hotDate
+                        $output .= "\n".'<style type="text/css">@import url('.$xoops_config->module_url.'/wp-content/plugins/hotDates/hotDates.css);</style>';
+                        return $output; 
+                } 
+                return '';
+        }
 
         function xpress_block_css_set($mydirname = '')
         {
                 $style_url =  get_block_stylesheet_url($mydirname);
-                  
+                
                 $tplVars =& $GLOBALS['xoopsTpl']->get_template_vars();
                 $csslink = "\n".'<link rel="stylesheet" type="text/css" media="screen" href="'. $style_url .'" />';
+                // 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)) {

trunk/templates/source/recent_posts_content_block.html

@@ -21 +21 @@
                 <{$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 +31 @@
                 <ul>
                 <{foreach from=$block.contents item=content}>
-                        <li>
-                        <{$content.post_title}><br />
-                        <{$content.post_content}><br />
-                        <{$content.post_date_time}><br />
-                        <{$content.post_author}><br />
-                        <{$content.post_category}><br />
-                        <{$content.post_tags}><br />
-                        <{$content.post_views}><br />
-                        <{$content.comment_link}><br />
-                        <{$content.trackback_url}>
-                        </li>
+                        <{$content.all_in_one}>
                 <{/foreach}>
                 </ul>

trunk/wp-content/plugins/xpressme/include/custom_functions.php

@@ -1 +1 @@
 <?php
+function xpress_the_title($show = false)
+{
+        $output = '<div class ="xpress-post-header">' . "\n";
+        
+        if (function_exists('hotDates')) {
+                ob_start();
+                        hotDates();
+                        $output .= ob_get_contents();
+                ob_end_clean();
+        }
+        $output .= '<div class ="xpress-post-title">' . "\n";
+        $output .= '<h2><a href="';
+        ob_start();
+                the_permalink();
+                $output .= ob_get_contents();
+        ob_end_clean();
+                                                
+        $output .= '" rel="bookmark" title="';
+        $output .= sprintf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0'));
+        $output .= '">';
+        ob_start();
+                the_title();
+                $output .= ob_get_contents();
+        ob_end_clean();
+        $output .= '</a></h2>' . "\n";
+        $output .= '</div>' . "\n";
+        $output .= '</div>' . "\n";
+        
+        if (empty($show))
+                return $output;
+        else
+                echo $output;
+
+}
+
 function xpress_selected_author($show=true ) {
         $output = '';

trunk/wp-content/themes/xpress_default/blocks/block_style.css

@@ -337 +337 @@
 
 }
+
+

trunk/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php

@@ -45 +45 @@
                         ob_end_clean();
                         
-                        ob_start();
-                                the_title();
-                                $title = ob_get_contents();
-                        ob_end_clean();
+                        $title = xpress_the_title(false);
                         
                         ob_start();
@@ -104 +101 @@
                                 $comments_popup_link = ob_get_contents();
                         ob_end_clean();
+
+// all_in_one                   
+                        ob_start();
+?>
+                                <div class="xpress-post" id="post-<?php the_ID(); ?>">
+                                        <div class ="xpress-post-header">
+                                                <?php if (function_exists('hotDates')) { hotDates(); }?>
+                                                <div class ="xpress-post-title">
+                                                        <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2>
+                                                </div>
+                                        </div>
+                                        <div class="xpress-post-entry">
+<?php
+                        if ($excerpt){
+                                $excerpt_length_word = $excerpt_size;
+                                $excerpt_length_character = $excerpt_size;
+                                $more_link_text = '';
+                                $post_content = get_xpress_excerpt_contents($excerpt_length_word,$excerpt_length_character,$more_link_text);
+                        } else {
+                                $post_content = xpress_the_content(__('more'),0,'',false);      
+                        }
+                        echo $post_content;
+?>                                                      
+                                        </div>
+                                        <div class="xpress-link-pages"><?php wp_link_pages() ?></div>
+                                        <div class ="xpress-post-footer">
+<?php
+                                                the_time('Y/m/d l');
+                                                echo ' - ';
+                                                the_author_posts_link();
+                                                echo ' (' . xpress_post_views_count($post->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 &#187;', 'xpress'), __('1 Comment &#187;', 'xpress'), __('% Comments &#187;', 'xpress'), '', __('Comments Closed', 'xpress') );
+?>
+                                        </div>
+                                </div>
+<?php
+                        $all_in_one = ob_get_contents();
+                        ob_end_clean();
+                                                
                         
                         $post_title = '<a href="' . $permalink . '">' . $title . '</a>';
@@ -127 +168 @@
                                 'post_views'            => $post_viwes,
                                 'comment_link'  => $comments_popup_link ,
-                                'trackback_url' => $trackback_url
+                                'trackback_url' => $trackback_url ,
+                                'all_in_one' => $all_in_one
                         );
                         
@@ -137 +179 @@
         return $block ;
 }
+
 ?>

trunk/wp-content/themes/xpress_default/index.php

@@ -30 +30 @@
                                         </div>
                                         <div class="xpress-post-entry">
-                                                <?php xpress_the_content(__('Read the rest of this entry &raquo;') ); ?>
+                                                <?php xpress_the_content(__('Read the rest of this entry &raquo;', 'xpress') ); ?>
                                         </div>
                                         <div class="xpress-link-pages"><?php wp_link_pages() ?></div>

trunk/xoops_version.php

@@ -31 +31 @@
 $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 +40 @@
 
 // status
-$modversion['codename'] = "r164";
+$modversion['codename'] = "r165";
 
 // onInstall, onUpdate, onUninstall