Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/dashboard_feed.php =================================================================== --- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/dashboard_feed.php (revision 378) +++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/dashboard_feed.php (revision 379) @@ -6,4 +6,5 @@ function xpress_register_dashboard_widget() { global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks; + global $xpress_config; $widget_options = get_option( 'xpress_dashboard_widget_options' ); @@ -37,7 +38,10 @@ } update_option( 'xpress_dashboard_widget_options', $widget_options ); - - wp_add_dashboard_widget( 'xpress_dashboard_primary', $widget_options['xpress_dashboard_primary']['title'], 'xpress_dashboard_primary', 'xpress_dashboard_primary_control' ); - wp_add_dashboard_widget( 'xpress_dashboard_secondary', $widget_options['xpress_dashboard_secondary']['title'], 'xpress_dashboard_secondary', 'xpress_dashboard_secondary_control'); + if ($xpress_config->is_dashboard_blog_disp){ + wp_add_dashboard_widget( 'xpress_dashboard_primary', $widget_options['xpress_dashboard_primary']['title'], 'xpress_dashboard_primary', 'xpress_dashboard_primary_control' ); + } + if ($xpress_config->is_dashboard_forum_disp){ + wp_add_dashboard_widget( 'xpress_dashboard_secondary', $widget_options['xpress_dashboard_secondary']['title'], 'xpress_dashboard_secondary', 'xpress_dashboard_secondary_control'); + } } Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/language/xpressme-ja.po =================================================================== --- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 378) +++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 379) @@ -8,6 +8,6 @@ "Project-Id-Version: XPressME Plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-24 20:14+0900\n" -"PO-Revision-Date: 2009-08-24 20:26+0900\n" +"POT-Creation-Date: 2009-09-08 18:08+0900\n" +"PO-Revision-Date: 2009-09-08 18:09+0900\n" "Last-Translator: toemon \n" "Language-Team: toemon \n" @@ -52,381 +52,397 @@ #: xpressme.php:145 -#: xpressme.php:234 -#: xpressme.php:240 -#: xpressme.php:245 -#: xpressme.php:251 -#: xpressme_class.php:271 -#: xpressme_class.php:287 -msgid "YES" -msgstr "はい" - -#: xpressme.php:146 #: xpressme.php:235 #: xpressme.php:241 #: xpressme.php:246 #: xpressme.php:252 -#: xpressme_class.php:272 -#: xpressme_class.php:288 +#: xpressme_class.php:277 +#: xpressme_class.php:293 +#: xpressme_class.php:425 +#: xpressme_class.php:436 +msgid "YES" +msgstr "はい" + +#: xpressme.php:146 +#: xpressme.php:236 +#: xpressme.php:242 +#: xpressme.php:247 +#: xpressme.php:253 +#: xpressme_class.php:278 +#: xpressme_class.php:294 +#: xpressme_class.php:426 +#: xpressme_class.php:437 msgid "NO" msgstr "いいえ" - -#: xpressme.php:154 -#: xpressme.php:203 -#: xpressme.php:257 -msgid "Update Config" -msgstr "更新" #: xpressme.php:155 #: xpressme.php:204 #: xpressme.php:258 +msgid "Update Config" +msgstr "更新" + +#: xpressme.php:156 +#: xpressme.php:205 +#: xpressme.php:259 msgid "Preset Config" msgstr "プリセット" -#: xpressme.php:187 +#: xpressme.php:188 msgid "XPressME Integration Setting" msgstr "XPressME 統合設定" -#: xpressme.php:192 +#: xpressme.php:193 msgid "Media Upload Base Path" msgstr "メディアアップロードのベースパス設定" -#: xpressme.php:193 +#: xpressme.php:194 msgid "Use XOOPS UPLOAD PATH" msgstr "XOOPSのアップロードパスを使用する。" -#: xpressme.php:194 +#: xpressme.php:195 msgid "USE WordPress BASE_PATH" msgstr "WordPressのベースパスを使用する。" -#: xpressme.php:228 +#: xpressme.php:229 msgid "XPressME Other Setting" msgstr "XPressME その他の設定" -#: xpressme.php:233 +#: xpressme.php:234 msgid "The change tracking of the post is preserved" msgstr "投稿の変更履歴を有効にする。" -#: xpressme.php:239 +#: xpressme.php:240 msgid "Select Multi user mode" msgstr "マルチユーザーモードを選択" -#: xpressme.php:244 +#: xpressme.php:245 msgid "Is the posts author views counted?" msgstr "投稿者の閲覧をカウントしますか？" -#: xpressme.php:250 +#: xpressme.php:251 msgid "Is SQL debugging window displayed?" msgstr "SQLデバッグウィンドを表示しますか？" -#: xpressme.php:274 +#: xpressme.php:275 msgid "XPressME Upgrade" msgstr "XPressME アップグレード" -#: xpressme.php:288 +#: xpressme.php:289 #, php-format msgid "You are using a XPressME Integration Kit development version (%1$s). Cool! Please stay updated." msgstr "お使いの XPressME Integration Kit は開発版 (%1$s) です。すばらしい ! どうぞ最新版を使い続けてください。" -#: xpressme.php:292 +#: xpressme.php:293 msgid "There is a new version of XPressME Integration Kit available for upgrade" msgstr "新しいバージョンの XPressME Integration Kit にアップグレードが可能です" -#: xpressme.php:295 +#: xpressme.php:296 #, php-format msgid "You can upgrade to version %s download the package and install it manually:" msgstr "バージョン %s のパッケージを手動でダウンロードしてインストールすることができます。" -#: xpressme.php:298 +#: xpressme.php:299 #, php-format msgid "Download %s" msgstr "%s をダウンロード" -#: xpressme.php:301 +#: xpressme.php:302 msgid "You have the latest version of XPressME Integration Kit. You do not need to upgrade" msgstr "最新バージョンの XPressME Integration Kit をご利用中です。アップグレードの必要はありません。" -#: xpressme.php:305 +#: xpressme.php:306 #, php-format msgid "There is no response from version check API now. sorry, please confirm it after." msgstr "現在、version check APIからのレスポンスがありません。　申し訳ありませんが、しばらく後で確認してください。" -#: xpressme.php:398 +#: xpressme.php:425 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please update now." msgstr "XPressME Integration Kit Version %1$s が利用可能です ! アップデートしてください。" -#: xpressme.php:400 +#: xpressme.php:427 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please notify the site administrator." msgstr "XPressME Integration Kit Version %1$s が利用可能です ! サイト管理者に連絡してください。" -#: xpressme_class.php:52 -#: xpressme_class.php:223 +#: xpressme_class.php:54 +#: xpressme_class.php:229 msgid "Older Post" msgstr "前の投稿へ" -#: xpressme_class.php:53 -#: xpressme_class.php:226 +#: xpressme_class.php:55 +#: xpressme_class.php:232 msgid "Newer Post" msgstr "次の投稿へ" -#: xpressme_class.php:55 -#: xpressme_class.php:229 +#: xpressme_class.php:57 +#: xpressme_class.php:235 msgid "Older Entries" msgstr "前ページへ" -#: xpressme_class.php:56 -#: xpressme_class.php:232 +#: xpressme_class.php:58 +#: xpressme_class.php:238 msgid "Newer Entries" msgstr "次ページへ" -#: xpressme_class.php:70 -#: xpressme_class.php:71 -#: xpressme_class.php:235 +#: xpressme_class.php:72 +#: xpressme_class.php:73 +#: xpressme_class.php:241 msgid "Read the rest of this entry »" msgstr "この投稿の続きを読む »" -#: xpressme_class.php:330 +#: xpressme_class.php:336 msgid "Single Post Navi Setting" msgstr "シングルポストナビの設定" -#: xpressme_class.php:335 -#: xpressme_class.php:380 +#: xpressme_class.php:341 +#: xpressme_class.php:386 msgid "Adjustment of Navi link display position" msgstr "リンクの表示位置設定" -#: xpressme_class.php:338 +#: xpressme_class.php:344 msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right" msgstr "以前の記事へのリンクを左に、より新しい記事へのリンクを右に表示" -#: xpressme_class.php:339 +#: xpressme_class.php:345 msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right" msgstr "より新しい記事へのリンクを左に、古い記事へのリンクを右に表示" -#: xpressme_class.php:345 +#: xpressme_class.php:351 msgid "Select Display name of PostNavi Link" msgstr "表示するリンクテキストを選択" -#: xpressme_class.php:348 +#: xpressme_class.php:354 msgid "Title of post" msgstr "投稿記事のタイトルを表示" -#: xpressme_class.php:349 +#: xpressme_class.php:355 msgid "Title of Navi" msgstr "ナビタイトルを表示" -#: xpressme_class.php:355 +#: xpressme_class.php:361 msgid "Display Navi Title of Old Post Link" msgstr "古い記事へのナビタイトルを設定" -#: xpressme_class.php:362 +#: xpressme_class.php:368 msgid "Display Navi Title of Newer Post Link" msgstr "より新しい記事へのナビタイトルを設定" -#: xpressme_class.php:375 +#: xpressme_class.php:381 msgid "Posts List Page Navi Setting" msgstr "ポストリストページナビの設定" -#: xpressme_class.php:383 +#: xpressme_class.php:389 msgid "'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right" msgstr "古いページへのリンクを左に、より新しいページへのリンクを右に表示" -#: xpressme_class.php:384 +#: xpressme_class.php:390 msgid "'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right" msgstr "より新しいページへのリンクを左に、古いページへのリンクを右に表示" -#: xpressme_class.php:390 +#: xpressme_class.php:396 msgid "Display Navi Title of Old Page Link" msgstr "古いページへのナビタイトルを設定" -#: xpressme_class.php:397 +#: xpressme_class.php:403 msgid "Display Navi Title of Newer Page Link" msgstr "より新しいページへのナビタイトルを設定" -#: xpressme_class.php:412 +#: xpressme_class.php:416 +msgid "Dashboard feed Display Setting" +msgstr "ダッシュボード　フィード表示設定" + +#: xpressme_class.php:422 +msgid "Display XPressMe Integration Kit Blog" +msgstr "XPressME Integration Kit ブログを表示する。" + +#: xpressme_class.php:433 +msgid "Display XPressMe Integration Kit Forum" +msgstr "XPressME Integration Kit フォーラムを表示する。" + +#: xpressme_class.php:450 msgid "Role Setting at Login" msgstr "ログイン時の権限設定" -#: xpressme_class.php:415 +#: xpressme_class.php:453 msgid "XOOPS Groupe" msgstr "XOOPSグループ名" -#: xpressme_class.php:415 +#: xpressme_class.php:453 msgid "WordPress Role" msgstr "WordPressでの権限" -#: xpressme_class.php:415 +#: xpressme_class.php:453 msgid "Role is set at each login" msgstr "ログイン時、常に権限を更新する" -#: xpressme_class.php:441 -#: xpressme_class.php:445 -#: xpressme_class.php:448 +#: xpressme_class.php:479 +#: xpressme_class.php:483 +#: xpressme_class.php:486 msgid "Default Role of WordPress" msgstr "WordPressのデフォルト権限" -#: xpressme_class.php:442 -#: xpressme_class.php:446 -#: xpressme_class.php:449 +#: xpressme_class.php:480 +#: xpressme_class.php:484 +#: xpressme_class.php:487 msgid "Group User Doesn't Register" msgstr "ユーザ登録しない" -#: xpressme_class.php:480 +#: xpressme_class.php:518 msgid "WordPress MU cannot integrate the comments." msgstr "WordPress MUはコメント統合できません。" -#: xpressme_class.php:482 +#: xpressme_class.php:520 msgid "Do Not Comment Integration." msgstr "コメント統合しません。" -#: xpressme_class.php:517 +#: xpressme_class.php:555 msgid "Comment integration with D3Forum" msgstr "D3Forumとのコメント統合" -#: xpressme_class.php:519 +#: xpressme_class.php:557 msgid "Select the forum of D3Forum that does the comment integration from the following lists." msgstr "以下のリストからコメント統合をするD3Forumのフォーラムを選択してください。" -#: xpressme_class.php:524 +#: xpressme_class.php:562 msgid "Select the Type of display of D3Forum comment." msgstr "D3Forumの表示タイプを選択" -#: xpressme_class.php:526 -#: xpressme_class.php:529 +#: xpressme_class.php:564 +#: xpressme_class.php:567 msgid "Flat" msgstr "フラット" -#: xpressme_class.php:527 -#: xpressme_class.php:530 +#: xpressme_class.php:565 +#: xpressme_class.php:568 msgid "Threaded" msgstr "スレッド" -#: xpressme_class.php:533 +#: xpressme_class.php:571 msgid "Select the order of display of D3Forum comment." msgstr "D3Forumコメントの表示順を選択" -#: xpressme_class.php:535 -#: xpressme_class.php:538 +#: xpressme_class.php:573 +#: xpressme_class.php:576 msgid "DESC" msgstr "降順" -#: xpressme_class.php:536 -#: xpressme_class.php:539 +#: xpressme_class.php:574 +#: xpressme_class.php:577 msgid "ASC" msgstr "昇順" -#: xpressme_class.php:542 +#: xpressme_class.php:580 msgid "Number of displays of D3Forum comments." msgstr "D3Forumのコメント表示数" -#: xpressme_class.php:545 +#: xpressme_class.php:583 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. " msgstr "WordPressコメントとD3Forumポスト間の一括転送（エクスポート・インポート）" -#: xpressme_class.php:546 +#: xpressme_class.php:584 msgid "Export to D3Forum" msgstr "D3Forumへ一括エクスポート" -#: xpressme_class.php:547 +#: xpressme_class.php:585 msgid "Import from D3Forum" msgstr "D3Forumから一括インポート" -#: xpressme_class.php:560 +#: xpressme_class.php:598 msgid "Contents Excerpt Setting" msgstr "記事抜粋の設定" -#: xpressme_class.php:565 +#: xpressme_class.php:603 msgid "Is the excerpt display done with the archive of contents?" msgstr "記事のアーカイブで抜粋表示を行いますか？" -#: xpressme_class.php:572 +#: xpressme_class.php:610 msgid "When ASCII character more than the set ratio is included, it is judged ASCII contents. " msgstr "ASCII文字が含まれる比率が設定された値より大きい場合、ASCII文字コンテンツと判断します。" -#: xpressme_class.php:579 +#: xpressme_class.php:617 msgid "Excerpt length of word for ASCII contents" msgstr "ASCIIコンテンツの抜粋単語数" -#: xpressme_class.php:586 +#: xpressme_class.php:624 msgid "Excerpt length of character for multibyte contents" msgstr "マルチバイトコンテンツの抜粋文字数" -#: xpressme_class.php:593 +#: xpressme_class.php:631 msgid "This text is displayed in the link that reads contents not excerpted.(Is not displayed for the blank.)" msgstr "抜粋されていないコンテンツを読むためのリンクに表示されるテキスト(空白の場合リンクを表示しません)" -#: xpressme_class.php:600 +#: xpressme_class.php:638 msgid "This text is displayed in the link that more tag (<!--more-->). " msgstr "more タグ (<!--more-->)のリンクに表示されるテキスト" -#: xpressme_class.php:612 +#: xpressme_class.php:650 msgid "Display Mode Setting" msgstr "表示モード設定" -#: xpressme_class.php:615 +#: xpressme_class.php:653 msgid "Select the XPressME Display Mode." msgstr "XPressMEの表示モードの選択" -#: xpressme_class.php:620 +#: xpressme_class.php:658 msgid "Xoops Mode" msgstr "XOOPSモード" -#: xpressme_class.php:624 +#: xpressme_class.php:662 msgid "WordPress Mode" msgstr "WordPressモード" -#: xpressme_class.php:628 +#: xpressme_class.php:666 msgid "User select" msgstr "ユーザによる選択" -#: xpressme_class.php:638 +#: xpressme_class.php:676 msgid "Header Meta Option" msgstr "ヘッダメタ　オプション" -#: xpressme_class.php:643 +#: xpressme_class.php:681 msgid "Select the Header keyword." msgstr "ヘッダで使用するキーワードの選択" -#: xpressme_class.php:648 +#: xpressme_class.php:686 msgid "Xoops KeyWord" msgstr "XOOPSのキーワード" -#: xpressme_class.php:651 +#: xpressme_class.php:689 msgid "WordPress KeyWord" msgstr "WordPressのキーワード" -#: xpressme_class.php:654 +#: xpressme_class.php:692 msgid "WordPress & Xoops KeyWord" msgstr "WordPressｊとXOOPSのキーワード" -#: xpressme_class.php:660 +#: xpressme_class.php:698 msgid "Select the Header Description." msgstr "ヘッダで使用するディスクリプション（説明）の選択" -#: xpressme_class.php:665 +#: xpressme_class.php:703 msgid "Xoops Description" msgstr "XOOPSのディスクリプション" -#: xpressme_class.php:668 +#: xpressme_class.php:706 msgid "WordPress Description" msgstr "WordPressのディスクリプション" -#: xpressme_class.php:671 +#: xpressme_class.php:709 msgid "WordPress & Xoops Description" msgstr "WordPressとXOOPSのディスクリプション" -#: xpressme_class.php:677 +#: xpressme_class.php:715 msgid "Select the Header Robots Index." msgstr "ヘッダで使用するロボットインデックスの選択" -#: xpressme_class.php:682 +#: xpressme_class.php:720 msgid "Xoops Robots Index" msgstr "XOOPSのロボットインデックス" -#: xpressme_class.php:685 +#: xpressme_class.php:723 msgid "WordPress Robots Index" msgstr "WordPressのロボットインデックス" -#: xpressme_class.php:714 +#: xpressme_class.php:752 #, php-format msgid "Unable to create directory %s. Is its parent directory writable by the server?" @@ -517,4 +533,16 @@ msgid "% TrackBack/Pingback" msgstr "トラックバック・ピンバック % 件" + +#: include/dashboard_feed.php:19 +msgid "XPressME Integration Kit Blog" +msgstr "XPressME Integration Kit ブログ" + +#: include/dashboard_feed.php:32 +msgid "XPressME Integration Kit Folum" +msgstr "XPressME Integration Kit フォーラム" + +#: include/dashboard_feed.php:92 +msgid "Unknown Feed" +msgstr "不明なフィード" #: include/functions_for_wp_old.php:21 Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php =================================================================== --- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 378) +++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 379) @@ -149,4 +149,5 @@ echo $xpress_config->posts_page_navi_option(); echo $xpress_config->excerpt_option(); + echo $xpress_config->dashboard_display_option(); echo "\n"; Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php =================================================================== --- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php (revision 378) +++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php (revision 379) @@ -33,4 +33,6 @@ var $meta_description_type; var $meta_robot_type; + var $is_dashboard_blog_disp; + var $is_dashboard_forum_disp; //constructor function XPressME_Class() @@ -75,4 +77,6 @@ $this->meta_description_type = 'xoops'; $this->meta_robot_type = 'xoops'; + $this->is_dashboard_blog_disp = true; + $this->is_dashboard_forum_disp = true; } @@ -126,5 +130,7 @@ 'meta_keyword_type' => $this->meta_keyword_type, 'meta_description_type' => $this->meta_description_type, - 'meta_robot_type' => $this->meta_robot_type + 'meta_robot_type' => $this->meta_robot_type, + 'is_dashboard_blog_disp' => $this->is_dashboard_blog_disp, + 'is_dashboard_forum_disp' => $this->is_dashboard_forum_disp ); if ($mode == 'add_new') { @@ -405,4 +411,36 @@ } + + function dashboard_display_option(){ + $form = ''; + $form .= ''; + $form .= "\n"; + $form .= "\n"; + + $form .= "\n"; + + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "\n"; + + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + + $form .= "
" . __('Display XPressMe Integration Kit Blog','xpressme') . "\n"; + $form .= $this->yes_no_radio_option_sub('is_dashboard_blog_disp', + __('YES','xpressme'), + __('NO','xpressme') + ); + $form .= "
" . __('Display XPressMe Integration Kit Forum','xpressme') . "\n"; + $form .= $this->yes_no_radio_option_sub('is_dashboard_forum_disp', + __('YES','xpressme'), + __('NO','xpressme') + ); + $form .= "
\n"; + return $form; + } function groupe_role_option(){