Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/365] Unify announcements and news module and remove inline css

Browse Source 
B3P-365
This commit is contained in:
Marc Alexander
2014-09-11 00:20:01 +02:00
parent b0830f2eae
commit 0d27f01ec4
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
styles/prosilver/template/portal/modules/announcements_center.html
View File

@@ -1,12 +1,10 @@
<!-- BEGIN announcements_center_row -->
<!-- IF announcements_center_row.S_FIRST_ROW -->
{$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
<!-- ENDIF -->
<!-- IF $S_POSTBODY_TOP --><div class="postbody portal-module-postbody"><!-- ENDIF -->
<!-- BEGIN announcements_center_row -->
<!-- IF announcements_center_row.S_NO_TOPICS -->
<div class="post bg2">
<div class="inner">
<span class="portal-centered-content"><strong>{L_NO_ANNOUNCEMENTS}</strong></span>
<span><strong>{L_NO_ANNOUNCEMENTS}</strong></span>
<!-- ELSE -->
<div class="post <!-- IF announcements_center_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --> portal-no-margin">
<div class="inner">
@@ -44,8 +42,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- END announcements_center_row -->
<!-- IF $S_POSTBODY_TOP --></div><!-- ENDIF -->
<!-- IF announcements_center_row.S_LAST_ROW -->
{$C_BLOCK_F_L}{$C_BLOCK_F_R}
<!-- ENDIF -->
<!-- END announcements_center_row -->
{$C_BLOCK_F_L}{$C_BLOCK_F_R}

18
styles/prosilver/template/portal/modules/news_center.html
View File

@@ -1,14 +1,14 @@
{$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
<!-- IF $S_POSTBODY_TOP --><div class="postbody" style="width: 100%"><!-- ENDIF -->
<!-- IF $S_POSTBODY_TOP --><div class="postbody portal-module-postbody"><!-- ENDIF -->
<!-- BEGIN news_row -->
<!-- IF news_row.S_NO_TOPICS -->
<div class="post bg2" style="margin-bottom: 0px">
<div class="post bg2">
<div class="inner">
<span style="text-align: center;"><strong>{L_NO_NEWS}</strong></span>
<span><strong>{L_NO_NEWS}</strong></span>
</div>
</div>
<!-- ELSE -->
<div style="margin-bottom: <!-- IF news_row.S_LAST_ROW -->0px<!-- ELSE -->1px<!-- ENDIF -->" class="post <!-- IF news_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
<div class="post <!-- IF 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 -->
@@ -16,7 +16,7 @@
<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>
</ul>
<!-- IF not $S_POSTBODY_TOP --><div class="postbody" style="width: 100%"><!-- ENDIF -->
<!-- IF not $S_POSTBODY_TOP --><div class="postbody portal-module-postbody"><!-- ENDIF -->
<div class="content">
<br />{news_row.TEXT}
</div>
@@ -28,11 +28,11 @@
<!-- END attachment -->
</dl>
<!-- ENDIF -->
<br style="clear:both" />
<span style="float: left;">{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 style="float: right; margin: 0 0 5px 0">{news_row.OPEN}<a href="{news_row.U_READ_FULL}">{news_row.L_READ_FULL}</a>{news_row.CLOSE}</span>
<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>
<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 style="clear:both" /><!-- ENDIF -->
<!-- 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 -->

6
styles/prosilver/template/portal/modules/news_compact_center.html
View File

@@ -1,9 +1,9 @@
<!-- BEGIN news_row -->
<!-- IF news_row.S_NO_TOPICS -->
{$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
<div class="post bg2" style="margin-bottom: 0px">
<div class="post bg2 portal-no-margin">
<div class="inner">
<span style="text-align: center;"><strong>{L_NO_NEWS}</strong></span>
<span><strong>{L_NO_NEWS}</strong></span>
</div>
</div>
{$C_BLOCK_F_L}{$C_BLOCK_F_R}
@@ -43,7 +43,7 @@
<!-- 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}" style="font-weight: bold;">{news_row.FORUM_NAME}</a>
<br />{L_FORUM}{L_COLON} <a href="{news_row.U_VIEWFORUM}" class="portal-forumtitle">{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 -->
</div> <!-- \END <div class="list-inner"> -->

2
styles/prosilver/theme/portal.css
View File

@@ -155,7 +155,7 @@
margin: 0 0 5px 0;
}
div.inner > .portal-module-postbody:not(:last-child) .post {
.portal-module-postbody .post:not(:last-child) {
margin-bottom: 1px;
}