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/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 5cec6e1..05582e0 100644 --- a/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php +++ b/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php @@ -116,7 +116,14 @@ 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もしくはトップ)が表示されます'); +} ?> \ No newline at end of file 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..4602dea 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() ) ; @@ -326,7 +356,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' ,