Index: trunk/wp-content/plugins/xpressme/include/custom_functions.php =================================================================== --- trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 146) +++ trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 147) @@ -1,3 +1,9 @@ ">'; + comment_author_link(); +} function xpress_credit($show = false) Index: trunk/wp-content/plugins/xpressme/include/xpress_common_functions.php =================================================================== --- trunk/wp-content/plugins/xpressme/include/xpress_common_functions.php (revision 146) +++ trunk/wp-content/plugins/xpressme/include/xpress_common_functions.php (revision 147) @@ -229,4 +229,9 @@ } +function xpress_comment_count( $count ) { + global $id; + $comments_by_type = &separate_comments(get_comments('status=approve&post_id=' . $id)); + return count($comments_by_type['comment']); +} ?> Index: trunk/wp-content/plugins/xpressme/language/xpressme-ja.po =================================================================== --- trunk/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 146) +++ trunk/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 147) @@ -3,5 +3,5 @@ "Project-Id-Version: XPressME Plugin\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2009-03-31 17:36+0900\n" +"PO-Revision-Date: 2009-04-01 16:42+0900\n" "Last-Translator: toemon \n" "Language-Team: \n" @@ -286,58 +286,71 @@ msgstr "プリセット" -#: include/custom_functions.php:232 +#: include/custom_functions.php:238 #, php-format msgid "views :%d" msgstr "閲覧数 :%d" -#: include/custom_functions.php:348 +#: include/custom_functions.php:354 msgid "Main" msgstr "メイン" -#: include/custom_functions.php:350 +#: include/custom_functions.php:356 #, php-format msgid "Archive for the ‘%s’ Category" msgstr "カテゴリー ‘%s’ のアーカイブ" -#: include/custom_functions.php:352 +#: include/custom_functions.php:358 #, php-format msgid "Posts Tagged ‘%s’" msgstr "‘%s’ タグのついている投稿" -#: include/custom_functions.php:354 +#: include/custom_functions.php:360 #, php-format msgid "Archive for %s|Daily archive page" msgstr "%sの日別アーカイブ" -#: include/custom_functions.php:354 +#: include/custom_functions.php:360 msgid "F jS, Y" msgstr "Y年n月j日" -#: include/custom_functions.php:356 +#: include/custom_functions.php:362 #, php-format msgid "Archive for %s|Monthly archive page" msgstr "%sの月別アーカイブ" -#: include/custom_functions.php:356 +#: include/custom_functions.php:362 msgid "F, Y" msgstr "Y年n月" -#: include/custom_functions.php:358 +#: include/custom_functions.php:364 #, php-format msgid "Archive for %s|Yearly archive page" msgstr "%sの年別アーカイブ " -#: include/custom_functions.php:358 +#: include/custom_functions.php:364 msgid "Y" msgstr "Y年" -#: include/custom_functions.php:360 +#: include/custom_functions.php:366 #, php-format msgid "Archive for the ‘%s’ Author" msgstr "投稿者 ‘%s’ のアーカイブ" -#: include/custom_functions.php:362 +#: include/custom_functions.php:368 #, php-format msgid "Search Results of word ‘%s’" msgstr "‘%s’ の検索結果" +#: include/xpress_common_functions.php:202 +msgid "Themes" +msgstr "テーマ" + +#: include/xpress_common_functions.php:217 +msgid "Switch to XOOPS mode" +msgstr "XOOPSモードへ切替" + +#: include/xpress_common_functions.php:221 +#: include/xpress_common_functions.php:224 +msgid "Switch to WordPress mode" +msgstr "WordPressモードへ切替" + Index: trunk/wp-content/plugins/xpressme/xpressme.php =================================================================== --- trunk/wp-content/plugins/xpressme/xpressme.php (revision 146) +++ trunk/wp-content/plugins/xpressme/xpressme.php (revision 147) @@ -69,4 +69,6 @@ } +//The trackback and the pingback are excluded from the count of the comment. +add_filter('get_comments_number', 'xpress_comment_count', 0); // SQL debug windows Index: trunk/wp-content/themes/xpress_default/comments.php =================================================================== --- trunk/wp-content/themes/xpress_default/comments.php (revision 146) +++ trunk/wp-content/themes/xpress_default/comments.php (revision 147) @@ -2,121 +2,89 @@ if (isset($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) die ('Please do not load this page directly. Thanks!'); - - if (!empty($post->post_password)) { // if there's a password - if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) { // and it doesn't match the cookie - ?> - -

- - +

+ - -

- -
    - -
    -
    -
    -
    -
- -
    + + +

    - +
    + +
    + -
  1. id="comment-"> - - %s Says:', 'xpress'), get_comment_author_link()); ?> - comment_approved == '0') : ?> - - -
    - - - - -
    2. - - - - - -
- +
+
+
+
- comment_status) : ?> - + comment_status) : ?> + - - -

+ + +

Comments are closed.

- + comment_status) : ?> -
-

- -
- -
- - -

logged in to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?>

- +
-
+

- +
+ +
+ +
+ +

logged in to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?>

+ -

%2$s.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?>

+ - + -

/> -

+

%2$s.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?>

-

/> -

+ -

-

+

/> +

- +

/> +

- +

+

-

+ +
+ +
+ -

- - - - - -

- ID); ?> + +
+ +
+ + ID); ?> + +
+ +
- - - -
Index: trunk/wp-content/themes/xpress_default/index.php =================================================================== --- trunk/wp-content/themes/xpress_default/index.php (revision 146) +++ trunk/wp-content/themes/xpress_default/index.php (revision 147) @@ -47,5 +47,5 @@
- +
\n" "Language-Team: toemon \n" @@ -137,13 +137,13 @@ #: xpress_default/comments.php:23 msgid "No Responses" -msgstr "コメント / トラックバックはありません" +msgstr "コメント はありません" #: xpress_default/comments.php:23 msgid "One Response" -msgstr "コメント / トラックバック 1 件" +msgstr "コメント 1 件" #: xpress_default/comments.php:23 msgid "% Responses" -msgstr "コメント / トラックバック % 件" +msgstr "コメント % 件" #: xpress_default/comments.php:23 @@ -181,4 +181,8 @@ msgid "Leave a Reply" msgstr "コメントをどうぞ" + +#: xpress_default/comments.php:75 +msgid "Leave a Reply for %s" +msgstr "%s にコメントする" #: xpress_default/comments.php:83 Index: trunk/wp-content/themes/xpress_default/single.php =================================================================== --- trunk/wp-content/themes/xpress_default/single.php (revision 146) +++ trunk/wp-content/themes/xpress_default/single.php (revision 147) @@ -43,6 +43,6 @@
' . __('Read the rest of this entry »', 'xpress') . '

'); ?> -
+
-
- + +
+
Index: trunk/wp-content/themes/xpress_default/style.css =================================================================== --- trunk/wp-content/themes/xpress_default/style.css (revision 146) +++ trunk/wp-content/themes/xpress_default/style.css (revision 147) @@ -67,5 +67,5 @@ margin: 0 auto; padding: 5px 0; - text-align: center; + text-align: right; } @@ -88,20 +88,73 @@ } + +.xpress-post .xpress-link-pages { + padding-top:10px; + clear: both; + text-align: center; +} + .xpress-post .xpress-post-footer{ text-align: right; font-size: 0.8em; -} -.xpress-comments-block { - margin: 5px 0 10px; + margin-bottom: 10px; +} + +#xpress-comments-block { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 5px; + margin-right: 5px; padding-top:10px; padding-left:20px; - padding-right:20px; - padding-bottom:30px; - clear: both; - } -h2.xpress_comments { - padding: 0; - margin: 40px auto 20px ; - } + padding-right:5px; + padding-bottom:10px; + clear: both; + } +#xpress_commentlist { + margin: 0px; + padding-left: 20px; + } + +#xpress_commentlist ol{ + font-size: 1em; + list-style-image:none; + list-style-position:inside; + list-style-type:none; + } + +#xpress_commentlist li{ + margin: 0px; + padding-top: 5px; + padding-bottom: 100px; + padding-left: 5px; + padding-right: 1px; + font-size: 1em; + list-style-image:none; + list-style-position:inside; + list-style-type:none; + } + +#xpress_commentlist .even { + background:#F4F4F4 none repeat scroll 0 0; + } + +#xpress_commentlist .odd { + background:#EFEFEF none repeat scroll 0 0; + } + +#xpress_commentlist .avatar { + float: right; + border: 1px solid #eee; + padding: 2px; + background: #efefef; + } + +#xpress_commentlist cite, .commentlist cite a { + font-weight: bold; + font-style: normal; + font-size: 1.1em; + } + #xpress_footer { @@ -110,4 +163,5 @@ width: 100%; clear: both; + text-align: center; } #xpress_footer .xpress_rss { @@ -144,10 +198,4 @@ line-height: 1.2em; font-size: 0.9em; - } - -#xpress_page .alt { - background-color: #f8f8f8; - border-top: 1px solid #000; - border-bottom: 1px solid #000; } @@ -179,33 +227,4 @@ font-size: 1.6em; } - -.xpress_commentlist li, #xpress_commentform input, #xpress_commentform textarea { - font-size: 11px; - } - -.xpress_commentlist li { - font-weight: bold; - list-style-type: none!important; - } - -.xpress_commentlist li .avatar { - float: right; - border: 1px solid #eee; - padding: 2px; - background: #fff; - } - -.xpress_commentlist cite, .xpress_commentlist cite a { - font-weight: bold; - font-style: normal; - font-size: 1.1em; - } - -.xpress_commentlist p { - font-weight: normal; - line-height: 1.5em; - text-transform: none; - } - .xpress_commentmetadata { font-size: 11px; @@ -266,14 +285,4 @@ padding:0; } - - -#xpress_header { - margin:0 0 30px; - padding:0 2px 3px; - background:url(./images/titleline.jpg) no-repeat left bottom; - } - - - .widecolumn { @@ -327,22 +336,7 @@ } - - #xpress_page .clear { clear: both; } - - -#xpress_footer p { - margin: 0; - padding: 0px 0; - text-align: center; - } - - - - - - .dateblock{ @@ -467,7 +461,4 @@ } -#xpress_page ol li, .xpress_sidebar ul ol li { - list-style: decimal outside; - } .xpress_sidebar ul ul li, .xpress_sidebar ul ol li { @@ -503,46 +494,41 @@ } -#xpress_commentform{ - margin-top: 15px; - } - -#xpress_commentform input { - width: 170px; - padding: 2px; - margin: 1px 5px 1px 0; - } - -#xpress_commentform textarea { - width: 90%; /*500px-padding•ª4px-border•ª2px*/ - padding: 2px; - } - -#xpress_commentform #xpress_submit { - margin: 0; - float: right; - } -/* End Form Elements */ - - - -/* Begin Comments*/ -.xpress_commentlist { - margin: 15px 0 20px; - padding: 0; - } - -.xpress_commentlist li { - margin: 0 0 3px; - padding: 5px 10px 3px; - list-style: none; - } - -.xpress_commentlist p { - margin: 10px 5px 10px 0; - } - -#xpress_commentform p { - padding: 0 0 1px; - } + +#xpress-respond { + margin: 0px; + padding-top: 10px; + padding-bottom: 5px; + padding-left: 0px; + padding-right: 0px; +} + +#xpress-comment-user { + margin: 0px; + padding-top: 0px; + padding-bottom: 0px; + padding-left: 20px; + padding-right: 0px; +} + +#xpress-comment-form { + margin: 0px; + padding-top: 0px; + padding-bottom: 0px; + padding-left: 20px; + padding-right: 5px; + font-size: 18px; + +} + +#xpress-comment-form .xpress-comment-submit{ + margin: 0px; + padding-top: 5px; + padding-bottom: 0px; + padding-left: 0px; + padding-right: 0px; + font-size: 12px; + +} + .nocomments { @@ -552,8 +538,4 @@ } -.xpress_commentmetadata { - margin: 0; - display: block; - } /* End Comments */