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 */