Changeset 141

Timestamp:

Mar 29, 2009, 2:09:34 PM (16 years ago)

Author:

toemon

Message:

デフォルトテーマxpress_defaultの調整　bump Ver0.18
メインメニューにwordPress管理とXPressME設定を追加

Location:

trunk

Files:

• language/ja_utf8/modinfo.php (modified) (1 diff)
• wp-content/plugins/xpressme/include/custom_functions.php (modified) (1 diff)
• wp-content/plugins/xpressme/include/xpress_common_functions.php (modified) (1 diff)
• wp-content/plugins/xpressme/language/xpressme-ja.mo (modified) (previous)
• wp-content/plugins/xpressme/language/xpressme-ja.po (modified) (4 diffs)
• wp-content/themes/xpress_default/index.php (modified) (1 diff)
• wp-content/themes/xpress_default/ja.mo (modified) (previous)
• wp-content/themes/xpress_default/ja.po (modified) (15 diffs)
• wp-content/themes/xpress_default/search.php (deleted)
• wp-content/themes/xpress_default/single.php (modified) (2 diffs)
• wp-content/themes/xpress_default/style.css (modified) (1 diff)
• xoops_version.php (modified) (3 diffs)

trunk/language/ja_utf8/modinfo.php

@@ -14 +14 @@
         // Sub menu titles
         define("_MI_XPRESS_MENU_POST_NEW","新規投稿");
-        define("_MI_XPRESS_MENU_EDIT","投稿編集");
+        define("_MI_XPRESS_MENU_EDIT","編集");
+        define("_MI_XPRESS_MENU_ADMIN","WordPress管理");
+        define("_MI_XPRESS_MENU_XPRESS","XPressME設定");
 
         // Block Name

trunk/wp-content/plugins/xpressme/include/custom_functions.php

@@ -264 +264 @@
 function xpress_conditional_title($display = true)
 {
-        $output = __('Main', 'xpress');
+        $output = __('Main', 'xpressme');
         if (is_category())
-                $output = sprintf(__('Archive for the ‘%s’ Category', 'xpress'), single_cat_title('', false));
+                $output = sprintf(__('Archive for the ‘%s’ Category', 'xpressme'), single_cat_title('', false));
         if (is_tag())
-                $output = sprintf(__('Posts Tagged ‘%s’', 'xpress'), single_tag_title('', false) );
+                $output = sprintf(__('Posts Tagged ‘%s’', 'xpressme'), single_tag_title('', false) );
         if (is_day())
-                $output = sprintf(_c('Archive for %s|Daily archive page', 'xpress'), get_the_time(__('F jS, Y', 'xpress')));
+                $output = sprintf(__('Archive for %s|Daily archive page', 'xpressme'), get_the_time(__('F jS, Y', 'xpressme')));
         if (is_month())
-                $output = sprintf(_c('Archive for %s|Monthly archive page', 'xpress'), get_the_time(__('F, Y', 'xpress')));
+                $output = sprintf(__('Archive for %s|Monthly archive page', 'xpressme'), get_the_time(__('F, Y', 'xpressme')));
         if (is_year())
-                $output = sprintf(_c('Archive for %s|Yearly archive page', 'xpress'), get_the_time(__('Y', 'xpress')));
+                $output = sprintf(__('Archive for %s|Yearly archive page', 'xpressme'), get_the_time(__('Y', 'xpressme')));
         if (is_author())
-                $output = get_author_name( get_query_var('author')); __('Author Archive', 'xpress');
+                $output = sprintf(__('Archive for the ‘%s’ Author', 'xpressme'), get_author_name( get_query_var('author')));
         if (is_search())
-                $output = __('Search Results', 'xpress');
+                $output = __('Search Results', 'xpressme');
                 
         if ($display) 

trunk/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -128 +128 @@
 }
 
+function block_cache_refresh() 
+{ 
+        global $xoops_db; 
+        $mid = get_xpress_modid(); 
+        $sql = "SELECT bid,options,func_file FROM " . get_xoops_prefix() . "newblocks WHERE mid = $mid"; 
+        $blocks = $xoops_db->get_results($sql); 
+        $mydirname = get_xpress_dir_name(); 
+        require_once get_xpress_dir_path() . '/include/xpress_block_render.php'; 
+
+
+        foreach($blocks as $block){ 
+                $func_file = $block->func_file; 
+                $call_theme_function_name = str_replace(".php", "", $func_file); 
+                $inc_theme_file_name = str_replace(".php", "", $func_file) . '_theme.php'; 
+                $cache_title = str_replace(".php", "", $func_file); 
+                $blockID = $block->bid; 
+                $options = explode("|", $block->options); 
+
+                $block_theme_file = get_block_file_path($mydirname,$inc_theme_file_name); 
+                require_once $block_theme_file; 
+                $block_render = $call_theme_function_name($options);            //The block name and the called function name should be assumed to be the same name.                     
+                $xml['block'] = $block_render; 
+                $xml['block']['options'] = $block->options; 
+                xpress_block_cache_write($mydirname,$cache_title. $blockID, $xml); 
+        } 
+}
 ?>

trunk/wp-content/plugins/xpressme/language/xpressme-ja.po

@@ -3 +3 @@
 "Project-Id-Version: XPressME Plugin\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-03-25 00:47+0900\n"
+"PO-Revision-Date: 2009-03-29 13:01+0900\n"
 "Last-Translator: toemon <toychee@toemon.com>\n"
 "Language-Team: \n"
@@ -30 +30 @@
 
 #: xpressme_class.php:204
-#: xpressme_class.php:410
-#: xpressme_class.php:415
-#: xpressme_class.php:436
-#: xpressme_class.php:441
+#: xpressme_class.php:416
+#: xpressme_class.php:421
+#: xpressme_class.php:442
+#: xpressme_class.php:447
 msgid "YES"
 msgstr "はい"
 
 #: xpressme_class.php:205
-#: xpressme_class.php:411
-#: xpressme_class.php:416
-#: xpressme_class.php:437
-#: xpressme_class.php:442
+#: xpressme_class.php:417
+#: xpressme_class.php:422
+#: xpressme_class.php:443
+#: xpressme_class.php:448
 msgid "NO"
 msgstr "いいえ"
@@ -61 +61 @@
 msgstr "ログイン時、常に権限を更新する"
 
-#: xpressme_class.php:269
-#: xpressme_class.php:273
-#: xpressme_class.php:276
+#: xpressme_class.php:274
+#: xpressme_class.php:278
+#: xpressme_class.php:281
 msgid "Default Role of WordPress"
 msgstr "WordPressのデフォルト権限"
 
-#: xpressme_class.php:270
-#: xpressme_class.php:274
-#: xpressme_class.php:277
+#: xpressme_class.php:275
+#: xpressme_class.php:279
+#: xpressme_class.php:282
 msgid "Group User Doesn't Register"
 msgstr "ユーザ登録しない"
 
-#: xpressme_class.php:305
+#: xpressme_class.php:311
 msgid "Do Not Comment Integration."
 msgstr "コメント統合しません。"
 
-#: xpressme_class.php:339
+#: xpressme_class.php:345
 msgid "Comment integration with D3Forum"
 msgstr "D3Forumとのコメント統合"
 
-#: xpressme_class.php:341
+#: xpressme_class.php:347
 msgid "Select the forum of D3Forum that does the comment integration from the following lists."
 msgstr "以下のリストからコメント統合をするD3Forumのフォーラムを選択してください。"
 
-#: xpressme_class.php:345
+#: xpressme_class.php:351
 msgid "Select the Type of display of D3Forum comment."
 msgstr "D3Forumの表示タイプを選択"
 
-#: xpressme_class.php:347
-#: xpressme_class.php:350
+#: xpressme_class.php:353
+#: xpressme_class.php:356
 msgid "Flat"
 msgstr "フラット"
 
-#: xpressme_class.php:348
-#: xpressme_class.php:351
+#: xpressme_class.php:354
+#: xpressme_class.php:357
 msgid "Threaded"
 msgstr "スレッド"
 
-#: xpressme_class.php:354
+#: xpressme_class.php:360
 msgid "Select the order of display of D3Forum comment."
 msgstr "D3Forumコメントの表示順を選択"
 
-#: xpressme_class.php:356
-#: xpressme_class.php:359
+#: xpressme_class.php:362
+#: xpressme_class.php:365
 msgid "DESC"
 msgstr "降順"
 
-#: xpressme_class.php:357
-#: xpressme_class.php:360
+#: xpressme_class.php:363
+#: xpressme_class.php:366
 msgid "ASC"
 msgstr "昇順"
 
-#: xpressme_class.php:363
+#: xpressme_class.php:369
 msgid "Number of displays of D3Forum comments."
 msgstr "D3Forumのコメント表示数"
 
-#: xpressme_class.php:367
+#: xpressme_class.php:373
 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. "
 msgstr "WordPressコメントとD3Forumポスト間の一括転送（エクスポート・インポート）"
 
-#: xpressme_class.php:368
+#: xpressme_class.php:374
 msgid "Export to D3Forum"
 msgstr "D3Forumへ一括エクスポート"
 
-#: xpressme_class.php:369
+#: xpressme_class.php:375
 msgid "Import from D3Forum"
 msgstr "D3Forumから一括インポート"
 
-#: xpressme_class.php:400
+#: xpressme_class.php:406
 msgid "XPressME Configuration Page"
 msgstr "XPressMEの設定ページ"
 
-#: xpressme_class.php:404
+#: xpressme_class.php:410
 msgid "Media Upload Base Path"
 msgstr "メディアアップロードのベースパス設定"
 
-#: xpressme_class.php:405
+#: xpressme_class.php:411
 msgid "Use XOOPS UPLOAD PATH"
 msgstr "XOOPSのアップロードパスを使用する。"
 
-#: xpressme_class.php:406
+#: xpressme_class.php:412
 msgid "USE WordPress BASE_PATH"
 msgstr "WordPressのベースパスを使用する。"
 
-#: xpressme_class.php:409
+#: xpressme_class.php:415
 msgid "Thema Sidebar Display"
 msgstr "テーマ表示時にサイドバー表示する。"
 
-#: xpressme_class.php:414
+#: xpressme_class.php:420
 msgid "The change tracking of the post is preserved"
 msgstr "投稿の変更履歴を有効にする。"
 
-#: xpressme_class.php:419
+#: xpressme_class.php:425
 msgid "Display Navi Title of Old Post Link"
 msgstr "古い記事へのナビタイトルを設定"
 
-#: xpressme_class.php:422
+#: xpressme_class.php:428
 msgid "Display Navi Title of Newer Post Link"
 msgstr "新しい記事へのナビタイトルを設定"
 
-#: xpressme_class.php:425
+#: xpressme_class.php:431
 msgid "Select Display name of PostNavi Link"
 msgstr "投稿記事リンクナビのタイトル設定"
 
-#: xpressme_class.php:426
+#: xpressme_class.php:432
 msgid "Title of post"
 msgstr "投稿記事のタイトルを表示"
 
-#: xpressme_class.php:427
+#: xpressme_class.php:433
 msgid "Title of Navi"
 msgstr "ナビタイトルを表示"
 
-#: xpressme_class.php:430
+#: xpressme_class.php:436
 msgid "Adjustment of Navi link display position"
 msgstr "投稿記事ナビリンクの表示位置設定"
 
-#: xpressme_class.php:431
+#: 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:432
+#: 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:435
+#: xpressme_class.php:441
 msgid "Is the posts author views counted?"
 msgstr "投稿者の閲覧をカウントしますか？"
 
-#: xpressme_class.php:440
+#: xpressme_class.php:446
 msgid "Is SQL debugging window displayed?"
 msgstr "SQLデバッグウィンドを表示しますか？"
 
-#: xpressme_class.php:452
+#: xpressme_class.php:458
 msgid "Update Config"
 msgstr "更新"
 
-#: xpressme_class.php:453
+#: xpressme_class.php:459
 msgid "Preset Config"
 msgstr "プリセット"
@@ -206 +206 @@
 msgstr "閲覧数 :%d"
 
+#: include/custom_functions.php:266
+msgid "Main"
+msgstr "メイン"
+
+#: include/custom_functions.php:268
+#, php-format
+msgid "Archive for the &#8216;%s&#8217; Category"
+msgstr "カテゴリー &#8216;%s&#8217; のアーカイブ"
+
+#: include/custom_functions.php:270
+#, php-format
+msgid "Posts Tagged &#8216;%s&#8217;"
+msgstr ""
+
+#: include/custom_functions.php:272
+#, php-format
+msgid "Archive for %s|Daily archive page"
+msgstr "%sの日別アーカイブ"
+
+#: include/custom_functions.php:272
+msgid "F jS, Y"
+msgstr "Y年n月j日"
+
+#: include/custom_functions.php:274
+#, php-format
+msgid "Archive for %s|Monthly archive page"
+msgstr "%sの月別アーカイブ"
+
+#: include/custom_functions.php:274
+msgid "F, Y"
+msgstr "Y年n月"
+
+#: include/custom_functions.php:276
+#, php-format
+msgid "Archive for %s|Yearly archive page"
+msgstr "%sの年別アーカイブ "
+
+#: include/custom_functions.php:276
+msgid "Y"
+msgstr "Y年"
+
+#: include/custom_functions.php:278
+#, php-format
+msgid "Archive for the &#8216;%s&#8217; Author"
+msgstr "投稿者 &#8216;%s&#8217; のアーカイブ"
+
+#: include/custom_functions.php:280
+msgid "Search Results"
+msgstr "検索結果"
+

trunk/wp-content/themes/xpress_default/index.php

@@ -7 +7 @@
                 echo '<div id="xpress_content" class="narrowcolumn_nonside">';
         }       
-?>
+?>                              
+
                 <div class="xpress-header-bar">
                         <div class="xpress-header-title">

trunk/wp-content/themes/xpress_default/ja.po

@@ -18 +18 @@
 "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 01:21+0900\n"
+"PO-Revision-Date: 2009-03-29 12:52+0900\n"
 "Last-Translator: toemon <toychee@toemon.com>\n"
 "Language-Team: toemon <info@toemon.com>\n"
@@ -167 +167 @@
 
 #: xpress_default/comments.php:45
-#: xpress_default/single.php:22
 msgid "F jS, Y"
 msgstr "Y 年 n 月 j 日"
@@ -354 +353 @@
 #: xpress_default/image.php:13
 #: xpress_default/index.php:46
-#: xpress_default/single.php:25
+#: xpress_default/single.php:38
 msgid "Read the rest of this entry &raquo;"
 msgstr "この投稿の続きを読む &raquo;"
@@ -360 +359 @@
 #: xpress_default/image.php:15
 #: xpress_default/page.php:29
-#: xpress_default/single.php:27
+#: xpress_default/single.php:40
 msgid "Pages:"
 msgstr "ページ:"
@@ -371 +370 @@
 #: xpress_default/image.php:25
 #: xpress_default/sidebar.php:24
-#: xpress_default/single.php:36
+#: xpress_default/single.php:49
 msgid "l, F jS, Y"
 msgstr "Y 年 n 月 j 日 l"
 
 #: xpress_default/image.php:27
-#: xpress_default/single.php:38
+#: xpress_default/single.php:51
 #, php-format
 msgid "You can follow any responses to this entry through the <a href='%s'>RSS 2.0</a> feed."
@@ -382 +381 @@
 
 #: xpress_default/image.php:31
-#: xpress_default/single.php:45
+#: xpress_default/single.php:58
 #, php-format
 msgid "You can <a href=\"#respond\">leave a response</a>, or <a href=\"%s\" rel=\"trackback\">trackback</a> from your own site."
@@ -388 +387 @@
 
 #: xpress_default/image.php:35
-#: xpress_default/single.php:49
+#: xpress_default/single.php:62
 #, php-format
 msgid "Responses are currently closed, but you can <a href=\"%s\" rel=\"trackback\">trackback</a> from your own site."
@@ -394 +393 @@
 
 #: xpress_default/image.php:39
-#: xpress_default/single.php:53
+#: xpress_default/single.php:66
 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:57
+#: xpress_default/single.php:70
 msgid "Both comments and pings are currently closed."
 msgstr "現在コメント、トラックバックともに受け付けておりません。"
@@ -409 +408 @@
 
 #: xpress_default/image.php:58
-#: xpress_default/single.php:71
+#: xpress_default/single.php:84
 msgid "Sorry, no posts matched your criteria."
 msgstr "該当する投稿は見つかりませんでした。"
 
 #: xpress_default/index.php:21
+#: xpress_default/single.php:16
 msgid "Mein Page"
 msgstr "メインページ"
 
 #: xpress_default/index.php:22
+#: xpress_default/single.php:17
 msgid "Post New"
 msgstr "新規投稿"
@@ -423 +424 @@
 #: xpress_default/index.php:31
 #: xpress_default/index.php:70
-#: xpress_default/search.php:27
-#: xpress_default/search.php:45
 msgid "&laquo; Older Entries"
 msgstr "&laquo; 前ページへ"
@@ -430 +429 @@
 #: xpress_default/index.php:32
 #: xpress_default/index.php:71
-#: xpress_default/search.php:28
-#: xpress_default/search.php:46
 msgid "Newer Entries &raquo;"
 msgstr "次ページへ &raquo;"
 
 #: xpress_default/index.php:42
-#: xpress_default/search.php:36
+#: xpress_default/single.php:33
 #, php-format
 msgid "Permanent Link to %s"
@@ -447 +444 @@
 
 #: xpress_default/index.php:56
-#: xpress_default/search.php:39
-#: xpress_default/single.php:28
+#: xpress_default/single.php:41
 #, php-format
 msgid "Posted in %s"
@@ -454 +450 @@
 
 #: xpress_default/index.php:58
-#: xpress_default/search.php:39
 msgid "Edit"
 msgstr "編集"
 
 #: xpress_default/index.php:59
-#: xpress_default/search.php:39
 msgid "No Comments &#187;"
 msgstr "コメントはまだありません &#187;"
 
 #: xpress_default/index.php:59
-#: xpress_default/search.php:39
 msgid "1 Comment &#187;"
 msgstr "1 件のコメント &#187;"
 
 #: xpress_default/index.php:59
-#: xpress_default/search.php:39
 msgid "% Comments &#187;"
 msgstr "% 件のコメント &#187;"
 
 #: xpress_default/index.php:59
-#: xpress_default/search.php:39
 msgid "Comments Closed"
 msgstr "コメントは受け付けていません。"
@@ -494 +485 @@
 msgstr "このページの続きを読む &raquo;"
 
-#: xpress_default/search.php:24
-msgid "Search Results"
-msgstr "検索結果"
-
-#: xpress_default/search.php:39
-#: xpress_default/single.php:28
+#: xpress_default/searchform.php:2
+msgid "Search for:"
+msgstr "検索:"
+
+#: xpress_default/searchform.php:4
+#: xpress_default/blocks/search_block_theme.php:13
+msgid "Search"
+msgstr "検索"
+
+#: xpress_default/sidebar.php:10
+msgid "Author"
+msgstr "作成者"
+
+#: xpress_default/sidebar.php:21
+#, php-format
+msgid "You are currently browsing the archives for the %s category."
+msgstr "%s カテゴリーのアーカイブを表示しています。"
+
+#: xpress_default/sidebar.php:24
+#, php-format
+msgid "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives for the day %3$s."
+msgstr "<a href=\"%1$s\">%2$s</a> ブログの %3$s のアーカイブを表示しています。"
+
+#: xpress_default/sidebar.php:27
+#, php-format
+msgid "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives for %3$s."
+msgstr "<a href=\"%1$s/\">%2$s</a> の %3$s のアーカイブを閲覧中です。"
+
+#: xpress_default/sidebar.php:27
+msgid "F, Y"
+msgstr "Y 年 n 月"
+
+#: xpress_default/sidebar.php:30
+#, php-format
+msgid "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives for the year %3$s."
+msgstr "<a href=\"%1$s\">%2$s</a> ブログの %3$s 年のアーカイブを表示しています。"
+
+#: xpress_default/sidebar.php:33
+#, php-format
+msgid "You have searched the <a href=\"%1$s/\">%2$s</a> blog archives for <strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links."
+msgstr "<a href=\"%1$s/\">%2$s</a> のアーカイブ内で<strong>&#8216;%3$s&#8217;</strong>を探しました。お探しのものが見つからない場合は他のリンクを試してみてください。"
+
+#: xpress_default/sidebar.php:36
+#, php-format
+msgid "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives."
+msgstr "<a href=\"%1$s/\">%2$s</a> ブログのアーカイブを閲覧中です。"
+
+#: xpress_default/sidebar.php:42
+msgid "Pages"
+msgstr "ページ"
+
+#: xpress_default/sidebar.php:44
+msgid "Archives"
+msgstr "アーカイブ"
+
+#: xpress_default/sidebar.php:51
+#: xpress_default/sidebar.php:53
+msgid "Categories"
+msgstr "カテゴリー"
+
+#: xpress_default/sidebar.php:62
+msgid "Meta"
+msgstr "メタ情報"
+
+#: xpress_default/sidebar.php:66
+msgid "This page validates as XHTML 1.0 Transitional"
+msgstr "このページが XHTML 1.0 Transitional に準拠しているか確認する"
+
+#: xpress_default/sidebar.php:66
+msgid "Valid <abbr title=\"eXtensible HyperText Markup Language\">XHTML</abbr>"
+msgstr "Valid <abbr title=\"eXtensible HyperText Markup Language\">XHTML</abbr>"
+
+#: xpress_default/sidebar.php:67
+msgid "XHTML Friends Network"
+msgstr "XHTML Friends Network"
+
+#: xpress_default/sidebar.php:67
+msgid "XFN"
+msgstr "XFN"
+
+#: xpress_default/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
@@ -506 +576 @@
 msgstr "タグ:"
 
-#: xpress_default/search.php:51
-msgid "No posts found. Try a different search?"
-msgstr "見つかりませんでした。別の検索をしますか ?"
-
-#: xpress_default/searchform.php:2
-msgid "Search for:"
-msgstr "検索:"
-
-#: xpress_default/searchform.php:4
-#: xpress_default/blocks/search_block_theme.php:13
-msgid "Search"
-msgstr "検索"
-
-#: xpress_default/sidebar.php:10
-msgid "Author"
-msgstr "作成者"
-
-#: xpress_default/sidebar.php:21
-#, php-format
-msgid "You are currently browsing the archives for the %s category."
-msgstr "%s カテゴリーのアーカイブを表示しています。"
-
-#: xpress_default/sidebar.php:24
-#, php-format
-msgid "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives for the day %3$s."
-msgstr "<a href=\"%1$s\">%2$s</a> ブログの %3$s のアーカイブを表示しています。"
-
-#: xpress_default/sidebar.php:27
-#, php-format
-msgid "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives for %3$s."
-msgstr "<a href=\"%1$s/\">%2$s</a> の %3$s のアーカイブを閲覧中です。"
-
-#: xpress_default/sidebar.php:27
-msgid "F, Y"
-msgstr "Y 年 n 月"
-
-#: xpress_default/sidebar.php:30
-#, php-format
-msgid "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives for the year %3$s."
-msgstr "<a href=\"%1$s\">%2$s</a> ブログの %3$s 年のアーカイブを表示しています。"
-
-#: xpress_default/sidebar.php:33
-#, php-format
-msgid "You have searched the <a href=\"%1$s/\">%2$s</a> blog archives for <strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links."
-msgstr "<a href=\"%1$s/\">%2$s</a> のアーカイブ内で<strong>&#8216;%3$s&#8217;</strong>を探しました。お探しのものが見つからない場合は他のリンクを試してみてください。"
-
-#: xpress_default/sidebar.php:36
-#, php-format
-msgid "You are currently browsing the <a href=\"%1$s/\">%2$s</a> blog archives."
-msgstr "<a href=\"%1$s/\">%2$s</a> ブログのアーカイブを閲覧中です。"
-
-#: xpress_default/sidebar.php:42
-msgid "Pages"
-msgstr "ページ"
-
-#: xpress_default/sidebar.php:44
-msgid "Archives"
-msgstr "アーカイブ"
-
-#: xpress_default/sidebar.php:51
-#: xpress_default/sidebar.php:53
-msgid "Categories"
-msgstr "カテゴリー"
-
-#: xpress_default/sidebar.php:62
-msgid "Meta"
-msgstr "メタ情報"
-
-#: xpress_default/sidebar.php:66
-msgid "This page validates as XHTML 1.0 Transitional"
-msgstr "このページが XHTML 1.0 Transitional に準拠しているか確認する"
-
-#: xpress_default/sidebar.php:66
-msgid "Valid <abbr title=\"eXtensible HyperText Markup Language\">XHTML</abbr>"
-msgstr "Valid <abbr title=\"eXtensible HyperText Markup Language\">XHTML</abbr>"
-
-#: xpress_default/sidebar.php:67
-msgid "XHTML Friends Network"
-msgstr "XHTML Friends Network"
-
-#: xpress_default/sidebar.php:67
-msgid "XFN"
-msgstr "XFN"
-
-#: xpress_default/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:36
+#: 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:40
+#: xpress_default/single.php:53
 msgid "You can follow any responses to this entry through the"
 msgstr "この投稿へのコメントは"
 
-#: xpress_default/single.php:40
+#: xpress_default/single.php:53
 msgid "feed."
 msgstr "フィードで購読することができます。"
 
-#: xpress_default/single.php:59
+#: xpress_default/single.php:72
 msgid "Edit this entry"
 msgstr "この投稿を編集 "

trunk/wp-content/themes/xpress_default/single.php

@@ -1 +1 @@
 <?php get_header(); ?>
 
-        <div id="xpress_content" class="widecolumn">
-
-    <div id="xpress_header">
-        <div id="xpress_headerimg">
-                <h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
-                <div class="description"><?php bloginfo('description'); ?></div>
-        </div>
-    </div>
+<div id="xpress_wrap">
+<?php
+        if(xpress_is_theme_sidebar_disp()) {
+                echo '<div id="xpress_content" class="narrowcolumn">';  
+        } else {
+                echo '<div id="xpress_content" class="narrowcolumn_nonside">';
+        }       
+?>
+                <div class="xpress-header-bar">
+                        <div class="xpress-header-title">
+                                <a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a>
+                        </div>
+                        <div class="xpress-conditional-title">
+                                &nbsp;( <?php xpress_conditional_title();?> )
+                        </div>
+                        <div class="xpress-description">
+                                <?php bloginfo('description'); ?>
+                        </div>
+                        <div class="xpress-operation-link">
+                                <a href="<?php echo get_option('home'); ?>/"><?php _e('Mein Page','xpress')?></a> 
+                                <?php if(is_xpress_contributor()) { echo ' | ' ; xpress_post_new_link(__('Post New','xpress')); }?>
+                        </div>
+                </div>
+                <hr class="xpress-border">
 
         <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 
-                <div class="xpress_single_navigation">
+                <div class="xpress-navi-bar">
                         <div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div>
                         <div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div>
                 </div>
 
-                <div class="post" id="post-<?php the_ID(); ?>">
-                        <?php if (function_exists('hotDates')) { hotDates(); }?>
-                        <h2><?php the_title(); ?></h2>
-                        <small><?php the_time(__('F jS, Y', 'xpress')) ?> <!-- by <?php the_author() ?> --></small>
+                <div class="xpress-post" id="post-<?php the_ID(); ?>">
+                                        <div class ="xpress-post-header">
+                                                <?php if (function_exists('hotDates')) { hotDates(); }?>
+                                                <div class ="xpress-post-title">
+                                                        <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2>
+                                                </div>
+                                        </div>
 
-                        <div class="entry">
+                        <div class="xpress-post-entry">
                                 <?php the_content('<p class="serif">' . __('Read the rest of this entry &raquo;', 'xpress') . '</p>'); ?>
 
@@ -72 +91 @@
 
 <?php endif; ?>
+                <div class="xpress-navi-bar">
+                        <div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div>
+                        <div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div>
+                </div>
 
         </div>
-
+</div>
+<?php if(xpress_is_theme_sidebar_disp()) get_sidebar(); ?>
+<hr class="xpress-border">
 <?php get_footer(); ?>

trunk/wp-content/themes/xpress_default/style.css

@@ -227 +227 @@
 
 #xpress_content {
-        padding: 0 15px;
+        padding: 0px;
         }
         

trunk/xoops_version.php

@@ -31 +31 @@
 $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XPRESS_NAME') ;
 $modversion['description'] = constant( '_MI_XPRESS_DESC');
-$modversion['version'] = "0.17";
+$modversion['version'] = "0.18";
 $modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://www.toemon.com) ;";
 $modversion['author'] = "toemon (http://www.toemon.com)";
@@ -40 +40 @@
 
 // status
-$modversion['codename'] = "r138";
+$modversion['codename'] = "r141";
 
 // onInstall, onUpdate, onUninstall
@@ -87 +87 @@
         $modversion['sub'][2]['name'] = constant( '_MI_XPRESS_MENU_EDIT');
         $modversion['sub'][2]['url'] = "wp-admin/edit.php";
+        $modversion['sub'][3]['name'] = constant( '_MI_XPRESS_MENU_ADMIN');
+        $modversion['sub'][3]['url'] = "wp-admin/";
+        $modversion['sub'][4]['name'] = constant( '_MI_XPRESS_MENU_XPRESS');
+        $modversion['sub'][4]['url'] = "wp-admin/options-general.php?page=xpressme_config";
 }