Index: trunk/blocks/page_block.php
===================================================================
--- trunk/blocks/page_block.php	(revision 126)
+++ trunk/blocks/page_block.php	(revision 127)
@@ -19,8 +19,16 @@
 		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
 		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_page_block.html' : trim( $options[1] );
-		$sort_column = empty( $options[2] ) ? 0 : $options[1] ;
-		$sort_order_asc = empty( $options[3] ) ? 0 : 1 ;
-		$show_date = empty( $options[4] ) ? 0 : 1 ;
-		$date_format = empty( $options[5] ) ? '' : $options[5] ;
+		$sort_column = empty( $options[2] ) ? 'post_title' : $options[2] ;
+		$sort_order = empty( $options[3] ) ? 'asc' : $options[3] ;
+		$exclude = empty( $options[4] ) ? '' : $options[4] ;
+		$exclude_tree = !is_numeric( $options[5] ) ? 0 : $options[5] ;
+		$includes = empty( $options[6] ) ? '' : $options[6] ;
+		$depth = !is_numeric( $options[7] ) ? 0 : $options[7] ;
+		$child_of = !is_numeric( $options[8] ) ? 0 : $options[8] ;
+		$show_date = empty( $options[9] ) ? 'none' : $options[9] ;
+		$date_format = empty( $options[10] ) ? '' : $options[10] ;
+		$hierarchical = empty( $options[11] ) ? false : true ;
+		$meta_key = empty( $options[12] ) ? '' : $options[12] ;
+		$meta_value = empty( $options[13] ) ? '' : $options[13] ;
 
 		require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
@@ -29,17 +37,87 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_SORT_COLUMN ."\n";
-		$form .= "<select name='options[2]' size='1'>\n";
-		$selected[0] = ''; $selected[1]= ''; $selected[2]= '';
-		$selected[$sort_column] = ' selected ';
-		$form .= "<option value='0' " . $selected[0] . " >" . _MB_XPRESS_TITLE . "</option>\n";
-		$form .= "<option value='1' " . $selected[1] . " >" . _MB_XPRESS_PUBLISH_DATE . "</option>\n";
-		$form .= "<option value='2' " . $selected[2] . " >" . _MB_XPRESS_MENU_ORDER . "</option>\n";
-		$form .= "</select><br />\n";
-		$form .= yes_no_radio_option('options[3]', _MB_XPRESS_SORT_ORDER , $sort_order_asc , _MB_XPRESS_SORT_ASC ,_MB_XPRESS_SORT_DESC) . "<br />\n";
-		$form .= yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_DATE , $show_date) . "<br />\n";
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
-//	    $form .="<br /><input type='text' size='60' name='options[2]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
-	    
+		$form .= _MB_XPRESS_PAGE_ORDERBY .": ";
+		$form .=  "<select name='options[2]'>";
+		
+		if ($sort_column =='post_title')
+			$form .=  "<option value='post_title' selected='selected'>". _MB_XPRESS_PAGE_TITLE;
+		else
+			$form .=  "<option value='post_title'>". _MB_XPRESS_PAGE_TITLE;
+		
+		if ($sort_column =='menu_order')
+			$form .=  "<option value='menu_order' selected='selected'>". _MB_XPRESS_PAGE_MENU_ORDER;
+		else
+			$form .=  "<option value='menu_order'>". _MB_XPRESS_PAGE_MENU_ORDER;
+		
+		if ($sort_column =='post_date')
+			$form .=  "<option value='post_date' selected='selected'>". _MB_XPRESS_PAGE_POST_DATE;
+		else
+			$form .=  "<option value='post_date'>". _MB_XPRESS_PAGE_POST_DATE;
+		
+		if ($sort_column =='post_modified')
+			$form .=  "<option value='post_modified' selected='selected'>". _MB_XPRESS_PAGE_POST_MODIFY;
+		else
+			$form .=  "<option value='post_modified'>". _MB_XPRESS_PAGE_POST_MODIFY;
+		
+		if ($sort_column =='ID')
+			$form .=  "<option value='ID' selected='selected'>". _MB_XPRESS_PAGE_ID;
+		else
+			$form .=  "<option value='ID'>". _MB_XPRESS_PAGE_ID;
+		
+		if ($sort_column =='post_author')
+			$form .=  "<option value='post_author' selected='selected'>". _MB_XPRESS_PAGE_AUTHOR;
+		else
+			$form .=  "<option value='post_author'>". _MB_XPRESS_PAGE_AUTHOR;
+		
+		if ($sort_column =='post_name')
+			$form .=  "<option value='post_name' selected='selected'>". _MB_XPRESS_PAGE_SLUG;
+		else
+			$form .=  "<option value='post_name'>". _MB_XPRESS_PAGE_SLUG;
+		
+		$form .=  "</select><br/>";
+		
+		
+		$form .= _MB_XPRESS_SORT_ORDER .": ";
+		$form .=  "<select name='options[3]'>";
+		if ($sort_order =='asc')
+			$form .=  "<option value='asc' selected='selected'>" . _MB_XPRESS_SORT_ASC;
+		else
+			$form .=  "<option value='asc'>" . _MB_XPRESS_SORT_ASC;
+		if ($sort_order =='desc')
+			$form .=  "<option value='desc' selected='selected'>" . _MB_XPRESS_SORT_DESC;
+		else
+			$form .=  "<option value='desc'>" . _MB_XPRESS_SORT_DESC;
+		$form .=  "</select><br/>\n";
+		
+		$form .= _MB_XPRESS_PAGE_EXCLUDE . "  <input type='text' name='options[4]' value='" . $exclude . "' size ='60' /><br />\n";
+		$form .= _MB_XPRESS_PAGE_EXCLUDE_TREE . "  <input type='text' name='options[5]' value='" . $exclude_tree . "' size ='8' /><br />\n";
+		$form .= _MB_XPRESS_PAGE_INCLUDE . "  <input type='text' name='options[6]' value='" . $includes . "' size ='60' /><br />\n";
+		$form .= _MB_XPRESS_PAGE_DEPTH . "  <input type='text' name='options[7]' value='" . $depth . "' size ='8' /><br />";
+		$form .= _MB_XPRESS_PAGE_CHILD_OF . "  <input type='text' name='options[8]' value='" . $child_of . "' size ='8' /><br />";
+
+		$form .= _MB_XPRESS_SHOW_DATE_SELECT .": ";
+		$form .=  "<select name='options[9]'>";
+		if ($show_date =='none')
+			$form .=  "<option value='none' selected='selected'>" . _MB_XPRESS_SHOW_DATE_NONE;
+		else
+			$form .=  "<option value='none'>" . _MB_XPRESS_SHOW_DATE_NONE;
+
+		if ($show_date =='post_date')
+			$form .=  "<option value='post_date' selected='selected'>" . _MB_XPRESS_SHOW_POST_DATE;
+		else
+			$form .=  "<option value='post_date'>" . _MB_XPRESS_SHOW_POST_DATE;
+
+		if ($show_date =='modified')
+			$form .=  "<option value='modified' selected='selected'>" . _MB_XPRESS_SHOW_MODIFY_DATE;
+		else
+			$form .=  "<option value='modified'>" . _MB_XPRESS_SHOW_MODIFY_DATE;
+		
+		$form .=  "</select><br/>\n";
+
+		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[10]' value='" . $date_format . "' /><br />\n";
+		$form .= yes_no_radio_option('options[11]', _MB_XPRESS_PAGE_HIERARCHICAL , $hierarchical) . "<br />" ;
+		$form .= _MB_XPRESS_PAGE_META_KEY . "  <input type='text' name='options[12]' value='" . $meta_key . "' size ='40' /><br />\n";
+		$form .= _MB_XPRESS_PAGE_META_VALUE . "  <input type='text' name='options[12]' value='" . $meta_value . "' size ='40' /><br />\n";
+    
 		return $form;
 	}
Index: trunk/language/ja_utf8/blocks.php
===================================================================
--- trunk/language/ja_utf8/blocks.php	(revision 126)
+++ trunk/language/ja_utf8/blocks.php	(revision 127)
@@ -16,4 +16,8 @@
 	define("_MB_XPRESS_SORT_ASC","昇順");
 	define("_MB_XPRESS_SORT_DESC","降順");
+	define("_MB_XPRESS_SHOW_DATE_SELECT","日付の表示");
+	define("_MB_XPRESS_SHOW_DATE_NONE","表示しない");
+	define("_MB_XPRESS_SHOW_POST_DATE","作成日を表示");
+	define("_MB_XPRESS_SHOW_MODIFY_DATE","最終更新日を表示");
 	define("_MB_XPRESS_SHOW_DATE","日付を表示する");
 	define("_MB_XPRESS_DATE_FORMAT","日付のフォーマット(空白の場合WordPressでの設定が適用されます)");
@@ -59,6 +63,20 @@
 
 // page 	
-	define("_MB_XPRESS_MENU_ORDER","メニューオーダー");
-	define("_MB_XPRESS_SORT_COLUMN","並び順の項目");
+	define("_MB_XPRESS_PAGE_ORDERBY","ページリストのソート項目");
+	define("_MB_XPRESS_PAGE_TITLE","タイトル名順");
+	define("_MB_XPRESS_PAGE_MENU_ORDER","ページ順");
+	define("_MB_XPRESS_PAGE_POST_DATE","作成日順");
+	define("_MB_XPRESS_PAGE_POST_MODIFY","最終更新日順");
+	define("_MB_XPRESS_PAGE_ID","ページ ID順");
+	define("_MB_XPRESS_PAGE_AUTHOR","作成者ID 順");
+	define("_MB_XPRESS_PAGE_SLUG","ページスラッグ順");
+	define("_MB_XPRESS_PAGE_EXCLUDE","リストから除外するページID をカンマ区切りで昇順に指定。");
+	define("_MB_XPRESS_PAGE_EXCLUDE_TREE","リストから除外するページID を指定(子ページも除外されます)。");
+	define("_MB_XPRESS_PAGE_INCLUDE","指定したページID のみリストに表示。カンマ区切りで昇順に指定");
+	define("_MB_XPRESS_PAGE_DEPTH","ページ階層のどのレベルまでをリストに出力するかを指定。 (0=全親子ページを出力）");
+	define("_MB_XPRESS_PAGE_CHILD_OF","指定IDのページを親とする階層のページをリストに表示します。(0=全親子ページを出力）");
+	define("_MB_XPRESS_PAGE_HIERARCHICAL","子ページをリスト表示するとき、インデント（字下げ）する。");
+	define("_MB_XPRESS_PAGE_META_KEY","ここに記述したカスタムフィールドキーを持つページだけを表示します。");
+	define("_MB_XPRESS_PAGE_META_VALUE","ここに記述したカスタムフィールド値を持つページだけを表示します。");
 	
 // Search
@@ -91,5 +109,5 @@
 	define("_MB_XPRESS_CAT_INCLUDE","指定したカテゴリID のみリストに表示。カンマ区切りで昇順に指定");
 	define("_MB_XPRESS_CAT_HIERARCHICAL","サブカテゴリーを表示するとき、インデント（字下げ）する。");
-	define("_MB_XPRESS_CAT_DEPTH","カテゴリ階層のどのレベルまでをカテゴリリストに出力するかを指定。 (0=全親子カテゴリを出力）");
+	define("_MB_XPRESS_CAT_DEPTH","カテゴリ階層のどのレベルまでをリストに出力するかを指定。 (0=全親子カテゴリを出力）");
 	
 // meta 
Index: trunk/templates/source/page_block.html
===================================================================
--- trunk/templates/source/page_block.html	(revision 126)
+++ trunk/templates/source/page_block.html	(revision 127)
@@ -2,10 +2,5 @@
  	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.contents}>						// Data array of archives. 
-		// Examples of <{$block.contents}>
-		<{foreach from=$block.contents item=content}>	// Loop
-		<{$content.page}>						// the author name is displayed as a link to their posts. Optionally this tag displays each author's post count.
-		<{/foreach}>							// End of Loop
+		<{$block.list_pages}>					// Displays Pages List from wp_list_pages() function
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
@@ -14,11 +9,5 @@
 	<{$block.err_message}>
 	<div class='xpress_page_block'>
-		<ul>
-		<{foreach from=$block.contents item=content}>
-			<li>
-			<{$content.page}>
-			</li>
-		<{/foreach}>
-		</ul>
+		<{$block.list_pages}>
 	</div>
 </div>
Index: trunk/wp-content/themes/xpress_default/blocks/page_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/page_block_theme.php	(revision 126)
+++ trunk/wp-content/themes/xpress_default/blocks/page_block_theme.php	(revision 127)
@@ -5,47 +5,40 @@
 	$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
 	$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_page_block.html' : trim( $options[1] );
-	$sort_column = empty( $options[2] ) ? 0 : $options[2] ;
-	$sort_order_asc = empty( $options[3] ) ? 0 : 1 ;
-	$show_date = empty( $options[4] ) ? 0 : 1 ;
-	$date_format = empty( $options[5] ) ? '' : $options[5] ;
+	$sort_column = empty( $options[2] ) ? 'post_title' : $options[2] ;
+	$sort_order = empty( $options[3] ) ? 'asc' : $options[3] ;
+	$exclude = empty( $options[4] ) ? '' : $options[4] ;
+	$exclude_tree = !is_numeric( $options[5] ) ? 0 : $options[5] ;
+	$includes = empty( $options[6] ) ? '' : $options[6] ;
+	$depth  = !is_numeric( $options[7] ) ? 0 : $options[7] ;
+	$child_of  = !is_numeric( $options[8] ) ? 0 : $options[8] ;
+	$show_date = empty( $options[9] ) ? 'none' : $options[9] ;
+	$date_format = empty( $options[10] ) ? '' : $options[10] ;
+	$hierarchical = empty( $options[11] ) ? false : true ;
+	$meta_key = empty( $options[12] ) ? '' : $options[12] ;
+	$meta_value = empty( $options[13] ) ? '' : $options[13] ;
 
-	switch ($sort_column) {
-		case 0:
-			$sort_column_name = 'post_title';
-			break ;
-		case 1:
-			$sort_column_name = 'post_date';
-			break ;
-		case 2:
-			$sort_column_name = 'menu_order';
-			break ;
-		default:
-			$sort_column_name = 'post_title';
-			break ;
-	}
 	if (empty($date_format)) $date_format = get_option('date_format');
-	if ($show_date) $show_date_name = 'post_date' ; else $show_date_name = '';
+	if ($exclude_tree == 0 ) $exclude_tree = '';
+	if ($show_date == 'none' ) $show_date = '';
+	
 	$parm = array(
-    	'depth'       => 0, 
-    	'title_li'    => '', 
-    	'show_date'   => $show_date_name,
-    	'date_format' => $date_format,
-    	'child_of'    => 0, 
-    	'exclude'     => '',
-    	'echo'        => 0,
-    	'authors'     => '',
-    	'sort_column' => $sort_column_name
+    	'sort_column'	=> $sort_column, 
+    	'sort_order'	=> $sort_order, 
+    	'exclude'		=> $exclude,
+    	'exclude_tree'	=> $exclude_tree,
+    	'include'		=> $includes,
+    	'depth'			=> $depth, 
+    	'child_of'		=> $child_of,
+    	'show_date'		=> $show_date,
+    	'date_format'	=> $date_format,
+    	'title_li'		=> '',
+    	'echo'			=> 0,
+    	'hierarchical'	=> $hierarchical,
+    	'meta_key'		=> $meta_key,
+    	'meta_value'	=> $meta_value
     );
 	
-	$content = wp_list_pages($parm);
-		$item_no = 0;
-		$row_data = array(
-			'page'		=> $content
-		);
-		$block['contents']['item'.$item_no] = $row_data;
-		$item_no++;
-
-	$block['data_count'] = $item_no;  //xml unserialise error
-
+	$output = "<ul>\n" . wp_list_pages($parm) . "\n</ul>\n";
+	$block['list_pages'] = $output;
 	return $block ;	
 }
Index: trunk/xoops_version.php
===================================================================
--- trunk/xoops_version.php	(revision 126)
+++ trunk/xoops_version.php	(revision 127)
@@ -187,6 +187,6 @@
 	'show_func' 	=> "b_". $mydirname . "_page_show" ,
 	'edit_func' 	=> "b_". $mydirname . "_page_edit" ,
-	'options'		=> $mydirname. '||0|1|1|' ,
-	'can_clone'		=> false ,
+	'options'		=> $mydirname. '||post_title|asc||0||0|0|none||1||' ,
+	'can_clone'		=> true ,
 	'func_num'		=> $b_no,
 );
