From c72a94b8b22cad43cdf1e61cc285f7e09e09ad99 Mon Sep 17 00:00:00 2001
From: Ice <ice@tcoa.co.uk>
Date: Wed, 23 Apr 2008 16:08:20 +0000
Subject: [PATCH] Unreported: Better posted by text

---
 root/portal/block/news.php                                      | 1 +
 root/styles/prosilver/template/portal/block/announcements.html  | 2 +-
 .../prosilver/template/portal/block/announcements_compact.html  | 2 +-
 root/styles/prosilver/template/portal/block/news.html           | 2 +-
 root/styles/prosilver/template/portal/block/news_compact.html   | 2 +-
 templates/subsilver2/template/portal/block/announcements.html   | 2 +-
 .../subsilver2/template/portal/block/announcements_compact.html | 2 +-
 templates/subsilver2/template/portal/block/news.html            | 2 +-
 templates/subsilver2/template/portal/block/news_compact.html    | 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/root/portal/block/news.php b/root/portal/block/news.php
index e56f3465..7611f013 100644
--- a/root/portal/block/news.php
+++ b/root/portal/block/news.php
@@ -161,6 +161,7 @@ if($news < 0)
 			if ($portal_config['portal_number_of_news'] <> 0 && $portal_config['portal_news_archive'])
 			{
 				$template->assign_vars(array(
+					'POSTED_BY_TEXT'	=> ( $portal_config['portal_news_show_last'] ) ? $user->lang['LAST_POST'] : $user->lang['POSTED'],
 					'NP_PAGINATION'		=> $pagination,
 					'TOTAL_NEWS'		=> ($total_news == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $total_news),
 					'NP_PAGE_NUMBER'	=> on_page($total_news, $portal_config['portal_number_of_news'], $start))
diff --git a/root/styles/prosilver/template/portal/block/announcements.html b/root/styles/prosilver/template/portal/block/announcements.html
index ae559d23..42875da0 100644
--- a/root/styles/prosilver/template/portal/block/announcements.html
+++ b/root/styles/prosilver/template/portal/block/announcements.html
@@ -11,7 +11,7 @@
 						<h4 class="first"><a name="a{announcements_row.A_ID}"></a><!-- IF announcements_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG} <!-- IF announcements_row.S_POLL --> <strong>{L_POLL}: </strong><!-- ENDIF --><a href="{announcements_row.U_VIEW_COMMENTS}"><strong>{announcements_row.TITLE}</strong></a></h4>
 						<!-- IF announcements_row.PAGINATION --><strong class="pagination"><span>{announcements_row.PAGINATION}</span></strong><!-- ENDIF -->
 						<ul class="linklist">
-							<li>{L_POSTED_BY}: {announcements_row.POSTER_FULL} {L_POSTED_ON_DATE}: {announcements_row.TIME}</li>
+							<li>{L_POSTED} {L_POST_BY_AUTHOR}: {announcements_row.POSTER_FULL} {L_POSTED_ON_DATE}: {announcements_row.TIME}</li>
 						</ul>
 						<ul class="linklist">
 							<li>
diff --git a/root/styles/prosilver/template/portal/block/announcements_compact.html b/root/styles/prosilver/template/portal/block/announcements_compact.html
index b6eede2b..3e15e519 100644
--- a/root/styles/prosilver/template/portal/block/announcements_compact.html
+++ b/root/styles/prosilver/template/portal/block/announcements_compact.html
@@ -16,7 +16,7 @@
 						<a href="{announcements_row.U_VIEW_COMMENTS}" title="{announcements_row.TITLE}" class="topictitle">{announcements_row.TITLE}</a>
 						<br style="clear:both" />
 						<!-- IF announcements_row.PAGINATION --><strong class="pagination"><span>{announcements_row.PAGINATION}</span></strong><!-- ENDIF -->
-						{L_POST_BY_AUTHOR} {announcements_row.POSTER_FULL} {L_POSTED_ON_DATE} {announcements_row.TIME}
+						{L_POSTED} {L_POST_BY_AUTHOR}: {announcements_row.POSTER_FULL} {L_POSTED_ON_DATE} {announcements_row.TIME}
 						<br style="clear:both" />
 						<!-- IF announcements_row.FORUM_NAME -->
 						{L_FORUM}: <strong><a href="{announcements_row.U_VIEWFORUM}">{announcements_row.FORUM_NAME}</a></strong>
diff --git a/root/styles/prosilver/template/portal/block/news.html b/root/styles/prosilver/template/portal/block/news.html
index eaaaab98..c135cdeb 100644
--- a/root/styles/prosilver/template/portal/block/news.html
+++ b/root/styles/prosilver/template/portal/block/news.html
@@ -11,7 +11,7 @@
 						<h4 class="first"><a name="n{news_row.N_ID}"></a><!-- IF news_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><a href="{news_row.U_LAST_COMMENTS}"><strong>{news_row.TITLE}</strong></a></h4>
 						<!-- IF news_row.PAGINATION --><strong class="pagination"><span>{news_row.PAGINATION}</span></strong><!-- ENDIF -->
 						<ul class="linklist">
-							<li>{L_LAST_POST} {L_POST_BY_AUTHOR}: {news_row.POSTER_FULL} {L_POSTED_ON_DATE} {news_row.TIME}</li>
+							<li>{POSTED_BY_TEXT} {L_POST_BY_AUTHOR}: {news_row.POSTER_FULL} {L_POSTED_ON_DATE} {news_row.TIME}</li>
 						</ul>
 						<ul class="linklist">
 							<li>{L_FORUM}: <strong><a href="{news_row.U_VIEWFORUM}">{news_row.FORUM_NAME}</a></strong></li>
diff --git a/root/styles/prosilver/template/portal/block/news_compact.html b/root/styles/prosilver/template/portal/block/news_compact.html
index 7080c91d..f81481cc 100644
--- a/root/styles/prosilver/template/portal/block/news_compact.html
+++ b/root/styles/prosilver/template/portal/block/news_compact.html
@@ -15,7 +15,7 @@
 					<!-- IF news_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {news_row.ATTACH_ICON_IMG}  <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><a href="{news_row.U_LAST_COMMENTS}" title="{L_JUMP_NEWEST}" class="topictitle">{news_row.TITLE}</a>
 					<br style="clear:both" />
 					<!-- IF news_row.PAGINATION --><strong class="pagination"><span>{news_row.PAGINATION}</span></strong><!-- ENDIF -->
-					{L_LAST_POST} {L_POST_BY_AUTHOR}: {news_row.POSTER_FULL} {L_POSTED_ON_DATE} {news_row.TIME}
+					{POSTED_BY_TEXT} {L_POST_BY_AUTHOR}: {news_row.POSTER_FULL} {L_POSTED_ON_DATE} {news_row.TIME}
 					<br style="clear:both" />
 					<!-- IF news_row.FORUM_NAME -->
 					{L_FORUM}: <strong><a href="{news_row.U_VIEWFORUM}">{news_row.FORUM_NAME}</a></strong>
diff --git a/templates/subsilver2/template/portal/block/announcements.html b/templates/subsilver2/template/portal/block/announcements.html
index bfca22a3..8e3c75a2 100644
--- a/templates/subsilver2/template/portal/block/announcements.html
+++ b/templates/subsilver2/template/portal/block/announcements.html
@@ -15,7 +15,7 @@
 				<tr class="row<!-- IF announcements_row.S_ROW_COUNT is odd -->1<!-- ELSE -->2<!-- ENDIF -->">
 					<td style="padding:5px 5px 5px 5px;">
 						
-						<span class="gensmall" style="float: left;">{L_POSTED_BY}: {announcements_row.POSTER_FULL}
+						<span class="gensmall" style="float: left;">{L_POSTED} {L_POST_BY_AUTHOR}: {announcements_row.POSTER_FULL}
 							<!-- IF announcements_row.FORUM_NAME --> &nbsp;&bull;&nbsp; {L_FORUM}: <strong><a href="{announcements_row.U_VIEWFORUM}">{announcements_row.FORUM_NAME}</a></strong>
 							<!-- ELSE -->
 								 &nbsp;&bull;&nbsp; {L_GLOBAL_ANNOUNCEMENT}
diff --git a/templates/subsilver2/template/portal/block/announcements_compact.html b/templates/subsilver2/template/portal/block/announcements_compact.html
index 6aca5400..5730dc29 100644
--- a/templates/subsilver2/template/portal/block/announcements_compact.html
+++ b/templates/subsilver2/template/portal/block/announcements_compact.html
@@ -9,7 +9,7 @@
 				<!-- IF announcements_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG} <!-- IF announcements_row.S_POLL --> <strong style="font-size:1.1em;">{L_POLL}: </strong><!-- ENDIF -->
 				<a href="{announcements_row.U_VIEW_COMMENTS}" title="{announcements_row.TITLE}"><strong style="font-size:1.1em;">{announcements_row.TITLE}</strong></a>
 				<br style="clear:both" />
-				<span style="float: left;">{L_POST_BY_AUTHOR} {announcements_row.POSTER_FULL} {L_POSTED_ON_DATE} {announcements_row.TIME}</span>
+				<span style="float: left;">{L_POSTED} {L_POST_BY_AUTHOR}: {announcements_row.POSTER_FULL} {L_POSTED_ON_DATE} {announcements_row.TIME}</span>
 				<!-- IF announcements_row.PAGINATION --><span style="float: right; font-size:0.9em;"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {announcements_row.PAGINATION} ] </span><!-- ENDIF -->
 			<br style="clear:both" />
 			<!-- IF announcements_row.FORUM_NAME -->
diff --git a/templates/subsilver2/template/portal/block/news.html b/templates/subsilver2/template/portal/block/news.html
index 542c937e..1b762f99 100644
--- a/templates/subsilver2/template/portal/block/news.html
+++ b/templates/subsilver2/template/portal/block/news.html
@@ -13,7 +13,7 @@
 				</tr>
 				<tr class="row<!-- IF news_row.S_ROW_COUNT is odd -->1<!-- ELSE -->2<!-- ENDIF -->">
 					<td style="padding:5px 5px 5px 5px;">
-						<span class="gensmall" style="float: left;">{L_POSTED_BY}: {news_row.POSTER_FULL}
+						<span class="gensmall" style="float: left;">{POSTED_BY_TEXT} {L_POST_BY_AUTHOR}: {news_row.POSTER_FULL}
 						<!-- IF news_row.FORUM_NAME --> &nbsp;&bull;&nbsp; {L_FORUM}: <strong><a href="{news_row.U_VIEWFORUM}">{news_row.FORUM_NAME}</a></strong><!-- ENDIF -->
 						</span>
 						<span class="gensmall" style="float: right;">{news_row.TIME}</span>
diff --git a/templates/subsilver2/template/portal/block/news_compact.html b/templates/subsilver2/template/portal/block/news_compact.html
index 310b2311..e5d53eda 100644
--- a/templates/subsilver2/template/portal/block/news_compact.html
+++ b/templates/subsilver2/template/portal/block/news_compact.html
@@ -8,7 +8,7 @@
 			<!-- IF news_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --> <strong style="font-size:1.1em;">{L_POLL}: </strong><!-- ENDIF -->
 			<a href="{news_row.U_VIEW_COMMENTS}" title="{news_row.TITLE}"><strong style="font-size:1.1em;">{news_row.TITLE}</strong></a>
 			<br style="clear:both" />
-			<span style="float: left;">{L_POST_BY_AUTHOR} {news_row.POSTER_FULL} {L_POSTED_ON_DATE} {news_row.TIME}</span>
+			<span style="float: left;">{POSTED_BY_TEXT} {L_POST_BY_AUTHOR}: {news_row.POSTER_FULL} {L_POSTED_ON_DATE} {news_row.TIME}</span>
 			<!-- IF news_row.PAGINATION --><span style="float: right; font-size:0.9em;"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {news_row.PAGINATION} ] </span><!-- ENDIF -->
 			<br style="clear:both" />
 			<!-- IF news_row.FORUM_NAME -->{L_FORUM}: <strong><a href="{news_row.U_VIEWFORUM}">{news_row.FORUM_NAME}</a></strong><!-- ENDIF -->