format the sitesub, site notice and usermessage boxes into a single box with footer...

diff --git a/skins/Modern.php b/skins/Modern.php
index 24c87b3..a873066 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -91,7 +91,6 @@ class ModernTemplate extends QuickTemplate {
        </div>
 
        <div id="mw_main">
-
        <div id="mw_contentwrapper">
        <!-- navigation portlet -->
        <div id="p-cactions" class="portlet">
@@ -114,18 +113,24 @@ class ModernTemplate extends QuickTemplate {
             the content area without affecting the meaning of 'em' in #mw_content, which is used
             for the margins -->
        <div id="mw_contentholder">
-                       <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
-                       <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
+               <div class='mw-topboxes'>
+                       <div class="mw-topbox" id="siteSub"><?php $this->msg('tagline') ?></div>
+                       <?php if($this->data['newtalk'] ) {
+                               ?><div class="usermessage mw-topbox"><?php $this->html('newtalk')  ?></div>
+                       <?php } ?>
+                       <?php if($this->data['sitenotice']) {
+                               ?><div class="mw-topbox" id="siteNotice"><?php $this->html('sitenotice') ?></div>
+                       <?php } ?>
+               </div>
 
-                       <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
-                       <div id="contentSub"><?php $this->html('subtitle') ?></div>
+               <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['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 if($this->data['undelete']) { ?><div id="contentSub2"><?php     $this->html('undelete') ?></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') ?>
-                       <div class='mw_clear'></div>
-                       <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
+               <?php $this->html('bodytext') ?>
+               <div class='mw_clear'></div>
+               <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
        </div><!-- mw_contentholder -->
        </div><!-- mw_content -->
        </div><!-- mw_contentwrapper -->

diff --git a/skins/modern/main.css b/skins/modern/main.css
index de9eb04..78cd2b2 100644 (file)
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -111,7 +111,7 @@ body {
        border-bottom: solid 1px #bbbbbb;
 
        line-height: 1.5em;
-       padding: 1em 1em 1em 1em;
+       padding: 0 1em 1em 1em;
 }
 
 #mw_portlets {
@@ -1068,12 +1068,33 @@ pre {
 }
 
 .usermessage {
+       background-color: #dadaff;
+}
+
+.mw-topboxes {
+       border-collapse: collapse;
+       margin: 0 -1em 1em -1em;
+       padding: 0 0 8px 0;
+       background: url(footer-grad.png) repeat-x bottom left;
+}
+
+.mw-topbox p {
+       padding: 0 0 0 0;
+       margin: 0 0 0 0;
+}
+
+.mw-topbox {
         color: black;
         font-weight: bold;
-        margin: -1em -1em 0 -1em;
-        padding: 0 1em 1em 1em;
-        vertical-align: middle;
-        background: #dadaff url(footer-grad.png) repeat-x bottom left;
+       margin: 0 0 0 0;
+       padding: 0 1em 0 1em;
+       vertical-align: middle;
+       border-collapse: collapse;
+       border-bottom: solid 1px #bbbbbb;
+}
+
+#siteSub {
+       background-color: #dddddd;
 }
 
 /* emulate center */