From 4bdcc6a2d4fe4cb8d1cff450ff1af6e2e8adb8bb Mon Sep 17 00:00:00 2001 From: mika umoto Date: Fri, 4 Oct 2013 16:53:11 +0900 Subject: [PATCH 1/3] =?UTF-8?q?xoops=5Fversion.php=20=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AE=E6=96=87=E5=AD=97=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=82=92=E3=80=80utf-8=E3=81=AB=E3=81=97=E3=81=9F=20$?= =?UTF-8?q?modversion['author']=20=E3=81=AE=E5=80=A4=E3=81=AB=E5=85=A8?= =?UTF-8?q?=E8=A7=92=E6=96=87=E5=AD=97=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=82=82=E3=81=AE=E3=82=92=E5=8D=8A=E8=A7=92=E3=81=AB=E7=BD=AE?= =?UTF-8?q?=E3=81=8D=E6=8F=9B=E3=81=88=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit configを追加 　表題を表示する（デフォルト　はい） 　モジュールトップページの時パンくずを隠す（デフォルト　はい） 　TOPカテゴリーはモジュール名を表示する（デフォルト　はい） 　RSSリンクを表示する（デフォルト　いいえ） 　MENUリンクを表示する（デフォルト　いいえ） configのデフォルトを修正 　デフォルトを　いいえ　に 　　ページナビゲーションを表示する 　　印刷画面へのリンクを表示する 　　友達に紹介するリンクを表示する 　　tellafriendモジュールを利用する --- .../pico/include/configs_can_override.inc.php | 5 ++ .../modules/pico/language/ja_utf8/modinfo.php | 9 +++ .../pico/templates/inc_breadcrumbs.html | 19 +++++- .../pico/templates/main_listcontents.html | 14 ++++- .../modules/pico/templates/main_menu.html | 13 +++- .../pico/templates/main_viewcontent.html | 4 +- .../modules/pico/xoops_version.php | 60 +++++++++++++++++-- 7 files changed, 111 insertions(+), 13 deletions(-) diff --git a/xoops_trust_path/modules/pico/include/configs_can_override.inc.php b/xoops_trust_path/modules/pico/include/configs_can_override.inc.php index cf0a529..6e9384c 100644 --- a/xoops_trust_path/modules/pico/include/configs_can_override.inc.php +++ b/xoops_trust_path/modules/pico/include/configs_can_override.inc.php @@ -2,7 +2,10 @@ $pico_configs_can_be_override = array( 'show_listasindex' => 'bool' , + 'show_subject' => 'bool' , 'show_breadcrumbs' => 'bool' , + 'when_top_hide_breadcrumbs' => 'bool' , + 'top_show_module_name' => 'bool' , 'show_pagenavi' => 'bool' , 'show_printicon' => 'bool' , 'show_tellafriend' => 'bool' , @@ -14,6 +17,8 @@ 'guest_vote_interval' => 'int' , 'htmlheader' => 'text' , 'allow_each_htmlheader' => 'bool' , + 'rss_link_show' => 'bool' , + 'menu_link_show' => 'bool' , 'css_uri' => 'text' , 'images_dir' => 'text' , 'body_editor' => 'text' , diff --git a/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php b/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php index 5cec6e1..f23d482 100644 --- a/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php +++ b/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php @@ -116,6 +116,15 @@ define($constpref.'_NOTIFY_CONTENT_COMMENTCAP', 'このコンテンツへのコメント登録があった場合に通知します（未承認であれば通知しません）'); define($constpref.'_NOTIFY_CONTENT_COMMENTSBJ', '[{X_SITENAME}] {X_MODULE} : コメントの投稿がありました'); +define($constpref.'_RSS_LINK_SHOW','RSSリンクを表示する'); +define($constpref.'_SHOW_SUBJECT','表題を表示する'); +define($constpref.'_SHOW_SUBJECTCAP','コンテンツを表示するときに表題を表示します'); +define($constpref.'_MENU_LINK_SHOW','MENUリンクを表示する'); +define($constpref.'_WHEN_TOP_HIDE_BREADCRUMBS','モジュールトップページの時パンくずを隠す'); +define($constpref.'_WHEN_TOP_HIDE_BREADCRUMBSCAP','モジュールトップページの時はパンくずを表示したくないときは　はい　としてください'); +define($constpref.'_TOP_SHOW_MODULE_NAME','TOPカテゴリーはモジュール名を表示する'); +define($constpref.'_TOP_SHOW_MODULE_NAMECAP','いいえ　にした場合はトップカテゴリー名（デフォルト:TOPもしくはトップ）が表示されます'); + } diff --git a/xoops_trust_path/modules/pico/templates/inc_breadcrumbs.html b/xoops_trust_path/modules/pico/templates/inc_breadcrumbs.html index beb1b86..011a2f3 100644 --- a/xoops_trust_path/modules/pico/templates/inc_breadcrumbs.html +++ b/xoops_trust_path/modules/pico/templates/inc_breadcrumbs.html @@ -1,7 +1,22 @@ -<{if $mod_config.show_breadcrumbs}> +<{assign var="show" value=$mod_config.show_breadcrumbs}> +<{assign var="count" value=$xoops_breadcrumbs|@count}> +<{if $show}> + <{if $count ==1}> + <{if $mod_config.when_top_hide_breadcrumbs}> + <{assign var="show" value=0}> + <{/if}> + <{/if}> +<{/if}> +<{if $show}>
- <{$smarty.const._MD_PICO_TOP}> + + <{if $mod_config.top_show_module_name}> + <{$xoops_modulename}> + <{else}> + <{$smarty.const._MD_PICO_TOP}> + <{/if}> + <{foreach from=$xoops_breadcrumbs key="i" item="bc"}> <{if $i > 0}>  >  diff --git a/xoops_trust_path/modules/pico/templates/main_listcontents.html b/xoops_trust_path/modules/pico/templates/main_listcontents.html index 109af05..75eaad8 100644 --- a/xoops_trust_path/modules/pico/templates/main_listcontents.html +++ b/xoops_trust_path/modules/pico/templates/main_listcontents.html @@ -6,8 +6,9 @@
+<{if $mod_config.menu_link_show == 1}> [<{$smarty.const._MD_PICO_MENU}>] - +<{/if}> <{if $category.isadminormod}> [<{$smarty.const._MD_PICO_LINK_EDITCATEGORY}>] <{/if}> @@ -29,13 +30,20 @@ <{/if}> +<{if $mod_config.rss_link_show == 1}> [RSS] - +<{/if}>
<{if $category.id == 0}>

<{$mod_config.top_message}>

<{/if}> -

<{$category.title}>

+

+<{if $mod_config.top_show_module_name && $category.id == 0}> + <{$xoops_modulename}> +<{else}> + <{$category.title}> +<{/if}> +

<{if $category.isadminormod}>

<{$smarty.const._MD_PICO_CONTENTS_TOTAL}>:<{$category.redundants.contents_total}> diff --git a/xoops_trust_path/modules/pico/templates/main_menu.html b/xoops_trust_path/modules/pico/templates/main_menu.html index 274adbe..7fb5184 100644 --- a/xoops_trust_path/modules/pico/templates/main_menu.html +++ b/xoops_trust_path/modules/pico/templates/main_menu.html @@ -8,14 +8,21 @@ [<{$smarty.const._MD_PICO_LINK_MAKECATEGORY}>] <{/if}> +<{if $mod_config.rss_link_show == 1}> [RSS] +<{/if}>

<{$mod_config.top_message}>

<{foreach item=category from=$categories}> - - ><{$category.title}> + > + <{if $category.depth_in_tree == 1 && $mod_config.top_show_module_name == 1}> + <{$xoops_modulename}> + <{else}> + <{$category.title}> + <{/if}> + > @@ -41,7 +48,9 @@ <{/if}> +<{if $mod_config.rss_link_show == 1}> [RSS] +<{/if}>
diff --git a/xoops_trust_path/modules/pico/templates/main_viewcontent.html b/xoops_trust_path/modules/pico/templates/main_viewcontent.html index 3e66615..284a63f 100644 --- a/xoops_trust_path/modules/pico/templates/main_viewcontent.html +++ b/xoops_trust_path/modules/pico/templates/main_viewcontent.html @@ -1,7 +1,9 @@
<{include file="db:`$mydirname`_inc_breadcrumbs.html"}> - +<{if $mod_config.show_subject}> +

<{$content.subject}>

+<{/if}> <{* admin controllers *}> <{capture name="controllers"}> <{if $content.can_edit}> diff --git a/xoops_trust_path/modules/pico/xoops_version.php b/xoops_trust_path/modules/pico/xoops_version.php index 0c54b91..644a77f 100644 --- a/xoops_trust_path/modules/pico/xoops_version.php +++ b/xoops_trust_path/modules/pico/xoops_version.php @@ -14,7 +14,7 @@ $modversion['version'] = 1.86 ; $modversion['detailed_version'] = "1.86.0" ; $modversion['credits'] = "PEAK Corp."; -$modversion['author'] = "GIJ=CHECKMATE
PEAK Corp.(http://www.peak.ne.jp/)
XOOPS X�@(ten)�@Distribution�ihttps://github.com/XoopsX/pico�j" ; +$modversion['author'] = "GIJ=CHECKMATE
PEAK Corp.(http://www.peak.ne.jp/)
XOOPS X (ten) Distribution(https://github.com/XoopsX/pico)" ; $modversion['help'] = "" ; $modversion['license'] = "GPL" ; $modversion['official'] = 0 ; @@ -210,6 +210,16 @@ 'options' => array() ) ; +$modversion['config'][] = array( + 'name' => 'show_subject' , + 'title' => $constpref.'_SHOW_SUBJECT' , + 'description' => '' , + 'formtype' => 'yesno' , + 'valuetype' => 'int' , + 'default' => 1 , + 'options' => array() +) ; + $modversion['config'][] = array( 'name' => 'show_breadcrumbs' , 'title' => $constpref.'_SHOW_BREADCRUMBS' , @@ -220,13 +230,33 @@ 'options' => array() ) ; +$modversion['config'][] = array( + 'name' => 'when_top_hide_breadcrumbs' , + 'title' => $constpref.'_WHEN_TOP_HIDE_BREADCRUMBS' , + 'description' => $constpref.'_WHEN_TOP_HIDE_BREADCRUMBSCAP' , + 'formtype' => 'yesno' , + 'valuetype' => 'int' , + 'default' => 1 , + 'options' => array() +) ; + +$modversion['config'][] = array( + 'name' => 'top_show_module_name' , + 'title' => $constpref.'_TOP_SHOW_MODULE_NAME' , + 'description' => $constpref.'_TOP_SHOW_MODULE_NAMECAP' , + 'formtype' => 'yesno' , + 'valuetype' => 'int' , + 'default' => 1 , + 'options' => array() +) ; + $modversion['config'][] = array( 'name' => 'show_pagenavi' , 'title' => $constpref.'_SHOW_PAGENAVI' , 'description' => '' , 'formtype' => 'yesno' , 'valuetype' => 'int' , - 'default' => 1 , + 'default' => 0 , 'options' => array() ) ; @@ -236,7 +266,7 @@ 'description' => '' , 'formtype' => 'yesno' , 'valuetype' => 'int' , - 'default' => 1 , + 'default' => 0 , 'options' => array() ) ; @@ -246,7 +276,7 @@ 'description' => '' , 'formtype' => 'yesno' , 'valuetype' => 'int' , - 'default' => 1 , + 'default' => 0 , 'options' => array() ) ; @@ -256,7 +286,7 @@ 'description' => '' , 'formtype' => 'yesno' , 'valuetype' => 'int' , - 'default' => 1 , + 'default' => 0 , 'options' => array() ) ; @@ -360,6 +390,26 @@ 'options' => array() ) ; +$modversion['config'][] = array( + 'name' => 'rss_link_show' , + 'title' => $constpref.'_RSS_LINK_SHOW' , + 'description' => '' , + 'formtype' => 'yesno' , + 'valuetype' => 'int' , + 'default' => 0 , + 'options' => array() +) ; + +$modversion['config'][] = array( + 'name' => 'menu_link_show' , + 'title' => $constpref.'_MENU_LINK_SHOW' , + 'description' => '' , + 'formtype' => 'yesno' , + 'valuetype' => 'int' , + 'default' => 0 , + 'options' => array() +) ; + $modversion['config'][] = array( 'name' => 'css_uri' , 'title' => $constpref.'_CSS_URI' , From c9717f5a8785d4bcab7739894efd226279e3e1ec Mon Sep 17 00:00:00 2001 From: mika umoto Date: Fri, 4 Oct 2013 17:00:17 +0900 Subject: [PATCH 2/3] =?UTF-8?q?config=E3=81=AE=E3=83=87=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AB=E3=83=88=E3=82=92=E4=BF=AE=E6=AD=A3=20=E3=80=80?= =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=82=92=E3=80=80?= =?UTF-8?q?=E3=81=84=E3=81=84=E3=81=88=E3=80=80=E3=81=AB=20=20=20=E6=8A=95?= =?UTF-8?q?=E7=A5=A8=E6=A9=9F=E8=83=BD=E3=82=92=E5=88=A9=E7=94=A8=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xoops_trust_path/modules/pico/xoops_version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xoops_trust_path/modules/pico/xoops_version.php b/xoops_trust_path/modules/pico/xoops_version.php index 644a77f..4602dea 100644 --- a/xoops_trust_path/modules/pico/xoops_version.php +++ b/xoops_trust_path/modules/pico/xoops_version.php @@ -356,7 +356,7 @@ 'description' => '' , 'formtype' => 'yesno' , 'valuetype' => 'int' , - 'default' => 1 , + 'default' => 0 , 'options' => array() ) ; From 8bf98ffebec2a96cf9ba275c9efe1d2dc53f6da1 Mon Sep 17 00:00:00 2001 From: mika umoto Date: Sat, 5 Oct 2013 09:28:07 +0900 Subject: [PATCH 3/3] =?UTF-8?q?language=E3=81=AB=E8=8B=B1=E8=AA=9E?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=80=82=E4=BD=99=E5=88=86=E3=81=AA=E6=94=B9?= =?UTF-8?q?=E8=A1=8C=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pico/language/english/modinfo.php | 11 +++++++++-- .../modules/pico/language/ja_utf8/modinfo.php | 2 -- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xoops_trust_path/modules/pico/language/english/modinfo.php b/xoops_trust_path/modules/pico/language/english/modinfo.php index 7dfb22a..886d373 100644 --- a/xoops_trust_path/modules/pico/language/english/modinfo.php +++ b/xoops_trust_path/modules/pico/language/english/modinfo.php @@ -116,7 +116,14 @@ define($constpref.'_NOTIFY_CONTENT_COMMENTCAP', 'Notify if a new comment is posted. (approved comments only)'); define($constpref.'_NOTIFY_CONTENT_COMMENTSBJ', '[{X_SITENAME}] {X_MODULE} : a new comment'); -} - +define($constpref.'_RSS_LINK_SHOW','Show RSS Link'); +define($constpref.'_SHOW_SUBJECT','Show Subject'); +define($constpref.'_SHOW_SUBJECTCAP','Show Subject in contents view'); +define($constpref.'_MENU_LINK_SHOW','Show MENU Link'); +define($constpref.'_WHEN_TOP_HIDE_BREADCRUMBS','Hide breadcrumb in module top page'); +define($constpref.'_WHEN_TOP_HIDE_BREADCRUMBSCAP','If you want to hide breadcrumb in module top page, select YES'); +define($constpref.'_TOP_SHOW_MODULE_NAME','Top category show module name'); +define($constpref.'_TOP_SHOW_MODULE_NAMECAP','If you choose NO, it shows default category name'); +} ?> diff --git a/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php b/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php index f23d482..05582e0 100644 --- a/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php +++ b/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php @@ -126,6 +126,4 @@ define($constpref.'_TOP_SHOW_MODULE_NAMECAP','いいえ　にした場合はトップカテゴリー名（デフォルト:TOPもしくはトップ）が表示されます'); } - - ?> \ No newline at end of file