From 3c3eb2d1579a3834ca01babab99d1274c26f84f6 Mon Sep 17 00:00:00 2001
From: Kevin <kevin@breest.info>
Date: Sun, 17 Aug 2008 00:15:30 +0000
Subject: [PATCH] Fix anchor part II (read full in text view) and column hide
 in subsilver2 announcements_compact.html

---
 root/portal/block/announcements.php                           | 4 ++--
 root/portal/block/news.php                                    | 4 ++--
 .../template/portal/block/announcements_compact.html          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/root/portal/block/announcements.php b/root/portal/block/announcements.php
index 62e4ce9a..c38504d9 100644
--- a/root/portal/block/announcements.php
+++ b/root/portal/block/announcements.php
@@ -129,7 +129,7 @@ else
 	
 			$real_forum_id = ( $forum_id == 0 ) ? $fetch_news['global_id']: $forum_id;
 			
-			$read_full_url = (isset($_GET['ap'])) ? 'ap='. $start . '&amp;announcement=' . $i . '#a' . $i : 'announcement=' . $i . '#a' . $i;
+			$read_full_url = (isset($_GET['ap'])) ? 'ap='. $start . '&amp;announcement=#a' : 'announcement=#a';
 			$view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&amp;t=' . $topic_id);
 			if ( $portal_config['portal_announcements_archive'] )
 			{
@@ -251,7 +251,7 @@ else
 		$close_bracket = ' ]';
 		$read_full = $user->lang['BACK'];
 
-		$read_full_url = (isset($_GET['ap'])) ? append_sid("{$phpbb_root_path}portal.$phpEx", "ap=$start#a$i") : append_sid("{$phpbb_root_path}portal.$phpEx#a$i");
+		$read_full_url = (isset($_GET['ap'])) ? append_sid("{$phpbb_root_path}portal.$phpEx", "ap=$start#a") : append_sid("{$phpbb_root_path}portal.$phpEx#a");
 		$view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&amp;t=' . $topic_id);
 		if ( $portal_config['portal_announcements_archive'] )
 		{
diff --git a/root/portal/block/news.php b/root/portal/block/news.php
index 5e731e8a..436fab6f 100644
--- a/root/portal/block/news.php
+++ b/root/portal/block/news.php
@@ -119,7 +119,7 @@ else
 			$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id, $global_announce_list = false);
 			$unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
 			
-			$read_full_url = (isset($_GET['np'])) ? 'np='. $start . '&amp;news=' . $i . '#n' . $i : 'news=' . $i . '#n' . $i;
+			$read_full_url = (isset($_GET['np'])) ? 'np='. $start . '&amp;news=#n' : 'news=#n' ;
 			$view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&amp;t=' . $topic_id);
 			if ( $portal_config['portal_news_archive'] )
 			{
@@ -237,7 +237,7 @@ else
 		$close_bracket = ' ]';
 		$read_full = $user->lang['BACK'];
 				
-		$read_full_url = (isset($_GET['np'])) ? append_sid("{$phpbb_root_path}portal.$phpEx", "np=$start#n$i") : append_sid("{$phpbb_root_path}portal.$phpEx#n$i");
+		$read_full_url = (isset($_GET['np'])) ? append_sid("{$phpbb_root_path}portal.$phpEx", "np=$start#n") : append_sid("{$phpbb_root_path}portal.$phpEx#n");
 		$view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&amp;t=' . $topic_id);
 		if ( $portal_config['portal_news_archive'] )
 		{
diff --git a/root/styles/subsilver2/template/portal/block/announcements_compact.html b/root/styles/subsilver2/template/portal/block/announcements_compact.html
index 3a166cb6..5aa895d9 100644
--- a/root/styles/subsilver2/template/portal/block/announcements_compact.html
+++ b/root/styles/subsilver2/template/portal/block/announcements_compact.html
@@ -24,7 +24,7 @@
 	<!-- ELSE -->
 			<tr>
 				<td class="row1" width="25" align="center">{announcements_row.TOPIC_FOLDER_IMG}</td>
-					<td class="row1" width="25" align="center"><!-- IF announcements_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{announcements_row.TOPIC_ICON_IMG}" width="{announcements_row.TOPIC_ICON_IMG_WIDTH}" height="{announcements_row.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
+					<!-- IF S_TOPIC_ICONS --><td class="row1" width="25" align="center"><!-- IF announcements_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{announcements_row.TOPIC_ICON_IMG}" width="{announcements_row.TOPIC_ICON_IMG_WIDTH}" height="{announcements_row.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td><!-- ENDIF -->
 				<td class="row1">
 				<!-- IF announcements_row.PAGINATION --><span style="float: right; font-size:0.9em;"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {announcements_row.PAGINATION} ] </span><!-- ENDIF -->
 					{announcements_row.ATTACH_ICON_IMG} <!-- IF announcements_row.S_POLL --> <strong style="font-size:1.1em;">{L_POLL}: </strong><!-- ENDIF --><a title="{L_POSTED}: {announcements_row.FIRST_POST_TIME}" href="{announcements_row.U_VIEW_TOPIC}" class="topictitle">{announcements_row.TITLE}</a>