From 771fb8c9c2203b325ce12252df443eb48152a8bc Mon Sep 17 00:00:00 2001
From: Kevin <kevin@breest.info>
Date: Tue, 12 Aug 2008 18:38:59 +0000
Subject: [PATCH] Cleaning up - as promised :P
 http://www.board3.de/viewtopic.php?f=24&t=711

---
 .../template/portal/portal_body.html          | 39 +++++++++----------
 .../template/portal/portal_body.html          | 38 +++++++++---------
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/root/styles/prosilver/template/portal/portal_body.html b/root/styles/prosilver/template/portal/portal_body.html
index f5b460d1..4c3cd7d4 100644
--- a/root/styles/prosilver/template/portal/portal_body.html
+++ b/root/styles/prosilver/template/portal/portal_body.html
@@ -9,7 +9,7 @@
 		<br style="clear:both" />
 
 		<!-- IF S_DISPLAY_MAINMENU -->
-		<!-- INCLUDE portal/block/main_menu.html -->
+			<!-- INCLUDE portal/block/main_menu.html -->
 		<!-- ENDIF -->
 		
 		<!-- IF S_DISPLAY_BIRTHDAY_LIST -->
@@ -36,11 +36,9 @@
 			<!-- INCLUDE portal/block/custom_small.html -->
 		<!-- ENDIF -->
 
-<!-- IF S_STYLE_OPTIONS -->
-		<!-- IF S_DISPLAY_CHANGE_STYLE -->
-			<!-- INCLUDE portal/block/change_style.html -->
+		<!-- IF S_STYLE_OPTIONS and S_DISPLAY_CHANGE_STYLE -->
+				<!-- INCLUDE portal/block/change_style.html -->
 		<!-- ENDIF -->
-<!-- ENDIF -->
 
 		<!-- IF S_DISPLAY_TOP_POSTERS -->
 			<!-- INCLUDE portal/block/top_poster.html -->
@@ -73,31 +71,32 @@
 		<!-- IF S_DISPLAY_WELCOME -->
 			<!-- IF S_DISPLAY_WELCOME_GUEST and S_USER_LOGGED_IN -->
 			<!-- ELSE -->
-			<!-- INCLUDE portal/block/welcome.html -->
+				<!-- INCLUDE portal/block/welcome.html -->
 			<!-- ENDIF -->
 		<!-- ENDIF -->
 
 		<!-- IF S_CUSTOM_CENTER -->
 			<!-- INCLUDE portal/block/custom_center.html -->
 		<!-- ENDIF -->
+
 		<!-- IF S_DISPLAY_RECENT -->
 			<!-- INCLUDE portal/block/recent.html -->
 		<!-- ENDIF -->
 
 		<!-- IF S_DISPLAY_ANNOUNCEMENTS -->
-		<!-- IF S_ANNOUNCE_COMPACT -->
-			<!-- INCLUDE portal/block/announcements_compact.html -->
-		<!-- ELSE -->
-			<!-- INCLUDE portal/block/announcements.html -->
-		<!-- ENDIF -->
+			<!-- IF S_ANNOUNCE_COMPACT -->
+				<!-- INCLUDE portal/block/announcements_compact.html -->
+			<!-- ELSE -->
+				<!-- INCLUDE portal/block/announcements.html -->
+			<!-- ENDIF -->
 		<!-- ENDIF -->
 
 		<!-- IF S_DISPLAY_NEWS -->
-		<!-- IF S_NEWS_COMPACT -->
-			<!-- INCLUDE portal/block/news_compact.html -->
-		<!-- ELSE -->
-			<!-- INCLUDE portal/block/news.html -->
-		<!-- ENDIF -->
+			<!-- IF S_NEWS_COMPACT -->
+				<!-- INCLUDE portal/block/news_compact.html -->
+			<!-- ELSE -->
+				<!-- INCLUDE portal/block/news.html -->
+			<!-- ENDIF -->
 		<!-- ENDIF -->
 
 		<!-- IF S_DISPLAY_POLL -->
@@ -106,12 +105,12 @@
 		
 		<!-- IF S_DISPLAY_PORTAL_FORUM_INDEX -->		
 			<!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
-				<ul class="linklist">
+					<ul class="linklist">
 				<!-- IF S_DISPLAY_SEARCH -->
-				<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> &bull; <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
+					<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> &bull; <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
 				<!-- ENDIF -->
 			<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
-				</ul>
+					</ul>
 			<!-- ENDIF -->
 
 			<!-- INCLUDE forumlist_body.html -->
@@ -182,8 +181,6 @@
 			<!-- INCLUDE portal/block/donation/donation_small.html -->
 		<!-- ENDIF -->
 
-			<!-- //INCLUDE portal/block/_sample_block_design.html-->
-
 	</td>
 <!-- [-] right block area -->
 </tr>
diff --git a/root/styles/subsilver2/template/portal/portal_body.html b/root/styles/subsilver2/template/portal/portal_body.html
index 58432055..e192d3c6 100644
--- a/root/styles/subsilver2/template/portal/portal_body.html
+++ b/root/styles/subsilver2/template/portal/portal_body.html
@@ -41,7 +41,7 @@ small, .small {
 	<td width="{PORTAL_LEFT_COLUMN}px" valign="top" style="padding-right:6px;">
 	
 		<!-- IF S_DISPLAY_MAINMENU -->
-		<!-- INCLUDE portal/block/main_menu.html -->
+			<!-- INCLUDE portal/block/main_menu.html -->
 		<!-- ENDIF -->
 		
 		<!-- IF S_DISPLAY_BIRTHDAY_LIST -->
@@ -68,11 +68,9 @@ small, .small {
 			<!-- INCLUDE portal/block/custom_small.html -->
 		<!-- ENDIF -->		
 
-<!-- IF S_STYLE_OPTIONS -->
-		<!-- IF S_DISPLAY_CHANGE_STYLE -->
+		<!-- IF S_STYLE_OPTIONS and S_DISPLAY_CHANGE_STYLE -->
 			<!-- INCLUDE portal/block/change_style.html -->
-		<!-- ENDIF -->
-<!-- ENDIF -->		
+		<!-- ENDIF -->		
 
 		<!-- IF S_DISPLAY_TOP_POSTERS -->
 			<!-- INCLUDE portal/block/top_poster.html -->
@@ -104,8 +102,8 @@ small, .small {
 		<!-- IF S_DISPLAY_WELCOME -->
 			<!-- IF S_DISPLAY_WELCOME_GUEST and S_USER_LOGGED_IN -->
 			<!-- ELSE -->
-			<!-- INCLUDE portal/block/welcome.html -->
-		<!-- ENDIF -->
+				<!-- INCLUDE portal/block/welcome.html -->
+			<!-- ENDIF -->
 		<!-- ENDIF -->
 
 		<!-- IF S_CUSTOM_CENTER -->
@@ -117,19 +115,19 @@ small, .small {
 		<!-- ENDIF -->			
 
 		<!-- IF S_DISPLAY_ANNOUNCEMENTS -->
-		<!-- IF S_ANNOUNCE_COMPACT -->
-			<!-- INCLUDE portal/block/announcements_compact.html -->
-		<!-- ELSE -->
-			<!-- INCLUDE portal/block/announcements.html -->
-		<!-- ENDIF -->
+			<!-- IF S_ANNOUNCE_COMPACT -->
+				<!-- INCLUDE portal/block/announcements_compact.html -->
+			<!-- ELSE -->
+				<!-- INCLUDE portal/block/announcements.html -->
+			<!-- ENDIF -->
 		<!-- ENDIF -->
 		
 		<!-- IF S_DISPLAY_NEWS -->
-		<!-- IF S_NEWS_COMPACT -->
-			<!-- INCLUDE portal/block/news_compact.html -->
-		<!-- ELSE -->
-			<!-- INCLUDE portal/block/news.html -->
-		<!-- ENDIF -->
+			<!-- IF S_NEWS_COMPACT -->
+				<!-- INCLUDE portal/block/news_compact.html -->
+			<!-- ELSE -->
+				<!-- INCLUDE portal/block/news.html -->
+			<!-- ENDIF -->
 		<!-- ENDIF -->
 
 		<!-- IF S_DISPLAY_POLL -->
@@ -193,11 +191,11 @@ small, .small {
 	<!-- ENDIF -->
 
 		<!-- IF not S_IS_BOT and S_USER_LOGGED_IN and S_ZEBRA_ENABLED and S_DISPLAY_FRIENDS -->
-		<!-- INCLUDE portal/block/online_friends.html -->
+			<!-- INCLUDE portal/block/online_friends.html -->
 		<!-- ENDIF -->
 
 		<!-- IF S_DISPLAY_ADVANCED_STAT -->
-		<!-- INCLUDE portal/block/statistics.html -->
+			<!-- INCLUDE portal/block/statistics.html -->
 		<!-- ENDIF -->
 
 		<!-- IF S_DISPLAY_MINICAL -->
@@ -205,7 +203,7 @@ small, .small {
 		<!-- ENDIF -->
 
 		<!-- IF S_DISPLAY_LEADERS -->
-		<!-- INCLUDE portal/block/leaders.html -->
+			<!-- INCLUDE portal/block/leaders.html -->
 		<!-- ENDIF -->		
 
           <!-- IF S_DISPLAY_LAST_BOTS and S_LAST_VISITED_BOTS -->