From: <vo...@us...> - 2011-12-31 13:02:34
|
Revision: 8624 http://xoops.svn.sourceforge.net/xoops/?rev=8624&view=rev Author: voltan1 Date: 2011-12-31 13:02:26 +0000 (Sat, 31 Dec 2011) Log Message: ----------- Change time Modified Paths: -------------- XoopsModules/fmcontent/branches/news/admin/file.php XoopsModules/fmcontent/branches/news/admin/topic.php XoopsModules/fmcontent/branches/news/article.php XoopsModules/fmcontent/branches/news/blocks/list.php XoopsModules/fmcontent/branches/news/class/story.php XoopsModules/fmcontent/branches/news/index.php XoopsModules/fmcontent/branches/news/language/arabic/blocks.php XoopsModules/fmcontent/branches/news/language/arabic/main.php XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php XoopsModules/fmcontent/branches/news/language/english/blocks.php XoopsModules/fmcontent/branches/news/language/english/main.php XoopsModules/fmcontent/branches/news/language/english/modinfo.php XoopsModules/fmcontent/branches/news/language/persian/blocks.php XoopsModules/fmcontent/branches/news/language/persian/main.php XoopsModules/fmcontent/branches/news/language/persian/modinfo.php XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html XoopsModules/fmcontent/branches/news/templates/news_article.html XoopsModules/fmcontent/branches/news/templates/news_index_default.html XoopsModules/fmcontent/branches/news/templates/news_index_list.html XoopsModules/fmcontent/branches/news/templates/news_index_news.html XoopsModules/fmcontent/branches/news/templates/news_index_photo.html XoopsModules/fmcontent/branches/news/templates/news_index_table.html XoopsModules/fmcontent/branches/news/templates/news_rss.html XoopsModules/fmcontent/branches/news/topic.php XoopsModules/fmcontent/branches/news/xoops_version.php Modified: XoopsModules/fmcontent/branches/news/admin/file.php =================================================================== --- XoopsModules/fmcontent/branches/news/admin/file.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/admin/file.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -32,8 +32,8 @@ // Define scripts $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js'); -$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/order.js'); -$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/admin.js'); +$xoTheme->addScript(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/js/order.js'); +$xoTheme->addScript(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/js/admin.js'); // Add module stylesheet $xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css'); $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'); Modified: XoopsModules/fmcontent/branches/news/admin/topic.php =================================================================== --- XoopsModules/fmcontent/branches/news/admin/topic.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/admin/topic.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -33,8 +33,8 @@ // Define scripts $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js'); -$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/order.js'); -$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/admin.js'); +$xoTheme->addScript(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/js/order.js'); +$xoTheme->addScript(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/js/admin.js'); // Add module stylesheet $xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css'); $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'); Modified: XoopsModules/fmcontent/branches/news/article.php =================================================================== --- XoopsModules/fmcontent/branches/news/article.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/article.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -89,7 +89,7 @@ $content ['topic'] = $view_topic->getVar ( 'topic_title' ); $content ['topic_alias'] = $view_topic->getVar ( 'topic_alias' ); $content ['topic_id'] = $view_topic->getVar ( 'topic_id' ); -$content ['story_create'] = formatTimestamp ( $content ['story_create'], _MEDIUMDATESTRING ); +$content ['story_publish'] = formatTimestamp ( $content ['story_publish'], _MEDIUMDATESTRING ); $content ['story_update'] = formatTimestamp ( $content ['story_update'], _MEDIUMDATESTRING ); $content ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $content ['story_img']; $content ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $content ['story_img']; @@ -188,7 +188,7 @@ } } if (xoops_getModuleOption ( 'disp_date', $NewsModule->getVar ( 'dirname' ) )) { - $link ['date'] = XoopsUser::getUnameFromId ( $obj->getVar ( 'story_create' ) ); + $link ['date'] = XoopsUser::getUnameFromId ( $obj->getVar ( 'story_publish' ) ); } if (xoops_getModuleOption ( 'disp_author', $NewsModule->getVar ( 'dirname' ) )) { $content ['author'] = XoopsUser::getUnameFromId ( $obj->getVar ( 'story_uid' ) ); @@ -236,9 +236,9 @@ if (xoops_getModuleOption ( 'editinplace', $NewsModule->getVar ( 'dirname' ) ) && is_object ( $xoopsUser ) && ($xoopsUser->id () == $obj->getVar ( 'story_uid' ) || $xoopsUser->isAdmin ()) && $content ['dohtml']) { // Add scripts $xoTheme->addScript ( 'browse.php?Frameworks/jquery/jquery.js' ); - $xoTheme->addScript ( 'browse.php?modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.wysiwyg.js' ); - $xoTheme->addScript ( 'browse.php?modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.jeditable.mini.js' ); - $xoTheme->addScript ( 'browse.php?modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.jeditable.wysiwyg.js' ); + $xoTheme->addScript ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.wysiwyg.js' ); + $xoTheme->addScript ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.jeditable.mini.js' ); + $xoTheme->addScript ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.jeditable.wysiwyg.js' ); // Add Stylesheet $xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/jquery.wysiwyg.css' ); $xoopsTpl->assign ( 'editinplace', true ); @@ -249,7 +249,7 @@ $xoTheme->addScript ( 'browse.php?Frameworks/jquery/jquery.js' ); $xoTheme->addScript ( 'browse.php?Frameworks/jquery/plugins/jquery.lightbox.js' ); // Add Stylesheet - $xoTheme->addStylesheet ( 'browse.php?modules/system/css/lightbox.css' ); + $xoTheme->addStylesheet ( XOOPS_URL . '/modules/system/css/lightbox.css' ); $xoopsTpl->assign ( 'img_lightbox', true ); } Modified: XoopsModules/fmcontent/branches/news/blocks/list.php =================================================================== --- XoopsModules/fmcontent/branches/news/blocks/list.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/blocks/list.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -145,7 +145,7 @@ $story_sort = new XoopsFormSelect(_NEWS_MI_SHOWSORT, 'options[]', $options[7]); $story_sort->addOption("story_id", _NEWS_MI_SHOWSORT_1); - $story_sort->addOption("story_create", _NEWS_MI_SHOWSORT_2); + $story_sort->addOption("story_publish", _NEWS_MI_SHOWSORT_2); $story_sort->addOption("story_update", _NEWS_MI_SHOWSORT_3); $story_sort->addOption("story_title", _NEWS_MI_SHOWSORT_4); $story_sort->addOption("story_order", _NEWS_MI_SHOWSORT_5); Modified: XoopsModules/fmcontent/branches/news/class/story.php =================================================================== --- XoopsModules/fmcontent/branches/news/class/story.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/class/story.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -437,7 +437,7 @@ $default = self::News_GetDefault ( $criteria ); $obj = self::get ( $default ); $contentDefault = $obj->toArray (); - $contentDefault ['story_create'] = formatTimestamp ( $contentDefault ['story_create'], _MEDIUMDATESTRING ); + $contentDefault ['story_publish'] = formatTimestamp ( $contentDefault ['story_publish'], _MEDIUMDATESTRING ); $contentDefault ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $contentDefault ['story_img']; $contentDefault ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $contentDefault ['story_img']; $contentDefault ['topic'] = $default_info ['title']; @@ -487,7 +487,7 @@ } $tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab ); - $tab ['story_create'] = formatTimestamp ( $root->getVar ( 'story_create' ), _MEDIUMDATESTRING ); + $tab ['story_publish'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING ); $tab ['story_update'] = formatTimestamp ( $root->getVar ( 'story_update' ), _MEDIUMDATESTRING ); $tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' ); $tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' ); @@ -547,7 +547,7 @@ } $tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab ); - $tab ['story_create'] = formatTimestamp ( $root->getVar ( 'story_create' ), _MEDIUMDATESTRING ); + $tab ['story_publish'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING ); $tab ['story_update'] = formatTimestamp ( $root->getVar ( 'story_update' ), _MEDIUMDATESTRING ); $tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' ); $tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' ); @@ -604,7 +604,7 @@ $tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab ); $tab ['title'] = mb_strlen ( $root->getVar ( 'story_title' ), 'utf-8' ) > $story_infos ['lenght_title'] ? mb_substr ( $root->getVar ( 'story_title' ), 0, ($story_infos ['lenght_title']), 'utf-8' ) . "..." : $root->getVar ( 'story_title' ); - $tab ['date'] = formatTimestamp ( $root->getVar ( 'story_create' ), _MEDIUMDATESTRING ); + $tab ['date'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING ); $ret [] = $tab; } } @@ -646,7 +646,7 @@ } $tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab ); - $tab ['story_create'] = formatTimestamp ( $root->getVar ( 'story_create' ), _MEDIUMDATESTRING ); + $tab ['story_publish'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING ); $tab ['story_update'] = formatTimestamp ( $root->getVar ( 'story_update' ), _MEDIUMDATESTRING ); $tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' ); $tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' ); @@ -873,7 +873,7 @@ } $criteria->setStart ( $start ); $criteria->setLimit ( $limit ); - $criteria->setSort ( 'story_create' ); + $criteria->setSort ( 'story_publish' ); $contents = $this->getObjects ( $criteria ); @@ -886,7 +886,7 @@ $data ['topic_alias'] = $data ['topic']; $data ['link'] = NewsUtils::News_Url ( 'news', $data ); $data ['title'] = $content->getVar ( 'story_title' ); - $data ['time'] = $content->getVar ( 'story_create' ); + $data ['time'] = $content->getVar ( 'story_publish' ); $data ['uid'] = $content->getVar ( 'story_uid' ); $ret [] = $data; } Modified: XoopsModules/fmcontent/branches/news/index.php =================================================================== --- XoopsModules/fmcontent/branches/news/index.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/index.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -59,17 +59,17 @@ $topics = $topic_handler->getall ( $story_topic ); $view_topic = $topics[$story_topic]; if (! isset ( $view_topic )) { - redirect_header ( 'index.php', 3, _NEWS_MD_TOPIC_ERROR ); + redirect_header ( 'index.php', 3, _NEWS_MD_ERROR_TOPIC ); exit (); } if ($view_topic->getVar ( 'topic_modid' ) != $NewsModule->getVar ( 'mid' )) { - redirect_header ( 'index.php', 3, _NEWS_MD_TOPIC_ERROR ); + redirect_header ( 'index.php', 3, _NEWS_MD_ERROR_TOPIC ); exit (); } if ($view_topic->getVar ( 'topic_online' ) == '0') { - redirect_header ( 'index.php', 3, _NEWS_MD_TOPIC_ERROR ); + redirect_header ( 'index.php', 3, _NEWS_MD_ERROR_TOPIC ); exit (); } @@ -199,7 +199,7 @@ $xoTheme->addScript ( 'browse.php?Frameworks/jquery/jquery.js' ); $xoTheme->addScript ( 'browse.php?Frameworks/jquery/plugins/jquery.lightbox.js' ); // Add Stylesheet - $xoTheme->addStylesheet ( 'browse.php?modules/system/css/lightbox.css' ); + $xoTheme->addStylesheet ( XOOPS_URL . '/modules/system/css/lightbox.css' ); $xoopsTpl->assign ( 'img_lightbox', true ); } Modified: XoopsModules/fmcontent/branches/news/language/arabic/blocks.php =================================================================== --- XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -28,5 +28,6 @@ define('_NEWS_MB_MORE', ' اقرأ المزيد '); define('_NEWS_MB_SHOE_MORELINK', 'Show more link'); define('_NEWS_MB_MORELINK', 'More link'); + define("_NEWS_MB_IMPORTANT", "Immediate "); } ?> \ No newline at end of file Modified: XoopsModules/fmcontent/branches/news/language/arabic/main.php =================================================================== --- XoopsModules/fmcontent/branches/news/language/arabic/main.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/language/arabic/main.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -32,6 +32,7 @@ define('_NEWS_MD_COM', 'الرأي'); define('_NEWS_MD_RELATED', 'مواضیع ذات صلة'); define("_NEWS_MD_HOME", "Home"); + define("_NEWS_MD_IMPORTANT", "Immediate "); // Link define('_NEWS_MD_NEXT', 'التالیة'); define('_NEWS_MD_PREV', 'السابقة'); Modified: XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php =================================================================== --- XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -155,7 +155,7 @@ define('_NEWS_MI_SHOWSORT_3', 'content update'); define('_NEWS_MI_SHOWSORT_4', 'content title'); define('_NEWS_MI_SHOWSORT_5', 'content order'); - define('_NEWS_MI_SHOWSORT_6', 'Random content'); + define('_NEWS_MI_SHOWSORT_6', 'Random'); define('_NEWS_MI_SHOWSORT_7', 'content Hits'); // Admin page define('_NEWS_MI_ADMIN_PERPAGE', 'الوثیقة في کل صفحة'); Modified: XoopsModules/fmcontent/branches/news/language/english/blocks.php =================================================================== --- XoopsModules/fmcontent/branches/news/language/english/blocks.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/language/english/blocks.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -28,5 +28,6 @@ define('_NEWS_MB_MORE', 'Read more'); define('_NEWS_MB_SHOE_MORELINK', 'Show more link'); define('_NEWS_MB_MORELINK', 'More link'); + define("_NEWS_MB_IMPORTANT", "Immediate "); } ?> \ No newline at end of file Modified: XoopsModules/fmcontent/branches/news/language/english/main.php =================================================================== --- XoopsModules/fmcontent/branches/news/language/english/main.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/language/english/main.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -31,7 +31,8 @@ define("_NEWS_MD_AUTHOR_ALL_DESC", "View all contributions by "); define('_NEWS_MD_COM', 'Comment'); define('_NEWS_MD_RELATED', 'Related articles'); - define("_NEWS_MD_HOME", "Home"); + define("_NEWS_MD_HOME", "Home"); + define("_NEWS_MD_IMPORTANT", "Immediate "); // Link define('_NEWS_MD_NEXT', 'Next page'); define('_NEWS_MD_PREV', 'Previous page'); Modified: XoopsModules/fmcontent/branches/news/language/english/modinfo.php =================================================================== --- XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -154,8 +154,8 @@ define('_NEWS_MI_SHOWSORT_2', 'article create'); define('_NEWS_MI_SHOWSORT_3', 'article update'); define('_NEWS_MI_SHOWSORT_4', 'article title'); - define('_NEWS_MI_SHOWSORT_5', 'Admin article page order'); - define('_NEWS_MI_SHOWSORT_6', 'Random order'); + define('_NEWS_MI_SHOWSORT_5', 'article order'); + define('_NEWS_MI_SHOWSORT_6', 'Random'); define('_NEWS_MI_SHOWSORT_7', 'article Hits'); // Admin page define('_NEWS_MI_ADMIN_PERPAGE', 'Admin article page items number'); Modified: XoopsModules/fmcontent/branches/news/language/persian/blocks.php =================================================================== --- XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -28,5 +28,6 @@ define('_NEWS_MB_MORE', 'ادامه مطلب'); define('_NEWS_MB_SHOE_MORELINK', 'Show more link'); define('_NEWS_MB_MORELINK', 'More link'); + define("_NEWS_MB_IMPORTANT", "Immediate "); } ?> \ No newline at end of file Modified: XoopsModules/fmcontent/branches/news/language/persian/main.php =================================================================== --- XoopsModules/fmcontent/branches/news/language/persian/main.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/language/persian/main.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -31,7 +31,8 @@ define("_NEWS_MD_AUTHOR_ALL_DESC", "مشاهده تمام مطالب ارسال شده توسط "); define('_NEWS_MD_COM', 'نظر'); define('_NEWS_MD_RELATED', 'مطالب مرتبط'); - define("_NEWS_MD_HOME", "Home"); + define("_NEWS_MD_HOME", "Home"); + define("_NEWS_MD_IMPORTANT", "Immediate "); // Link define('_NEWS_MD_NEXT', 'صفحه بعدی'); define('_NEWS_MD_PREV', 'صفحه قبلی'); Modified: XoopsModules/fmcontent/branches/news/language/persian/modinfo.php =================================================================== --- XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -155,7 +155,7 @@ define('_NEWS_MI_SHOWSORT_3', 'content update'); define('_NEWS_MI_SHOWSORT_4', 'content title'); define('_NEWS_MI_SHOWSORT_5', 'content order'); - define('_NEWS_MI_SHOWSORT_6', 'Random content'); + define('_NEWS_MI_SHOWSORT_6', 'Random'); define('_NEWS_MI_SHOWSORT_7', 'content Hits'); // Admin page define('_NEWS_MI_ADMIN_PERPAGE', 'سند در هر صفحه'); Modified: XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html =================================================================== --- XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html 2011-12-31 13:02:26 UTC (rev 8624) @@ -3,7 +3,7 @@ <{foreach item=content from=$block.contents}> <div class="item"> <div class="itemHead"> - <div class="itemTitle"><h3><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h3></div> + <div class="itemTitle"><h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h3></div> </div> <{if $block.date}> <div class="itemInfo"><{$smarty.const._NEWS_MB_DATE}> :<{$content.date}></div> @@ -39,7 +39,7 @@ </div> <{/if}> <li> - <h3><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3> + <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3> <{if $block.date}> <div class="itemPostDate"><{$content.date}></div> <{/if}> @@ -47,7 +47,7 @@ <{if $content.story_short}> <div class="itemText"><{$content.story_short}></div> <{else}> - <div class="itemText"><{$content.story_text|truncate:130:""}></div> + <div class="itemText"><{$content.story_text|truncate:130}></div> <{/if}> <{/if}> <div class="clear"></div> @@ -58,7 +58,7 @@ <ul> <{foreach item=content from=$block.contents}> <li> - <h3><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3> + <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3> <{if $block.date}> <div class="itemPostDate"><{$content.date}></div> <{/if}> @@ -74,7 +74,7 @@ <div class="itemBlockLeft"> <div class="item"> <div class="itemHead"> - <div class="itemTitle"><h2><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h2></div> + <div class="itemTitle"><h2><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h2></div> </div> <{if $block.date}> <div class="itemInfo"><{$smarty.const._NEWS_MB_DATE}> :<{$content.date}></div> @@ -104,7 +104,7 @@ <{foreach item=content from=$block.contents}> <{if $content.story_default == 0}> <div class="itemBlockRight"> - <h3><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title|truncate:80}></a></h3> + <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title|truncate:80}></a></h3> </div> <{/if}> <{/foreach}> Modified: XoopsModules/fmcontent/branches/news/templates/news_article.html =================================================================== --- XoopsModules/fmcontent/branches/news/templates/news_article.html 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/templates/news_article.html 2011-12-31 13:02:26 UTC (rev 8624) @@ -11,7 +11,7 @@ <!-- Display content header --> <div class="itemHead"> <div class="itemTitle"> - <h2><{$content.story_title}></h2> + <h2><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}><{$content.story_title}></h2> </div> </div> <{/if}> @@ -21,7 +21,7 @@ <{if $link.date || $link.hits || $content.story_comments || $link.topicshow}> •<{/if}> <{/if}> <{if $link.date}> - <span class="itemPostDate"><{$smarty.const._NEWS_MD_DATE}>: <{$content.story_create}></span> + <span class="itemPostDate"><{$smarty.const._NEWS_MD_DATE}>: <{$content.story_publish}></span> <{if $link.hits || $content.story_comments || $link.topicshow}> •<{/if}> <{/if}> <{if $link.hits}> @@ -64,7 +64,7 @@ </div> <{/if}> <{if $link.date}> - <{if $content.story_update != $content.story_create}> + <{if $content.story_update != $content.story_publish}> <div class="itemPostDate"><{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}></div> <{/if}> <{/if}> Modified: XoopsModules/fmcontent/branches/news/templates/news_index_default.html =================================================================== --- XoopsModules/fmcontent/branches/news/templates/news_index_default.html 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/templates/news_index_default.html 2011-12-31 13:02:26 UTC (rev 8624) @@ -1,5 +1,5 @@ <div id="default" class="item"> - <div class="itemTitle "><h2><{$default.story_title}></h2></div> + <div class="itemTitle "><h2><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}><{$default.story_title}></h2></div> <{if $default.story_short}> <div class="itemShort"> <{if $default.story_img}> @@ -34,7 +34,7 @@ <div class="clear"></div> </div> <{/if}> - <div class="itemPostDate"><{$smarty.const._NEWS_MD_DATE}>: <{$default.story_create}> + <div class="itemPostDate"><{$smarty.const._NEWS_MD_DATE}>: <{$default.story_publish}> <{if $xoops_isadmin}> <span class="itemAdminLink"> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=edit_content&story_id=<{$default.story_id}>" title="<{$smarty.const._NEWS_MD_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._story_EDIT}>"/></a> Modified: XoopsModules/fmcontent/branches/news/templates/news_index_list.html =================================================================== --- XoopsModules/fmcontent/branches/news/templates/news_index_list.html 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/templates/news_index_list.html 2011-12-31 13:02:26 UTC (rev 8624) @@ -2,7 +2,7 @@ <ul> <{foreach item=content from=$contents}> <li> - <h3><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3> + <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3> <{if $info.author || $info.date || $info.hits}> <div class="pad2"> <{if $info.author}> @@ -12,7 +12,7 @@ <{if $info.date || $info.hits}> •<{/if}> <{/if}> <{if $info.date}> - <span class="itemPostDate"><{$content.story_create}></span> + <span class="itemPostDate"><{$content.story_publish}></span> <{if $info.hits}> •<{/if}> <{/if}> <{if $info.hits}> Modified: XoopsModules/fmcontent/branches/news/templates/news_index_news.html =================================================================== --- XoopsModules/fmcontent/branches/news/templates/news_index_news.html 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/templates/news_index_news.html 2011-12-31 13:02:26 UTC (rev 8624) @@ -3,6 +3,7 @@ <div class="itemHead"> <div class="itemTitle"> <h2> + <{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}> <a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a> </h2> </div> @@ -16,7 +17,7 @@ <{/if}> <{if $info.date}> <span class="itemPostDate"> - <{$smarty.const._NEWS_MD_DATE}>: <{$content.story_create}><{if $content.story_update != $content.story_create}> • <{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}><{/if}> + <{$smarty.const._NEWS_MD_DATE}>: <{$content.story_publish}><{if $content.story_update != $content.story_publish}> • <{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}><{/if}> </span> <{if $info.hits}> •<{/if}> <{/if}> Modified: XoopsModules/fmcontent/branches/news/templates/news_index_photo.html =================================================================== --- XoopsModules/fmcontent/branches/news/templates/news_index_photo.html 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/templates/news_index_photo.html 2011-12-31 13:02:26 UTC (rev 8624) @@ -19,6 +19,7 @@ <div class="itemHead"> <div class="itemTitle"> <h2> + <{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}> <a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a> </h2> </div> @@ -32,7 +33,7 @@ <{/if}> <{if $info.date}> <span class="itemPostDate"> - <{$smarty.const._NEWS_MD_DATE}>: <{$content.story_create}><{if $content.story_update != $content.story_create}> • <{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}><{/if}> + <{$smarty.const._NEWS_MD_DATE}>: <{$content.story_publish}><{if $content.story_update != $content.story_publish}> • <{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}><{/if}> </span> <{if $info.hits}> •<{/if}> <{/if}> Modified: XoopsModules/fmcontent/branches/news/templates/news_index_table.html =================================================================== --- XoopsModules/fmcontent/branches/news/templates/news_index_table.html 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/templates/news_index_table.html 2011-12-31 13:02:26 UTC (rev 8624) @@ -12,10 +12,10 @@ <tbody> <{foreach item=content from=$contents}> <tr class="<{cycle values="even,odd"}>"> - <td><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></td> + <td><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></td> <{if !$story_topic}><td><a href="<{$content.topicurl}>" title="<{$content.topic}>"><{$content.topic}></a></td><{/if}> <{if $info.author}><td><a title="<{$content.owner}>" href="<{$xoops_url}>/user.php?id=<{$content.story_uid}>"><{$content.owner}></a></td><{/if}> - <{if $info.date}><td><{$content.story_create}></td><{/if}> + <{if $info.date}><td><{$content.story_publish}></td><{/if}> <{if $info.hits}><td><{$content.story_hits}></td><{/if}> <{if $info.coms}><td><{$content.story_comments}></td><{/if}> </tr> Modified: XoopsModules/fmcontent/branches/news/templates/news_rss.html =================================================================== --- XoopsModules/fmcontent/branches/news/templates/news_rss.html 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/templates/news_rss.html 2011-12-31 13:02:26 UTC (rev 8624) @@ -25,7 +25,7 @@ <title><{$content.story_title}></title> <link><{$content.url}></link> <description><{if $content.story_short}><{$content.story_short}><{else}><{$content.story_text|strip_tags|truncate:300}><{/if}></description> - <pubDate><{$content.story_create}></pubDate> + <pubDate><{$content.story_publish}></pubDate> <guid><{$content.url}></guid> </item> <{/foreach}> Modified: XoopsModules/fmcontent/branches/news/topic.php =================================================================== --- XoopsModules/fmcontent/branches/news/topic.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/topic.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -69,7 +69,7 @@ $xoTheme->addScript ( 'browse.php?Frameworks/jquery/jquery.js' ); $xoTheme->addScript ( 'browse.php?Frameworks/jquery/plugins/jquery.lightbox.js' ); // Add Stylesheet - $xoTheme->addStylesheet ( 'browse.php?modules/system/css/lightbox.css' ); + $xoTheme->addStylesheet ( XOOPS_URL . '/modules/system/css/lightbox.css' ); $xoopsTpl->assign ( 'img_lightbox', true ); } Modified: XoopsModules/fmcontent/branches/news/xoops_version.php =================================================================== --- XoopsModules/fmcontent/branches/news/xoops_version.php 2011-12-29 17:56:36 UTC (rev 8623) +++ XoopsModules/fmcontent/branches/news/xoops_version.php 2011-12-31 13:02:26 UTC (rev 8624) @@ -119,7 +119,7 @@ 'description' => '', 'show_func' => 'news_list_show', 'edit_func' => 'news_list_edit', - 'options' => $modversion['dirname'] . '|news|10|100|1|1|1|story_create|180|left|DESC|0|'. XOOPS_URL.'|0', + 'options' => $modversion['dirname'] . '|news|10|100|1|1|1|story_publish|180|left|DESC|0|'. XOOPS_URL.'|0', 'template' => 'news_list.html'); // Settings @@ -394,7 +394,7 @@ 'description' => '_NEWS_MI_SHOWSORT_DESC', 'formtype' => 'select', 'valuetype' => 'text', - 'options' => array(_NEWS_MI_SHOWSORT_1 => 'story_id', _NEWS_MI_SHOWSORT_2 => 'story_create', _NEWS_MI_SHOWSORT_3 => 'story_update', _NEWS_MI_SHOWSORT_4 => 'story_title', _NEWS_MI_SHOWSORT_5 => 'story_order', _NEWS_MI_SHOWSORT_6 => 'RAND()' , _NEWS_MI_SHOWSORT_7 => 'story_hits'), + 'options' => array(_NEWS_MI_SHOWSORT_1 => 'story_id', _NEWS_MI_SHOWSORT_2 => 'story_publish', _NEWS_MI_SHOWSORT_3 => 'story_update', _NEWS_MI_SHOWSORT_4 => 'story_title', _NEWS_MI_SHOWSORT_5 => 'story_order', _NEWS_MI_SHOWSORT_6 => 'RAND()' , _NEWS_MI_SHOWSORT_7 => 'story_hits'), 'default' => 'story_id'); $modversion['config'][] = array( @@ -792,7 +792,7 @@ 'description' => '_NEWS_MI_ADMIN_SHOWSORT_DESC', 'formtype' => 'select', 'valuetype' => 'text', - 'options' => array(_NEWS_MI_SHOWSORT_1 => 'story_id', _NEWS_MI_SHOWSORT_2 => 'story_create', _NEWS_MI_SHOWSORT_3 => 'story_update', _NEWS_MI_SHOWSORT_4 => 'story_title', _NEWS_MI_SHOWSORT_5 => 'story_order', _NEWS_MI_SHOWSORT_6 => 'RAND()'), + 'options' => array(_NEWS_MI_SHOWSORT_1 => 'story_id', _NEWS_MI_SHOWSORT_2 => 'story_publish', _NEWS_MI_SHOWSORT_3 => 'story_update', _NEWS_MI_SHOWSORT_4 => 'story_title', _NEWS_MI_SHOWSORT_5 => 'story_order', _NEWS_MI_SHOWSORT_6 => 'RAND()'), 'default' => 1); $modversion['config'][] = array( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |