! Final fixes to spacing bussiness.

SimplePortal · Mar 17, 2012 · 56c8ee7 · 56c8ee7
1 parent 22d9c39
commit 56c8ee7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/smf2/Themes/default/Portal.template.php b/smf2/Themes/default/Portal.template.php
@@ -58,7 +58,7 @@ function template_portal_above()
 		foreach ($context['SPortal']['blocks'][2] as $block)
 			template_block($block);
 
-		if (empty($context['SPortal']['is_portal']))
+		if (empty($context['SPortal']['on_portal']))
 			echo '
 				<br class="sp_side_clear" />';
 	}
@@ -70,7 +70,7 @@ function template_portal_below()
 
 	if (!empty($context['SPortal']['blocks'][3]))
 	{
-		if (empty($context['SPortal']['on_portal']) || !empty($context['SPortal']['blocks'][2]))
+		if (empty($context['SPortal']['on_portal']) || !empty($context['SPortal']['blocks'][2]) || !empty($modSettings['articleactive']))
 			echo '
 				<br class="sp_side_clear" />';
 

diff --git a/smf2/Themes/default/PortalArticles.template.php b/smf2/Themes/default/PortalArticles.template.php
@@ -18,9 +18,6 @@ function template_articles_core()
 	if (empty($modSettings['articleactive']))
 		return;
 
-	echo '
-				<div class="sp_regular_padding">';
-
 	while ($article = $context['get_articles']())
 	{
 		echo '
@@ -58,9 +55,6 @@ function template_articles_core()
 	if (!empty($modSettings['articleperpage']) && !empty($context['page_index']))
 		echo '
 					<div class="sp_page_index">', $txt['sp-articlesPages'], ': ', $context['page_index'], '</div>';
-
-	echo '
-				</div>';
 }
 
 function template_articles_curve()