From e8402bb08845b0039def4d4970c182e89905627c Mon Sep 17 00:00:00 2001
From: River Tarnell <river@users.mediawiki.org>
Date: Wed, 16 Jan 2008 04:06:48 +0000
Subject: [PATCH] rearrange the content area so clear'd elements don't shift
 the navigation out of whack

---
 skins/Modern.php      | 61 +++++++++++++++++++++++--------------------
 skins/modern/main.css | 10 ++++---
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/skins/Modern.php b/skins/Modern.php
index 0db294a4ce..221fb04704 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -92,6 +92,38 @@ class ModernTemplate extends QuickTemplate {
 
 	<div id="mw_main">
 
+	<div id="mw_contentwrapper">
+	<!-- navigation portlet -->
+	<div id="p-cactions" class="portlet">
+		<h5><?php $this->msg('views') ?></h5>
+		<div class="pBody">
+			<ul>
+	<?php			foreach($this->data['content_actions'] as $key => $tab) { ?>
+				 <li id="ca-<?php echo Sanitizer::escapeId($key) ?>"<?php
+					 	if($tab['class']) { ?> class="<?php echo htmlspecialchars($tab['class']) ?>"<?php }
+					 ?>><a href="<?php echo htmlspecialchars($tab['href']) ?>"<?php echo $skin->tooltipAndAccesskey('ca-'.$key) ?>><?php
+					 echo htmlspecialchars($tab['text']) ?></a></li>
+	<?php			 } ?>
+			</ul>
+		</div>
+	</div>
+
+	<!-- content -->
+	<div id="mw_content">
+			<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
+
+			<h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
+			<div id="contentSub"><?php $this->html('subtitle') ?></div>
+
+			<?php if($this->data['undelete']) { ?><div id="contentSub2"><?php     $this->html('undelete') ?></div><?php } ?>
+			<?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
+			<?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?>
+
+			<?php $this->html('bodytext') ?>
+			<?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
+	</div><!-- mw_content -->
+	</div><!-- mw_contentwrapper -->
+
 	<div id="mw_portlets">
 
 	<!-- other portlets -->
@@ -195,35 +227,6 @@ class ModernTemplate extends QuickTemplate {
 
 	</div><!-- mw_portlets -->
 
-	<!-- navigation portlet -->
-	<div id="p-cactions" class="portlet">
-		<h5><?php $this->msg('views') ?></h5>
-		<div class="pBody">
-			<ul>
-	<?php			foreach($this->data['content_actions'] as $key => $tab) { ?>
-				 <li id="ca-<?php echo Sanitizer::escapeId($key) ?>"<?php
-					 	if($tab['class']) { ?> class="<?php echo htmlspecialchars($tab['class']) ?>"<?php }
-					 ?>><a href="<?php echo htmlspecialchars($tab['href']) ?>"<?php echo $skin->tooltipAndAccesskey('ca-'.$key) ?>><?php
-					 echo htmlspecialchars($tab['text']) ?></a></li>
-	<?php			 } ?>
-			</ul>
-		</div>
-	</div>
-
-	<!-- content -->
-	<div id="mw_content">
-			<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-
-			<h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
-			<div id="contentSub"><?php $this->html('subtitle') ?></div>
-
-			<?php if($this->data['undelete']) { ?><div id="contentSub2"><?php     $this->html('undelete') ?></div><?php } ?>
-			<?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
-			<?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?>
-
-			<?php $this->html('bodytext') ?>
-			<?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
-	</div><!-- mw_content -->
 
 	</div><!-- main -->
 
diff --git a/skins/modern/main.css b/skins/modern/main.css
index 21b90a4d61..85a13cb763 100644
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -88,6 +88,12 @@ body {
 	display: none;
 }
 
+#mw_contentwrapper {
+	width: 100%;
+	margin: 0 0 0 -14.1em;
+	float: right;
+}
+
 #mw_content {
 	margin: 0 0 0 14em;
 
@@ -102,7 +108,6 @@ body {
 
 #mw_portlets {
 	width: 14em;
-	float: left;
 	
 	border-right: solid 1px #bbbbbb;
 	background-color: #f0f0f0;
@@ -137,7 +142,6 @@ body {
 	display: block;
 	margin-left: auto;
 	margin-right: auto;
-	clear: both;
 }
 
 .portlet h5 {
@@ -159,8 +163,8 @@ li {
 
 #p-cactions {
 	height: 1.5em;
-	display: block;
 	padding: 0 0 0 0;
+	margin: 0 0 0 14em;
 }
 
 #p-cactions div.pBody {
-- 
2.20.1