Index: trunk/wp-content/plugins/xpressme/include/custom_functions.php =================================================================== --- trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 149) +++ trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 150) @@ -1,6 +1,6 @@ ">'; comment_author_link(); @@ -374,3 +374,85 @@ } +function xpress_pings_list($show = false){ + + $trackbacks = xpress_get_pings(); + $output = '
    '; + + foreach ($trackbacks as $trackback){ + $list = date(get_settings('date_format'),$trackback['date']) . ' ' . sprintf(__('From %1$s on site %2$s','xpressme'),$trackback['title'],$trackback['site_name']) . "\n" ; + + $output .= '
  1. '; + $output .= $list ; + $output .= '
    2. '; + + } + $output .= '
' ; + if ($show) echo $output; else return $output; +} + +function xpress_pings_number( $zero = false, $one = false, $more = false, $deprecated = '' ) { + $pings = xpress_get_pings(); + if (empty($pings)){ + $number = 0; + }else { + $number = count($pings); + } + if ( $number > 1 ) + $output = str_replace('%', number_format_i18n($number), ( false === $more ) ? __('% TrackBack/Pingback', 'xpressme') : $more); + elseif ( $number == 0 ) + $output = ( false === $zero ) ? __('No Trackback/Pingback', 'xpressme') : $zero; + else // must be one + $output = ( false === $one ) ? __('One Trackback/Pingback', 'xpressme') : $one; + + echo $output; +} + + +function xpress_get_pings() +{ + global $withcomments, $post, $wpdb, $id, $trackback, $user_login, $user_ID, $user_identity; + + if ( ! (is_single() || is_page() || $withcomments) ) + return; + + /** @todo Use API instead of SELECTs. */ + if ( $user_ID) { + $trackbacks = $wpdb->get_results(sprintf("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND (comment_approved = '1' OR ( user_id = %d AND comment_approved = '0' ) ) AND ( comment_type = 'trackback' OR comment_type = 'pingback' ) ORDER BY comment_date", $post->ID, $user_ID)); + } else if ( empty($trackback_author) ) { + $trackbacks = $wpdb->get_results(sprintf("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1' AND ( comment_type = 'trackback' OR comment_type = 'pingback' ) ORDER BY comment_date", $post->ID)); + } else { + $trackbacks = $wpdb->get_results(sprintf("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND ( comment_approved = '1' OR ( comment_author = %s AND comment_author_email = %s AND comment_approved = '0' ) ) AND ( comment_type = 'trackback' OR comment_type = 'pingback' ) ORDER BY comment_date", $post->ID, $trackback_author, $trackback_author_email)); + } + + if ($trackbacks){ + $ret = array(); + foreach ($trackbacks as $trackback){ + + $pattern = '(.*)<\/strong>(.*)'; + if ( preg_match ( "/".$pattern."/i", $trackback->comment_content , $match ) ){ + $title = $match[1]; + $content = $match[2]; + } + if (empty($title)) $title = $trackback->comment_author; + + + $row_data = array( + 'ID' => $trackback->comment_ID , + 'post_ID' => $trackback->comment_post_ID , + 'site_name' => $trackback->comment_author , + 'site_url' => $trackback->comment_author_url , + 'title' => $title , + 'content' => $content , + 'date' => $trackback->comment_date , + 'date_gmt' => $trackback->comment_date_gmt , + 'agent' => $trackback->comment_agent , + 'type' => $trackback->comment_type , + 'IP' => $trackback->comment_author_IP , + ); + array_push($ret,$row_data); + } + return $ret; + } + return false; +} ?> Index: trunk/wp-content/plugins/xpressme/language/xpressme-ja.po =================================================================== --- trunk/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 149) +++ trunk/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 150) @@ -3,5 +3,5 @@ "Project-Id-Version: XPressME Plugin\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2009-04-01 16:42+0900\n" +"PO-Revision-Date: 2009-04-02 14:04+0900\n" "Last-Translator: toemon \n" "Language-Team: \n" @@ -342,4 +342,22 @@ msgstr "‘%s’ の検索結果" +#: include/custom_functions.php:382 +#, php-format +msgid "From %1$s on site %2$s" +msgstr "サイト %2$s の %1$s より" + +#: include/custom_functions.php:398 +#, fuzzy +msgid "% TrackBack/Pingback" +msgstr "トラックバック・ピンバック % 件" + +#: include/custom_functions.php:400 +msgid "No Trackback/Pingback" +msgstr "トラックバック・ピンバックはありません" + +#: include/custom_functions.php:402 +msgid "One Trackback/Pingback" +msgstr "トラックバック・ピンバック 1 件" + #: include/xpress_common_functions.php:202 msgid "Themes" Index: trunk/wp-content/themes/xpress_default/comments.php =================================================================== --- trunk/wp-content/themes/xpress_default/comments.php (revision 149) +++ trunk/wp-content/themes/xpress_default/comments.php (revision 150) @@ -13,78 +13,67 @@ - -

+ +

+
+ +
+ + +
+
+
+
+ -
- -
- - - -
-
-
-
- - - comment_status) : ?> - - - - -

Comments are closed.

- - + comment_status) : ?> + + + +

Comments are closed.

+ +comment_status) : ?> +
-comment_status) : ?> +

+
+ +
+ +
+ + +

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); ?>

+ +

/> +

-
+

/> +

-

+

+

+ +
-
- -
- -
- -

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); ?>

- - - -

/> -

- -

/> -

- -

-

- - -
- -
- - - -
- + +
+ +
+ + ID); ?> + +
+
- - ID); ?> - -
- -
Index: trunk/wp-content/themes/xpress_default/index.php =================================================================== --- trunk/wp-content/themes/xpress_default/index.php (revision 149) +++ trunk/wp-content/themes/xpress_default/index.php (revision 150) @@ -1,28 +1,29 @@ -
-'; - } else { - echo '
'; - } -?> -
-
- -
-
-  ( ) -
-
- -
-
- - -
-
-
+
+
+ +
+
+  ( ) +
+
+ +
+
+ + +
+
+
+ +
+ '; + } else { + echo '
'; + } + ?>
@@ -41,5 +42,5 @@
-

+

@@ -85,4 +86,4 @@
-
+
Index: trunk/wp-content/themes/xpress_default/ja.po =================================================================== --- trunk/wp-content/themes/xpress_default/ja.po (revision 149) +++ trunk/wp-content/themes/xpress_default/ja.po (revision 150) @@ -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-04-01 16:55+0900\n" +"PO-Revision-Date: 2009-04-02 18:19+0900\n" "Last-Translator: toemon \n" "Language-Team: toemon \n" @@ -28,680 +28,637 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-KeywordsList: __;_e;_c\n" -"X-Poedit-Basepath: C:\\XPressME_Ver2_SVN\\trunk\\wp-content\\themes\\\n" +"X-Poedit-Basepath: C:\\XPressME_Ver2_SVN\\trunk\\wp-content\\themes\\xpress_default\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-SearchPath-0: xpress_default\n" - -#: xpress_default/404.php:22 +"X-Poedit-SearchPath-0: .\n" + +#: 404.php:22 msgid "Error 404 - Not Found" msgstr "エラー 404 - 見つかりませんでした" -#: xpress_default/archives.php:20 +#: archives.php:20 msgid "Archives by Month:" msgstr "月別のアーカイブ:" -#: xpress_default/archives.php:25 +#: archives.php:25 msgid "Archives by Subject:" msgstr "カテゴリー別アーカイブ:" -#: xpress_default/comments-popup.php:9 +#: comments-popup.php:9 #, php-format msgid "%1$s - Comments on %2$s" msgstr "%1$s - %2$s へのコメント" -#: xpress_default/comments-popup.php:22 +#: comments-popup.php:22 msgid "Comments" msgstr "コメント" -#: xpress_default/comments-popup.php:24 +#: comments-popup.php:24 msgid "RSS feed for comments on this post." msgstr "このコメント欄の RSS フィード" -#: xpress_default/comments-popup.php:27 +#: comments-popup.php:27 #, php-format msgid "The URL to TrackBack this entry is: %s" msgstr "この投稿へのトラックバック URL: %s" -#: xpress_default/comments-popup.php:45 +#: comments-popup.php:45 msgid "Comment" msgstr "コメント" -#: xpress_default/comments-popup.php:45 +#: comments-popup.php:45 msgid "Trackback" msgstr "トラックバック" -#: xpress_default/comments-popup.php:45 +#: comments-popup.php:45 msgid "Pingback" msgstr "ピンバック" -#: xpress_default/comments-popup.php:45 +#: comments-popup.php:45 #, php-format msgid "by %1$s — %2$s @ %4$s" msgstr "— %2$s @ %4$s: %1$s より" -#: xpress_default/comments-popup.php:51 +#: comments-popup.php:51 msgid "No comments yet." msgstr "コメントはまだありません。" -#: xpress_default/comments-popup.php:55 +#: comments-popup.php:55 msgid "Leave a comment" msgstr "コメントをどうぞ" -#: xpress_default/comments-popup.php:56 +#: comments-popup.php:56 #, php-format msgid "Line and paragraph breaks automatic, e-mail address never displayed, HTML allowed: %s" msgstr "改行と段落タグは自動で挿入されます。メールアドレスは表示されません。利用可能な HTML タグ: %s" -#: xpress_default/comments-popup.php:60 +#: comments-popup.php:60 #, php-format msgid "Logged in as %2$s. Log out »" msgstr "%2$s としてログイン中。ログアウト »" -#: xpress_default/comments-popup.php:64 -#: xpress_default/comments.php:95 +#: comments-popup.php:64 +#: comments.php:55 msgid "Name" msgstr "お名前" -#: xpress_default/comments-popup.php:71 +#: comments-popup.php:71 msgid "E-mail" msgstr "メールアドレス" -#: xpress_default/comments-popup.php:76 +#: comments-popup.php:76 msgid "URL" msgstr "URL" -#: xpress_default/comments-popup.php:81 +#: comments-popup.php:81 msgid "Your Comment" msgstr "コメント" -#: xpress_default/comments-popup.php:87 +#: comments-popup.php:87 msgid "Say It!" msgstr "送信する !" -#: xpress_default/comments-popup.php:92 +#: comments-popup.php:92 msgid "Sorry, the comment form is closed at this time." msgstr "コメントフォームは現在閉鎖中です。" -#: xpress_default/comments-popup.php:97 +#: comments-popup.php:97 msgid "Close this window." msgstr "このウインドウを閉じる。" -#: xpress_default/comments-popup.php:105 +#: comments-popup.php:105 #, php-format msgid "Powered by WordPress" msgstr "Powered by WordPress" -#: xpress_default/comments.php:9 +#: comments.php:6 msgid "This post is password protected. Enter the password to view comments." msgstr "この投稿はパスワードで保護されています。コメントを閲覧するにはパスワードを入力してください。" -#: xpress_default/comments.php:23 +#: comments.php:16 msgid "No Responses" msgstr "コメント はありません" -#: xpress_default/comments.php:23 +#: comments.php:16 msgid "One Response" msgstr "コメント 1 件" -#: xpress_default/comments.php:23 +#: comments.php:16 msgid "% Responses" msgstr "コメント % 件" -#: xpress_default/comments.php:23 +#: comments.php:16 #, php-format msgid "to “%s”" msgstr "" -#: xpress_default/comments.php:39 -#, php-format -msgid "%s Says:" -msgstr "%s より: " - -#: xpress_default/comments.php:41 -msgid "Your comment is awaiting moderation." -msgstr "コメントは管理者の承認待ちです。" - -#: xpress_default/comments.php:45 -#, php-format -msgid "%1$s at %2$s" -msgstr "%1$s %2$s" - -#: xpress_default/comments.php:45 -msgid "F jS, Y" -msgstr "Y 年 n 月 j 日" - -#: xpress_default/comments.php:45 -msgid "edit" -msgstr "編集" - -#: xpress_default/comments.php:67 -msgid "Comments are closed." -msgstr "コメントは受け付けていません。" - -#: xpress_default/comments.php:75 +#: comments.php:39 msgid "Leave a Reply" msgstr "コメントをどうぞ" -#: xpress_default/comments.php:75 +#: comments.php:39 +#, php-format msgid "Leave a Reply for %s" msgstr "%s にコメントする" -#: xpress_default/comments.php:83 +#: comments.php:47 #, php-format msgid "You must be logged in to post a comment." msgstr "コメントを投稿するにはログインしてください。" -#: xpress_default/comments.php:90 +#: comments.php:52 #, php-format msgid "Logged in as %2$s." msgstr "%2$s としてログイン中。" -#: xpress_default/comments.php:90 +#: comments.php:52 msgid "Log out of this account" msgstr "このアカウントからログアウト" -#: xpress_default/comments.php:90 +#: comments.php:52 msgid "Log out »" msgstr "ログアウト »" -#: xpress_default/comments.php:95 -#: xpress_default/comments.php:98 +#: comments.php:55 +#: comments.php:58 msgid "(required)" msgstr " (必須)" -#: xpress_default/comments.php:98 +#: comments.php:58 msgid "Mail (will not be published)" msgstr "メールアドレス (公開されません)" -#: xpress_default/comments.php:101 +#: comments.php:61 msgid "Website" msgstr "ウェブサイト" -#: xpress_default/comments.php:105 +#: comments.php:66 #, php-format msgid "XHTML: You can use these tags: %s" msgstr "XHTML: 次のタグを使用できます: %s" -#: xpress_default/comments.php:109 +#: comments.php:70 msgid "Submit Comment" msgstr "コメント送信" -#: xpress_default/footer.php:3 +#: footer.php:3 #, php-format msgid "%1$s and %2$s." msgstr "%1$s と %2$s" -#: xpress_default/footer.php:3 +#: footer.php:3 msgid "Entries (RSS)" msgstr "投稿 (RSS)" -#: xpress_default/footer.php:3 +#: footer.php:3 msgid "Comments (RSS)" msgstr "コメント (RSS)" -#: xpress_default/footer.php:5 +#: footer.php:5 #, php-format msgid "%d queries. %s seconds." msgstr "%d 個のクエリと %s 秒を要しました。" -#: xpress_default/functions.php:149 +#: functions.php:149 msgid "Customize Header" msgstr "ヘッダーのカスタマイズ" -#: xpress_default/functions.php:149 -#: xpress_default/functions.php:363 +#: functions.php:149 +#: functions.php:363 msgid "Header Image and Color" msgstr "ヘッダーの背景と文字の色" -#: xpress_default/functions.php:162 +#: functions.php:162 msgid "Close Color Picker" msgstr "カラーピッカーを閉じる" -#: xpress_default/functions.php:359 +#: functions.php:359 msgid "Options saved." msgstr "設定を保存しました。" -#: xpress_default/functions.php:376 -#: xpress_default/functions.php:383 +#: functions.php:376 +#: functions.php:383 msgid "Save" msgstr "保存" -#: xpress_default/functions.php:377 +#: functions.php:377 msgid "Font Color:" msgstr "フォントの色:" -#: xpress_default/functions.php:377 +#: functions.php:377 #, php-format msgid "Any CSS color (%s or %s or %s)" msgstr "CSS 色指定 (%s 、%s もしくは %s)" -#: xpress_default/functions.php:378 +#: functions.php:378 msgid "Upper Color:" msgstr "グラデーション上側の色:" -#: xpress_default/functions.php:378 -#: xpress_default/functions.php:379 +#: functions.php:378 +#: functions.php:379 #, php-format msgid "HEX only (%s or %s)" msgstr "16 進数のみ (%s もしくは %s)" -#: xpress_default/functions.php:379 +#: functions.php:379 msgid "Lower Color:" msgstr "グラデーション下側の色:" -#: xpress_default/functions.php:381 +#: functions.php:381 msgid "Toggle Text" msgstr "テキスト表示の切替え" -#: xpress_default/functions.php:382 +#: functions.php:382 msgid "Use Defaults" msgstr "デフォルト設定に戻す" -#: xpress_default/functions.php:391 +#: functions.php:391 msgid "Font Color" msgstr "フォントの色" -#: xpress_default/functions.php:392 +#: functions.php:392 msgid "Upper Color" msgstr "グラデーション上側の色" -#: xpress_default/functions.php:393 +#: functions.php:393 msgid "Lower Color" msgstr "グラデーション下側の色" -#: xpress_default/functions.php:394 +#: functions.php:394 msgid "Revert" msgstr "取り消し" -#: xpress_default/functions.php:395 +#: functions.php:395 msgid "Advanced" msgstr "詳細" -#: xpress_default/functions.php:402 +#: functions.php:402 msgid "Update Header »" msgstr "ヘッダーを更新 »" -#: xpress_default/functions.php:408 +#: functions.php:408 msgid "Font Color (CSS):" msgstr "フォントの色 (CSS):" -#: xpress_default/functions.php:409 +#: functions.php:409 msgid "Upper Color (HEX):" msgstr "グラデーション上側の色 (16 進数):" -#: xpress_default/functions.php:410 +#: functions.php:410 msgid "Lower Color (HEX):" msgstr "グラデーション下側の色 (16 進数):" -#: xpress_default/functions.php:411 +#: functions.php:411 msgid "Select Default Colors" msgstr "デフォルト設定に戻す" -#: xpress_default/functions.php:412 +#: functions.php:412 msgid "Toggle Text Display" msgstr "テキスト表示の切替え" -#: xpress_default/header.php:9 +#: header.php:9 msgid "» Blog Archive" msgstr "» ブログアーカイブ" -#: xpress_default/header.php:14 +#: header.php:14 #, php-format msgid "%s RSS Feed" msgstr "%s RSS フィード" -#: xpress_default/header.php:15 +#: header.php:15 #, php-format msgid "%s Atom Feed" msgstr "%s Atom フィード" -#: xpress_default/image.php:13 -#: xpress_default/index.php:46 -#: xpress_default/single.php:38 +#: image.php:13 +#: index.php:48 +#: single.php:43 msgid "Read the rest of this entry »" msgstr "この投稿の続きを読む »" -#: xpress_default/image.php:15 -#: xpress_default/page.php:29 -#: xpress_default/single.php:40 +#: image.php:15 +#: page.php:29 msgid "Pages:" msgstr "ページ:" -#: xpress_default/image.php:25 +#: image.php:25 #, php-format msgid "This entry was posted on %1$s at %2$s and is filed under %3$s." msgstr "この投稿は %1$s %2$s に %3$s カテゴリーに公開されました。" -#: xpress_default/image.php:25 -#: xpress_default/sidebar.php:24 -#: xpress_default/single.php:49 +#: image.php:25 +#: sidebar.php:24 msgid "l, F jS, Y" msgstr "Y 年 n 月 j 日 l" -#: xpress_default/image.php:27 -#: xpress_default/single.php:51 +#: image.php:27 #, php-format msgid "You can follow any responses to this entry through the RSS 2.0 feed." msgstr "この投稿へのコメントは RSS 2.0 フィードで購読することができます。" -#: xpress_default/image.php:31 -#: xpress_default/single.php:58 +#: image.php:31 #, php-format msgid "You can leave a response, or trackback from your own site." msgstr "コメントを残すか、ご自分のサイトからトラックバックすることができます。" -#: xpress_default/image.php:35 -#: xpress_default/single.php:62 +#: image.php:35 #, php-format msgid "Responses are currently closed, but you can trackback from your own site." msgstr "現在コメントは受け付けておりませんが、ご自分のサイトからトラックバックを送ることはできます。" -#: xpress_default/image.php:39 -#: xpress_default/single.php:66 +#: image.php:39 msgid "You can skip to the end and leave a response. Pinging is currently not allowed." msgstr "このページの一番下でコメントを残すことができます。トラックバック / ピンバックは現在受け付けていません。" -#: xpress_default/image.php:43 -#: xpress_default/single.php:70 +#: image.php:43 msgid "Both comments and pings are currently closed." msgstr "現在コメント、トラックバックともに受け付けておりません。" -#: xpress_default/image.php:45 -#: xpress_default/page.php:34 +#: image.php:45 +#: page.php:34 msgid "Edit this entry." msgstr "この投稿を編集する。" -#: xpress_default/image.php:58 -#: xpress_default/single.php:84 +#: image.php:58 +#: single.php:81 msgid "Sorry, no posts matched your criteria." msgstr "該当する投稿は見つかりませんでした。" -#: xpress_default/index.php:21 -#: xpress_default/single.php:16 +#: index.php:14 +#: single.php:14 msgid "Mein Page" msgstr "メインページ" -#: xpress_default/index.php:22 -#: xpress_default/single.php:17 +#: index.php:15 +#: single.php:15 msgid "Post New" msgstr "新規投稿" -#: xpress_default/index.php:31 -#: xpress_default/index.php:70 -msgid "« Older Entries" -msgstr "« 前ページへ" - -#: xpress_default/index.php:32 -#: xpress_default/index.php:71 -msgid "Newer Entries »" -msgstr "次ページへ »" - -#: xpress_default/index.php:42 -#: xpress_default/single.php:33 +#: index.php:44 +#: single.php:38 #, php-format msgid "Permanent Link to %s" msgstr "%s のパーマリンク" -#: xpress_default/index.php:53 +#: index.php:56 +#: single.php:53 #, php-format msgid "Views :%d" msgstr "閲覧 :%d" -#: xpress_default/index.php:56 -#: xpress_default/single.php:41 +#: index.php:59 +#: single.php:56 #, php-format msgid "Posted in %s" msgstr "カテゴリー: %s" -#: xpress_default/index.php:58 +#: index.php:61 +#: single.php:58 msgid "Edit" msgstr "編集" -#: xpress_default/index.php:59 +#: index.php:62 +#: single.php:59 msgid "No Comments »" msgstr "コメントはまだありません »" -#: xpress_default/index.php:59 +#: index.php:62 +#: single.php:59 msgid "1 Comment »" msgstr "1 件のコメント »" -#: xpress_default/index.php:59 +#: index.php:62 +#: single.php:59 msgid "% Comments »" msgstr "% 件のコメント »" -#: xpress_default/index.php:59 +#: index.php:62 +#: single.php:59 msgid "Comments Closed" msgstr "コメントは受け付けていません。" -#: xpress_default/index.php:77 +#: index.php:80 msgid "Not Found" msgstr "見つかりませんでした。" -#: xpress_default/index.php:78 +#: index.php:81 msgid "Sorry, but you are looking for something that isn’t here." msgstr "お探しの物はここにはありません。" -#: xpress_default/links.php:18 +#: links.php:18 msgid "Links:" msgstr "リンク:" -#: xpress_default/page.php:27 +#: page.php:27 msgid "Read the rest of this page »" msgstr "このページの続きを読む »" -#: xpress_default/searchform.php:2 +#: searchform.php:2 msgid "Search for:" msgstr "検索:" -#: xpress_default/searchform.php:4 -#: xpress_default/blocks/search_block_theme.php:13 +#: searchform.php:4 +#: blocks/search_block_theme.php:13 msgid "Search" msgstr "検索" -#: xpress_default/sidebar.php:10 +#: sidebar.php:10 msgid "Author" msgstr "作成者" -#: xpress_default/sidebar.php:21 +#: sidebar.php:21 #, php-format msgid "You are currently browsing the archives for the %s category." msgstr "%s カテゴリーのアーカイブを表示しています。" -#: xpress_default/sidebar.php:24 +#: sidebar.php:24 #, php-format msgid "You are currently browsing the %2$s blog archives for the day %3$s." msgstr "%2$s ブログの %3$s のアーカイブを表示しています。" -#: xpress_default/sidebar.php:27 +#: sidebar.php:27 #, php-format msgid "You are currently browsing the %2$s blog archives for %3$s." msgstr "%2$s の %3$s のアーカイブを閲覧中です。" -#: xpress_default/sidebar.php:27 +#: sidebar.php:27 msgid "F, Y" msgstr "Y 年 n 月" -#: xpress_default/sidebar.php:30 +#: sidebar.php:30 #, php-format msgid "You are currently browsing the %2$s blog archives for the year %3$s." msgstr "%2$s ブログの %3$s 年のアーカイブを表示しています。" -#: xpress_default/sidebar.php:33 +#: sidebar.php:33 #, php-format msgid "You have searched the %2$s blog archives for ‘%3$s’. If you are unable to find anything in these search results, you can try one of these links." msgstr "%2$s のアーカイブ内で‘%3$s’を探しました。お探しのものが見つからない場合は他のリンクを試してみてください。" -#: xpress_default/sidebar.php:36 +#: sidebar.php:36 #, php-format msgid "You are currently browsing the %2$s blog archives." msgstr "%2$s ブログのアーカイブを閲覧中です。" -#: xpress_default/sidebar.php:42 +#: sidebar.php:42 msgid "Pages" msgstr "ページ" -#: xpress_default/sidebar.php:44 +#: sidebar.php:44 msgid "Archives" msgstr "アーカイブ" -#: xpress_default/sidebar.php:51 -#: xpress_default/sidebar.php:53 +#: sidebar.php:51 +#: sidebar.php:53 msgid "Categories" msgstr "カテゴリー" -#: xpress_default/sidebar.php:62 +#: sidebar.php:62 msgid "Meta" msgstr "メタ情報" -#: xpress_default/sidebar.php:66 +#: sidebar.php:66 msgid "This page validates as XHTML 1.0 Transitional" msgstr "このページが XHTML 1.0 Transitional に準拠しているか確認する" -#: xpress_default/sidebar.php:66 +#: sidebar.php:66 msgid "Valid XHTML" msgstr "Valid XHTML" -#: xpress_default/sidebar.php:67 +#: sidebar.php:67 msgid "XHTML Friends Network" msgstr "XHTML Friends Network" -#: xpress_default/sidebar.php:67 +#: sidebar.php:67 msgid "XFN" msgstr "XFN" -#: xpress_default/sidebar.php:68 +#: sidebar.php:68 msgid "Powered by WordPress, state-of-the-art semantic personal publishing platform." msgstr "Powered by WordPress, state-of-the-art semantic personal publishing platform." -#: xpress_default/single.php:41 -#: xpress_default/blocks/popular_posts_block_theme.php:109 -#: xpress_default/blocks/recent_posts_content_block_theme.php:61 -#: xpress_default/blocks/recent_posts_list_block_theme.php:56 +#: single.php:64 +msgid "No Trackback/Pingback" +msgstr "トラックバック・ピンバックはありません" + +#: single.php:64 +msgid "One Trackback/Pingback" +msgstr "トラックバック・ピンバック 1 件" + +#: single.php:64 +msgid "% TrackBack/Pingback" +msgstr "トラックバック・ピンバック % 件" + +#: blocks/archives_block_theme.php:13 +msgid "Select Yearly" +msgstr "年を選択" + +#: blocks/archives_block_theme.php:16 +#: blocks/archives_block_theme.php:28 +msgid "Select Monthly" +msgstr "月を選択" + +#: blocks/archives_block_theme.php:19 +msgid "Select Weekly" +msgstr "週を選択" + +#: blocks/archives_block_theme.php:22 +msgid "Select Daily" +msgstr "日を選択" + +#: blocks/archives_block_theme.php:25 +msgid "Select Post" +msgstr "記事を選択" + +#: blocks/calender_block_theme.php:71 +msgid "Calendar" +msgstr "カレンダー" + +#: blocks/calender_block_theme.php:72 +#, php-format +msgid "%1$s %2$s|Used as a calendar caption" +msgstr "%2$s 年 %1$s|カレンダーのキャプションに使われます" + +#: blocks/calender_block_theme.php:104 +#: blocks/calender_block_theme.php:114 +#, php-format +msgid "View posts for %1$s %2$s" +msgstr "%2$s 年 %1$s の投稿を表示" + +#: blocks/enhanced_block_theme.php:11 +msgid "The include file name to display it is not set." +msgstr "表示を行うためのインクルードファイル名が設定されていません。" + +#: blocks/enhanced_block_theme.php:13 +#, php-format +msgid "File %s not exist." +msgstr "ファイル %s が見つかりません。" + +#: blocks/enhanced_block_theme.php:19 +msgid "PHP code error" +msgstr "PHPコードにエラーがあります。" + +#: blocks/meta_block_theme.php:24 +msgid "Posts RSS" +msgstr "投稿の RSS" + +#: blocks/meta_block_theme.php:27 +msgid "Comments RSS" +msgstr "コメント のRSS" + +#: blocks/meta_block_theme.php:39 +msgid "Add New" +msgstr "新規投稿" + +#: blocks/meta_block_theme.php:47 +msgid "Site Admin" +msgstr "WordPress管理" + +#: blocks/meta_block_theme.php:53 +msgid "User Profile" +msgstr "ユーザープロファイル" + +#: blocks/meta_block_theme.php:61 +#: blocks/meta_block_theme.php:66 +msgid "Subscription management" +msgstr "メール購読の設定" + +#: blocks/meta_block_theme.php:74 +msgid "ReadMe" +msgstr "ReadMe表示" + +#: blocks/meta_block_theme.php:79 +msgid "Themes" +msgstr "テーマ選択" + +#: blocks/popular_posts_block_theme.php:114 +#: blocks/recent_posts_content_block_theme.php:62 +#: blocks/recent_posts_list_block_theme.php:60 msgid "Tags:" msgstr "タグ:" -#: xpress_default/single.php:49 -#, php-format -msgid "This entry was posted %1$s on %2$s at %3$s and is filed under %4$s." -msgstr "この投稿は %1$s %2$s %3$s に %4$s カテゴリーに公開されました。" - -#: xpress_default/single.php:53 -msgid "You can follow any responses to this entry through the" -msgstr "この投稿へのコメントは" - -#: xpress_default/single.php:53 -msgid "feed." -msgstr "フィードで購読することができます。" - -#: xpress_default/single.php:72 -msgid "Edit this entry" -msgstr "この投稿を編集 " - -#: xpress_default/blocks/archives_block_theme.php:13 -msgid "Select Yearly" -msgstr "年を選択" - -#: xpress_default/blocks/archives_block_theme.php:16 -#: xpress_default/blocks/archives_block_theme.php:28 -msgid "Select Monthly" -msgstr "月を選択" - -#: xpress_default/blocks/archives_block_theme.php:19 -msgid "Select Weekly" -msgstr "週を選択" - -#: xpress_default/blocks/archives_block_theme.php:22 -msgid "Select Daily" -msgstr "日を選択" - -#: xpress_default/blocks/archives_block_theme.php:25 -msgid "Select Post" -msgstr "記事を選択" - -#: xpress_default/blocks/calender_block_theme.php:71 -msgid "Calendar" -msgstr "カレンダー" - -#: xpress_default/blocks/calender_block_theme.php:72 -#, php-format -msgid "%1$s %2$s|Used as a calendar caption" -msgstr "%2$s 年 %1$s|カレンダーのキャプションに使われます" - -#: xpress_default/blocks/calender_block_theme.php:104 -#: xpress_default/blocks/calender_block_theme.php:114 -#, php-format -msgid "View posts for %1$s %2$s" -msgstr "%2$s 年 %1$s の投稿を表示" - -#: xpress_default/blocks/enhanced_block_theme.php:11 -msgid "The include file name to display it is not set." -msgstr "表示を行うためのインクルードファイル名が設定されていません。" - -#: xpress_default/blocks/enhanced_block_theme.php:13 -#, php-format -msgid "File %s not exist." -msgstr "ファイル %s が見つかりません。" - -#: xpress_default/blocks/enhanced_block_theme.php:19 -msgid "PHP code error" -msgstr "PHPコードにエラーがあります。" - -#: xpress_default/blocks/meta_block_theme.php:24 -msgid "Posts RSS" -msgstr "投稿の RSS" - -#: xpress_default/blocks/meta_block_theme.php:27 -msgid "Comments RSS" -msgstr "コメント のRSS" - -#: xpress_default/blocks/meta_block_theme.php:39 -msgid "Add New" -msgstr "新規投稿" - -#: xpress_default/blocks/meta_block_theme.php:47 -msgid "Site Admin" -msgstr "WordPress管理" - -#: xpress_default/blocks/meta_block_theme.php:53 -msgid "User Profile" -msgstr "ユーザープロファイル" - -#: xpress_default/blocks/meta_block_theme.php:61 -#: xpress_default/blocks/meta_block_theme.php:66 -msgid "Subscription management" -msgstr "メール購読の設定" - -#: xpress_default/blocks/meta_block_theme.php:74 -msgid "ReadMe" -msgstr "ReadMe表示" - -#: xpress_default/blocks/meta_block_theme.php:79 -msgid "Themes" -msgstr "テーマ選択" - -#: xpress_default/blocks/popular_posts_block_theme.php:135 -#: xpress_default/blocks/recent_posts_content_block_theme.php:93 -#: xpress_default/blocks/recent_posts_list_block_theme.php:82 +#: blocks/popular_posts_block_theme.php:140 +#: blocks/recent_posts_content_block_theme.php:97 +#: blocks/recent_posts_list_block_theme.php:86 msgid "Comments (0)" msgstr "コメントはありません" -#: xpress_default/blocks/popular_posts_block_theme.php:135 -#: xpress_default/blocks/recent_posts_content_block_theme.php:93 -#: xpress_default/blocks/recent_posts_list_block_theme.php:82 +#: blocks/popular_posts_block_theme.php:140 +#: blocks/recent_posts_content_block_theme.php:97 +#: blocks/recent_posts_list_block_theme.php:86 msgid "Comments (1)" msgstr "1件のコメント" -#: xpress_default/blocks/popular_posts_block_theme.php:135 -#: xpress_default/blocks/recent_posts_content_block_theme.php:93 -#: xpress_default/blocks/recent_posts_list_block_theme.php:82 +#: blocks/popular_posts_block_theme.php:140 +#: blocks/recent_posts_content_block_theme.php:97 +#: blocks/recent_posts_list_block_theme.php:86 msgid "Comments (%)" msgstr "Comments (%)" -#: xpress_default/blocks/recent_comments_block_theme.php:71 +#: blocks/recent_comments_block_theme.php:73 #, fuzzy, php-format msgid "%1$s on %2$s" msgstr "%1$s と %2$s" -#: xpress_default/blocks/recent_posts_content_block_theme.php:66 -#: xpress_default/blocks/recent_posts_content_block_theme.php:68 +#: blocks/recent_posts_content_block_theme.php:72 msgid "more" msgstr "続きを読む" Index: trunk/wp-content/themes/xpress_default/sidebar.php =================================================================== --- trunk/wp-content/themes/xpress_default/sidebar.php (revision 149) +++ trunk/wp-content/themes/xpress_default/sidebar.php (revision 150) @@ -1,3 +1,3 @@ -
+
    +
    +
    + +
    +
    +  ( ) +
    +
    + +
    +
    + + +
    +
    +
    +
    '; - } else { - echo '
    '; - } +if(xpress_is_theme_sidebar_disp()) { + echo '
    '; +} else { + echo '
    '; +} ?> -
    -
    - -
    -
    -  ( ) -
    -
    - -
    -
    - - -
    -
    -
    - - - +
    - +
    -

    +

    @@ -44,5 +43,7 @@ ' . __('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 149) +++ trunk/wp-content/themes/xpress_default/style.css (revision 150) @@ -9,4 +9,5 @@ */ + #xpress_page { padding: 0; @@ -16,4 +17,56 @@ } +#xpress_page .clear { + clear: both; +} + +#xpress_page h1 { + padding-top: 20px; + margin: 0 0 5px; + font-size: 18px; + } + +#xpress_page h2 { + font-size: 16px; + } + +#xpress_page h3 { + padding: 0; + margin: 0; + } + +#xpress_page h3 { + font-size: 14px; + } + +#xpress_page small { + font-family: Arial, Helvetica, Sans-Serif; + color: #777; + font-size: 0.8em; + line-height: 1.5em; + } + +#xpress_page code { + font-size: 1.1em; + } + +#xpress_page select { + width: 130px; + } + +#xpress_page .hidden { + display: none; + } + + +#xpress_page a img { + border: none; + } + +#xpress_page .center { + text-align: center; + } + + #xpress_wrap { float: left; @@ -28,7 +81,10 @@ #xpress_content.narrowcolumn { - margin-right: 205px; - } - + margin-right: 200px; + } + + +/* Begin Header Menu */ + #xpress-header-bar { clear: both; @@ -57,10 +113,16 @@ text-align: right; } - +/* End Header Menu */ + + +/* Begin Border line */ .xpress-border { clear: both; display: block; } - +/* End Border lin */ + + +/* Begin Navi */ .xpress-navi-bar { clear: both; @@ -74,5 +136,8 @@ text-align: right; } - +/* End Navi */ + + +/* Begin Post */ .xpress-post { width: 100%; @@ -81,5 +146,11 @@ clear: both; } - +.xpress-post h2 { + margin: 0; + } +.xpress-post hr { + display: block; + } + .xpress-post .xpress-post-header{ text-align: left; @@ -105,22 +176,20 @@ margin-bottom: 10px; } - -#xpress-comments-block { - margin-top: 5px; - margin-bottom: 5px; +/* End post */ + + +/* Begin Pings */ +#xpress-pings-block { + margin-top: 0px; + margin-bottom: 0px; margin-left: 5px; margin-right: 5px; - padding-top:10px; + padding-top:0px; padding-left:20px; padding-right:5px; - padding-bottom:10px; - clear: both; - } -#xpress_commentlist { - margin: 0px; - padding-left: 20px; - } - -#xpress_commentlist ol{ + padding-bottom:0px; + clear: both; + } +#xpress_pingslist ol{ font-size: 1em; list-style-image:none; @@ -128,9 +197,8 @@ list-style-type:none; } - -#xpress_commentlist li{ +#xpress_pingslist li{ margin: 0px; - padding-top: 5px; - padding-bottom: 100px; + padding-top: 0px; + padding-bottom: 0px; padding-left: 5px; padding-right: 1px; @@ -140,11 +208,60 @@ list-style-type:none; } +/* End pings */ + + +/* Begin Comment */ +#xpress-comments-block { + margin-top: 0px; + margin-bottom: 5px; + margin-left: 5px; + margin-right: 5px; + padding-top:0px; + padding-left: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: 0px; + 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; + margin-top: 4px; + padding-top: 0px; + padding-bottom: 4px; + padding-left: 10px; + padding-right:0px } #xpress_commentlist .odd { background:#EFEFEF none repeat scroll 0 0; + margin-top: 4px; + padding-top: 0px; + padding-bottom: 4px; + padding-left: 10px; + padding-right:0px } @@ -161,358 +278,4 @@ font-size: 1.1em; } - - -#xpress_footer { - padding-top: 0px; - margin: 0 auto; - width: 100%; - clear: both; - text-align: center; - } -#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 */ - - -.widecolumn .entry { - font-size: 1.05em; - } - -.narrowcolumn .entry,.narrowcolumn_nonside .entry, .widecolumn .entry { - line-height: 1.4em; - } - -p.postmeta{ - line-height: 1.2em; - font-size: 0.9em; - } - -#xpress_page small { - font-family: Arial, Helvetica, Sans-Serif; - font-size: 0.8em; - line-height: 1.5em; - } - -#xpress_headerimg .description { - font-size: 1.2em; - } - -#xpress_page h1, -#xpress_page h2 { - font-size: 1.4em; - } - -.xpress_pagetitle { - font-size: 1.5em; - font-weight: bold; - } - -.xpress_sidebar h2 { - font-size: 1.1em; - } - -#xpress_page h3 { - font-size: 1.6em; - } -.xpress_commentmetadata { - font-size: 11px; - font-weight: normal; - } - -.postmetadata { - font-size: 0.9em; - } - -.xpress_sidebar { - font-size: 0.8em; - } - -#xpress_page small, .xpress_sidebar ul ul li, .xpress_sidebar ul ol li, .nocomments, .postmetadata, blockquote, strike { - color: #777; - } - -#xpress_page code { - font-size: 1.1em; - } - -acronym, abbr, span.caps -{ - font-size: 0.9em; - letter-spacing: .07em; - } - -#wp-calendar #prev a, #wp-calendar #next a { - font-size: 9pt; - } - -#wp-calendar a { - text-decoration: none; - } - -#wp-calendar caption { - font: bold 1.3em; - text-align: center; - } - -#wp-calendar th { - font-style: normal; - text-transform: capitalize; - } - -#xpress_footer p { - font-size: 0.9em; -} - -/* End Typography & Colors */ - - - -/* Begin Structure */ -p{ - margin:0; - padding:0; -} - -.widecolumn { - width: 500px; /*width of single page*/ - margin: 0 auto; - } - - - -.xpress-post h2 { - margin: 0; - } -.xpress-post hr { - display: block; - } - -.entry { - clear:both; - padding:10px 0 0; - } - -.entry p{ - padding: 5px 0; - } - -p.postmeta{ - padding-top: 20px; - } - -.narrowcolumn_nonside .postmetadata, -.narrowcolumn .postmetadata { - padding-top: 10px; - /*text-align:center;*//*postmeta of index page*/ - } - -.widecolumn .postmetadata { - margin: 30px 0; - padding:5px 10px; - } - -.widecolumn .smallattachment { - text-align: center; - float: left; - width: 128px; - margin: 5px 5px 5px 0px; -} - -.widecolumn .attachment { - text-align: center; - margin: 5px 0px; -} - -#xpress_page .clear { - clear: both; -} - -.dateblock{ - margin:-12px 0 0 -5px!important; - } - -/* End Structure */ - - -/* Begin Headers */ -#xpress_page h1 { - padding-top: 20px; - margin: 0 0 5px; - } - -.xpress_sidebar h2 { - margin: 5px 0 0; - padding: 0; - } - -#xpress_page h3 { - padding: 0; - margin: 0; - } - -/* End Headers */ - -/* Begin Images */ - -/* Using 'class="alignright"' on an image will (who would've - thought?!) align the image to the right. And using 'class="centered', - will of course center the image. This is much better than using - align="center", being much more futureproof (and valid) */ - -img.centered { - display: block; - margin-left: auto; - margin-right: auto; - } - -img.alignright { - padding: 4px; - margin: 0 0 2px 7px; - display: inline; - } - -img.alignleft { - padding: 4px; - margin: 0 7px 2px 0; - display: inline; - } - -.alignright { - float: right; - } - -.alignleft { - float: left - } -/* End Images */ - - - -/* Begin Lists - - Special stylized non-IE bullets - Do not work in Internet Explorer, which merely default to normal bullets. */ - -html>body .entry ul { - margin-left: 0px; - padding: 0 0 0 30px; - list-style: none; - padding-left: 10px; - text-indent: -10px; - } - -html>body .entry li { - margin: 7px 0 8px 10px; - } - -.entry ul li:before, .xpress_sidebar ul ul li:before { - content: "\00BB \0020"; - } - -.entry ol { - padding: 0 0 0 35px; - margin: 0; - } - -.entry ol li { - margin: 0; - padding: 0; - } - -.postmetadata ul, .postmetadata li { - display: inline; - list-style-type: none; - list-style-image: none; - } - -.xpress_sidebar ul, .xpress_sidebar ul ol { - margin: 0; - padding: 0; - } - -.xpress_sidebar ul li { - list-style-type: none; - list-style-image: none; - margin-bottom: 15px; - } - -.xpress_sidebar ul p, .xpress_sidebar ul select { - margin: 5px 0 8px; - } - -.xpress_sidebar ul ul, .xpress_sidebar ul ol { - margin: 5px 0 0 10px; - } - -.xpress_sidebar ul ul ul, .xpress_sidebar ul ol { - margin: 0 0 0 10px; - } - - -.xpress_sidebar ul ul li, .xpress_sidebar ul ol li { - margin: 3px 0 0; - padding: 0; - } -/* End Entry Lists */ - - - -/* Begin Form Elements */ -.xpress_sidebar #searchform { - margin: 10px auto; - padding: 5px 3px; - text-align: center; - } - -.xpress_sidebar #searchform #s { - width: 108px; - padding: 2px; - } - -.xpress_sidebar #searchsubmit { - padding: 1px; - } - -.entry form { /* This is mainly for password protected posts, makes them look better. */ - text-align:center; - } - -#xpress_page select { - width: 130px; - } - - -#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 { @@ -526,4 +289,20 @@ } +#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 .xpress-comment-submit{ margin: 0px; @@ -536,5 +315,4 @@ } - .nocomments { text-align: center; @@ -542,23 +320,118 @@ padding: 0; } - /* End Comments */ +/* Begin Footer Title */ +#xpress_footer { + padding-top: 0px; + margin: 0 auto; + width: 100%; + clear: both; + text-align: center; + } +#xpress_footer p { + font-size: 0.9em; +} + +#xpress_footer .xpress_rss { + margin: 0; + padding: 0; + text-align: right; + } + +#xpress_footer .xpress_credit { + margin: 0; + padding: 0; + text-align: center; + font-size: 10px; + color: #BDBDBD; + } + +#xpress_footer .xpress_credit a { + font-size: 10px; + color: #BDBDBD; + } +/* End Footer Title */ + /* Begin Sidebar */ -#xpress_page .xpress_sidebar { +#xpress_sidebar { float: right; display:inline; - margin:0 15px 0 0; - padding: 20px 0 10px; - width: 190px; - } - -.xpress_sidebar form { - margin: 0; + margin-top: 0px; + margin-bottom: 0px; + margin-left: 10px; + margin-right: 0px; + padding-top: 0px; + padding-bottom: 0px; + padding-left: 100px + padding-right: 0px + font-size: 0.8em; + width: 180px; + } + +#xpress_sidebar h2 { + margin: 5px 0 0; + padding: 0; + font-size: 14px; + } + +#xpress_sidebar form { + margin: 0; + } + +#xpress_sidebar ul ul li:before { + content: "\00BB \0020"; + } + +#xpress_sidebar ul, #xpress_sidebar ul ol { + margin: 0; + padding: 0; + list-style-type: none; + list-style-image: none; + list-style: none; + list-style-position:inside; + } + +#xpress_sidebar ul li { + list-style-type: none; + list-style-image: none; + margin-bottom: 15px; + } + +#xpress_sidebar ul p, #xpress_sidebar ul select { + margin: 5px 0 8px; + } + +#xpress_sidebar ul ul, #xpress_sidebar ul ol { + margin: 5px 0 0 10px; + } + +#xpress_sidebar ul ul ul, #xpress_sidebar ul ol { + margin: 0 0 0 10px; + } + + +#xpress_sidebar ul ul li, #xpress_sidebar ul ol li { + margin: 3px 0 0; + padding: 0; + } + +#xpress_sidebar #searchform { + margin: 0px ; + padding: 0px; + text-align: left; + } + +#xpress_sidebar #searchform #s { + width: 108px; + padding: 2px; + } + +#xpress_sidebar #searchsubmit { + padding: 1px; } /* End Sidebar */ - @@ -573,4 +446,5 @@ padding-right: 10px; text-align: right; + font-size: 9pt; } @@ -578,8 +452,10 @@ padding-left: 10px; text-align: left; + font-size: 9pt; } #wp-calendar a { display: block; + text-decoration: none; } @@ -587,4 +463,5 @@ text-align: center; width: 100%; + font: bold 1.3em; } @@ -596,5 +473,192 @@ #wp-calendar td.pad:hover { /* Doesn't work in IE */ background-color: #fff; } + +#wp-calendar th { + font-style: normal; + text-transform: capitalize; + } /* End Calendar */ + + + +/* Nocheck Under css */ + + +.widecolumn .entry { + font-size: 1.05em; + } + +.narrowcolumn .entry,.narrowcolumn_nonside .entry, .widecolumn .entry { + line-height: 1.4em; + } + +p.postmeta{ + line-height: 1.2em; + font-size: 0.9em; + } + + +#xpress_headerimg .description { + font-size: 1.2em; + } + + +.xpress_pagetitle { + font-size: 1.5em; + font-weight: bold; + } + +.xpress_commentmetadata { + font-size: 11px; + font-weight: normal; + } + +.postmetadata { + font-size: 0.9em; + } + + + +acronym, abbr, span.caps +{ + font-size: 0.9em; + letter-spacing: .07em; + } + +p{ + margin:0; + padding:0; +} + +.widecolumn { + width: 500px; /*width of single page*/ + margin: 0 auto; + } + +.entry { + clear:both; + padding:10px 0 0; + } + +.entry p{ + padding: 5px 0; + } + +p.postmeta{ + padding-top: 20px; + } + +.narrowcolumn_nonside .postmetadata, +.narrowcolumn .postmetadata { + padding-top: 10px; + /*text-align:center;*//*postmeta of index page*/ + } + +.widecolumn .postmetadata { + margin: 30px 0; + padding:5px 10px; + } + +.widecolumn .smallattachment { + text-align: center; + float: left; + width: 128px; + margin: 5px 5px 5px 0px; +} + +.widecolumn .attachment { + text-align: center; + margin: 5px 0px; +} + + +/* End Headers */ + +/* Begin Images */ + +/* Using 'class="alignright"' on an image will (who would've + thought?!) align the image to the right. And using 'class="centered', + will of course center the image. This is much better than using + align="center", being much more futureproof (and valid) */ + +img.centered { + display: block; + margin-left: auto; + margin-right: auto; + } + +img.alignright { + padding: 4px; + margin: 0 0 2px 7px; + display: inline; + } + +img.alignleft { + padding: 4px; + margin: 0 7px 2px 0; + display: inline; + } + +.alignright { + float: right; + } + +.alignleft { + float: left + } +/* End Images */ + + + +/* Begin Lists + + Special stylized non-IE bullets + Do not work in Internet Explorer, which merely default to normal bullets. */ + +html>body .entry ul { + margin-left: 0px; + padding: 0 0 0 30px; + list-style: none; + padding-left: 10px; + text-indent: -10px; + } + +html>body .entry li { + margin: 7px 0 8px 10px; + } + +.entry ul li:before{ + content: "\00BB \0020"; + } + +.entry ol { + padding: 0 0 0 35px; + margin: 0; + } + +.entry ol li { + margin: 0; + padding: 0; + } + +.postmetadata ul, .postmetadata li { + display: inline; + list-style-type: none; + list-style-image: none; + } + + +.entry form { /* This is mainly for password protected posts, makes them look better. */ + text-align:center; + } + + + + + + + + + @@ -620,17 +684,4 @@ } -#xpress_page .center { - text-align: center; - } - -#xpress_page .hidden { - display: none; - } - - -#xpress_page a img { - border: none; - } - .xpress_single_navigation { display:block; @@ -682,3 +733,9 @@ margin: 0; } -/* End captions */ +.dateblock{ + margin:-12px 0 0 -5px!important; + } + +.nocomments, .postmetadata, blockquote, strike { + color: #777; + }