Index: trunk/blocks/category_block.php =================================================================== --- trunk/blocks/category_block.php (revision 122) +++ trunk/blocks/category_block.php (revision 122) @@ -0,0 +1,91 @@ +"; + $form .= "
"; + $form .= "
"; + $form .= _MB_XPRESS_CAT_ALL_STR . "
"; + $form .= _MB_XPRESS_CAT_ORDERBY .": "; + $form .= "
"; + + $form .= _MB_XPRESS_SORT_ORDER .": "; + $form .= "
"; + + $form .= yes_no_radio_option('options[5]', _MB_XPRESS_SHOW_LAST_UPDATE , $show_last_updated) . "
" ; + $form .= yes_no_radio_option('options[6]', _MB_XPRESS_SHOW_NUM_OF_POST , $show_count) . "
" ; + $form .= yes_no_radio_option('options[7]', _MB_XPRESS_CAT_HIDE_EMPTY , $hide_empty) . "
" ; + $form .= yes_no_radio_option('options[8]', _MB_XPRESS_DESC_FOR_TITLE , $use_desc_for_title) . "
" ; + $form .= _MB_XPRESS_CAT_EXCLUDE . "
"; + $form .= _MB_XPRESS_CAT_INCLUDE . "
"; + $form .= yes_no_radio_option('options[11]', _MB_XPRESS_CAT_HIERARCHICAL , $hierarchical) . "
" ; + $form .= _MB_XPRESS_CAT_DEPTH . "
"; + return $form; + } + + function _b_category_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/meta_block.php =================================================================== --- trunk/blocks/meta_block.php (revision 122) +++ trunk/blocks/meta_block.php (revision 122) @@ -0,0 +1,58 @@ +
"; + $form .= "
"; + $form .= "
"; + $form .= yes_no_radio_option('options[2]', _MB_XPRESS_META_WP_LINK , $wp_link) . "
\n"; + $form .= yes_no_radio_option('options[3]', _MB_XPRESS_META_XOOPS_LINK , $xoops_link) . "
\n"; + $form .= yes_no_radio_option('options[4]', _MB_XPRESS_META_POST_RSS , $post_rss) . "
\n"; + $form .= yes_no_radio_option('options[5]', _MB_XPRESS_META_COMMENT_RSS , $comment_rss) . "
\n"; + $form .= yes_no_radio_option('options[6]', _MB_XPRESS_META_POST_NEW , $post_new) . "
\n"; + $form .= yes_no_radio_option('options[7]', _MB_XPRESS_META_ADMIN , $admin_edit) . "
\n"; + $form .= yes_no_radio_option('options[8]', _MB_XPRESS_META_README , $readme) . "
\n"; + $form .= yes_no_radio_option('options[9]', _MB_XPRESS_META_CH_STYLE , $ch_style) . "\n"; + + return $form; + } + + function _b_meta_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/tag_cloud_block.php =================================================================== --- trunk/blocks/tag_cloud_block.php (revision 122) +++ trunk/blocks/tag_cloud_block.php (revision 122) @@ -0,0 +1,121 @@ +
"; + $form .= "
"; + $form .= "
"; + $form .= _MB_XPRESS_CLOUD_SMALLEST .":
"; + $form .= _MB_XPRESS_CLOUD_LARGEST .":
"; + $form .= _MB_XPRESS_CLOUD_UNIT .": "; + $form .= "
"; + + $form .= _MB_XPRESS_CLOUD_NUMBER .":
"; + + $form .= _MB_XPRESS_CLOUD_FORMAT .": "; + $form .= "
"; + + $form .= _MB_XPRESS_CLOUD_ORDERBY .": "; + $form .= "
"; + + $form .= _MB_XPRESS_CLOUD_ORDER .": "; + $form .= "
"; + + $form .= _MB_XPRESS_CLOUD_EXCLUDE .":
"; + $form .= _MB_XPRESS_CLOUD_INCLUDE .":
"; + + +// $form .="
"; + + return $form; + } + + function _b_tag_cloud_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/include/xpress_templates_make.php =================================================================== --- trunk/include/xpress_templates_make.php (revision 121) +++ trunk/include/xpress_templates_make.php (revision 122) @@ -82,4 +82,7 @@ 'page_block.html', 'search_block.html', + 'tag_cloud_block.html', + 'category_block.html', + 'meta_block.html' , 'index.html', ); Index: trunk/language/ja_utf8/blocks.php =================================================================== --- trunk/language/ja_utf8/blocks.php (revision 121) +++ trunk/language/ja_utf8/blocks.php (revision 122) @@ -17,4 +17,6 @@ define("_MB_XPRESS_SHOW_DATE","日付を表示する"); define("_MB_XPRESS_DATE_FORMAT","日付のフォーマット(空白の場合WordPressでの設定が適用されます)"); + define("_MB_XPRESS_FLAT","フラット"); + define("_MB_XPRESS_LIST","リスト"); // recent comment block @@ -58,4 +60,45 @@ // Search define("_MB_XPRESS_SEARCH_LENGTH","検索BOXの長さ"); + +// tag cloud + define("_MB_XPRESS_CLOUD_SMALLEST",'最少使用数のタグの表示に使うフォントサイズ'); + define("_MB_XPRESS_CLOUD_LARGEST",'最多使用数のタグの表示に使うフォントサイズ'); + define("_MB_XPRESS_CLOUD_UNIT","フォントサイズの単位。pt, px, em, % 等"); + define("_MB_XPRESS_CLOUD_NUMBER","クラウドに表示するタグ数。[0] を指定すると全タグを表示"); + define("_MB_XPRESS_CLOUD_FORMAT","クラウド表示のフォーマット"); + define("_MB_XPRESS_CLOUD_ORDERBY","タグの表示順とする項目"); + define("_MB_XPRESS_CLOUD_ORDER","ソート順（ランダムはWordPress2.5以上で指定可能）"); + define("_MB_XPRESS_CLOUD_EXCLUDE","除外するタグの term_id をカンマ区切りで指定"); + define("_MB_XPRESS_CLOUD_INCLUDE","表示対象とするタグの term_id をカンマ区切りで指定、空白時は全タグ対象"); + define("_MB_XPRESS_RAND","ランダム"); + define("_MB_XPRESS_TAG_NAME","タグ名"); + define("_MB_XPRESS_TAG_COUNT","使用回数"); + +// Categorie + define("_MB_XPRESS_CAT_ALL_STR","全カテゴリへのリンクを示す文字を指定します。(空白時は表示なし）"); + define("_MB_XPRESS_CAT_ORDERBY","カテゴリのソート項目"); + define("_MB_XPRESS_CAT_NAME","カテゴリ名"); + define("_MB_XPRESS_CAT_COUNT","カテゴリの投稿数"); + define("_MB_XPRESS_CAT_ID","カテゴリID"); + define("_MB_XPRESS_SHOW_LAST_UPDATE","各カテゴリに属する投稿の最終更新日を表示する。"); + define("_MB_XPRESS_CAT_HIDE_EMPTY","投稿のないカテゴリを非表示にする。"); + define("_MB_XPRESS_DESC_FOR_TITLE","カテゴリの概要をリンクの title 属性に挿入する。"); + define("_MB_XPRESS_CAT_EXCLUDE","リストから除外するカテゴリID をカンマ区切りで昇順に指定。"); + define("_MB_XPRESS_CAT_INCLUDE","指定したカテゴリID のみリストに表示。カンマ区切りで昇順に指定"); + define("_MB_XPRESS_CAT_HIERARCHICAL","サブカテゴリーを表示するとき、インデント（字下げ）する。"); + define("_MB_XPRESS_CAT_DEPTH","カテゴリ階層のどのレベルまでをカテゴリリストに出力するかを指定。 (0=全親子カテゴリを出力）"); + +// meta + define("_MB_XPRESS_META_WP_LINK","WordPressサイトへのリンクを表示"); + define("_MB_XPRESS_META_XOOPS_LINK","Xoopsサイトへのリンクを表示"); + define("_MB_XPRESS_META_POST_RSS","投稿のRSSを表示"); + define("_MB_XPRESS_META_COMMENT_RSS","コメントのRSSを表示"); + define("_MB_XPRESS_META_POST_NEW","新規投稿を表示"); + define("_MB_XPRESS_META_ADMIN","サイトの管理を表示"); + define("_MB_XPRESS_META_README","ReadMeを表示"); + define("_MB_XPRESS_META_CH_STYLE","表示モード切替を表示"); + + + } ?> Index: trunk/language/ja_utf8/modinfo.php =================================================================== --- trunk/language/ja_utf8/modinfo.php (revision 121) +++ trunk/language/ja_utf8/modinfo.php (revision 122) @@ -14,5 +14,5 @@ // Sub menu titles define("_MI_XPRESS_MENU_POST_NEW","新規投稿"); - define("_MI_XPRESS_MENU_EDIT","投稿管理"); + define("_MI_XPRESS_MENU_EDIT","投稿編集"); // Block Name @@ -26,4 +26,7 @@ define("_MI_XPRESS_BLOCK_PAGE","ページ"); define("_MI_XPRESS_BLOCK_SEARCH","検索"); + define("_MI_XPRESS_BLOCK_TAG","タグクラウド"); + define("_MI_XPRESS_BLOCK_CATEGORY","カテゴリー"); + define("_MI_XPRESS_BLOCK_META","メタ情報"); // Notify Categories Index: trunk/templates/source/category_block.html =================================================================== --- trunk/templates/source/category_block.html (revision 122) +++ trunk/templates/source/category_block.html (revision 122) @@ -0,0 +1,15 @@ +<{* ************************** usage **************************** + 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.categories}> // Displays Categories from wp_list_categories() function + ************************* End of usage ************************ *}> +<{* Start Template *}> + +
+ <{$block.err_message}> +
+ +
+
Index: trunk/templates/source/meta_block.html =================================================================== --- trunk/templates/source/meta_block.html (revision 122) +++ trunk/templates/source/meta_block.html (revision 122) @@ -0,0 +1,13 @@ +<{* ************************** usage **************************** + 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.meta_info}> // Displays Meta Info. + ************************* End of usage ************************ *}> +<{* Start Template *}> + +
+ <{$block.err_message}> +
+ <{$block.meta_info}> +
+
Index: trunk/templates/source/tag_cloud_block.html =================================================================== --- trunk/templates/source/tag_cloud_block.html (revision 122) +++ trunk/templates/source/tag_cloud_block.html (revision 122) @@ -0,0 +1,13 @@ +<{* ************************** usage **************************** + 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.tag_cloud}> // Displays Tag Cloud from wp_tag_cloud() function + ************************* End of usage ************************ *}> +<{* Start Template *}> + +
+ <{$block.err_message}> +
+ <{$block.tag_cloud}> +
+
Index: trunk/wp-content/themes/xpress_default/blocks/block_style.css =================================================================== --- trunk/wp-content/themes/xpress_default/blocks/block_style.css (revision 121) +++ trunk/wp-content/themes/xpress_default/blocks/block_style.css (revision 122) @@ -251,2 +251,69 @@ } + +/*********** recent post content block ***************/ +.xpress_tag_cloud_block { + +} + +.xpress_tag_cloud_block a { + +} + +.xpress_tag_cloud_block a:hover { + +} + +.xpress_tag_cloud_block a:visited { + +} + +/*********** category block ***************/ +.xpress_category_block { + +} + +.xpress_category_block ul { + +} + +.xpress_category_block li { + +} + +.xpress_category_block a { + +} + +.xpress_category_block a:hover { + +} + +.xpress_category_block a:visited { + +} + +/*********** meta block ***************/ +.xpress_meta_block { + +} + +.xpress_meta_block ul { + +} + +.xpress_meta_block li { + +} + +.xpress_meta_block a { + +} + +.xpress_meta_block a:hover { + +} + +.xpress_meta_block a:visited { + +} Index: trunk/wp-content/themes/xpress_default/blocks/category_block_theme.php =================================================================== --- trunk/wp-content/themes/xpress_default/blocks/category_block_theme.php (revision 122) +++ trunk/wp-content/themes/xpress_default/blocks/category_block_theme.php (revision 122) @@ -0,0 +1,43 @@ + $show_option_all, + 'orderby' => $orderby, + 'order' => $order, + 'show_last_update' => $show_last_updated, + 'style' => 'list', + 'show_count' => $show_count, + 'hide_empty' => $hide_empty, + 'use_desc_for_title' => $use_desc_for_title, + 'child_of' => 0, + 'feed' => '', + 'feed_image' => '', + 'exclude' => $exclude, + 'include' => $includes, + 'hierarchical' => $hierarchical, + 'title_li' => '', + 'number' => '', + 'echo' => 0, + 'depth' => $depth + ); + $block['categories'] = wp_list_categories($param); + return $block ; +} + +?> Index: trunk/wp-content/themes/xpress_default/blocks/meta_block_theme.php =================================================================== --- trunk/wp-content/themes/xpress_default/blocks/meta_block_theme.php (revision 122) +++ trunk/wp-content/themes/xpress_default/blocks/meta_block_theme.php (revision 122) @@ -0,0 +1,89 @@ +\n"; + + if ($wp_link){ + $output .= '
  • WordPress
    • '; + } + if ($xoops_link){ + $output .= '
  • XOOPS cube
    • '; + } + if ($post_rss){ + $output .= '
  • '. __('Posts RSS', 'xpress') .'
    • '; + } + if ($comment_rss){ + $output .= '
  • '. __('Comments RSS', 'xpress') .'
    • '; + } + + if (is_user_logged_in()) { + global $current_user; + + $Now_user_level = $current_user->user_level; + + if ($post_new){ + if($Now_user_level > 0){ + $output .= + '
  • '. + ''. __('Add New', 'xpress') .''. + '
    • '; + } + } + if ($admin_edit){ + if($Now_user_level > 7){ + $output .= + '
  • '. + ''. __('Site Admin', 'xpress') .''. + '
    • '; + } + } + $output .= + '
  • '. + ''. __('User Profile', 'xpress') .''. + '
    • '; + + + if (defined('S2VERSION')){ + if($Now_user_level > 7){ + $output .= + '
  • '. + ''. __('Subscription management', 'xpress') .''. + '
    • '; + } else { + $output .= + '
  • '. + ''. __('Subscription management', 'xpress') .''. + '
    • '; + } + } + + } + + if ($readme){ + $output .='
  • '.'' . __('ReadMe', 'xpress') . ''.'
    • '; + } + + if (function_exists('wp_theme_switcher') ) { + ob_start(); + echo '
  • ' . __('Themes') . ':'; + wp_theme_switcher('dropdown'); + echo '
    • '; + $output .= ob_get_contents(); + ob_end_clean(); + } + $output .= ''; + $block['meta_info'] = $output; + return $block ; +} +?> Index: trunk/wp-content/themes/xpress_default/blocks/tag_cloud_block_theme.php =================================================================== --- trunk/wp-content/themes/xpress_default/blocks/tag_cloud_block_theme.php (revision 122) +++ trunk/wp-content/themes/xpress_default/blocks/tag_cloud_block_theme.php (revision 122) @@ -0,0 +1,35 @@ + $smallest, + 'largest' => $largest, + 'unit' => $unit, + 'number' => $number, + 'format' => $format, + 'orderby' => $orderby, + 'order' => $order, + 'exclude' => $exclude, + 'include' => $wp_include + ); + ob_start(); + wp_tag_cloud($param); + $output = ob_get_contents(); + ob_end_clean(); + + $block['tag_cloud'] = $output; + return $block ; +} +?> Index: trunk/wp-content/themes/xpress_default/ja.po =================================================================== --- trunk/wp-content/themes/xpress_default/ja.po (revision 121) +++ trunk/wp-content/themes/xpress_default/ja.po (revision 122) @@ -18,5 +18,5 @@ "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-17 10:21+0900\n" +"PO-Revision-Date: 2009-03-19 16:41+0900\n" "Last-Translator: toemon \n" "Language-Team: toemon \n" @@ -562,4 +562,5 @@ #: xpress_default/searchform.php:4 +#: xpress_default/blocks/search_block_theme.php:13 msgid "Search" msgstr "検索" @@ -676,24 +677,54 @@ msgstr "" +#: xpress_default/blocks/meta_block_theme.php:24 +msgid "Posts RSS" +msgstr "投稿の RSS" + +#: xpress_default/blocks/meta_block_theme.php:27 +msgid "Comments RSS" +msgstr "コメント のRSS" + +#: xpress_default/blocks/meta_block_theme.php:39 +msgid "Add New" +msgstr "新規投稿" + +#: xpress_default/blocks/meta_block_theme.php:47 +msgid "Site Admin" +msgstr "WordPress管理" + +#: xpress_default/blocks/meta_block_theme.php:53 +msgid "User Profile" +msgstr "ユーザープロファイル" + +#: xpress_default/blocks/meta_block_theme.php:61 +#: xpress_default/blocks/meta_block_theme.php:66 +msgid "Subscription management" +msgstr "メール購読の設定" + +#: xpress_default/blocks/meta_block_theme.php:74 +msgid "ReadMe" +msgstr "ReadMe表示" + +#: xpress_default/blocks/meta_block_theme.php:79 +msgid "Themes" +msgstr "テーマ選択" + #: xpress_default/blocks/popular_posts_block_theme.php:135 #: xpress_default/blocks/recent_posts_content_block_theme.php:93 #: xpress_default/blocks/recent_posts_list_block_theme.php:82 -#, fuzzy msgid "Comments (0)" -msgstr "コメント (RSS)" +msgstr "コメントはありません" #: xpress_default/blocks/popular_posts_block_theme.php:135 #: xpress_default/blocks/recent_posts_content_block_theme.php:93 #: xpress_default/blocks/recent_posts_list_block_theme.php:82 -#, fuzzy msgid "Comments (1)" -msgstr "コメント (RSS)" +msgstr "1件のコメント" #: xpress_default/blocks/popular_posts_block_theme.php:135 #: xpress_default/blocks/recent_posts_content_block_theme.php:93 #: xpress_default/blocks/recent_posts_list_block_theme.php:82 -#, fuzzy msgid "Comments (%)" -msgstr "コメント (RSS)" +msgstr "Comments (%)" #: xpress_default/blocks/recent_comments_block_theme.php:71 Index: trunk/xoops_version.php =================================================================== --- trunk/xoops_version.php (revision 121) +++ trunk/xoops_version.php (revision 122) @@ -54,5 +54,6 @@ $db_prefix = 'wp'; } - $modversion['tables'] = array( + +$modversion['tables'] = array( $db_prefix . "_comments", $db_prefix . "_links", @@ -68,5 +69,5 @@ $db_prefix . "_d3forum_link", $db_prefix . "_group_role" - ); +); @@ -188,5 +189,5 @@ 'options' => $mydirname. '||0|1|1|' , 'can_clone' => false , - 'func_num' => $b_no, + 'func_num' => $b_no, ); $b_no++; @@ -201,4 +202,39 @@ 'func_num' => $b_no , ); +$b_no++; +$modversion['blocks'][$b_no] = array( + 'file' => 'tag_cloud_block.php' , + 'name' => constant('_MI_XPRESS_BLOCK_TAG') , + 'description' => '' , + 'show_func' => "b_". $mydirname . "_tag_cloud_show" , + 'edit_func' => "b_". $mydirname . "_tag_cloud_edit" , + 'options' => $mydirname. '||8|22|pt|45|flat|name|ASC||' , + 'can_clone' => false , + 'func_num' => $b_no, +); +$b_no++; +$modversion['blocks'][$b_no] = array( + 'file' => 'category_block.php' , + 'name' => constant('_MI_XPRESS_BLOCK_CATEGORY') , + 'description' => '' , + 'show_func' => "b_". $mydirname . "_category_show" , + 'edit_func' => "b_". $mydirname . "_category_edit" , + 'options' => $mydirname. '||ALL|name|ASC|0|0|1|1|||1|0' , + 'can_clone' => false , + 'func_num' => $b_no, +); +$b_no++; +$modversion['blocks'][$b_no] = array( + 'file' => 'meta_block.php' , + 'name' => constant('_MI_XPRESS_BLOCK_META') , + 'description' => '' , + 'show_func' => "b_". $mydirname . "_meta_show" , + 'edit_func' => "b_". $mydirname . "_meta_edit" , + 'options' => $mydirname. '||1|1|1|1|1|1|1|1' , + 'can_clone' => false , + 'func_num' => $b_no, +); + + // Notification $modversion['hasNotification'] = 1;