Index: trunk/include/custom_functions.php
===================================================================
--- trunk/include/custom_functions.php	(revision 31)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?php
-	
-function the_credit($show = false)
-{
-	global $xoopsModule,$wp_version;
-	
-	$ret = '<a href="http://www.toemon.com"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xoopsModule->getInfo('version'),$xoopsModule->getInfo('codename')) .'</a>';
-	if (strstr($wp_version,'ME')){
-		$ret .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
-	} else {
-		$ret .= '(included <a href="http://ja.wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
-	}
-
-	if (empty($show))
-		return $ret;
-	else
-		echo $ret;
-}
-
-function html_convert_time($show = false)
-{
-	$ret =  timer_stop(0) .'sec. ';
-	if (empty($show))
-		return $ret;
-	else
-		echo $ret;
-}
-?>
Index: trunk/wp-config.php
===================================================================
--- trunk/wp-config.php	(revision 31)
+++ trunk/wp-config.php	(revision 32)
@@ -3,5 +3,4 @@
 require_once dirname( __FILE__ ).'/include/set_cash_cookie_path.php' ;
 require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
-require_once dirname( __FILE__ ).'/include/custom_functions.php' ;
 
 mb_language('Japanese');
Index: trunk/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/custom_functions.php	(revision 32)
+++ trunk/wp-content/plugins/xpressme/include/custom_functions.php	(revision 32)
@@ -0,0 +1,97 @@
+<?php
+	
+function xpress_credit($show = false)
+{
+	global $xoopsModule,$wp_version;
+	
+	$ret = '<a href="http://www.toemon.com"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xoopsModule->getInfo('version'),$xoopsModule->getInfo('codename')) .'</a>';
+	if (strstr($wp_version,'ME')){
+		$ret .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
+	} else {
+		$ret .= '(included <a href="http://ja.wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
+	}
+
+	if (empty($show))
+		return $ret;
+	else
+		echo $ret;
+}
+
+function xpress_convert_time($show = false)
+{
+	$ret =  timer_stop(0) .'sec. ';
+	if (empty($show))
+		return $ret;
+	else
+		echo $ret;
+}
+
+function xpress_is_theme_sidebar_disp(){
+	$config = new XPressME_Class();
+	return $config->is_theme_sidebar_disp;
+}	
+
+function xpress_left_arrow_post_link($show = false)
+{
+	$config = new XPressME_Class();
+	$ret = '';		
+	
+	if($config->is_left_postnavi_old){
+		$link_title = $config->old_post_link_text;
+		ob_start();
+		if ($config->is_postnavi_title_disp)
+			previous_post_link('&laquo; %link');
+		else 
+			previous_post_link('&laquo; %link',$link_title);
+		$ret = ob_get_contents();
+		ob_end_clean();
+	} else {
+		$link_title = $config->newer_post_link_text;
+		ob_start();
+		if ($config->is_postnavi_title_disp)
+			next_post_link('&laquo; %link');
+		else
+			next_post_link('&laquo; %link',$link_title);
+		$ret = ob_get_contents();
+		ob_end_clean();
+	}
+	$ret = str_replace('">','" title="'.$link_title . '">' , $ret);
+
+	if (empty($show))
+		return $ret;
+	else
+		echo $ret;	
+}
+
+function xpress_right_arrow_post_link($show = false)
+{
+	$config = new XPressME_Class();
+	$ret = '';		
+	
+	if($config->is_left_postnavi_old){
+		$link_title = $config->newer_post_link_text;
+		ob_start();
+		if ($config->is_postnavi_title_disp)
+			next_post_link('%link &raquo;');
+		else
+			next_post_link('%link &raquo;',$link_title);
+		$ret = ob_get_contents();
+		ob_end_clean();
+	} else {
+		$link_title = $config->old_post_link_text;
+		ob_start();
+		if ($config->is_postnavi_title_disp)
+			previous_post_link('%link &raquo;');
+		else 
+			previous_post_link('%link &raquo;',$link_title);
+		$ret = ob_get_contents();
+		ob_end_clean();
+	}
+	$ret = str_replace('">','" title="'.$link_title . '">' , $ret);
+
+	if (empty($show))
+		return $ret;
+	else
+		echo $ret;	
+}
+?>
Index: trunk/wp-content/plugins/xpressme/language/xpressme-ja.po
===================================================================
--- trunk/wp-content/plugins/xpressme/language/xpressme-ja.po	(revision 31)
+++ trunk/wp-content/plugins/xpressme/language/xpressme-ja.po	(revision 32)
@@ -3,5 +3,5 @@
 "Project-Id-Version: fckeditor for xpress\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-12-15 17:50+0900\n"
+"PO-Revision-Date: 2008-12-17 09:50+0900\n"
 "Last-Translator: toemon <toychee@toemon.com>\n"
 "Language-Team: \n"
@@ -15,49 +15,91 @@
 "X-Poedit-SearchPath-0: .\n"
 
-#: xpressme_class.php:20
+#: xpressme_class.php:25
 msgid "XPressME Settings"
 msgstr "XPressME設定"
 
-#: xpressme_class.php:73
-#: xpressme_class.php:118
-#: xpressme_class.php:123
+#: xpressme_class.php:42
+#: xpressme_class.php:81
+msgid "to Old Post"
+msgstr "前の投稿へ"
+
+#: xpressme_class.php:43
+#: xpressme_class.php:83
+msgid "to Newer Post"
+msgstr "次の投稿へ"
+
+#: xpressme_class.php:88
+#: xpressme_class.php:148
+#: xpressme_class.php:153
 msgid "YES"
 msgstr "はい"
 
-#: xpressme_class.php:74
-#: xpressme_class.php:119
-#: xpressme_class.php:124
+#: xpressme_class.php:89
+#: xpressme_class.php:149
+#: xpressme_class.php:154
 msgid "NO"
 msgstr "いいえ"
 
-#: xpressme_class.php:108
+#: xpressme_class.php:138
 msgid "XPressME Configuration Page"
 msgstr "XPressMEの設定ページ"
 
-#: xpressme_class.php:112
+#: xpressme_class.php:142
 msgid "Media Upload Base Path"
 msgstr "メディアアップロードのベースパス設定"
 
-#: xpressme_class.php:113
+#: xpressme_class.php:143
 msgid "Use XOOPS UPLOAD PATH"
 msgstr "XOOPSのアップロードパスを使用する。"
 
-#: xpressme_class.php:114
+#: xpressme_class.php:144
 msgid "USE WordPress BASE_PATH"
 msgstr "WordPressのベースパスを使用する。"
 
-#: xpressme_class.php:117
+#: xpressme_class.php:147
 msgid "Thema Sidebar Display"
 msgstr "テーマ表示時にサイドバー表示する。"
 
-#: xpressme_class.php:122
+#: xpressme_class.php:152
 msgid "The change tracking of the post is preserved"
 msgstr "投稿の変更履歴を有効にする。"
 
-#: xpressme_class.php:131
+#: xpressme_class.php:157
+msgid "Select Display name of PostNavi Link"
+msgstr "投稿記事リンクナビのタイトル設定"
+
+#: xpressme_class.php:158
+msgid "Title of post"
+msgstr "投稿記事のタイトルを表示"
+
+#: xpressme_class.php:159
+msgid "Next and Previous"
+msgstr "[次の投稿へ]、[前の投稿]へを表示"
+
+#: xpressme_class.php:162
+msgid "Adjustment of Navi link display position"
+msgstr "投稿記事ナビリンクの表示位置設定"
+
+#: xpressme_class.php:163
+msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right"
+msgstr "古い記事へのリンクを左に、より新しい記事へのリンクを右に表示"
+
+#: xpressme_class.php:164
+msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right"
+msgstr "より新しい記事へのリンクを左に、古い記事へのリンクを右に表示"
+
+#: xpressme_class.php:167
+msgid "Display Title of Old Post Link"
+msgstr "古い記事へのリンクタイトルを設定"
+
+#: xpressme_class.php:170
+msgid "Display Title of Newer Post Link"
+msgstr "より新しい記事へのリンクタイトルを設定"
+
+#: xpressme_class.php:178
 msgid "Update Config"
 msgstr "更新"
 
-#: xpressme_class.php:132
+#: xpressme_class.php:179
 msgid "Preset Config"
 msgstr "プリセット"
Index: trunk/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- trunk/wp-content/plugins/xpressme/xpressme.php	(revision 31)
+++ trunk/wp-content/plugins/xpressme/xpressme.php	(revision 32)
@@ -17,4 +17,5 @@
 	remove_action( 'pre_post_update', 'wp_save_post_revision' );			// Not Save Post Revision
 }
-
+//require_once('../include/custom_functions.php');
+require_once dirname( __FILE__ ).'/include/custom_functions.php' ;
 ?>
Index: trunk/wp-content/plugins/xpressme/xpressme_class.php
===================================================================
--- trunk/wp-content/plugins/xpressme/xpressme_class.php	(revision 31)
+++ trunk/wp-content/plugins/xpressme/xpressme_class.php	(revision 32)
@@ -8,4 +8,9 @@
 	var $is_theme_sidebar_disp;
 	var $is_save_post_revision;
+	var $is_postnavi_title_disp;
+	var $is_left_postnavi_old;
+	var $old_post_link_text;
+	var $newer_post_link_text;
+
 	//constructor
 	function XPressME_Class()
@@ -33,4 +38,8 @@
 		$this->is_theme_sidebar_disp = true;
 		$this->is_save_post_revision = true;
+		$this->is_postnavi_title_disp = true;
+		$this->is_left_postnavi_old = true;
+		$this->old_post_link_text = __('to Old Post');
+		$this->newer_post_link_text = __('to Newer Post');
 	}
 	
@@ -53,5 +62,10 @@
 		$write_options = array (
 			'is_use_xoops_upload_path' => $this->is_use_xoops_upload_path ,
-			'is_theme_sidebar_disp' => $this->is_theme_sidebar_disp 
+			'is_theme_sidebar_disp' => $this->is_theme_sidebar_disp ,
+			'is_save_post_revision' => $this->is_save_post_revision ,
+			'is_postnavi_title_disp' => $this->is_postnavi_title_disp ,
+			'is_left_postnavi_old' => $this->is_left_postnavi_old ,
+			'old_post_link_text' => $this->old_post_link_text ,
+			'newer_post_link_text' => $this->newer_post_link_text 
 		);
 		if ($mode == 'add_new') {
@@ -67,28 +81,50 @@
 		$this->is_theme_sidebar_disp = stripslashes(trim($_POST['ch_is_theme_sidebar_disp']));
 		$this->is_save_post_revision = stripslashes(trim($_POST['ch_is_save_post_revision']));
+		$this->is_postnavi_title_disp = stripslashes(trim($_POST['ch_is_postnavi_title_disp']));
+		$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');
+		$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');
+		
 	}
 	
 	function yes_no_radio_option($option_name,$option_desc,$yes = '',$no= ''){
-	if (empty( $yes ))  $yes = __('YES','xpressme') ;
-	if (empty( $no ))  $no = __('NO','xpressme') ;
-	$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";
-	if ($value){
-		$form .= "<label><input type='radio' name='". $ans_name . "' value='1' checked='checked' />" . $yes ."</label><br />\n";
-		$form .= "<label><input type='radio' name='". $ans_name . "' value='0' />". $no . "</label>\n";
-	}else{
-		$form .= "<label><input type='radio' name='". $ans_name . "' value='1' />" . $yes . "</label><br />\n";
-		$form .= "<label><input type='radio' name='". $ans_name . "' value='0' checked='checked' />". $no ."</label>\n";
-	}
-	$form .=  "</td>\n";
-	$form .=  "</tr><tr>\n";
-		
-    return $form;
-	
-}
+		if (empty( $yes ))  $yes = __('YES','xpressme') ;
+		if (empty( $no ))  $no = __('NO','xpressme') ;
+		$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";
+		if ($value){
+			$form .= "<label><input type='radio' name='". $ans_name . "' value='1' checked='checked' />" . $yes ."</label><br />\n";
+			$form .= "<label><input type='radio' name='". $ans_name . "' value='0' />". $no . "</label>\n";
+		}else{
+			$form .= "<label><input type='radio' name='". $ans_name . "' value='1' />" . $yes . "</label><br />\n";
+			$form .= "<label><input type='radio' name='". $ans_name . "' value='0' checked='checked' />". $no ."</label>\n";
+		}
+		$form .=  "</td>\n";
+		$form .=  "</tr><tr>\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 .= '<label> <input name="'. $ans_name . '" type="text" size="25" maxlength="50" value="'  . $value . '" /></label>'."\n";
+		$form .=  "</td>\n";
+		$form .=  "</tr><tr>\n";
+			
+	    return $form;
+	
+	}
 		
 	function option_page()
@@ -123,4 +159,21 @@
 												__('NO','xpressme')
 												);
+		echo				$this->yes_no_radio_option('is_postnavi_title_disp',
+												__('Select Display name of PostNavi Link','xpressme'),
+												__('Title of post','xpressme'),
+												__('Next and Previous','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->text_option('old_post_link_text',
+												__('Display Title of Old Post Link','xpressme')
+												);
+		echo				$this->text_option('newer_post_link_text',
+												__('Display Title of Newer Post Link','xpressme')
+												);
+		
 			
 //		$this->is_use_xoops_upload_path_html();
Index: trunk/wp-content/themes/xpress_default/footer.php
===================================================================
--- trunk/wp-content/themes/xpress_default/footer.php	(revision 31)
+++ trunk/wp-content/themes/xpress_default/footer.php	(revision 32)
@@ -1,10 +1,10 @@
 <hr />
 <div id="xpress_footer">
-<!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. -->
 	<p>
-		<?php printf(__('%1$s is proudly powered by %2$s', 'kubrick'), get_bloginfo('name'),the_credit()); ?>
-		<br /><?php printf(__('%1$s and %2$s.', 'kubrick'), '<a href="' . get_bloginfo('rss2_url') . '">' . __('Entries (RSS)', 'kubrick') . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __('Comments (RSS)', 'kubrick') . '</a>'); ?>
+		<?php printf(__('%1$s and %2$s.', 'kubrick'), '<a href="' . get_bloginfo('rss2_url') . '">' . __('Entries (RSS)', 'kubrick') . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __('Comments (RSS)', 'kubrick') . '</a>'); ?>
 		<!-- <?php printf(__('%d queries. %s seconds.', 'kubrick'), get_num_queries(), timer_stop(0, 3)); ?> -->
 	</p>
+	<!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. -->
+		<div id="xpress_credit"><?php echo xpress_credit(). ' (' . xpress_convert_time() . ')'; ?></div>
 </div>
 </div>
Index: trunk/wp-content/themes/xpress_default/functions.php
===================================================================
--- trunk/wp-content/themes/xpress_default/functions.php	(revision 31)
+++ trunk/wp-content/themes/xpress_default/functions.php	(revision 32)
@@ -10,38 +10,4 @@
 load_theme_textdomain('kubrick');
 
-function the_credit()
-{
-	
-}
-
-function is_sidbar_disp()
-{
-	return true;
-}
-
-function kuro_previous_post_link($format='&laquo; %link', $link='%title', $in_same_cat = false, $excluded_categories = '')
-{
-	$pre_title = __('Previous Post'); // This text is included in the language file that exists in WordPress2.3 or the version after that.
-
-	ob_start();
-		previous_post_link($format,$link,$in_same_cat,$excluded_categories);
-		$ret = ob_get_contents();
-	ob_end_clean();
-	$ret= str_replace('">','" title="'. $pre_title . '">' , $ret);
-	echo $ret;
-}
-
-function kuro_next_post_link($format='%link &raquo;', $link='%title', $in_same_cat = false, $excluded_categories = '')
-{
-	$next_title = __('Next Post'); // This text is included in the language file that exists in WordPress2.3 or the version after that.  
-
-	ob_start();
-		next_post_link($format,$link,$in_same_cat,$excluded_categories);
-		$ret = ob_get_contents();
-	ob_end_clean();
-	$ret= str_replace('">','" title="'. $next_title . '">' , $ret);
-	echo $ret;
-}
-    
 function kubrick_head() {
 	$head = "<style type='text/css'>\n<!--";
Index: trunk/wp-content/themes/xpress_default/index.php
===================================================================
--- trunk/wp-content/themes/xpress_default/index.php	(revision 31)
+++ trunk/wp-content/themes/xpress_default/index.php	(revision 32)
@@ -3,5 +3,5 @@
        <div id="xpress_wrap">
 	   
-	<?php if(is_sidbar_disp()) : ?>
+	<?php if(xpress_is_theme_sidebar_disp()) : ?>
 	   
 		<div id="xpress_content" class="narrowcolumn">
Index: trunk/wp-content/themes/xpress_default/single.php
===================================================================
--- trunk/wp-content/themes/xpress_default/single.php	(revision 31)
+++ trunk/wp-content/themes/xpress_default/single.php	(revision 32)
@@ -13,6 +13,6 @@
 
 		<div class="xpress_single_navigation">
-			<div class="alignleft"><?php kuro_previous_post_link('&laquo; %link') ?></div>
-			<div class="alignright"><?php kuro_next_post_link('%link &raquo;') ?></div>
+			<div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div>
+			<div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div>
 		</div>
 
Index: trunk/wp-content/themes/xpress_default/style.css
===================================================================
--- trunk/wp-content/themes/xpress_default/style.css	(revision 31)
+++ trunk/wp-content/themes/xpress_default/style.css	(revision 32)
@@ -141,4 +141,13 @@
 	font-size: 0.9em;
 }	
+
+#xpress_credit {
+	font-size: 0.9em;
+	color: darkgray;
+}
+#xpress_credit a {
+	font-size: 0.9em;
+	color: darkgray;
+}	
 /* End Typography & Colors */
 
@@ -250,4 +259,10 @@
 	margin: 0;
 	padding: 20px 0;
+	text-align: center;
+	}
+	
+#xpress_credit {
+	margin: 0;
+	padding: 0;
 	text-align: center;
 	}