Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9887] XoopsModules/fmcontent/branches/news
|
From: <vo...@us...> - 2012-07-16 08:33:52
|
Revision: 9887
http://xoops.svn.sourceforge.net/xoops/?rev=9887&view=rev
Author: voltan1
Date: 2012-07-16 08:33:45 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
Update module
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/utils.php
XoopsModules/fmcontent/branches/news/templates/blocks/news_block_list.html
XoopsModules/fmcontent/branches/news/templates/news_article.html
XoopsModules/fmcontent/branches/news/templates/news_index.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
Modified: XoopsModules/fmcontent/branches/news/class/utils.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/utils.php 2012-07-16 08:29:14 UTC (rev 9886)
+++ XoopsModules/fmcontent/branches/news/class/utils.php 2012-07-16 08:33:45 UTC (rev 9887)
@@ -411,7 +411,7 @@
// Redirect
if($start_id <= $last_id) {
- self::News_Redirect('tools.php?op='.$op.'&start_id='.$start_id.'&end_id='.$end_id, 20, _NEWS_AM_MSG_INPROC);
+ self::News_Redirect('tools.php?op='.$op.'&start_id='.$start_id.'&end_id='.$end_id, 3, _NEWS_AM_MSG_INPROC);
xoops_cp_footer ();
exit ();
}
Modified: XoopsModules/fmcontent/branches/news/templates/blocks/news_block_list.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/blocks/news_block_list.html 2012-07-16 08:29:14 UTC (rev 9886)
+++ XoopsModules/fmcontent/branches/news/templates/blocks/news_block_list.html 2012-07-16 08:33:45 UTC (rev 9887)
@@ -58,9 +58,9 @@
<ul>
<{foreach item=content from=$block.contents}>
<li>
- <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 $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.title}></a>
<{if $block.date}>
- <div class="itemPostDate"><{$content.date}></div>
+ <span class="itemPostDate"><{$content.date}></span>
<{/if}>
</li>
<{/foreach}>
Modified: XoopsModules/fmcontent/branches/news/templates/news_article.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_article.html 2012-07-16 08:29:14 UTC (rev 9886)
+++ XoopsModules/fmcontent/branches/news/templates/news_article.html 2012-07-16 08:33:45 UTC (rev 9887)
@@ -49,7 +49,7 @@
<{/if}>
<div class="itemText editable <{$multiple_columns}>" id="story_<{$content.story_id}>">
<{if $content.story_img}>
- <div class="gallery">
+ <div class="itemImg gallery">
<{if $img_lightbox}>
<a href="<{$content.imageurl}>" title="<{$content.story_title}>" >
<img class="<{$imgfloat}> story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
Modified: XoopsModules/fmcontent/branches/news/templates/news_index.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index.html 2012-07-16 08:29:14 UTC (rev 9886)
+++ XoopsModules/fmcontent/branches/news/templates/news_index.html 2012-07-16 08:33:45 UTC (rev 9887)
@@ -4,34 +4,6 @@
<{if $default}>
<{include file="db:news_index_default.html"}>
- <div class="related">
- <h2><{$smarty.const._NEWS_MD_RELATED}></h2>
- </div>
- <{else}>
- <div class="topic_header">
- <{if !$story_topic}>
- <h2><{$modname}></h2>
- <{else}>
- <h2><{$topic_title}></h2>
- <{/if}>
- </div>
- <{if $topic_img || $topic_desc}>
- <div class="itemBody">
- <{if $topic_img}>
- <div class="itemImg gallery">
- <{if $img_lightbox}>
- <a href="<{$topic_medium}>" title="<{$topic_title}>" >
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
- </a>
- <{else}>
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
- <{/if}>
- </div>
- <{/if}>
- <{$topic_desc}>
- <div class="clear"></div>
- </div>
- <{/if}>
<{/if}>
<{if $advertisement}>
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_default.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_default.html 2012-07-16 08:29:14 UTC (rev 9886)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_default.html 2012-07-16 08:33:45 UTC (rev 9887)
@@ -1,45 +1,73 @@
-<div id="default" class="item">
- <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}>
- <div class="itemImg gallery">
- <{if $img_lightbox}>
- <a href="<{$default.imageurl}>" title="<{$content.story_title}>">
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$default.thumburl}>" alt="<{$default.story_title}>"/>
- </a>
+<div class="news-index-default">
+ <div class="news-topicinfo">
+ <div class="topic_header">
+ <{if !$story_topic}>
+ <h2><{$modname}></h2>
<{else}>
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$default.thumburl}>" alt="<{$default.story_title}>"/>
+ <h2><{$topic_title}></h2>
<{/if}>
</div>
+ <{if $topic_img || $topic_desc}>
+ <div class="itemBody">
+ <{if $topic_img}>
+ <div class="itemImg gallery">
+ <{if $img_lightbox}>
+ <a href="<{$topic_medium}>" title="<{$topic_title}>" >
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
+ </a>
+ <{else}>
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{$topic_desc}>
+ <div class="clear"></div>
+ </div>
<{/if}>
- <{$default.story_short}>
- <div class="clear spacer"></div>
- <a class="itemMore" href="<{$default.url}>" title="<{$smarty.const._NEWS_MD_MORE}>"><{$smarty.const._NEWS_MD_MORE}></a>
</div>
- <{else}>
- <div class="itemText">
- <{if $default.story_img}>
- <div class="gallery">
- <{if $img_lightbox}>
- <a href="<{$default.imageurl}>" >
+ <div id="default" class="item">
+ <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}>
+ <div class="itemImg gallery">
+ <{if $img_lightbox}>
+ <a href="<{$default.imageurl}>" title="<{$content.story_title}>">
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$default.thumburl}>" alt="<{$default.story_title}>"/>
+ </a>
+ <{else}>
<img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$default.thumburl}>" alt="<{$default.story_title}>"/>
- </a>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{$default.story_short}>
+ <div class="clear spacer"></div>
+ <a class="itemMore" href="<{$default.url}>" title="<{$smarty.const._NEWS_MD_MORE}>"><{$smarty.const._NEWS_MD_MORE}></a>
+ </div>
<{else}>
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$default.thumburl}>" alt="<{$default.story_title}>"/>
+ <div class="itemText">
+ <{if $default.story_img}>
+ <div class="gallery">
+ <{if $img_lightbox}>
+ <a href="<{$default.imageurl}>" >
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$default.thumburl}>" alt="<{$default.story_title}>"/>
+ </a>
+ <{else}>
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$default.thumburl}>" alt="<{$default.story_title}>"/>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{$default.story_text}>
+ <div class="clear"></div>
+ </div>
<{/if}>
+ <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>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=delete&story_id=<{$default.story_id}>" title="<{$smarty.const._NEWS_MD_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._story_DELETE}>"/></a>
+ </span>
+ <{/if}>
</div>
- <{/if}>
- <{$default.story_text}>
- <div class="clear"></div>
</div>
- <{/if}>
- <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>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=delete&story_id=<{$default.story_id}>" title="<{$smarty.const._NEWS_MD_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._story_DELETE}>"/></a>
- </span>
- <{/if}>
- </div>
</div>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_list.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_list.html 2012-07-16 08:29:14 UTC (rev 9886)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_list.html 2012-07-16 08:33:45 UTC (rev 9887)
@@ -1,26 +1,54 @@
-<div class="itemList">
- <ul>
- <{foreach item=content from=$contents}>
- <li>
- <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}>
- <span class="itemPoster">
- <a href="<{$xoops_url}>/user.php?id=<{$content.story_uid}>" title="<{$content.owner}>"><{$content.owner}></a><{if $alluserpost}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.story_uid}>" title="<{$smarty.const._NEWS_MD_AUTHOR_ALL_DESC}><{$content.owner}>"><{$smarty.const._NEWS_MD_AUTHOR_ALL}></a>)<{/if}>
- </span>
- <{if $info.date || $info.hits}> •<{/if}>
+<div class="news-index-list">
+ <div class="news-topicinfo">
+ <div class="topic_header">
+ <{if !$story_topic}>
+ <h2><{$modname}></h2>
+ <{else}>
+ <h2><{$topic_title}></h2>
+ <{/if}>
+ </div>
+ <{if $topic_img || $topic_desc}>
+ <div class="itemBody">
+ <{if $topic_img}>
+ <div class="itemImg gallery">
+ <{if $img_lightbox}>
+ <a href="<{$topic_medium}>" title="<{$topic_title}>" >
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
+ </a>
+ <{else}>
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
<{/if}>
- <{if $info.date}>
- <span class="itemPostDate"><{$content.story_publish}></span>
- <{if $info.hits}> •<{/if}>
+ </div>
+ <{/if}>
+ <{$topic_desc}>
+ <div class="clear"></div>
+ </div>
+ <{/if}>
+ </div>
+ <div class="itemList">
+ <ul>
+ <{foreach item=content from=$contents}>
+ <li>
+ <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}>
+ <span class="itemPoster">
+ <a href="<{$xoops_url}>/user.php?id=<{$content.story_uid}>" title="<{$content.owner}>"><{$content.owner}></a><{if $alluserpost}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.story_uid}>" title="<{$smarty.const._NEWS_MD_AUTHOR_ALL_DESC}><{$content.owner}>"><{$smarty.const._NEWS_MD_AUTHOR_ALL}></a>)<{/if}>
+ </span>
+ <{if $info.date || $info.hits}> •<{/if}>
+ <{/if}>
+ <{if $info.date}>
+ <span class="itemPostDate"><{$content.story_publish}></span>
+ <{if $info.hits}> •<{/if}>
+ <{/if}>
+ <{if $info.hits}>
+ <span class="itemStats"><{$content.story_hits}> <{$smarty.const._NEWS_MD_HITS}></span>
+ <{/if}>
+ </div>
<{/if}>
- <{if $info.hits}>
- <span class="itemStats"><{$content.story_hits}> <{$smarty.const._NEWS_MD_HITS}></span>
- <{/if}>
- </div>
- <{/if}>
- </li>
- <{/foreach}>
- </ul>
+ </li>
+ <{/foreach}>
+ </ul>
+ </div>
</div>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_news.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_news.html 2012-07-16 08:29:14 UTC (rev 9886)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_news.html 2012-07-16 08:33:45 UTC (rev 9887)
@@ -1,62 +1,90 @@
-<{foreach item=content from=$contents}>
-<div class="item">
- <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>
- </div>
- <div class="itemInfo">
- <{if $info.author}>
- <span class="itemPoster">
- <{$smarty.const._NEWS_MD_AUTHOR}>: <a href="<{$xoops_url}>/user.php?id=<{$content.story_uid}>" title="<{$content.owner}>"><{$content.owner}></a><{if $alluserpost}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.story_uid}>" title="<{$smarty.const._NEWS_MD_AUTHOR_ALL_DESC}><{$content.owner}>"><{$smarty.const._NEWS_MD_AUTHOR_ALL}></a>)<{/if}>
- </span>
- <{if $info.date || $info.hits}> •<{/if}>
- <{/if}>
- <{if $info.date}>
- <span class="itemPostDate">
- <{$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}>
- <{if $info.hits}>
- <span class="itemStats"><{$content.story_hits}> <{$smarty.const._NEWS_MD_HITS}></span>
- <{/if}>
- <{if $info.showtopic && $content.story_topic}>
- <span class="itemPermaLink"> • <{$smarty.const._NEWS_MD_PUBTOPIC}>: <a href="<{$content.topicurl}>" title="<{$smarty.const._NEWS_MD_PUBTOPIC}> <{$content.topic}>"><{$content.topic}></a></span>
- <{/if}>
- </div>
- <div class="itemBody" id="story_<{$content.story_id}>">
- <{if $content.story_img}>
- <div class="itemImg gallery">
- <{if $img_lightbox}>
- <a href="<{$content.imageurl}>" title="<{$content.story_title}>" >
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
- </a>
+<div class="news-index-news">
+ <div class="news-topicinfo">
+ <div class="topic_header">
+ <{if !$story_topic}>
+ <h2><{$modname}></h2>
<{else}>
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
+ <h2><{$topic_title}></h2>
<{/if}>
</div>
+ <{if $topic_img || $topic_desc}>
+ <div class="itemBody">
+ <{if $topic_img}>
+ <div class="itemImg gallery">
+ <{if $img_lightbox}>
+ <a href="<{$topic_medium}>" title="<{$topic_title}>" >
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
+ </a>
+ <{else}>
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{$topic_desc}>
+ <div class="clear"></div>
+ </div>
<{/if}>
- <{if $content.story_short}>
- <div class="itemText"><{$content.story_short}></div>
- <{else}>
- <div class="itemText"><{$content.story_text|truncate:300}></div>
- <{/if}>
- <div class="clear"></div>
</div>
- <div class="itemFoot">
- <{if $info.coms}>
- <span class="itemPermaLink"><{if $content.story_comments}><{$content.story_comments}> <{$smarty.const._NEWS_MD_COMS}><{else}><{$smarty.const._NEWS_MD_NOCOMS}><{/if}></span>
- <{/if}>
- <{if $xoops_isadmin}>
- <span class="itemAdminLink">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=edit_content&story_id=<{$content.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>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=delete&story_id=<{$content.story_id}>" title="<{$smarty.const._NEWS_MD_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._story_DELETE}>"/></a>
- </span>
- <{/if}>
+ <{foreach item=content from=$contents}>
+ <div class="item">
+ <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>
+ </div>
+ <div class="itemInfo">
+ <{if $info.author}>
+ <span class="itemPoster">
+ <{$smarty.const._NEWS_MD_AUTHOR}>: <a href="<{$xoops_url}>/user.php?id=<{$content.story_uid}>" title="<{$content.owner}>"><{$content.owner}></a><{if $alluserpost}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.story_uid}>" title="<{$smarty.const._NEWS_MD_AUTHOR_ALL_DESC}><{$content.owner}>"><{$smarty.const._NEWS_MD_AUTHOR_ALL}></a>)<{/if}>
+ </span>
+ <{if $info.date || $info.hits}> •<{/if}>
+ <{/if}>
+ <{if $info.date}>
+ <span class="itemPostDate">
+ <{$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}>
+ <{if $info.hits}>
+ <span class="itemStats"><{$content.story_hits}> <{$smarty.const._NEWS_MD_HITS}></span>
+ <{/if}>
+ <{if $info.showtopic && $content.story_topic}>
+ <span class="itemPermaLink"> • <{$smarty.const._NEWS_MD_PUBTOPIC}>: <a href="<{$content.topicurl}>" title="<{$smarty.const._NEWS_MD_PUBTOPIC}> <{$content.topic}>"><{$content.topic}></a></span>
+ <{/if}>
+ </div>
+ <div class="itemBody" id="story_<{$content.story_id}>">
+ <{if $content.story_img}>
+ <div class="itemImg gallery">
+ <{if $img_lightbox}>
+ <a href="<{$content.imageurl}>" title="<{$content.story_title}>" >
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
+ </a>
+ <{else}>
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{if $content.story_short}>
+ <div class="itemText"><{$content.story_short}></div>
+ <{else}>
+ <div class="itemText"><{$content.story_text|truncate:300}></div>
+ <{/if}>
+ <div class="clear"></div>
+ </div>
+ <div class="itemFoot">
+ <{if $info.coms}>
+ <span class="itemPermaLink"><{if $content.story_comments}><{$content.story_comments}> <{$smarty.const._NEWS_MD_COMS}><{else}><{$smarty.const._NEWS_MD_NOCOMS}><{/if}></span>
+ <{/if}>
+ <{if $xoops_isadmin}>
+ <span class="itemAdminLink">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=edit_content&story_id=<{$content.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>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=delete&story_id=<{$content.story_id}>" title="<{$smarty.const._NEWS_MD_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._story_DELETE}>"/></a>
+ </span>
+ <{/if}>
+ </div>
</div>
-</div>
-<{/foreach}>
\ No newline at end of file
+ <{/foreach}>
+</div>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_photo.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_photo.html 2012-07-16 08:29:14 UTC (rev 9886)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_photo.html 2012-07-16 08:33:45 UTC (rev 9887)
@@ -1,59 +1,87 @@
-<{foreach item=content from=$contents}>
-<div class="item">
- <div class="itemBody" id="story_<{$content.story_id}>">
- <div class="itemImg center gallery">
- <{if $img_lightbox}>
- <a href="<{$content.imageurl}>" title ="<{$content.story_title}>" >
+<div class="news-index-photo">
+ <div class="news-topicinfo">
+ <div class="topic_header">
+ <{if !$story_topic}>
+ <h2><{$modname}></h2>
+ <{else}>
+ <h2><{$topic_title}></h2>
+ <{/if}>
+ </div>
+ <{if $topic_img || $topic_desc}>
+ <div class="itemBody">
+ <{if $topic_img}>
+ <div class="itemImg gallery">
+ <{if $img_lightbox}>
+ <a href="<{$topic_medium}>" title="<{$topic_title}>" >
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
+ </a>
+ <{else}>
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{$topic_desc}>
+ <div class="clear"></div>
+ </div>
+ <{/if}>
+ </div>
+ <{foreach item=content from=$contents}>
+ <div class="item">
+ <div class="itemBody" id="story_<{$content.story_id}>">
+ <div class="itemImg center gallery">
+ <{if $img_lightbox}>
+ <a href="<{$content.imageurl}>" title ="<{$content.story_title}>" >
+ <img width="<{$imgwidth}>" class="story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
+ </a>
+ <{else}>
<img width="<{$imgwidth}>" class="story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
- </a>
+ <{/if}>
+ </div>
+ <{if $content.story_short}>
+ <div class="itemText"><{$content.story_short}></div>
<{else}>
- <img width="<{$imgwidth}>" class="story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
+ <div class="itemText"><{$content.story_text|truncate:300}></div>
<{/if}>
</div>
- <{if $content.story_short}>
- <div class="itemText"><{$content.story_short}></div>
- <{else}>
- <div class="itemText"><{$content.story_text|truncate:300}></div>
- <{/if}>
- </div>
- <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 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>
</div>
+ <div class="itemInfo">
+ <{if $info.author}>
+ <span class="itemPoster">
+ <{$smarty.const._NEWS_MD_AUTHOR}>: <a href="<{$xoops_url}>/user.php?id=<{$content.story_uid}>" title="<{$content.owner}>"><{$content.owner}></a><{if $alluserpost}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.story_uid}>" title="<{$smarty.const._NEWS_MD_AUTHOR_ALL_DESC}><{$content.owner}>"><{$smarty.const._NEWS_MD_AUTHOR_ALL}></a>)<{/if}>
+ </span>
+ <{if $info.date || $info.hits}> •<{/if}>
+ <{/if}>
+ <{if $info.date}>
+ <span class="itemPostDate">
+ <{$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}>
+ <{if $info.hits}>
+ <span class="itemStats"><{$content.story_hits}> <{$smarty.const._NEWS_MD_HITS}></span>
+ <{/if}>
+ <{if $info.showtopic && $content.story_topic}>
+ <span class="itemPermaLink"> • <{$smarty.const._NEWS_MD_PUBTOPIC}>: <a href="<{$content.topicurl}>" title="<{$smarty.const._NEWS_MD_PUBTOPIC}> <{$content.topic}>"><{$content.topic}></a></span>
+ <{/if}>
+ </div>
+ <div class="itemFoot">
+ <{if $info.coms}>
+ <span class="itemPermaLink"><{if $content.story_comments}><{$content.story_comments}> <{$smarty.const._NEWS_MD_COMS}><{else}><{$smarty.const._NEWS_MD_NOCOMS}><{/if}></span>
+ <{/if}>
+ <{if $xoops_isadmin}>
+ <span class="itemAdminLink">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=edit_content&story_id=<{$content.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>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=delete&story_id=<{$content.story_id}>" title="<{$smarty.const._NEWS_MD_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._story_DELETE}>"/></a>
+ </span>
+ <{/if}>
+ </div>
</div>
- <div class="itemInfo">
- <{if $info.author}>
- <span class="itemPoster">
- <{$smarty.const._NEWS_MD_AUTHOR}>: <a href="<{$xoops_url}>/user.php?id=<{$content.story_uid}>" title="<{$content.owner}>"><{$content.owner}></a><{if $alluserpost}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.story_uid}>" title="<{$smarty.const._NEWS_MD_AUTHOR_ALL_DESC}><{$content.owner}>"><{$smarty.const._NEWS_MD_AUTHOR_ALL}></a>)<{/if}>
- </span>
- <{if $info.date || $info.hits}> •<{/if}>
- <{/if}>
- <{if $info.date}>
- <span class="itemPostDate">
- <{$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}>
- <{if $info.hits}>
- <span class="itemStats"><{$content.story_hits}> <{$smarty.const._NEWS_MD_HITS}></span>
- <{/if}>
- <{if $info.showtopic && $content.story_topic}>
- <span class="itemPermaLink"> • <{$smarty.const._NEWS_MD_PUBTOPIC}>: <a href="<{$content.topicurl}>" title="<{$smarty.const._NEWS_MD_PUBTOPIC}> <{$content.topic}>"><{$content.topic}></a></span>
- <{/if}>
- </div>
- <div class="itemFoot">
- <{if $info.coms}>
- <span class="itemPermaLink"><{if $content.story_comments}><{$content.story_comments}> <{$smarty.const._NEWS_MD_COMS}><{else}><{$smarty.const._NEWS_MD_NOCOMS}><{/if}></span>
- <{/if}>
- <{if $xoops_isadmin}>
- <span class="itemAdminLink">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=edit_content&story_id=<{$content.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>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=delete&story_id=<{$content.story_id}>" title="<{$smarty.const._NEWS_MD_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._story_DELETE}>"/></a>
- </span>
- <{/if}>
- </div>
-</div>
-<{/foreach}>
\ No newline at end of file
+ <{/foreach}>
+</div>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_table.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_table.html 2012-07-16 08:29:14 UTC (rev 9886)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_table.html 2012-07-16 08:33:45 UTC (rev 9887)
@@ -1,24 +1,52 @@
-<table summary="<{$topic_title}> <{$smarty.const._NEWS_MD_RELATED}>">
- <thead>
- <tr>
- <th><{$smarty.const._NEWS_MD_TITLE}></th>
- <{if !$story_topic}><th><{$smarty.const._NEWS_MD_TOPIC}></th><{/if}>
- <{if $info.author}><th><{$smarty.const._NEWS_MD_AUTHOR}></th><{/if}>
- <{if $info.date}><th><{$smarty.const._NEWS_MD_DATE}></th><{/if}>
- <{if $info.hits}><th><{$smarty.const._NEWS_MD_HITS}></th><{/if}>
- <{if $info.coms}><th><{$smarty.const._NEWS_MD_COMS}></th><{/if}>
- </tr>
- </thead>
- <tbody>
- <{foreach item=content from=$contents}>
- <tr class="<{cycle values="even,odd"}>">
- <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_publish}></td><{/if}>
- <{if $info.hits}><td><{$content.story_hits}></td><{/if}>
- <{if $info.coms}><td><{$content.story_comments}></td><{/if}>
- </tr>
- <{/foreach}>
- </tbody>
-</table>
+<div class="news-index-table">
+ <div class="news-topicinfo">
+ <div class="topic_header">
+ <{if !$story_topic}>
+ <h2><{$modname}></h2>
+ <{else}>
+ <h2><{$topic_title}></h2>
+ <{/if}>
+ </div>
+ <{if $topic_img || $topic_desc}>
+ <div class="itemBody">
+ <{if $topic_img}>
+ <div class="itemImg gallery">
+ <{if $img_lightbox}>
+ <a href="<{$topic_medium}>" title="<{$topic_title}>" >
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
+ </a>
+ <{else}>
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{$topic_desc}>
+ <div class="clear"></div>
+ </div>
+ <{/if}>
+ </div>
+ <table>
+ <thead>
+ <tr>
+ <th><{$smarty.const._NEWS_MD_TITLE}></th>
+ <{if !$story_topic}><th><{$smarty.const._NEWS_MD_TOPIC}></th><{/if}>
+ <{if $info.author}><th><{$smarty.const._NEWS_MD_AUTHOR}></th><{/if}>
+ <{if $info.date}><th><{$smarty.const._NEWS_MD_DATE}></th><{/if}>
+ <{if $info.hits}><th><{$smarty.const._NEWS_MD_HITS}></th><{/if}>
+ <{if $info.coms}><th><{$smarty.const._NEWS_MD_COMS}></th><{/if}>
+ </tr>
+ </thead>
+ <tbody>
+ <{foreach item=content from=$contents}>
+ <tr class="<{cycle values="even,odd"}>">
+ <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_publish}></td><{/if}>
+ <{if $info.hits}><td><{$content.story_hits}></td><{/if}>
+ <{if $info.coms}><td><{$content.story_comments}></td><{/if}>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
