Index: trunk/wp-content/plugins/xpressme/xpressme_class.php
===================================================================
--- trunk/wp-content/plugins/xpressme/xpressme_class.php	(revision 139)
+++ trunk/wp-content/plugins/xpressme/xpressme_class.php	(revision 143)
@@ -12,4 +12,7 @@
 	var $old_post_link_text;
 	var $newer_post_link_text;
+	var $is_left_page_navi_old;
+	var $old_page_link_text;
+	var $newer_page_link_text;
 	var $is_author_view_count;
 	var $is_sql_debug;
@@ -48,6 +51,9 @@
 		$this->is_postnavi_title_disp = true;
 		$this->is_left_postnavi_old = true;
-		$this->old_post_link_text = __('to Old Post', 'xpressme');
-		$this->newer_post_link_text = __('to Newer Post', 'xpressme');
+		$this->old_post_link_text = __('Older Post', 'xpressme');
+		$this->newer_post_link_text = __('Newer Post', 'xpressme');
+		$this->is_left_page_navi_old = true;
+		$this->old_page_link_text = __('Older Entries', 'xpressme');
+		$this->newer_page_link_text = __('Newer Entries', 'xpressme');
 		$this->is_author_view_count = false;
 		$this->is_sql_debug = false;
@@ -88,4 +94,7 @@
 			'old_post_link_text' => $this->old_post_link_text ,
 			'newer_post_link_text' => $this->newer_post_link_text,
+			'is_left_page_navi_old' => $this->is_left_page_navi_old ,
+			'old_page_link_text' => $this->old_page_link_text ,
+			'newer_page_link_text' => $this->newer_page_link_text,
 			'is_author_view_count' => $this->is_author_view_count,
 			'is_sql_debug' => $this->is_sql_debug,
@@ -156,7 +165,12 @@
 		$this->is_left_postnavi_old = stripslashes(trim($_POST['ch_is_left_postnavi_old']));
 		$this->old_post_link_text = stripslashes($_POST['ch_old_post_link_text']);
-		if(empty($this->old_post_link_text)) $this->old_post_link_text = __('to Old Post', 'xpressme');
+		if(empty($this->old_post_link_text)) $this->old_post_link_text = __('Older Post', 'xpressme');
 		$this->newer_post_link_text = stripslashes($_POST['ch_newer_post_link_text']);
-		if(empty($this->newer_post_link_text)) $this->newer_post_link_text = __('to Newer Post', 'xpressme');
+		if(empty($this->newer_post_link_text)) $this->newer_post_link_text = __('Newer Post', 'xpressme');
+		$this->is_left_page_navi_old = stripslashes(trim($_POST['ch_is_left_page_navi_old']));
+		$this->old_page_link_text = stripslashes($_POST['ch_old_page_link_text']);
+		if(empty($this->old_page_link_text)) $this->old_page_link_text = __('Older Entries', 'xpressme');
+		$this->newer_page_link_text = stripslashes($_POST['ch_newer_page_link_text']);
+		if(empty($this->newer_page_link_text)) $this->newer_page_link_text = __('Newer Entries', 'xpressme');
 		$this->is_author_view_count = stripslashes(trim($_POST['ch_is_author_view_count']));
 		$this->is_sql_debug = stripslashes(trim($_POST['ch_is_sql_debug']));
@@ -210,4 +224,17 @@
 		$form .=  '<th><label for="images_to_link">' . $option_desc . "</label></th>\n";
 		$form .=  "<td>\n";
+		$form .=  $this->yes_no_radio_option_sub($option_name,$yes,$no);
+		$form .=  "</td>\n";
+		$form .=  "</tr><tr>\n";
+			
+	    return $form;
+	
+	}
+	function yes_no_radio_option_sub($option_name,$yes = '',$no= ''){
+		if (empty( $yes ))  $yes = __('YES','xpressme') ;
+		if (empty( $no ))  $no = __('NO','xpressme') ;
+		$value = $this->{$option_name};
+		$ans_name = 'ch_' . $option_name;
+		
 		if ($value){
 			$form .= "<label><input type='radio' name='". $ans_name . "' value='1' checked='checked' />" . $yes ."</label><br />\n";
@@ -217,4 +244,16 @@
 			$form .= "<label><input type='radio' name='". $ans_name . "' value='0' checked='checked' />". $no ."</label>\n";
 		}
+	    return $form;
+	}
+
+
+	function text_option($option_name,$option_desc){
+		$value = $this->{$option_name};
+		$ans_name = 'ch_' . $option_name;
+		
+		$form  =  "<tr>\n";
+		$form .=  '<th><label for="images_to_link">' . $option_desc . "</label></th>\n";
+		$form .=  "<td>\n";
+		$form .= $this->text_option_sub($option_name);
 		$form .=  "</td>\n";
 		$form .=  "</tr><tr>\n";
@@ -223,18 +262,93 @@
 	
 	}
-
-	function text_option($option_name,$option_desc){
+	
+	function text_option_sub($option_name){
 		$value = $this->{$option_name};
 		$ans_name = 'ch_' . $option_name;
 		
-		$form  =  "<tr>\n";
-		$form .=  '<th><label for="images_to_link">' . $option_desc . "</label></th>\n";
-		$form .=  "<td>\n";
-		$form .= '<label> <input name="'. $ans_name . '" type="text" size="25" maxlength="50" value="'  . $value . '" /></label>'."\n";
-		$form .=  "</td>\n";
-		$form .=  "</tr><tr>\n";
-			
+		$form = '<label> <input name="'. $ans_name . '" type="text" size="25" maxlength="50" value="'  . $value . '" /></label>'."\n";
 	    return $form;
 	
+	}
+
+	
+	function single_post_navi_option(){
+		$form = '';
+		$form .= '<tr><th><label for="single_page_navi">' .__('Single Post Navi Setting', 'xpressme') . '</label></th>';
+		$form .= "<td>\n";
+		$form .= "<table>\n";
+		$form .= "<tr>\n";
+		
+		$form .= "<td>" . __('Adjustment of Navi link display position','xpressme') . "</td>\n";		
+		$form .= "<td>\n";
+		$form .=  $this->yes_no_radio_option_sub('is_left_postnavi_old',
+												__("'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right",'xpressme'),
+												__("'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right",'xpressme')
+												);
+		$form .= "</td>\n";
+		$form .= "</tr>\n";
+		
+		$form .= "<tr>\n";
+		$form .= "<td>" . __('Select Display name of PostNavi Link','xpressme') . "</td>\n";		
+		$form .= "<td>\n";
+		$form .=  $this->yes_no_radio_option_sub('is_postnavi_title_disp',
+												__('Title of post','xpressme'),
+												__('Title of Navi','xpressme')
+												);
+		$form .= "</td>\n";
+		$form .= "</tr>\n";
+		
+		$form .= "<tr>\n";
+		$form .= "<td>" . __('Display Navi Title of Old Post Link','xpressme') . "</td>\n";		
+		$form .= "<td>\n";
+		$form .=  $this->text_option_sub('old_post_link_text');
+		$form .= "</td>\n";
+		$form .= "</tr>\n";
+		
+		$form .= "<tr>\n";
+		$form .= "<td>" . __('Display Navi Title of Newer Post Link','xpressme') . "</td>\n";		
+		$form .= "<td>\n";
+		$form .=  $this->text_option_sub('newer_post_link_text');
+		$form .= "</td>\n";
+		$form .= "</tr>\n";
+		
+		$form .= "</table></td></tr>\n";
+	    return $form;
+
+	}
+
+	function posts_page_navi_option(){
+		$form = '';
+		$form .= '<tr><th><label for="posts_page_navi">' .__('Posts List Page Navi Setting', 'xpressme') . '</label></th>';
+		$form .= "<td>\n";
+		$form .= "<table>\n";
+		$form .= "<tr>\n";
+		
+		$form .= "<td>" . __('Adjustment of Navi link display position','xpressme') . "</td>\n";		
+		$form .= "<td>\n";
+		$form .=  $this->yes_no_radio_option_sub('is_left_page_navi_old',
+												__("'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right",'xpressme'),
+												__("'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right",'xpressme')
+												);
+		$form .= "</td>\n";
+		$form .= "</tr>\n";
+		
+		$form .= "<tr>\n";
+		$form .= "<td>" . __('Display Navi Title of Old Page Link','xpressme') . "</td>\n";		
+		$form .= "<td>\n";
+		$form .=  $this->text_option_sub('old_page_link_text');
+		$form .= "</td>\n";
+		$form .= "</tr>\n";
+		
+		$form .= "<tr>\n";
+		$form .= "<td>" . __('Display Navi Title of Newer Page Link','xpressme') . "</td>\n";		
+		$form .= "<td>\n";
+		$form .=  $this->text_option_sub('newer_page_link_text');
+		$form .= "</td>\n";
+		$form .= "</tr>\n";
+		
+		$form .= "</table></td></tr>\n";
+	    return $form;
+
 	}
 	
@@ -422,20 +536,9 @@
 												__('NO','xpressme')
 												);
-		echo				$this->text_option('old_post_link_text',
-												__('Display Navi Title of Old Post Link','xpressme')
-												);
-		echo				$this->text_option('newer_post_link_text',
-												__('Display Navi Title of Newer Post Link','xpressme')
-												);
-		echo				$this->yes_no_radio_option('is_postnavi_title_disp',
-												__('Select Display name of PostNavi Link','xpressme'),
-												__('Title of post','xpressme'),
-												__('Title of Navi','xpressme')
-												);
-		echo				$this->yes_no_radio_option('is_left_postnavi_old',
-												__('Adjustment of Navi link display position','xpressme'),
-												__("'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right",'xpressme'),
-												__("'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right",'xpressme')
-												);
+		
+		echo 				$this->single_post_navi_option();
+		echo 				$this->posts_page_navi_option();
+
+		
 		echo				$this->yes_no_radio_option('is_author_view_count',
 												__('Is the posts author views counted?','xpressme'),