Index: /trunk/extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php
===================================================================
--- /trunk/extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php (revision 338)
+++ /trunk/extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php (revision 339)
@@ -126,4 +126,5 @@
define("_MB_XP2_SELECT_WIDGET","ɽ¼¨¤¹¤ë¥¦¥£¥¸¥§¥Ã¥È¤òÁªÂò (Ê£¿ôÁªÂò²Ä)");
define("_MB_XP2_NO_WIDGET","WordPress¦¤Çɽ¼¨¤¹¤ë¥¦¥£¥¸¥§¥Ã¥È¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó");
+ define("_MB_XP2_WIDGET_TITLE_SHOW","ñÆÈ¥¦¥£¥¸¥§¥Ã¥ÈÁªÂò»þ¡¢¥¦¥£¥¸¥§¥Ã¥È¤Î¥¿¥¤¥È¥ë¤òɽ¼¨");
// custom
Index: /trunk/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php
===================================================================
--- /trunk/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php (revision 338)
+++ /trunk/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php (revision 339)
@@ -126,4 +126,5 @@
define("_MB_XP2_SELECT_WIDGET","表示するウィジェットを選択 (複数選択可)");
define("_MB_XP2_NO_WIDGET","WordPress側で表示するウィジェットが選択されていません");
+ define("_MB_XP2_WIDGET_TITLE_SHOW","単独ウィジェット選択時、ウィジェットのタイトルを表示");
// custom
Index: /trunk/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/portuguesebr/blocks.php
===================================================================
--- /trunk/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/portuguesebr/blocks.php (revision 338)
+++ /trunk/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/portuguesebr/blocks.php (revision 339)
@@ -126,4 +126,5 @@
define("_MB_XP2_SELECT_WIDGET","Displayed Widget is selected.");
define("_MB_XP2_NO_WIDGET","Widget displayed on the WordPress side has not been selected. ");
+ define("_MB_XP2_WIDGET_TITLE_SHOW","When only one Widget has been selected, the title of Widget is displayed.");
// custom
Index: /trunk/xpressme_integration_kit/blocks/widget_block.php
===================================================================
--- /trunk/xpressme_integration_kit/blocks/widget_block.php (revision 338)
+++ /trunk/xpressme_integration_kit/blocks/widget_block.php (revision 339)
@@ -19,5 +19,6 @@
$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_widget_block.html' : trim( $options[1] );
- $selected = array_slice($options,2); // get allowed cats
+ $title_show = empty( $options[2] ) ? false : true ;
+ $selected = array_slice($options,3); // get allowed cats
if ($mydirname == 'wordpress'){
@@ -44,4 +45,5 @@
$form = "MyDirectory
";
$form .= "
";
+ $form .= "
" . yes_no_radio_option('options[2]', _MB_XP2_WIDGET_TITLE_SHOW , $title_show);
$form .= "
";
$form .= _MB_XP2_SELECT_WIDGET .":
\n";
Index: /trunk/xpressme_integration_kit/language/english/blocks.php
===================================================================
--- /trunk/xpressme_integration_kit/language/english/blocks.php (revision 338)
+++ /trunk/xpressme_integration_kit/language/english/blocks.php (revision 339)
@@ -126,4 +126,5 @@
define("_MB_XP2_SELECT_WIDGET","Displayed Widget is selected.");
define("_MB_XP2_NO_WIDGET","Widget displayed on the WordPress side has not been selected. ");
+ define("_MB_XP2_WIDGET_TITLE_SHOW","When only one Widget has been selected, the title of Widget is displayed.");
// custom
Index: /trunk/xpressme_integration_kit/language/ja_utf8/blocks.php
===================================================================
--- /trunk/xpressme_integration_kit/language/ja_utf8/blocks.php (revision 338)
+++ /trunk/xpressme_integration_kit/language/ja_utf8/blocks.php (revision 339)
@@ -126,4 +126,5 @@
define("_MB_XP2_SELECT_WIDGET","表示するウィジェットを選択 (複数選択可)");
define("_MB_XP2_NO_WIDGET","WordPress側で表示するウィジェットが選択されていません");
+ define("_MB_XP2_WIDGET_TITLE_SHOW","単独ウィジェット選択時、ウィジェットのタイトルを表示");
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/widget_block_theme.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/widget_block_theme.php (revision 338)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/widget_block_theme.php (revision 339)
@@ -4,5 +4,6 @@
$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_widget.html' : trim( $options[1] );
- $selected = array_slice($options,2); // get allowed cats
+ $title_show = empty( $options[2] ) ? false : true ;
+ $selected = array_slice($options,3); // get allowed cats
$output = '';
@@ -17,8 +18,17 @@
ob_end_clean();
}
-// if (count($selected) > 1)
- $block['widget'] = "