From: <tr...@us...> - 2012-12-17 22:06:05
|
Revision: 10433 http://sourceforge.net/p/xoops/svn/10433 Author: trabis Date: 2012-12-17 22:06:02 +0000 (Mon, 17 Dec 2012) Log Message: ----------- Removing db: Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/backendt.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_archives.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_bigstory.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_moderate.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_randomnews.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_top.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topics.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topicsnav.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_cloud.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_top.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_article.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_by_topic.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_index.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/item.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_items_spot.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_addfile.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_full.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_list.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_summary.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_wfsection.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_footer.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_item.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/backendt.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/backendt.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/backendt.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -68,7 +68,7 @@ $tpl = new XoopsTpl(); $tpl->caching=2; $tpl->xoops_setCacheTime(3600); // Change this to the value you want -if (!$tpl->is_cached('db:news_rss.html', $topicid)) { +if (!$tpl->is_cached('module:news|news_rss.html', $topicid)) { $xt = new NewsTopic($topicid); $sarray = $story->getAllPublished($newsnumber, 0, $restricted, $topicid); if (is_array($sarray) && count($sarray)>0) { @@ -106,5 +106,5 @@ } } } -$tpl->display('db:news_rss.html', $topicid); +$tpl->display('module:news|news_rss.html', $topicid); ?> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_archives.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_archives.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_archives.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -50,7 +50,7 @@ } else { include_once XOOPS_ROOT_PATH.'/modules/news/language/english/main.php'; } - + $months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER); $block = array(); $sort_order = $options[0] == 0 ? 'ASC' : 'DESC'; @@ -167,7 +167,7 @@ $tpl = new XoopsTpl(); $tpl->assign('block', $block); - $tpl->display('db:news_block_archives.html'); + $tpl->display('block:news|news_block_archives.html'); } ?> Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_bigstory.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_bigstory.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_bigstory.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -49,7 +49,7 @@ $htmltitle=' title="'.$block['infotips'].'"'; } else { $htmltitle=' title="'.$story->title('Show').'"'; - } + } $block['htmltitle']=$htmltitle; $block['message'] = _MB_NEWS_TMRSI; $block['story_title'] = $story->title('Show'); @@ -76,7 +76,7 @@ $tpl = new XoopsTpl(); $tpl->assign('block', $block); - $tpl->display('db:news_block_bigstory.html'); + $tpl->display('block:news|news_block_bigstory.html'); } ?> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_moderate.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_moderate.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_moderate.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -85,6 +85,6 @@ $tpl = new XoopsTpl(); $tpl->assign('block', $block); - $tpl->display('db:news_block_moderate.html'); + $tpl->display('block:news|news_block_moderate.html'); } ?> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_randomnews.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_randomnews.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_randomnews.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -70,7 +70,7 @@ $news['topic_color']= '#'.$myts->displayTarea($story->topic_color); $news['picture'] = XOOPS_URL.'/uploads/news/image/'.$story->picture(); $news['pictureinfo'] = $story->pictureinfo(); - + if ($options[3] > 0) { $html = $story->nohtml() == 1 ? 0 : 1; $news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext, $html), $options[3]+3); @@ -144,7 +144,7 @@ $tpl = new XoopsTpl(); $tpl->assign('block', $block); - $tpl->display('db:news_block_moderate.html'); + $tpl->display('block:news|news_block_moderate.html'); } ?> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_top.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_top.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_top.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -355,7 +355,7 @@ $news['topic_color'] = '#'.$myts->displayTarea($story->topic_color); $news['picture'] = XOOPS_URL.'/uploads/news/image/'.$story->picture(); $news['pictureinfo'] = $story->pictureinfo(); - + if($displayname!=3) { $news['author'] = sprintf("%s %s",_POSTEDBY,$story->uname()); } else { @@ -473,7 +473,7 @@ $news['topic_color'] = '#'.$myts->displayTarea($story->topic_color); $news['picture'] = XOOPS_URL.'/uploads/news/image/'.$story->picture(); $news['pictureinfo'] = $story->pictureinfo(); - + if($displayname!=3) { $news['author']= sprintf("%s %s",_POSTEDBY,$story->uname()); } else { @@ -481,7 +481,7 @@ } if ($options[3] > 0) { $html = $story->nohtml() == 1 ? 0 : 1; - $news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext(), $html), $options[3]+3); + $news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext(), $html), $options[3]+3); $news['infotips'] = ''; } else { $news['teaser'] = ''; @@ -694,7 +694,7 @@ $tpl = new XoopsTpl(); $tpl->assign('block', $block); - $tpl->display('db:news_block_top.html'); + $tpl->display('block:news|news_block_top.html'); } ?> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topics.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topics.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topics.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -54,7 +54,7 @@ $tpl = new XoopsTpl(); $tpl->assign('block', $block); - $tpl->display('db:news_block_topics.html'); + $tpl->display('block:news|news_block_topics.html'); } ?> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topicsnav.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topicsnav.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topicsnav.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -94,7 +94,7 @@ $tpl = new XoopsTpl(); $tpl->assign('block', $block); - $tpl->display('db:news_block_topicnav.html'); + $tpl->display('block:news|news_block_topicnav.html'); } ?> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_cloud.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_cloud.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_cloud.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -1 +1 @@ -<{include file="db:tag_block_cloud.html"}> \ No newline at end of file +<{include file="block:tag|tag_block_cloud.html"}> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_top.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_top.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_top.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -1 +1 @@ -<{include file="db:tag_block_top.html"}> +<{include file="block:tag|tag_block_top.html"}> Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_article.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_article.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_article.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -1,7 +1,7 @@ <div class="news-article"> - - <div class="marg2 pad2"><{include file="db:news_item.html" story=$story}> + <div class="marg2 pad2"><{include file="module:news|news_item.html" story=$story}> + <{if $xoops_isadmin}> <a href="<{$xoops_url}>/modules/news/submit.php?op=edit&storyid=<{$story.id}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>"></a> <a href="<{$xoops_url}>/modules/news/admin/index.php?op=delete&storyid=<{$story.id}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>"></a> @@ -14,8 +14,8 @@ <{/if}> </div> - + <{if $attached_files_count>0}> <div class="itemInfo"><{$lang_attached_files}> <{foreach item=onefile from=$attached_files}> @@ -23,21 +23,21 @@ <{/foreach}> </div> <{/if}> - + <{if $pagenav}><div class="pagenav"><{$smarty.const._NW_PAGE}> <{$pagenav}></div><{/if}> - + <{if $tags}> - <div class="marg10 tagbar"><{include file="db:tag_bar.html"}></div> + <div class="marg10 tagbar"><{include file="block:tag|tag_bar.html"}></div> <{/if}> - + <div class="pad5 marg5"> <{if $nav_links}> <{if $previous_story_id != -1}><a href='<{$xoops_url}>/modules/news/article.php?storyid=<{$previous_story_id}>' title="<{$previous_story_title}>"><{$lang_previous_story}></a> - <{/if}> <{if $next_story_id!= -1}><a href='<{$xoops_url}>/modules/news/article.php?storyid=<{$next_story_id}>' title="<{$next_story_title}>"><{$lang_next_story}></a><{/if}> - <{/if}> + <{/if}> </div> - + <{if $showsummary == true && $summary_count>0}> <div class="marg10"> <table width='50%' cellspacing='0' cellpadding='1'> @@ -52,7 +52,7 @@ </table> </div> <{/if}> - + <{if $bookmarkme == true}> <div class="item-bookmarkme"> <div class="head item-bookmarkme-title"><{$smarty.const._NW_BOOKMARK_ME}></div> @@ -96,21 +96,21 @@ <div id="fb-root"></div><script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script><fb:comments href="<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" num_posts="5" width="500"></fb:comments> <{/if}> - + <div class="pad2 marg2"> <{$commentsnav}> <{$lang_notice}> </div> - + <div class="pad2 marg2"> <{if $comment_mode == "flat"}> - <{include file="db:system_comments_flat.html"}> + <{include file="module:system|system_comments_flat.html"}> <{elseif $comment_mode == "thread"}> - <{include file="db:system_comments_thread.html"}> + <{include file="module:system|system_comments_thread.html"}> <{elseif $comment_mode == "nest"}> - <{include file="db:system_comments_nest.html"}> + <{include file="module:system|system_comments_nest.html"}> <{/if}> </div> - <{include file='db:system_notification_select.html'}> + <{include file='module:system|system_notification_select.html'}> </div> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_by_topic.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_by_topic.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_by_topic.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -9,7 +9,7 @@ <{counter start=0 print=false assign=storynum}> <{foreach item=story from=$topic.stories}> <{if $storynum == 0}> - <{include file="db:news_item.html" story=$story}><br /> + <{include file="module:news|news_item.html" story=$story}><br /> <{else}> <{if $storynum == 1}> <ul> @@ -29,4 +29,4 @@ </tr> </table> </div> -<{include file='db:system_notification_select.html'}> \ No newline at end of file +<{include file='module:system|system_notification_select.html'}> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_index.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_index.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_index.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -2,7 +2,7 @@ <{if $topic_rssfeed_link != ""}> <div align='right'><{$topic_rssfeed_link}></div> <{/if}> - + <{if $displaynav == true}> <div style="text-align: center;"> <form name="form1" action="<{$xoops_url}>/modules/news/index.php" method="get"> @@ -10,20 +10,20 @@ <hr /> </div> <{/if}> - + <{if $topic_description != ''}> <div style="text-align: center;"><{$topic_description}></div> <{/if}> - + <div style="margin: 10px;"><{$pagenav}></div> <table width='100%' border='0'> <tr> <{section name=i loop=$columns}> - <td width="<{$columnwidth}>%"><{foreach item=story from=$columns[i]}><{include file="db:news_item.html" story=$story}><{/foreach}></td> + <td width="<{$columnwidth}>%"><{foreach item=story from=$columns[i]}><{include file="module:news|news_item.html" story=$story}><{/foreach}></td> <{/section}> </tr> </table> - + <div class="pagenav"><{$pagenav}></div> - <{include file='db:system_notification_select.html'}> + <{include file='module:system|system_notification_select.html'}> </div> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/item.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/item.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/item.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -465,7 +465,7 @@ $sform = $publisher->getForm($itemObj, 'item'); $sform->setTitle(_AM_PUBLISHER_ITEMS); $sform->assign($formTpl); - $formTpl->display('db:publisher_submit.html'); + $formTpl->display('module:publisher|publisher_submit.html'); PublisherUtils::closeCollapsableBar('edititemtable', 'edititemicon'); Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_items_spot.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_items_spot.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_items_spot.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -6,7 +6,7 @@ <{if $block.display_type=='block'}> -<{foreach item=item from=$block.items}> <{include file="db:publisher_singleitem_block.html" item=$item}> <{/foreach}> +<{foreach item=item from=$block.items}> <{include file="module:publisher|publisher_singleitem_block.html" item=$item}> <{/foreach}> <{else}> <{foreach item=item from=$block.items name=spotlight}> <{if $item.summary != ''}> <div class="itemText" style="padding-left: 5px; padding-top: 5px;"> Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_addfile.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_addfile.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_addfile.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -1,4 +1,4 @@ -<{include file="db:publisher_header.html" item=$item}> +<{include file="module:publisher|publisher_header.html" item=$item}> <div class="publisher_infotitle"><{$lang_intro_title}></div> <div class="publisher_infotext"><{$lang_intro_text}></div> Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_full.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_full.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_full.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -1,4 +1,4 @@ -<{include file='db:publisher_header.html'}> +<{include file='module:publisher|publisher_header.html'}> <!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE), let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}> @@ -9,7 +9,7 @@ <div id='toptable'> <span class="publisher_collaps_info""><{$lang_category_summary}></span> <!-- Content under the collapsable bar //--> <{/if}> - <{include file='db:publisher_categories_table.html'}> + <{include file='module:publisher|publisher_categories_table.html'}> <{if $collapsable_heading == 1}> </div> <{/if}> @@ -21,10 +21,10 @@ <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span> <{/if}> <div align="right"><{$navbar}></div> - <!-- Start item loop --> <{foreach item=item from=$items}> <{include file="db:publisher_singleitem.html" item=$item}> <{/foreach}> <!-- End item loop --> + <!-- Start item loop --> <{foreach item=item from=$items}> <{include file="module:publisher|publisher_singleitem.html" item=$item}> <{/foreach}> <!-- End item loop --> <div align="right"><{$navbar}></div> <{if $collapsable_heading == 1}> </div> <{/if}><!-- end of if $items --> <{/if}> -<{include file='db:publisher_footer.html'}> \ No newline at end of file +<{include file='module:publisher|publisher_footer.html'}> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_list.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_list.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_list.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -1,4 +1,4 @@ -<{include file='db:publisher_header.html'}> +<{include file='module:publisher|publisher_header.html'}> <!-- Display type is bullet list --> <div class="publisher_infotitle"><{$lang_category_summary}></div> @@ -7,7 +7,7 @@ <strong><{$smarty.const._MD_PUBLISHER_LAST_SMARTITEM}> : <{$category.last_title_link}> </div> <{/if}><br/> -<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE, let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}> <{include file='db:publisher_categories_table.html'}> +<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE, let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}> <{include file='module:publisher|publisher_categories_table.html'}> <br/><!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //--><{/if}> <{if $items}> <{if $collapsable_heading == 1}> @@ -69,4 +69,4 @@ <{if !$subcats && !$items}> <div class="publisher_infotext"><{$smarty.const._MD_PUBLISHER_EMPTY}></div><{/if}> -<{include file='db:publisher_footer.html'}> \ No newline at end of file +<{include file='module:publisher|publisher_footer.html'}> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_summary.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_summary.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_summary.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -1,4 +1,4 @@ -<{include file='db:publisher_header.html'}> +<{include file='module:publisher|publisher_header.html'}> <!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE), let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}> @@ -9,7 +9,7 @@ <div id='toptable'> <span class="publisher_collaps_info""><{$lang_category_summary}></span> <!-- Content under the collapsable bar //--> <{/if}> - <{include file='db:publisher_categories_table.html'}> + <{include file='module:publisher|publisher_categories_table.html'}> <{if $collapsable_heading == 1}> </div> <{/if}> @@ -57,4 +57,4 @@ <{if $collapsable_heading == 1}> </div> <{/if}><!-- end of if $items --> <{/if}> -<{include file='db:publisher_footer.html'}> \ No newline at end of file +<{include file='module:publisher|publisher_footer.html'}> \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_wfsection.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_wfsection.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_wfsection.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -1,4 +1,4 @@ -<{include file='db:publisher_header.html'}> +<{include file='module:publisher|publisher_header.html'}> <!--<{if $collapsable_heading == 1}> <div class="publisher_collaps_title"><a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/images/links/close12.gif' alt='' /></a> <{$lang_category_summary}></div> @@ -96,4 +96,4 @@ <{/if}> <!-- end of if $items --> <{/if}> </div> -<{include file='db:publisher_footer.html'}> +<{include file='module:publisher|publisher_footer.html'}> Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_footer.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_footer.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_footer.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -7,7 +7,7 @@ <td colspan="3" align="left"> <div style="text-align: center; padding: 3px; margin:3px;"> <{$commentsnav}> <{$lang_notice}></div> <div style="margin:3px; padding: 3px;"> - <!-- start comments loop --> <{if $comment_mode == "flat"}> <{include file="db:system_comments_flat.html"}> <{elseif $comment_mode == "thread"}> <{include file="db:system_comments_thread.html"}> <{elseif $comment_mode == "nest"}> <{include file="db:system_comments_nest.html"}> <{/if}> <!-- end comments loop --> + <!-- start comments loop --> <{if $comment_mode == "flat"}> <{include file="module:system|system_comments_flat.html"}> <{elseif $comment_mode == "thread"}> <{include file="module:system|system_comments_thread.html"}> <{elseif $comment_mode == "nest"}> <{include file="module:system|system_comments_nest.html"}> <{/if}> <!-- end comments loop --> </div> </td> </tr> @@ -16,4 +16,4 @@ <{if $rssfeed_link != ""}> <div id="publisher_rpublisher_feed"><{$rssfeed_link}></div><{/if}> -<{include file='db:system_notification_select.html'}> +<{include file='module:system|system_notification_select.html'}> Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_item.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_item.html 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_item.html 2012-12-17 22:06:02 UTC (rev 10433) @@ -1,4 +1,4 @@ -<{include file='db:publisher_header.html'}> +<{include file='module:publisher|publisher_header.html'}> <div class="item"> <h2><{$item.title}></h2> @@ -67,7 +67,7 @@ <{/if}> <{if $pagenav}> <div class="publisher_pagenav_bottom"><{$smarty.const._MD_PUBLISHER_PAGE}>: <{$pagenav}></div> <{/if}> <{if $tagbar}> - <p><{include file="db:tag_bar.html"}></p> + <p><{include file="module:tag|tag_bar.html"}></p> <{/if}> </div> <{if $itemfooter}> @@ -172,7 +172,7 @@ </tr> <{/foreach}> <!-- End item loop --> </table><{/if}><{if $rating_enabled}> -<small><{$item.ratingbar}></small><{/if}><{include file='db:publisher_footer.html'}> +<small><{$item.ratingbar}></small><{/if}><{include file='module:publisher|publisher_footer.html'}> <script type="text/javascript"> <!--//<![CDATA[ Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php 2012-12-17 21:48:45 UTC (rev 10432) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php 2012-12-17 22:06:02 UTC (rev 10433) @@ -257,7 +257,7 @@ $block = b_xlanguage_select_show($options); $xoops->theme()->addStylesheet('modules/xlanguage/css/block.css'); $xoops->tpl()->assign('block', $block); - $xlanguage_switch_code = "<div id='xo-language' class='" . $options[0] . "'>" . $xoops->tpl()->fetch('db:xlanguage_block.html') . "</div>"; + $xlanguage_switch_code = "<div id='xo-language' class='" . $options[0] . "'>" . $xoops->tpl()->fetch('block:xlanguage|xlanguage_block.html') . "</div>"; $xoops->tpl()->assign('xlanguage_switch_code', $xlanguage_switch_code); return true; } \ No newline at end of file |