- Timestamp:
- Apr 1, 2009, 11:05:02 PM (16 years ago)
- Location:
- trunk/wp-content
- Files:
-
- 11 edited
-
plugins/xpressme/include/custom_functions.php (modified) (1 diff)
-
plugins/xpressme/include/xpress_common_functions.php (modified) (1 diff)
-
plugins/xpressme/language/xpressme-ja.mo (modified) (previous)
-
plugins/xpressme/language/xpressme-ja.po (modified) (2 diffs)
-
plugins/xpressme/xpressme.php (modified) (1 diff)
-
themes/xpress_default/comments.php (modified) (1 diff)
-
themes/xpress_default/index.php (modified) (1 diff)
-
themes/xpress_default/ja.mo (modified) (previous)
-
themes/xpress_default/ja.po (modified) (3 diffs)
-
themes/xpress_default/single.php (modified) (2 diffs)
-
themes/xpress_default/style.css (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-content/plugins/xpressme/include/custom_functions.php
r145 r147 1 1 <?php 2 3 function xpress_list_pings($comment, $args, $depth) { 4 $GLOBALS['comment'] = $comment; 5 echo '<li id="comment-<?php comment_ID(); ?>">'; 6 comment_author_link(); 7 } 2 8 3 9 function xpress_credit($show = false) -
trunk/wp-content/plugins/xpressme/include/xpress_common_functions.php
r145 r147 229 229 } 230 230 231 function xpress_comment_count( $count ) { 232 global $id; 233 $comments_by_type = &separate_comments(get_comments('status=approve&post_id=' . $id)); 234 return count($comments_by_type['comment']); 235 } 231 236 232 237 ?> -
trunk/wp-content/plugins/xpressme/language/xpressme-ja.po
r145 r147 3 3 "Project-Id-Version: XPressME Plugin\n" 4 4 "POT-Creation-Date: \n" 5 "PO-Revision-Date: 2009-0 3-31 17:36+0900\n"5 "PO-Revision-Date: 2009-04-01 16:42+0900\n" 6 6 "Last-Translator: toemon <toychee@toemon.com>\n" 7 7 "Language-Team: \n" … … 286 286 msgstr "プリセット" 287 287 288 #: include/custom_functions.php:23 2288 #: include/custom_functions.php:238 289 289 #, php-format 290 290 msgid "views :%d" 291 291 msgstr "閲覧数 :%d" 292 292 293 #: include/custom_functions.php:3 48293 #: include/custom_functions.php:354 294 294 msgid "Main" 295 295 msgstr "メイン" 296 296 297 #: include/custom_functions.php:35 0297 #: include/custom_functions.php:356 298 298 #, php-format 299 299 msgid "Archive for the ‘%s’ Category" 300 300 msgstr "カテゴリー ‘%s’ のアーカイブ" 301 301 302 #: include/custom_functions.php:35 2302 #: include/custom_functions.php:358 303 303 #, php-format 304 304 msgid "Posts Tagged ‘%s’" 305 305 msgstr "‘%s’ タグのついている投稿" 306 306 307 #: include/custom_functions.php:3 54307 #: include/custom_functions.php:360 308 308 #, php-format 309 309 msgid "Archive for %s|Daily archive page" 310 310 msgstr "%sの日別アーカイブ" 311 311 312 #: include/custom_functions.php:3 54312 #: include/custom_functions.php:360 313 313 msgid "F jS, Y" 314 314 msgstr "Y年n月j日" 315 315 316 #: include/custom_functions.php:3 56316 #: include/custom_functions.php:362 317 317 #, php-format 318 318 msgid "Archive for %s|Monthly archive page" 319 319 msgstr "%sの月別アーカイブ" 320 320 321 #: include/custom_functions.php:3 56321 #: include/custom_functions.php:362 322 322 msgid "F, Y" 323 323 msgstr "Y年n月" 324 324 325 #: include/custom_functions.php:3 58325 #: include/custom_functions.php:364 326 326 #, php-format 327 327 msgid "Archive for %s|Yearly archive page" 328 328 msgstr "%sの年別アーカイブ " 329 329 330 #: include/custom_functions.php:3 58330 #: include/custom_functions.php:364 331 331 msgid "Y" 332 332 msgstr "Y年" 333 333 334 #: include/custom_functions.php:36 0334 #: include/custom_functions.php:366 335 335 #, php-format 336 336 msgid "Archive for the ‘%s’ Author" 337 337 msgstr "投稿者 ‘%s’ のアーカイブ" 338 338 339 #: include/custom_functions.php:36 2339 #: include/custom_functions.php:368 340 340 #, php-format 341 341 msgid "Search Results of word ‘%s’" 342 342 msgstr "‘%s’ の検索結果" 343 343 344 #: include/xpress_common_functions.php:202 345 msgid "Themes" 346 msgstr "テーマ" 347 348 #: include/xpress_common_functions.php:217 349 msgid "Switch to XOOPS mode" 350 msgstr "XOOPSモードへ切替" 351 352 #: include/xpress_common_functions.php:221 353 #: include/xpress_common_functions.php:224 354 msgid "Switch to WordPress mode" 355 msgstr "WordPressモードへ切替" 356 -
trunk/wp-content/plugins/xpressme/xpressme.php
r145 r147 69 69 } 70 70 71 //The trackback and the pingback are excluded from the count of the comment. 72 add_filter('get_comments_number', 'xpress_comment_count', 0); 71 73 72 74 // SQL debug windows -
trunk/wp-content/themes/xpress_default/comments.php
r143 r147 2 2 if (isset($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) 3 3 die ('Please do not load this page directly. Thanks!'); 4 5 if (!empty($post->post_password)) { // if there's a password 6 if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) { // and it doesn't match the cookie 7 ?> 8 9 <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.', 'xpress'); ?></p> 10 11 <?php 12 return; 13 } 4 5 if ( post_password_required() ) { ?> 6 <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.', 'xpress'); ?></p> 7 <?php 8 return; 14 9 } 15 16 /* This variable is for alternating comment background */17 $oddcomment = 'class="alt" ';18 10 ?> 19 11 20 12 <!-- You can start editing here. --> 21 13 22 <?php if ($comments) : ?> 23 <h2 id="xpress_comments"><?php comments_number(__('No Responses', 'xpress'), __('One Response', 'xpress'), __('% Responses', 'xpress'));?> <?php printf(__('to “%s”', 'xpress'), the_title('', '', false)); ?></h2> 24 <?php if (function_exists('wp_list_comments')) : ?> 25 <ol class="xpress_commentlist"> 26 <?php wp_list_comments();?> 27 <div class="navigation"> 28 <div class="alignleft"><?php previous_comments_link() ?></div> 29 <div class="alignright"><?php next_comments_link() ?></div> 30 </div> 31 </ol> 32 <?php else : ?> 33 <ol class="xpress_commentlist"> 14 <?php if ( have_comments() ) : ?> 15 <?php if ( ! empty($comments_by_type['comment']) ) : ?> 16 <h2 id="xpress_comments"><?php comments_number(__('No Responses', 'xpress'), __('One Response', 'xpress'), __('% Responses', 'xpress'));?> <?php printf(__('to “%s”', 'xpress'), the_title('', '', false)); ?></h2> 34 17 35 <?php foreach ($comments as $comment) : ?> 18 <div id="xpress_commentlist"> 19 <?php wp_list_comments('type=comment&style=div'); ?> 20 </div> 21 <?php endif; ?> 36 22 37 <li <?php echo $oddcomment; ?>id="comment-<?php comment_ID() ?>">38 <?php if(function_exists('get_avatar')) : ?><?php echo get_avatar( $comment, 32 ); ?><?php endif; ?>39 <?php printf(__('<cite>%s</cite> Says:', 'xpress'), get_comment_author_link()); ?>40 <?php if ($comment->comment_approved == '0') : ?>41 <em><?php _e('Your comment is awaiting moderation.', 'xpress'); ?></em>42 <?php endif; ?>43 <br />44 23 45 <small class="xpress_commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%1$s at %2$s', 'xpress'), get_comment_date(__('F jS, Y', 'xpress')), get_comment_time()); ?></a> <?php edit_comment_link(__('edit', 'xpress'),' ',''); ?></small> 46 47 <?php comment_text() ?> 48 49 </li> 50 51 <?php 52 /* Changes every other comment to a different class */ 53 $oddcomment = ( empty( $oddcomment ) ) ? 'class="alt" ' : ''; 54 ?> 55 56 <?php endforeach; /* end for each comment */ ?> 57 58 </ol> 59 <?php endif; ?> 24 <div class="navigation"> 25 <div class="alignleft"><?php previous_comments_link() ?></div> 26 <div class="alignright"><?php next_comments_link() ?></div> 27 </div> 60 28 <?php else : // this is displayed if there are no comments so far ?> 61 29 62 63 30 <?php if ('open' == $post->comment_status) : ?> 31 <!-- If comments are open, but there are no comments. --> 64 32 65 66 67 <p class="nocomments"><?php _e('Comments are closed.', 'xpress'); ?></p>33 <?php else : // comments are closed ?> 34 <!-- If comments are closed. --> 35 <p class="nocomments">Comments are closed.</p> 68 36 69 37 <?php endif; ?> 70 38 <?php endif; ?> 71 39 72 40 73 41 <?php if ('open' == $post->comment_status) : ?> 74 <div id="respond">75 <h2><?php _e('Leave a Reply', 'xpress'); ?></h2>76 <?php if ( function_exists('cancel_comment_reply_link') ): ?>77 <div class="cancel-comment-reply">78 <small><?php cancel_comment_reply_link(); ?></small>79 </div>80 <?php endif; ?>81 42 82 <?php if ( get_option('comment_registration') && !$user_ID ) : ?> 83 <p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p> 84 <?php else : ?> 43 <div id="xpress-respond"> 85 44 86 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="xpress_commentform">45 <h2><?php comment_form_title( __('Leave a Reply', 'xpress'), __('Leave a Reply for %s' , 'xpress') ); ?></h3> 87 46 88 <?php if ( $user_ID ) : ?> 47 <div id="cancel-comment-reply"> 48 <small><?php cancel_comment_reply_link() ?></small> 49 </div> 50 51 <div id="xpress-comment-user"> 52 <?php if ( get_option('comment_registration') && !$user_ID ) : ?> 53 <p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p> 54 <?php else : ?> 89 55 90 <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out »', 'xpress'); ?></a></p>56 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform"> 91 57 92 <?php else: ?>58 <?php if ( $user_ID ) : ?> 93 59 94 <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> /> 95 <label for="author"><small><?php _e('Name', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p> 60 <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out »', 'xpress'); ?></a></p> 96 61 97 <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> /> 98 <label for="email"><small><?php _e('Mail (will not be published)', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p> 62 <?php else : ?> 99 63 100 <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3"/>101 <label for="url"><small><?php _e('Website', 'xpress'); ?></small></label></p>64 <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> /> 65 <label for="author"><small><?php _e('Name', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p> 102 66 103 <?php endif; ?> 67 <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> /> 68 <label for="email"><small><?php _e('Mail (will not be published)', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p> 104 69 105 <!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>', 'xpress'), allowed_tags()); ?></small></p>--> 70 <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" /> 71 <label for="url"><small><?php _e('Website', 'xpress'); ?></small></label></p> 106 72 107 <p><textarea name="comment" id="xpress_comment" cols="100%" rows="10" tabindex="4"></textarea></p> 73 <?php endif; ?> 74 </div> 75 76 <div id="xpress-comment-form"> 77 <!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>', 'xpress'), allowed_tags()); ?></small></p>--> 108 78 109 <p><input name="submit" type="submit" id="xpress_submit" tabindex="5" value="<?php _e('Submit Comment', 'xpress'); ?>" /> 110 <?php if (function_exists('comment_id_fields')) : ?> 111 <?php comment_id_fields(); //@since 2.7.0 ?> 112 <?php else : ?> 113 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /> 114 <?php endif; ?> 115 </p> 116 <?php do_action('comment_form', $post->ID); ?> 79 <textarea name="comment" id="comment" cols="100" rows="5" tabindex="4" style="width:100%"></textarea> 80 <div class ="xpress-comment-submit"> 81 <input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'xpress'); ?>" /> 82 </div> 83 <?php comment_id_fields(); ?> 84 <?php do_action('comment_form', $post->ID); ?> 85 </form> 86 <div> 87 <?php endif; // If registration required and not logged in ?> 88 </div> 117 89 118 </form>119 120 <?php endif; // If registration required and not logged in ?>121 </div>122 90 <?php endif; // if you delete this the sky will fall on your head ?> -
trunk/wp-content/themes/xpress_default/index.php
r146 r147 47 47 <?php xpress_the_content(__('Read the rest of this entry »') ); ?> 48 48 </div> 49 < ?php wp_link_pages() ?>49 <div class="xpress-link-pages"><?php wp_link_pages() ?></div> 50 50 <div class ="xpress-post-footer"> 51 51 <?php -
trunk/wp-content/themes/xpress_default/ja.po
r143 r147 18 18 "Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n" 19 19 "POT-Creation-Date: 2008-08-15 21:16+0900\n" 20 "PO-Revision-Date: 2009-0 3-30 14:56+0900\n"20 "PO-Revision-Date: 2009-04-01 16:55+0900\n" 21 21 "Last-Translator: toemon <toychee@toemon.com>\n" 22 22 "Language-Team: toemon <info@toemon.com>\n" … … 137 137 #: xpress_default/comments.php:23 138 138 msgid "No Responses" 139 msgstr "コメント / トラックバックはありません"139 msgstr "コメント はありません" 140 140 141 141 #: xpress_default/comments.php:23 142 142 msgid "One Response" 143 msgstr "コメント / トラックバック1 件"143 msgstr "コメント 1 件" 144 144 145 145 #: xpress_default/comments.php:23 146 146 msgid "% Responses" 147 msgstr "コメント / トラックバック% 件"147 msgstr "コメント % 件" 148 148 149 149 #: xpress_default/comments.php:23 … … 181 181 msgid "Leave a Reply" 182 182 msgstr "コメントをどうぞ" 183 184 #: xpress_default/comments.php:75 185 msgid "Leave a Reply for %s" 186 msgstr "%s にコメントする" 183 187 184 188 #: xpress_default/comments.php:83 -
trunk/wp-content/themes/xpress_default/single.php
r146 r147 43 43 <div class="xpress-post-entry"> 44 44 <?php the_content('<p class="serif">' . __('Read the rest of this entry »', 'xpress') . '</p>'); ?> 45 <?php wp_link_pages() ?>46 45 </div> 46 <div class="xpress-link-pages"><?php wp_link_pages() ?></div> 47 47 <div class ="xpress-post-footer"> 48 48 <?php … … 59 59 ?> 60 60 </div> 61 <div class ="xpress-comments-block"> 62 <?php comments_template(); ?> 61 62 <div id ="xpress-comments-block"> 63 <?php comments_template('', true); ?> 63 64 </div> 64 65 </div> -
trunk/wp-content/themes/xpress_default/style.css
r143 r147 67 67 margin: 0 auto; 68 68 padding: 5px 0; 69 text-align: center;69 text-align: right; 70 70 } 71 71 … … 88 88 89 89 } 90 91 .xpress-post .xpress-link-pages { 92 padding-top:10px; 93 clear: both; 94 text-align: center; 95 } 96 90 97 .xpress-post .xpress-post-footer{ 91 98 text-align: right; 92 99 font-size: 0.8em; 93 } 94 .xpress-comments-block { 95 margin: 5px 0 10px; 100 margin-bottom: 10px; 101 } 102 103 #xpress-comments-block { 104 margin-top: 5px; 105 margin-bottom: 5px; 106 margin-left: 5px; 107 margin-right: 5px; 96 108 padding-top:10px; 97 109 padding-left:20px; 98 padding-right:20px; 99 padding-bottom:30px; 100 clear: both; 101 } 102 h2.xpress_comments { 103 padding: 0; 104 margin: 40px auto 20px ; 105 } 110 padding-right:5px; 111 padding-bottom:10px; 112 clear: both; 113 } 114 #xpress_commentlist { 115 margin: 0px; 116 padding-left: 20px; 117 } 118 119 #xpress_commentlist ol{ 120 font-size: 1em; 121 list-style-image:none; 122 list-style-position:inside; 123 list-style-type:none; 124 } 125 126 #xpress_commentlist li{ 127 margin: 0px; 128 padding-top: 5px; 129 padding-bottom: 100px; 130 padding-left: 5px; 131 padding-right: 1px; 132 font-size: 1em; 133 list-style-image:none; 134 list-style-position:inside; 135 list-style-type:none; 136 } 137 138 #xpress_commentlist .even { 139 background:#F4F4F4 none repeat scroll 0 0; 140 } 141 142 #xpress_commentlist .odd { 143 background:#EFEFEF none repeat scroll 0 0; 144 } 145 146 #xpress_commentlist .avatar { 147 float: right; 148 border: 1px solid #eee; 149 padding: 2px; 150 background: #efefef; 151 } 152 153 #xpress_commentlist cite, .commentlist cite a { 154 font-weight: bold; 155 font-style: normal; 156 font-size: 1.1em; 157 } 158 106 159 107 160 #xpress_footer { … … 110 163 width: 100%; 111 164 clear: both; 165 text-align: center; 112 166 } 113 167 #xpress_footer .xpress_rss { … … 144 198 line-height: 1.2em; 145 199 font-size: 0.9em; 146 }147 148 #xpress_page .alt {149 background-color: #f8f8f8;150 border-top: 1px solid #000;151 border-bottom: 1px solid #000;152 200 } 153 201 … … 179 227 font-size: 1.6em; 180 228 } 181 182 .xpress_commentlist li, #xpress_commentform input, #xpress_commentform textarea {183 font-size: 11px;184 }185 186 .xpress_commentlist li {187 font-weight: bold;188 list-style-type: none!important;189 }190 191 .xpress_commentlist li .avatar {192 float: right;193 border: 1px solid #eee;194 padding: 2px;195 background: #fff;196 }197 198 .xpress_commentlist cite, .xpress_commentlist cite a {199 font-weight: bold;200 font-style: normal;201 font-size: 1.1em;202 }203 204 .xpress_commentlist p {205 font-weight: normal;206 line-height: 1.5em;207 text-transform: none;208 }209 210 229 .xpress_commentmetadata { 211 230 font-size: 11px; … … 266 285 padding:0; 267 286 } 268 269 270 #xpress_header {271 margin:0 0 30px;272 padding:0 2px 3px;273 background:url(./images/titleline.jpg) no-repeat left bottom;274 }275 276 277 278 287 279 288 .widecolumn { … … 327 336 } 328 337 329 330 331 338 #xpress_page .clear { 332 339 clear: both; 333 340 } 334 335 336 #xpress_footer p {337 margin: 0;338 padding: 0px 0;339 text-align: center;340 }341 342 343 344 345 346 347 341 348 342 .dateblock{ … … 467 461 } 468 462 469 #xpress_page ol li, .xpress_sidebar ul ol li {470 list-style: decimal outside;471 }472 463 473 464 .xpress_sidebar ul ul li, .xpress_sidebar ul ol li { … … 503 494 } 504 495 505 #xpress_commentform{ 506 margin-top: 15px; 507 } 508 509 #xpress_commentform input { 510 width: 170px; 511 padding: 2px; 512 margin: 1px 5px 1px 0; 513 } 514 515 #xpress_commentform textarea { 516 width: 90%; /*500px-paddingª4px-borderª2px*/ 517 padding: 2px; 518 } 519 520 #xpress_commentform #xpress_submit { 521 margin: 0; 522 float: right; 523 } 524 /* End Form Elements */ 525 526 527 528 /* Begin Comments*/ 529 .xpress_commentlist { 530 margin: 15px 0 20px; 531 padding: 0; 532 } 533 534 .xpress_commentlist li { 535 margin: 0 0 3px; 536 padding: 5px 10px 3px; 537 list-style: none; 538 } 539 540 .xpress_commentlist p { 541 margin: 10px 5px 10px 0; 542 } 543 544 #xpress_commentform p { 545 padding: 0 0 1px; 546 } 496 497 #xpress-respond { 498 margin: 0px; 499 padding-top: 10px; 500 padding-bottom: 5px; 501 padding-left: 0px; 502 padding-right: 0px; 503 } 504 505 #xpress-comment-user { 506 margin: 0px; 507 padding-top: 0px; 508 padding-bottom: 0px; 509 padding-left: 20px; 510 padding-right: 0px; 511 } 512 513 #xpress-comment-form { 514 margin: 0px; 515 padding-top: 0px; 516 padding-bottom: 0px; 517 padding-left: 20px; 518 padding-right: 5px; 519 font-size: 18px; 520 521 } 522 523 #xpress-comment-form .xpress-comment-submit{ 524 margin: 0px; 525 padding-top: 5px; 526 padding-bottom: 0px; 527 padding-left: 0px; 528 padding-right: 0px; 529 font-size: 12px; 530 531 } 532 547 533 548 534 .nocomments { … … 552 538 } 553 539 554 .xpress_commentmetadata {555 margin: 0;556 display: block;557 }558 540 /* End Comments */ 559 541
Note: See TracChangeset
for help on using the changeset viewer.
