function beforeContent() {
$mainPageObj = Title::newMainPage();
- $s = "\n<div id='content'>\n<div id='topbar'>" .
- '<table style="width: 100%;" cellspacing="0" cellpadding="8"><tr>';
-
- $s .= '<td class="top" nowrap="nowrap">';
- $s .= '<a href="' . htmlspecialchars( $mainPageObj->getLocalURL() ) . '">';
- $s .= '<span id="sitetitle">' . wfMessage( 'sitetitle' )->escaped() . '</span></a>';
-
- $s .= '</td><td class="top" id="top-syslinks" style="width: 100%;">';
- $s .= $this->sysLinks();
- $s .= '</td></tr><tr><td class="top-subheader">';
-
- $s .= '<font size="-1"><span id="sitesub">';
- $s .= wfMessage( 'sitesubtitle' )->escaped() . '</span></font>';
- $s .= '</td><td class="top-linkcollection">';
-
- $s .= '<font size="-1"><span id="langlinks">';
- $s .= str_replace( '<br />', '', $this->otherLanguages() );
-
- $s .= $this->getSkin()->getCategories();
-
- $s .= '<br />' . $this->pageTitleLinks();
- $s .= '</span></font>';
-
- $s .= "</td></tr></table>\n";
-
- $s .= "\n</div>\n<div id='article'>";
+ $s = "\n<div id='content'>\n";
+ ob_start();
+?>
+<div id="topbar">
+ <p id="sitetitle">
+ <a href="<?php echo htmlspecialchars( $mainPageObj->getLocalURL() ) ?>">
+ <?php echo wfMessage( 'sitetitle' )->escaped() ?>
+ </a>
+ </p>
+ <p id="sitesub">
+ <?php echo wfMessage( 'sitesubtitle' )->escaped() ?>
+ </p>
+
+ <p id="syslinks">
+ <span><?php echo $this->sysLinks() ?></span>
+ </p>
+ <div id="linkcollection">
+ <div id="langlinks"><?php echo str_replace( '<br />', '', $this->otherLanguages() ) ?></div>
+ <?php echo $this->getSkin()->getCategories() ?>
+ <div id="titlelinks"><?php echo $this->pageTitleLinks() ?></div>
+ </div>
+</div>
+<?php
+ $s .= ob_get_contents();
+ ob_end_clean();
+
+ $s .= "\n<div id='article'>";
$notice = $this->getSkin()->getSiteNotice();
if( $notice ) {
* @return string
*/
function afterContent(){
- $s = "\n</div><br clear='all' />\n";
+ $s = "\n</div>\n";
$s .= "\n<div id='footer'>";
- $s .= '<table style="width: 98%;" cellspacing="0"><tr>';
-
- $s .= '<td class="bottom">';
$s .= $this->bottomLinks();
$s .= $this->getSkin()->getLanguage()->pipeList( array(
$s .= "\n<br />" . $this->pageStats();
- $s .= '</td>';
- $s .= "</tr></table>\n</div>\n</div>\n";
+ $s .= "\n</div>\n</div>\n";
$s .= $this->quickBar();
return $s;
font-size: 8pt;
}
-#topbar {
- padding: 0;
-}
-
#powersearch {
background: #DDEEFF;
border-style: solid;
}
#footer {
+ margin-right: 2%;
+ margin-top: 1em;
padding: 4px;
+ font-family: verdana, arial, sans-serif;
+ font-size: 10pt;
+ text-align: center;
}
#footer form {
display: inline;
}
-#sitetitle {
- font-family: Times, serif;
- color: white;
- font-weight: normal;
- font-size: 32pt;
- line-height: 32pt;
-}
-
-td.top {
- background-color: #6688AA;
- color: white;
- margin-top: 4px;
- margin-bottom: 4px;
- padding-top: 0;
- padding-bottom: 0;
- text-transform: uppercase;
- font-family: Verdana, Arial, sans-serif;
- font-size: 8pt;
-}
-
-td.top a {
- font-family: Verdana, Arial, sans-serif;
- background-color: #6688AA;
- color: white;
- text-decoration: none;
- font-size: 10pt;
-}
-
-td#top-syslinks {
- text-align: right;
- vertical-align: bottom;
-}
-td.top-linkcollection {
- text-align: right;
-}
-/**
- * Overrides text justification (user preference)
- * See bug 31990
- */
-td.top-linkcollection #catlinks {
- text-align: right;
-}
-td.top-subheader {
- vertical-align: top;
-}
-td.bottom {
- font-family: Verdana, Arial, sans-serif;
- font-size: 10pt;
- padding: 0;
- text-align: center;
- vertical-align: bottom;
-}
-
#pagestats {
font-family: Verdana, Arial, sans-serif;
color: black;
font-size: 9pt;
}
-#sitesub {
- font-family: Verdana, Arial, sans-serif;
- font-size: 9pt; font-weight: bold;
- color: black;
- padding-top: 0;
-}
+
#quickbar {
font-family: Verdana, Arial, sans-serif;
#quickbar { position: absolute; left: 4px; }
#article { margin-left: 148px; margin-right: 4px; }
#footer { margin-left: 152px; }
+
+
+#sitetitle, #sitesub, #syslinks, #linkcollection {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+#sitetitle, #syslinks {
+ color: white;
+ text-transform: uppercase;
+ height: 32pt;
+}
+#sitetitle {
+ padding-left: 8px;
+ font-family: Times, serif;
+ font-weight: normal;
+ font-size: 32pt;
+ line-height: 32pt;
+ background-color: #6688AA;
+}
+#sitetitle a, #syslinks a {
+ color: white;
+ text-decoration: none;
+}
+
+#syslinks {
+ font-family: Verdana, Arial, sans-serif;
+ position: absolute;
+ top: 0;
+ right: 8px;
+ width: 100%;
+ font-size: 8pt;
+}
+#syslinks a {
+ font-size: 10pt;
+}
+#syslinks span {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ width: 100%;
+ text-align: right;
+}
+
+#sitesub {
+ float: left;
+ margin-left: 8px;
+ font-family: Verdana, Arial, sans-serif;
+ font-size: 9pt;
+ font-weight: bold;
+ color: black;
+}
+
+#linkcollection {
+ margin-top: 0.5em;
+ font-size: small;
+ margin-right: 8px;
+ text-align: right;
+}
+/* Override text justification (user preference), see bug 31990 */
+#linkcollection * {
+ text-align: right;
+}