Index: trunk/wp-content/plugins/xpressme/include/custom_functions.php =================================================================== --- trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 142) +++ trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 143) @@ -135,4 +135,55 @@ echo $ret; } +// page link +function xpress_left_arrow_posts_link($show = false) +{ + global $XPressME; + $ret = ''; + + if($XPressME->is_left_page_navi_old){ + $link_title = $XPressME->old_page_link_text; + ob_start(); + next_posts_link("« $link_title"); + $ret = ob_get_contents(); + ob_end_clean(); + } else { + $link_title = $XPressME->newer_page_link_text; + ob_start(); + previous_posts_link("« $link_title"); + $ret = ob_get_contents(); + ob_end_clean(); + } + + if (empty($show)) + return $ret; + else + echo $ret; +} + +function xpress_right_arrow_posts_link($show = false) +{ + global $XPressME; + $ret = ''; + + if($XPressME->is_left_page_navi_old){ + $link_title = $XPressME->newer_page_link_text; + ob_start(); + previous_posts_link("$link_title »"); + $ret = ob_get_contents(); + ob_end_clean(); + } else { + $link_title = $XPressME->old_page_link_text; + ob_start(); + next_posts_link("$link_title »"); + $ret = ob_get_contents(); + ob_end_clean(); + } + + if (empty($show)) + return $ret; + else + echo $ret; +} + function xpress_is_author_view_count(){ @@ -278,5 +329,5 @@ $output = sprintf(__('Archive for the ‘%s’ Author', 'xpressme'), get_author_name( get_query_var('author'))); if (is_search()) - $output = __('Search Results', 'xpressme'); + $output = sprintf(__('Search Results of word ‘%s’', 'xpressme'), get_search_query()); if ($display) Index: trunk/wp-content/plugins/xpressme/language/xpressme-ja.po =================================================================== --- trunk/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 142) +++ trunk/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 143) @@ -3,5 +3,5 @@ "Project-Id-Version: XPressME Plugin\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2009-03-29 13:01+0900\n" +"PO-Revision-Date: 2009-03-30 17:58+0900\n" "Last-Translator: toemon \n" "Language-Team: \n" @@ -15,243 +15,282 @@ "X-Poedit-SearchPath-0: .\n" -#: xpressme_class.php:33 +#: xpressme_class.php:36 msgid "XPressME Settings" msgstr "XPressME設定" -#: xpressme_class.php:50 -#: xpressme_class.php:158 -msgid "to Old Post" +#: xpressme_class.php:53 +#: xpressme_class.php:167 +msgid "Older Post" msgstr "前の投稿へ" -#: xpressme_class.php:51 -#: xpressme_class.php:160 -msgid "to Newer Post" +#: xpressme_class.php:54 +#: xpressme_class.php:169 +#, fuzzy +msgid "Newer Post" msgstr "次の投稿へ" -#: xpressme_class.php:204 -#: xpressme_class.php:416 -#: xpressme_class.php:421 -#: xpressme_class.php:442 -#: xpressme_class.php:447 +#: xpressme_class.php:56 +#: xpressme_class.php:172 +msgid "Older Entries" +msgstr "前ページへ" + +#: xpressme_class.php:57 +#: xpressme_class.php:174 +msgid "Newer Entries" +msgstr "次ページへ" + +#: xpressme_class.php:218 +#: xpressme_class.php:234 +#: xpressme_class.php:530 +#: xpressme_class.php:535 +#: xpressme_class.php:545 +#: xpressme_class.php:550 msgid "YES" msgstr "はい" -#: xpressme_class.php:205 -#: xpressme_class.php:417 -#: xpressme_class.php:422 -#: xpressme_class.php:443 -#: xpressme_class.php:448 +#: xpressme_class.php:219 +#: xpressme_class.php:235 +#: xpressme_class.php:531 +#: xpressme_class.php:536 +#: xpressme_class.php:546 +#: xpressme_class.php:551 msgid "NO" msgstr "いいえ" -#: xpressme_class.php:245 +#: xpressme_class.php:277 +msgid "Single Post Navi Setting" +msgstr "シングルポストナビの設定" + +#: xpressme_class.php:282 +#: xpressme_class.php:327 +msgid "Adjustment of Navi link display position" +msgstr "リンクの表示位置設定" + +#: xpressme_class.php:285 +msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right" +msgstr "以前の記事へのリンクを左に、より新しい記事へのリンクを右に表示" + +#: xpressme_class.php:286 +msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right" +msgstr "より新しい記事へのリンクを左に、古い記事へのリンクを右に表示" + +#: xpressme_class.php:292 +msgid "Select Display name of PostNavi Link" +msgstr "表示するリンクテキストを選択" + +#: xpressme_class.php:295 +msgid "Title of post" +msgstr "投稿記事のタイトルを表示" + +#: xpressme_class.php:296 +msgid "Title of Navi" +msgstr "ナビタイトルを表示" + +#: xpressme_class.php:302 +msgid "Display Navi Title of Old Post Link" +msgstr "古い記事へのナビタイトルを設定" + +#: xpressme_class.php:309 +msgid "Display Navi Title of Newer Post Link" +msgstr "より新しい記事へのナビタイトルを設定" + +#: xpressme_class.php:322 +msgid "Posts List Page Navi Setting" +msgstr "ポストリストページナビの設定" + +#: xpressme_class.php:330 +msgid "'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right" +msgstr "古いページへのリンクを左に、より新しいページへのリンクを右に表示" + +#: xpressme_class.php:331 +msgid "'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right" +msgstr "より新しいページへのリンクを左に、古いページへのリンクを右に表示" + +#: xpressme_class.php:337 +msgid "Display Navi Title of Old Page Link" +msgstr "古いページへのナビタイトルを設定" + +#: xpressme_class.php:344 +msgid "Display Navi Title of Newer Page Link" +msgstr "より新しいページへのナビタイトルを設定" + +#: xpressme_class.php:359 msgid "Role Setting at Login" msgstr "ログイン時の権限設定" -#: xpressme_class.php:248 +#: xpressme_class.php:362 msgid "XOOPS Groupe" msgstr "XOOPSグループ名" -#: xpressme_class.php:248 +#: xpressme_class.php:362 msgid "WordPress Role" msgstr "WordPressでの権限" -#: xpressme_class.php:248 +#: xpressme_class.php:362 msgid "Role is set at each login" msgstr "ログイン時、常に権限を更新する" -#: xpressme_class.php:274 -#: xpressme_class.php:278 -#: xpressme_class.php:281 +#: xpressme_class.php:388 +#: xpressme_class.php:392 +#: xpressme_class.php:395 msgid "Default Role of WordPress" msgstr "WordPressのデフォルト権限" -#: xpressme_class.php:275 -#: xpressme_class.php:279 -#: xpressme_class.php:282 +#: xpressme_class.php:389 +#: xpressme_class.php:393 +#: xpressme_class.php:396 msgid "Group User Doesn't Register" msgstr "ユーザ登録しない" -#: xpressme_class.php:311 +#: xpressme_class.php:425 msgid "Do Not Comment Integration." msgstr "コメント統合しません。" -#: xpressme_class.php:345 +#: xpressme_class.php:459 msgid "Comment integration with D3Forum" msgstr "D3Forumとのコメント統合" -#: xpressme_class.php:347 +#: xpressme_class.php:461 msgid "Select the forum of D3Forum that does the comment integration from the following lists." msgstr "以下のリストからコメント統合をするD3Forumのフォーラムを選択してください。" -#: xpressme_class.php:351 +#: xpressme_class.php:465 msgid "Select the Type of display of D3Forum comment." msgstr "D3Forumの表示タイプを選択" -#: xpressme_class.php:353 -#: xpressme_class.php:356 +#: xpressme_class.php:467 +#: xpressme_class.php:470 msgid "Flat" msgstr "フラット" -#: xpressme_class.php:354 -#: xpressme_class.php:357 +#: xpressme_class.php:468 +#: xpressme_class.php:471 msgid "Threaded" msgstr "スレッド" -#: xpressme_class.php:360 +#: xpressme_class.php:474 msgid "Select the order of display of D3Forum comment." msgstr "D3Forumコメントの表示順を選択" -#: xpressme_class.php:362 -#: xpressme_class.php:365 +#: xpressme_class.php:476 +#: xpressme_class.php:479 msgid "DESC" msgstr "降順" -#: xpressme_class.php:363 -#: xpressme_class.php:366 +#: xpressme_class.php:477 +#: xpressme_class.php:480 msgid "ASC" msgstr "昇順" -#: xpressme_class.php:369 +#: xpressme_class.php:483 msgid "Number of displays of D3Forum comments." msgstr "D3Forumのコメント表示数" -#: xpressme_class.php:373 +#: xpressme_class.php:487 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. " msgstr "WordPressコメントとD3Forumポスト間の一括転送（エクスポート・インポート）" -#: xpressme_class.php:374 +#: xpressme_class.php:488 msgid "Export to D3Forum" msgstr "D3Forumへ一括エクスポート" -#: xpressme_class.php:375 +#: xpressme_class.php:489 msgid "Import from D3Forum" msgstr "D3Forumから一括インポート" -#: xpressme_class.php:406 +#: xpressme_class.php:520 msgid "XPressME Configuration Page" msgstr "XPressMEの設定ページ" -#: xpressme_class.php:410 +#: xpressme_class.php:524 msgid "Media Upload Base Path" msgstr "メディアアップロードのベースパス設定" -#: xpressme_class.php:411 +#: xpressme_class.php:525 msgid "Use XOOPS UPLOAD PATH" msgstr "XOOPSのアップロードパスを使用する。" -#: xpressme_class.php:412 +#: xpressme_class.php:526 msgid "USE WordPress BASE_PATH" msgstr "WordPressのベースパスを使用する。" -#: xpressme_class.php:415 +#: xpressme_class.php:529 msgid "Thema Sidebar Display" msgstr "テーマ表示時にサイドバー表示する。" -#: xpressme_class.php:420 +#: xpressme_class.php:534 msgid "The change tracking of the post is preserved" msgstr "投稿の変更履歴を有効にする。" -#: xpressme_class.php:425 -msgid "Display Navi Title of Old Post Link" -msgstr "古い記事へのナビタイトルを設定" - -#: xpressme_class.php:428 -msgid "Display Navi Title of Newer Post Link" -msgstr "新しい記事へのナビタイトルを設定" - -#: xpressme_class.php:431 -msgid "Select Display name of PostNavi Link" -msgstr "投稿記事リンクナビのタイトル設定" - -#: xpressme_class.php:432 -msgid "Title of post" -msgstr "投稿記事のタイトルを表示" - -#: xpressme_class.php:433 -msgid "Title of Navi" -msgstr "ナビタイトルを表示" - -#: xpressme_class.php:436 -msgid "Adjustment of Navi link display position" -msgstr "投稿記事ナビリンクの表示位置設定" - -#: xpressme_class.php:437 -msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right" -msgstr "古い記事へのリンクを左に、より新しい記事へのリンクを右に表示" - -#: xpressme_class.php:438 -msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right" -msgstr "より新しい記事へのリンクを左に、古い記事へのリンクを右に表示" - -#: xpressme_class.php:441 +#: xpressme_class.php:544 msgid "Is the posts author views counted?" msgstr "投稿者の閲覧をカウントしますか？" -#: xpressme_class.php:446 +#: xpressme_class.php:549 msgid "Is SQL debugging window displayed?" msgstr "SQLデバッグウィンドを表示しますか？" -#: xpressme_class.php:458 +#: xpressme_class.php:561 msgid "Update Config" msgstr "更新" -#: xpressme_class.php:459 +#: xpressme_class.php:562 msgid "Preset Config" msgstr "プリセット" -#: include/custom_functions.php:180 +#: include/custom_functions.php:231 #, php-format msgid "views :%d" msgstr "閲覧数 :%d" -#: include/custom_functions.php:266 +#: include/custom_functions.php:317 msgid "Main" msgstr "メイン" -#: include/custom_functions.php:268 +#: include/custom_functions.php:319 #, php-format msgid "Archive for the ‘%s’ Category" msgstr "カテゴリー ‘%s’ のアーカイブ" -#: include/custom_functions.php:270 +#: include/custom_functions.php:321 #, php-format msgid "Posts Tagged ‘%s’" -msgstr "" - -#: include/custom_functions.php:272 +msgstr "‘%s’ タグのついている投稿" + +#: include/custom_functions.php:323 #, php-format msgid "Archive for %s|Daily archive page" msgstr "%sの日別アーカイブ" -#: include/custom_functions.php:272 +#: include/custom_functions.php:323 msgid "F jS, Y" msgstr "Y年n月j日" -#: include/custom_functions.php:274 +#: include/custom_functions.php:325 #, php-format msgid "Archive for %s|Monthly archive page" msgstr "%sの月別アーカイブ" -#: include/custom_functions.php:274 +#: include/custom_functions.php:325 msgid "F, Y" msgstr "Y年n月" -#: include/custom_functions.php:276 +#: include/custom_functions.php:327 #, php-format msgid "Archive for %s|Yearly archive page" msgstr "%sの年別アーカイブ " -#: include/custom_functions.php:276 +#: include/custom_functions.php:327 msgid "Y" msgstr "Y年" -#: include/custom_functions.php:278 +#: include/custom_functions.php:329 #, php-format msgid "Archive for the ‘%s’ Author" msgstr "投稿者 ‘%s’ のアーカイブ" -#: include/custom_functions.php:280 -msgid "Search Results" -msgstr "検索結果" - +#: include/custom_functions.php:331 +#, php-format +msgid "Search Results of word ‘%s’" +msgstr "‘%s’ の検索結果" + Index: trunk/wp-content/plugins/xpressme/xpressme_class.php =================================================================== --- trunk/wp-content/plugins/xpressme/xpressme_class.php (revision 142) +++ 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 .= '\n"; $form .= "\n"; + $form .= $this->yes_no_radio_option_sub($option_name,$yes,$no); + $form .= "\n"; + $form .= "\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 .= "
\n"; @@ -217,4 +244,16 @@ $form .= "\n"; } + return $form; + } + + + function text_option($option_name,$option_desc){ + $value = $this->{$option_name}; + $ans_name = 'ch_' . $option_name; + + $form = "\n"; + $form .= '\n"; + $form .= "\n"; + $form .= $this->text_option_sub($option_name); $form .= "\n"; $form .= "\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 = "\n"; - $form .= '\n"; - $form .= "\n"; - $form .= ''."\n"; - $form .= "\n"; - $form .= "\n"; - + $form = ''."\n"; return $form; + } + + + function single_post_navi_option(){ + $form = ''; + $form .= ''; + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "
" . __('Adjustment of Navi link display position','xpressme') . "\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 .= "
" . __('Select Display name of PostNavi Link','xpressme') . "\n"; + $form .= $this->yes_no_radio_option_sub('is_postnavi_title_disp', + __('Title of post','xpressme'), + __('Title of Navi','xpressme') + ); + $form .= "
" . __('Display Navi Title of Old Post Link','xpressme') . "\n"; + $form .= $this->text_option_sub('old_post_link_text'); + $form .= "
" . __('Display Navi Title of Newer Post Link','xpressme') . "\n"; + $form .= $this->text_option_sub('newer_post_link_text'); + $form .= "
\n"; + return $form; + + } + + function posts_page_navi_option(){ + $form = ''; + $form .= ''; + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "
" . __('Adjustment of Navi link display position','xpressme') . "\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 .= "
" . __('Display Navi Title of Old Page Link','xpressme') . "\n"; + $form .= $this->text_option_sub('old_page_link_text'); + $form .= "
" . __('Display Navi Title of Newer Page Link','xpressme') . "\n"; + $form .= $this->text_option_sub('newer_page_link_text'); + $form .= "
\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'), Index: trunk/wp-content/themes/xpress_default/comments.php =================================================================== --- trunk/wp-content/themes/xpress_default/comments.php (revision 142) +++ trunk/wp-content/themes/xpress_default/comments.php (revision 143) @@ -21,5 +21,5 @@ -

+

    @@ -73,5 +73,5 @@ comment_status) : ?>
    -

    +

    Index: trunk/wp-content/themes/xpress_default/index.php =================================================================== --- trunk/wp-content/themes/xpress_default/index.php (revision 142) +++ trunk/wp-content/themes/xpress_default/index.php (revision 143) @@ -9,5 +9,5 @@ ?> -
    +
    @@ -30,6 +30,6 @@
    -
    -
     
    +
    +
    @@ -41,5 +41,5 @@
    -

    +

    @@ -69,6 +69,6 @@
    -
    -
     
    +
    +
    Index: trunk/wp-content/themes/xpress_default/ja.po =================================================================== --- trunk/wp-content/themes/xpress_default/ja.po (revision 142) +++ trunk/wp-content/themes/xpress_default/ja.po (revision 143) @@ -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-29 12:52+0900\n" +"PO-Revision-Date: 2009-03-30 14:56+0900\n" "Last-Translator: toemon \n" "Language-Team: toemon \n" @@ -621,5 +621,5 @@ #, php-format msgid "%1$s %2$s|Used as a calendar caption" -msgstr "" +msgstr "%2$s 年 %1$s|カレンダーのキャプションに使われます" #: xpress_default/blocks/calender_block_theme.php:104 @@ -627,5 +627,5 @@ #, php-format msgid "View posts for %1$s %2$s" -msgstr "" +msgstr "%2$s 年 %1$s の投稿を表示" #: xpress_default/blocks/enhanced_block_theme.php:11 Index: trunk/wp-content/themes/xpress_default/single.php =================================================================== --- trunk/wp-content/themes/xpress_default/single.php (revision 142) +++ trunk/wp-content/themes/xpress_default/single.php (revision 143) @@ -9,5 +9,5 @@ } ?> -
    +
    @@ -34,55 +34,34 @@
    -
    - -
    -

    -
    -
    +
    + +
    +

    +
    +
    ' . __('Read the rest of this entry »', 'xpress') . '

    '); ?> - - '

    ' . __('Pages:', 'xpress') . ' ', 'after' => '

    ', 'next_or_number' => 'number')); ?> - ' ;/* _e('Posted:', 'xpress'); echo ' '; the_author_posts_link(); echo '
    ' ; */?>'); ?>'); ?> - -

    - - post_date) - (60*120)); $time_since = sprintf(__('%s ago', 'xpress'), time_since($entry_datetime)); */ ?> - - - RSS 2.0 feed.", "xpress"), get_post_comments_feed_link()); ?> - - - - - comment_status) && ('open' == $post->ping_status)) { - // Both Comments and Pings are open ?> - leave a response, or trackback from your own site.', 'xpress'), trackback_url(false)); ?> - - comment_status) && ('open' == $post->ping_status)) { - // Only Pings are Open ?> - trackback from your own site.', 'xpress'), trackback_url(false)); ?> - - comment_status) && !('open' == $post->ping_status)) { - // Comments are open, Pings are not ?> - - - comment_status) && !('open' == $post->ping_status)) { - // Neither Comments, nor Pings are open ?> - - - - - -

    - +
    +
    + ID,__('Views :%d', 'xpress'),false) . ')'; + echo ' | '; + // echo the_tags(__('Tags:', 'xpress') . ' ', ', ', ' | '); + printf(__('Posted in %s', 'xpress'), get_the_category_list(', ')); + echo ' | '; + edit_post_link(__('Edit', 'xpress'), '', ' | '); + comments_popup_link(__('No Comments »', 'xpress'), __('1 Comment »', 'xpress'), __('% Comments »', 'xpress'), '', __('Comments Closed', 'xpress') ); + ?> +
    +
    +
    - + Index: trunk/wp-content/themes/xpress_default/style.css =================================================================== --- trunk/wp-content/themes/xpress_default/style.css (revision 142) +++ trunk/wp-content/themes/xpress_default/style.css (revision 143) @@ -3,12 +3,32 @@ Theme URI: http://trac.xpressme.info/XPressME Description: The theme for XPressME series -Version: 2.0 -Author: toemon -Author URI: http://www.toemon.com -Tags: XPressME,toemon - */ - -.xpress-header-title { +#xpress_page { + padding: 0; + width: 100%; + margin: 0; + text-align:left; + } + +#xpress_wrap { + float: left; + width: 100%; + margin-right: -205px; + } + +#xpress_content { + font-size: 1.0em; + padding: 0px; + } + +#xpress_content.narrowcolumn { + margin-right: 205px; + } + +#xpress-header-bar { + clear: both; +} + +#xpress-header-bar .xpress-header-title { float: left; margin-bottom: 20px; @@ -16,5 +36,5 @@ font-size: 16px; } -.xpress-conditional-title { +#xpress-header-bar .xpress-conditional-title { font-size: 14px; margin-bottom: 20px; @@ -22,5 +42,5 @@ } -.xpress-description { +#xpress-header-bar .xpress-description { clear: both; font-size: 12px; @@ -28,5 +48,5 @@ } -.xpress-operation-link { +#xpress-header-bar .xpress-operation-link { font-size: 12px; text-align: right; @@ -35,6 +55,6 @@ .xpress-border { clear: both; -display: block; -} + display: block; + } .xpress-navi-bar { @@ -49,27 +69,67 @@ text-align: center; } -.xpress-next-posts-link { - float: left; - -} -.xpress-previous-posts-link{ - text-align: right; -} - -.xpress-post-entry { + +.xpress-post { + width: 100%; + margin: 0px; + padding-top:20px; + clear: both; + } + +.xpress-post .xpress-post-header{ + text-align: left; + font-size: 0.8em; + + } + +.xpress-post .xpress-post-entry { clear: both; padding-left: 20px; } -.xpress-post-footer{ +.xpress-post .xpress-post-footer{ text-align: right; font-size: 0.8em; - -} +} +.xpress-comments-block { + margin: 5px 0 10px; + padding-top:10px; + padding-left:20px; + padding-right:20px; + padding-bottom:30px; + clear: both; + } +h2.xpress_comments { + padding: 0; + margin: 40px auto 20px ; + } + +#xpress_footer { + padding-top: 0px; + margin: 0 auto; + width: 100%; + clear: both; + } +#xpress_footer .xpress_rss { + margin: 0; + padding: 0; + text-align: right; + } + +#xpress_footer .xpress_credit { + margin: 0; + padding: 0; + text-align: center; + font-size: 0.9em; + color: #BDBDBD; + } + +#xpress_footer .xpress_credit a { + font-size: 0.9em; + color: #BDBDBD; + } + /* Begin Typography & Colors */ -.xpress_content { - font-size: 1.0em; - } .widecolumn .entry { @@ -117,5 +177,5 @@ #xpress_page h3 { - font-size: 1.3em; + font-size: 1.6em; } @@ -207,10 +267,4 @@ } -#xpress_page { - padding: 0; - width: 100%; - margin: 0; - text-align:left; - } #xpress_header { @@ -220,17 +274,6 @@ } -#xpress_wrap { - float: left; - width: 100%; - margin-right: -205px; - } - -#xpress_content { - padding: 0px; - } - -#xpress_content.narrowcolumn { - margin-right: 205px; - } + + .widecolumn { @@ -238,12 +281,6 @@ margin: 0 auto; } - - -.xpress-post { - width: 100%; - margin: 5px 0 10px; - padding-top:20px; - clear: both; - } + + .xpress-post h2 { @@ -296,10 +333,4 @@ } -#xpress_footer { - padding-top: 0px; - margin: 0 auto; - width: 100%; - clear: both; - } #xpress_footer p { @@ -309,23 +340,9 @@ } -.xpress_rss { - margin: 0; - padding: 0; - text-align: right; - } - - -.xpress_credit { - margin: 0; - padding: 0; - text-align: center; - font-size: 0.9em; - color: #BDBDBD; - } - -.xpress_credit a { - font-size: 0.9em; - color: #BDBDBD; -} + + + + + .dateblock{ @@ -352,8 +369,4 @@ } -h3.xpress_comments { - padding: 0; - margin: 40px auto 20px ; - } /* End Headers */