Changeset 125 for trunk

Timestamp:

Mar 20, 2009, 12:47:52 PM (16 years ago)

Author:

toemon

Message:

サイドバーの追加　と　アーカイブブロックの修正 #74 bump Ver0.11

Location:

trunk

Files:

• blocks/archives_block.php (modified) (2 diffs)
• blocks/sidebar_block.php (added)
• language/ja_utf8/blocks.php (modified) (2 diffs)
• templates/source/archives_block.html (modified) (2 diffs)
• templates/source/sidebar_block.html (added)
• wp-content/themes/xpress_default/blocks/archives_block_theme.php (modified) (1 diff)
• wp-content/themes/xpress_default/blocks/sidebar_block_theme.php (added)
• wp-content/themes/xpress_default/ja.mo (modified) (previous)
• wp-content/themes/xpress_default/ja.po (modified) (2 diffs)
• xoops_version.php (modified) (3 diffs)

trunk/blocks/archives_block.php

@@ -20 +20 @@
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
                 $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_category.html' : trim( $options[1] );
-                $type = empty( $options[2] ) ? false : true ;
-                $limit = empty( $options[3] ) ? '10' : $options[3] ;
+                $type = empty( $options[2] ) ? 'monthly' : $options[2] ;
+                $limit  = !is_numeric( $options[3] ) ? 0 : $options[3] ;
                 $show_post_count = empty( $options[4] ) ? false : true ;                
                 $drop_down = empty( $options[5] ) ? false : true ;
@@ -33 +33 @@
                 $a_week = _MB_XPRESS_ARC_WEEK ;         
 
-                $form .= "<br />" . yes_no_radio_option('options[2]', _MB_XPRESS_ARC_TYPE , $type,$a_month,$a_week);
-                $form .= "<br />" . _MB_XPRESS_COUNT . "  <input type='text' name='options[3]' value='" . $limit . "' />";
+                $form .= _MB_XPRESS_ARC_TYPE .": ";
+                $form .=  "<select name='options[2]'>";
+                if ($type =='yearly')
+                        $form .=  "<option value='yearly' selected='selected'>". _MB_XPRESS_ARC_YEAR;
+                else
+                        $form .=  "<option value='yearly'>". _MB_XPRESS_ARC_YEAR;
+                
+                if ($type =='monthly')
+                        $form .=  "<option value='monthly' selected='selected'>". _MB_XPRESS_ARC_MONTH;
+                else
+                        $form .=  "<option value='monthly'>". _MB_XPRESS_ARC_MONTH;
+                
+                if ($type =='weekly')
+                        $form .=  "<option value='weekly' selected='selected'>". _MB_XPRESS_ARC_WEEK;
+                else
+                        $form .=  "<option value='weekly'>". _MB_XPRESS_ARC_WEEK;
+                
+                if ($type =='daily')
+                        $form .=  "<option value='daily' selected='selected'>". _MB_XPRESS_ARC_DAY;
+                else
+                        $form .=  "<option value='daily'>". _MB_XPRESS_ARC_DAY;
+
+                if ($type =='postbypost')
+                        $form .=  "<option value='postbypost' selected='selected'>". _MB_XPRESS_ARC_POST;
+                else
+                        $form .=  "<option value='postbypost'>". _MB_XPRESS_ARC_POST;
+
+                $form .=  "</select><br/>";
+                
+                $form .= "<br />" . _MB_XPRESS_COUNT_ZERO_ALL . "  <input type='text' name='options[3]' value='" . $limit . "' />";
                 $form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_NUM_OF_POST , $show_post_count);
                 $form .= "<br />" . yes_no_radio_option('options[5]', _MB_XPRESS_SHOW_DROP_DOWN , $drop_down);

trunk/language/ja_utf8/blocks.php

@@ -4 +4 @@
 // general      
         define("_MB_XPRESS_COUNT",'表示数');
+        define("_MB_XPRESS_COUNT_ZERO_ALL",'表示数(0の場合全てを表示)');
         define("_MB_XPRESS_LENGTH","長さ");
         define("_MB_XPRESS_ALL","すべて");
@@ -46 +47 @@
         
 // archives
-        define("_MB_XPRESS_ARC_MONTH","月間アーカイブ");
-        define("_MB_XPRESS_ARC_WEEK","週間アーカイブ");
         define("_MB_XPRESS_ARC_TYPE","アーカイブタイプ");
+        define("_MB_XPRESS_ARC_YEAR","年別アーカイブ");
+        define("_MB_XPRESS_ARC_MONTH","月別アーカイブ");
+        define("_MB_XPRESS_ARC_WEEK","週別アーカイブ");
+        define("_MB_XPRESS_ARC_DAY","日別アーカイブ");
+        define("_MB_XPRESS_ARC_POST","個別記事アーカイブ");
 
 // authors      

trunk/templates/source/archives_block.html

@@ -2 +2 @@
         The template tag of the following list can be used. 
                 <{$block.err_message}>                                  // When the block cannot be displayed, this outputs the reason. Please do not delete it.
-                <{$block.data_count}>                                   // The number of archives is displayed. 
-                <{$block.config.is_archive_doropdown}>  // When this returns the true value. The user has selected the archive to be displayed by the drop down list in the setting of the block.  
-                <{$block.archive_dropdown}>                             // Displays a dropdown list of links to date-based archives.
-                <{$block.contents}>                                             // Data array of archives. 
-                // Examples of <{$block.contents}>
-                <{foreach from=$block.contents item=content}>   // Loop
-                <{$content.archive}>                                    // Displays a list of links to date-based archives.
-                <{/foreach}>                                                    // End of Loop
+                <{$block.archive}>                                              // Displays Archives from wp_get_archives() function
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
@@ -16 +9 @@
         <{$block.err_message}>
         <div class="xpress_archive_block">
-                <{if $block.config.is_archive_doropdown}>
-                        <{$block.archive_dropdown}>
-                <{else}>
-                        <ul>
-                                <{foreach from=$block.contents item=content}>
-                                        <li>
-                                        <{$content.archive}>
-                                        </li>
-                                <{/foreach}>
-                        </ul>
-                <{/if}>
+                <{$block.archive}>
         </div>
 </div>

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

@@ -4 +4 @@
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
         $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_archives_block.html' : trim( $options[1] );
-        $type = empty( $options[2] ) ? false : true ;
-        $limit = empty( $options[3] ) ? '10' : $options[3] ;
+        $type = empty( $options[2] ) ? 'monthly' : $options[2] ;
+        $limit  = !is_numeric( $options[3] ) ? 0 : $options[3] ;
         $show_post_count = empty( $options[4] ) ? false : true ;                
         $drop_down = empty( $options[5] ) ? false : true ;      
         
-        if ($type) {
-                $type_name = 'monthly';
+        switch($type){
+                case 'yearly':
+                        $select_str = __('Select Yearly', 'xpress');
+                        break;
+                case 'monthly':
+                        $select_str = __('Select Monthly', 'xpress');
+                        break;
+                case 'weekly':
+                        $select_str = __('Select Weekly', 'xpress');
+                        break;
+                case 'daily':
+                        $select_str = __('Select Daily', 'xpress');
+                        break;
+                case 'postbypost':
+                        $select_str = __('Select Post', 'xpress');
+                        break;
+                default:
+                        $select_str = __('Select Monthly', 'xpress');
+        }
+        
+        if ($drop_down) $format = 'option'; else $format = 'html';
+        if ($limit == 0 ) $limit_str = ''; else $limit_str = $limit;
+        
+        $param = array(
+                'type' => $type, 
+                'limit' => $limit_str, 
+                'format' => $format, 
+                'before' => '', 
+                'after' => '',
+                'show_post_count' => $show_post_count
+        );
+        
+        ob_start();
+                wp_get_archives($param);
+                $get_archives_output = ob_get_contents();
+        ob_end_clean();
+        
+
+        if($drop_down){
+                
+
+                $output = '<form id="archiveform" action="">';
+                $output .= '<select name="archive_chrono" onchange="window.location = (document.forms.archiveform.archive_chrono[document.forms.archiveform.archive_chrono.selectedIndex].value);">';
+                $output .= "<option value=''>" . $select_str . "</option>\n";
+                $output .=  $get_archives_output;
+                $output .= '</select>';
+                $output .= '</form>';
+                
+                $output  = '<select name="archive-dropdown"' . "onChange='document.location.href=this.options[this.selectedIndex].value;'>\n";
+                $output .= '<option value="">'.attribute_escape($select_str) . "</option>\n";
+                $output .=      $get_archives_output;
+                $output .=      "</select>\n";
+                
         } else {
-                $type_name = 'weekly';
-        }                       
-
-        $drop_down_list = '<form id="archiveform" action="">';
-        $drop_down_list .= '<select name="archive_chrono" onchange="window.location = (document.forms.archiveform.archive_chrono[document.forms.archiveform.archive_chrono.selectedIndex].value);">';
-        $drop_down_list .= "<option value=''>";
-        if ($type) {
-                $drop_down_list .= __('Select Monthly', 'xpress');
-        } else {
-                $drop_down_list .= __('Select Weekly', 'xpress');
+                $output  = "<ul>\n";
+                $output .=  $get_archives_output;
+                $output  .= "</ul>\n";
         }
-        $drop_down_list .=  '</option>';
-        ob_start();
-                get_archives($type_name,$limit,'option','','',$show_post_count);
-                $drop_down_list .= ob_get_contents();
-        ob_end_clean();
-        $drop_down_list .= '</select>';
-        $drop_down_list .= '</form>';                           
-
-        ob_start();
-                get_archives($type_name,$limit,'custom','','|',$show_post_count);
-                $output = ob_get_contents();
-        ob_end_clean();
-        $output = preg_replace('/\|$/', '' ,$output); // "|" at the end of line is deleted. 
-        $archives = explode('|',$output);
-        $item_no = 0;
-        foreach ($archives as $archive){
-                $row_data = array(
-                        'archive'               => $archive
-                );
-                $block['contents']['item'.$item_no] = $row_data;
-                $item_no++;
-        }
-        $block['data_count'] = $item_no;
-        $block['config']['is_archive_doropdown'] = $drop_down;
-        $block['archive_dropdown'] = $drop_down_list;
+        $block['archive'] = $output;
         return $block ; 
 }

trunk/wp-content/themes/xpress_default/ja.po

@@ -18 +18 @@
 "Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n"
 "POT-Creation-Date: 2008-08-15 21:16+0900\n"
-"PO-Revision-Date: 2009-03-19 16:41+0900\n"
+"PO-Revision-Date: 2009-03-20 12:18+0900\n"
 "Last-Translator: toemon <toychee@toemon.com>\n"
 "Language-Team: toemon <info@toemon.com>\n"
@@ -654 +654 @@
 msgstr "この投稿を編集 "
 
-#: xpress_default/blocks/archives_block_theme.php:21
+#: xpress_default/blocks/archives_block_theme.php:13
+msgid "Select Yearly"
+msgstr "年を選択"
+
+#: xpress_default/blocks/archives_block_theme.php:16
+#: xpress_default/blocks/archives_block_theme.php:28
 msgid "Select Monthly"
 msgstr "月を選択"
 
-#: xpress_default/blocks/archives_block_theme.php:23
+#: xpress_default/blocks/archives_block_theme.php:19
 msgid "Select Weekly"
 msgstr "週を選択"
+
+#: xpress_default/blocks/archives_block_theme.php:22
+msgid "Select Daily"
+msgstr "日を選択"
+
+#: xpress_default/blocks/archives_block_theme.php:25
+msgid "Select Post"
+msgstr "記事を選択"
 
 #: xpress_default/blocks/calender_block_theme.php:71

trunk/xoops_version.php

@@ -31 +31 @@
 $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XPRESS_NAME') ;
 $modversion['description'] = constant( '_MI_XPRESS_DESC');
-$modversion['version'] = "0.10";
+$modversion['version'] = "0.11";
 $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'] = "r124";
+$modversion['codename'] = "r125";
 
 // onInstall, onUpdate, onUninstall
@@ -165 +165 @@
         'show_func'     => "b_". $mydirname . "_archives_show" ,
         'edit_func'     => "b_". $mydirname . "_archives_edit" ,
-        'options'               => $mydirname. '||1|10|1|0' ,
-        'can_clone'             => false ,
+        'options'               => $mydirname. '||monthly|0|1|0' ,
+        'can_clone'             => true ,
         'func_num'              => $b_no,       
 );