[ticket/416] Fix news modules variables for independent news modules

B3P-416
This commit is contained in:
Marc Alexander
2014-11-09 19:43:42 +01:00
parent 703e846e37
commit ced68fc73b
2 changed files with 57 additions and 48 deletions

View File

@@ -1,45 +1,48 @@
{$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
<!-- IF $S_POSTBODY_TOP --><div class="postbody portal-module-postbody"><!-- ENDIF -->
<!-- BEGIN news -->
<!-- IF news.MODULE_ID eq $MODULE_ID -->
<!-- BEGIN news_row -->
<!-- IF news_row.S_NO_TOPICS -->
<!-- IF news.news_row.S_FIRST_ROW --><a id="n_{$MODULE_ID}"></a><!-- ENDIF -->
<!-- IF news.news_row.S_NO_TOPICS -->
<div class="post bg2">
<div class="inner">
<span><strong>{L_NO_NEWS}</strong></span>
</div>
</div>
<!-- ELSE -->
<div class="post <!-- IF news_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
<div class="post <!-- IF news.news_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
<div class="inner">
<h4 class="first"><a id="n{news_row.N_ID}"></a><!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --><strong>{L_VIEW_TOPIC_POLL}</strong><!-- ENDIF --><!-- IF news_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{news_row.TOPIC_ICON_IMG}" width="{news_row.TOPIC_ICON_IMG_WIDTH}" height="{news_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{news_row.U_VIEW_COMMENTS}"><strong>{news_row.TITLE}</strong></a></h4>
<!-- IF news_row.PAGINATION --><strong class="pagination"><span>{news_row.PAGINATION}</span></strong><!-- ENDIF -->
<h4 class="first"><a id="n_{$MODULE_ID}_{news.news_row.N_ID}"></a><!-- IF news.news_row.S_UNREAD_INFO --><a href="{news.news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news.news_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {news.news_row.ATTACH_ICON_IMG} <!-- IF news.news_row.S_POLL --><strong>{L_VIEW_TOPIC_POLL}</strong><!-- ENDIF --><!-- IF news.news_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{news.news_row.TOPIC_ICON_IMG}" width="{news.news_row.TOPIC_ICON_IMG_WIDTH}" height="{news.news_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{news.news_row.U_VIEW_COMMENTS}"><strong>{news.news_row.TITLE}</strong></a></h4>
<!-- IF news.news_row.PAGINATION --><strong class="pagination"><span>{news.news_row.PAGINATION}</span></strong><!-- ENDIF -->
<ul class="linklist">
<li>{POSTED_BY_TEXT} {L_POST_BY_AUTHOR}{L_COLON} {news_row.POSTER_FULL} &raquo; {news_row.TIME}</li>
<li class="rightside">{L_FORUM}{L_COLON} <strong><a href="{news_row.U_VIEWFORUM}">{news_row.FORUM_NAME}</a></strong></li>
<li>{news.POSTED_BY_TEXT} {L_POST_BY_AUTHOR}{L_COLON} {news.news_row.POSTER_FULL} &raquo; {news.news_row.TIME}</li>
<li class="rightside">{L_FORUM}{L_COLON} <strong><a href="{news.news_row.U_VIEWFORUM}">{news.news_row.FORUM_NAME}</a></strong></li>
</ul>
<!-- IF not $S_POSTBODY_TOP --><div class="postbody portal-module-postbody"><!-- ENDIF -->
<div class="content">
<br />{news_row.TEXT}
<br />{news.news_row.TEXT}
</div>
<!-- IF news_row.S_HAS_ATTACHMENTS -->
<!-- IF news.news_row.S_HAS_ATTACHMENTS -->
<dl class="attachbox">
<dt>{L_ATTACHMENTS}</dt>
<!-- BEGIN attachment -->
<dd>{news_row.attachment.DISPLAY_ATTACHMENT}</dd>
<dd>{news.news_row.attachment.DISPLAY_ATTACHMENT}</dd>
<!-- END attachment -->
</dl>
<!-- ENDIF -->
<br class="portal-clear" />
<span class="portal-title-span">{L_TOPIC_VIEWS}{L_COLON} {news_row.TOPIC_VIEWS} &nbsp;&bull;&nbsp; <a href="{news_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}">{L_COMMENTS}{L_COLON} {news_row.REPLIES}</a> &nbsp;&bull;&nbsp; <a href="{news_row.U_POST_COMMENT}">{L_PORTAL_POST_REPLY}</a></span>
<span class="portal-read-all-link">{news_row.OPEN}<a href="{news_row.U_READ_FULL}">{news_row.L_READ_FULL}</a>{news_row.CLOSE}</span>
<span class="portal-title-span">{L_TOPIC_VIEWS}{L_COLON} {news.news_row.TOPIC_VIEWS} &nbsp;&bull;&nbsp; <a href="{news.news_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}">{L_COMMENTS}{L_COLON} {news.news_row.REPLIES}</a> &nbsp;&bull;&nbsp; <a href="{news.news_row.U_POST_COMMENT}">{L_PORTAL_POST_REPLY}</a></span>
<span class="portal-read-all-link">{news.news_row.OPEN}<a href="{news.news_row.U_READ_FULL}">{news.news_row.L_READ_FULL}</a>{news.news_row.CLOSE}</span>
<div class="back2top"><a href="#wrap" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
<!-- IF news_row.S_NOT_LAST --><br class="portal-clear" /><!-- ENDIF -->
<!-- IF news_row.S_LAST_ROW -->
<!-- IF not news_row.S_NO_TOPICS -->
<!-- IF NP_PAGINATION or TOTAL_NEWS -->
<!-- IF news.news_row.S_NOT_LAST --><br class="portal-clear" /><!-- ENDIF -->
<!-- IF news.news_row.S_LAST_ROW -->
<!-- IF not news.news_row.S_NO_TOPICS -->
<!-- IF news.NP_PAGINATION or news.TOTAL_NEWS -->
<hr class="dashed" />
<div class="pagination">
{TOTAL_NEWS}
<!-- IF NP_PAGE_NUMBER --><!-- IF NP_PAGINATION --> &bull; {NP_PAGE_NUMBER} &bull; {NP_PAGINATION}<!-- ELSE --> &bull; {NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
{news.TOTAL_NEWS}
<!-- IF news.NP_PAGE_NUMBER --><!-- IF news.NP_PAGINATION --> &bull; {news.NP_PAGE_NUMBER} &bull; {news.NP_PAGINATION}<!-- ELSE --> &bull; {news.NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
<!-- ENDIF -->
@@ -49,5 +52,7 @@
</div>
<!-- ENDIF -->
<!-- END news_row -->
<!-- ENDIF -->
<!-- END news -->
<!-- IF $S_POSTBODY_TOP --></div><!-- ENDIF -->
{$C_BLOCK_F_L}{$C_BLOCK_F_R}
{$C_BLOCK_F_L}{$C_BLOCK_F_R}

View File

@@ -1,5 +1,7 @@
<!-- BEGIN news -->
<!-- IF news.MODULE_ID eq $MODULE_ID -->
<!-- BEGIN news_row -->
<!-- IF news_row.S_NO_TOPICS -->
<!-- IF news.news_row.S_NO_TOPICS -->
{$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
<div class="post bg2 portal-no-margin">
<div class="inner">
@@ -8,10 +10,10 @@
</div>
{$C_BLOCK_F_L}{$C_BLOCK_F_R}
<!-- ELSE -->
<!-- IF news_row.S_FIRST_ROW -->
<!-- IF news.news_row.S_FIRST_ROW -->
{$CC_BLOCK_H_L}
<dt id="n">{$TITLE}</dt>
<!-- IF S_DISPLAY_NEWS_RVS -->
<dt id="n_{$MODULE_ID}">{$TITLE}</dt>
<!-- IF news.S_DISPLAY_NEWS_RVS -->
<dd class="posts responsive-portal-news">{L_REPLIES}</dd>
<dd class="views responsive-portal-news">{L_VIEWS}</dd>
<!-- ENDIF -->
@@ -19,51 +21,51 @@
{$CC_BLOCK_H_R}
<ul class="topiclist topics responsive-portal-news">
<!-- ENDIF -->
<li class="row<!-- IF news_row.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
<dl class="icon {news_row.TOPIC_IMG_STYLE}">
<dt <!-- IF news_row.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{news_row.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{news_row.TOPIC_FOLDER_IMG_ALT}">
<!-- IF news_row.S_UNREAD_TOPIC -->
<a href="{news_row.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>
<li class="row<!-- IF news.news_row.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
<dl class="icon {news.news_row.TOPIC_IMG_STYLE}">
<dt <!-- IF news.news_row.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{news.news_row.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{news.news_row.TOPIC_FOLDER_IMG_ALT}">
<!-- IF news.news_row.S_UNREAD_TOPIC -->
<a href="{news.news_row.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>
<!-- ENDIF -->
<div class="list-inner">
<!-- IF news_row.ATTACH_ICON_IMG -->{news_row.ATTACH_ICON_IMG} <!-- ENDIF -->
<a href="{news_row.U_VIEW_COMMENTS}" title="{news_row.TITLE}" class="topictitle">{news_row.TITLE}</a><!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --> &bull; <a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->
<!-- IF news_row.PAGINATION -->
<!-- IF news.news_row.ATTACH_ICON_IMG -->{news.news_row.ATTACH_ICON_IMG} <!-- ENDIF -->
<a href="{news.news_row.U_VIEW_COMMENTS}" title="{news.news_row.TITLE}" class="topictitle">{news.news_row.TITLE}</a><!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --> &bull; <a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->
<!-- IF news.news_row.PAGINATION -->
<div class="pagination">
<ul><!-- BEGIN pagination -->
<!-- IF news_row.pagination.S_IS_PREV -->
<!-- ELSEIF news_row.pagination.S_IS_CURRENT --><li class="active"><span>{news_row.pagination.PAGE_NUMBER}</span></li>
<!-- ELSEIF news_row.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
<!-- ELSEIF news_row.pagination.S_IS_NEXT -->
<!-- ELSE --><li><a href="{news_row.pagination.PAGE_URL}">{news_row.pagination.PAGE_NUMBER}</a></li>
<!-- IF news.news_row.pagination.S_IS_PREV -->
<!-- ELSEIF news.news_row.pagination.S_IS_CURRENT --><li class="active"><span>{news.news_row.pagination.PAGE_NUMBER}</span></li>
<!-- ELSEIF news.news_row.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
<!-- ELSEIF news.news_row.pagination.S_IS_NEXT -->
<!-- ELSE --><li><a href="{news.news_row.pagination.PAGE_URL}">{news.news_row.pagination.PAGE_NUMBER}</a></li>
<!-- ENDIF -->
<!-- END pagination --->
</ul>
</div>
<!-- ENDIF -->
<br />{L_POSTED} {L_POST_BY_AUTHOR} {news_row.POSTER_FULL} &raquo; {news_row.TIME}
<!-- IF news_row.FORUM_NAME -->
<br />{L_FORUM}{L_COLON} <a href="{news_row.U_VIEWFORUM}" class="portal-forumtitle">{news_row.FORUM_NAME}</a>
<br />{L_POSTED} {L_POST_BY_AUTHOR} {news.news_row.POSTER_FULL} &raquo; {news.news_row.TIME}
<!-- IF news.news_row.FORUM_NAME -->
<br />{L_FORUM}{L_COLON} <a href="{news.news_row.U_VIEWFORUM}" class="portal-forumtitle">{news.news_row.FORUM_NAME}</a>
<!-- ENDIF -->
<!-- IF not S_DISPLAY_NEWS_RVS --><!-- IF news_row.FORUM_NAME -->&bull; <!-- ENDIF -->{L_REPLIES}{L_COLON} <strong>{news_row.REPLIES}</strong> &bull; {L_VIEWS}{L_COLON} <strong>{news_row.TOPIC_VIEWS}</strong><!-- ENDIF -->
<!-- IF not S_DISPLAY_NEWS_RVS --><!-- IF news.news_row.FORUM_NAME -->&bull; <!-- ENDIF -->{L_REPLIES}{L_COLON} <strong>{news.news_row.REPLIES}</strong> &bull; {L_VIEWS}{L_COLON} <strong>{news.news_row.TOPIC_VIEWS}</strong><!-- ENDIF -->
</div> <!-- \END <div class="list-inner"> -->
</dt>
<!-- IF S_DISPLAY_NEWS_RVS -->
<dd class="posts" data-skip-responsive="true">{news_row.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
<dd class="views" data-skip-responsive="true">{news_row.TOPIC_VIEWS} <dfn>{L_VIEWS}</dfn></dd>
<dd class="posts" data-skip-responsive="true">{news.news_row.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
<dd class="views" data-skip-responsive="true">{news.news_row.TOPIC_VIEWS} <dfn>{L_VIEWS}</dfn></dd>
<!-- ENDIF -->
<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn>{L_POST_BY_AUTHOR} {news_row.USERNAME_FULL_LAST} <!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --><br />
{news_row.LAST_POST_TIME}</span>
<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn>{L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} <!-- IF news.news_row.S_UNREAD_INFO --><a href="{news.news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news.news_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --><br />
{news.news_row.LAST_POST_TIME}</span>
</dd>
</dl>
</li>
<!-- IF news_row.S_LAST_ROW -->
<!-- IF NP_PAGINATION or TOTAL_NEWS -->
<li class="row<!-- IF news_row.S_ROW_COUNT is even --> bg2<!-- ELSE --> bg1<!-- ENDIF --> portal-news-pagination">
<!-- IF news.news_row.S_LAST_ROW -->
<!-- IF news.NP_PAGINATION or news.TOTAL_NEWS -->
<li class="row<!-- IF news.news_row.S_ROW_COUNT is even --> bg2<!-- ELSE --> bg1<!-- ENDIF --> portal-news-pagination">
<div class="topic-actions">
<div class="pagination">
{TOTAL_NEWS}
<!-- IF NP_PAGE_NUMBER --><!-- IF NP_PAGINATION --> &bull; {NP_PAGE_NUMBER} &bull; {NP_PAGINATION}<!-- ELSE --> &bull; {NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> &nbsp;
{news.TOTAL_NEWS}
<!-- IF news.NP_PAGE_NUMBER --><!-- IF news.NP_PAGINATION --> &bull; {news.NP_PAGE_NUMBER} &bull; {news.NP_PAGINATION}<!-- ELSE --> &bull; {news.NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> &nbsp;
</div>
</div>
</li>
@@ -73,3 +75,5 @@
<!-- ENDIF -->
<!-- ENDIF -->
<!-- END news_row -->
<!-- ENDIF -->
<!-- END news -->