From 41f758f4ba17efde372e3cd18eee6f45519b41e2 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Mar 2010 01:07:53 +0100
Subject: minimize diff with MonoBook.php

---
 skins/ArchLinux.php | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php
index 3b2c0037..9dba72cc 100644
--- a/skins/ArchLinux.php
+++ b/skins/ArchLinux.php
@@ -68,7 +68,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 		wfSuppressWarnings();
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php 
+<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php
 	foreach($this->data['xhtmlnamespaces'] as $tag => $ns) {
 		?>xmlns:<?php echo "{$tag}=\"{$ns}\" ";
 	} ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
@@ -82,7 +82,6 @@ class ArchLinuxTemplate extends QuickTemplate {
 		<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
 
 		<style type="text/css" media="screen">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/archlinux.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style>
-		<!--[if lt IE 7]><style type="text/css">#content{margin-bottom: 185px;} #p-cactions{top: 190px;} #p-personal{height:26px; top:149px;}</style><![endif]-->
 		<?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
 
 		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script>
@@ -194,9 +193,14 @@ class ArchLinuxTemplate extends QuickTemplate {
 			</ul>
 		</div>
 	</div>
+	<div class="portlet" id="p-logo">
+		<a style="background-image: url(<?php $this->text('logopath') ?>);" <?php
+			?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php
+			echo $skin->tooltipAndAccesskey('p-logo') ?>></a>
+	</div>
 	<script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
-<?php 
-		$sidebar = $this->data['sidebar'];		
+<?php
+		$sidebar = $this->data['sidebar'];
 		if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true;
 		if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true;
 		if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true;
@@ -216,6 +220,13 @@ class ArchLinuxTemplate extends QuickTemplate {
 			<div class="visualClear"></div>
 			<div id="footer">
 <?php
+		if($this->data['poweredbyico']) { ?>
+				<div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div>
+<?php 	}
+		if($this->data['copyrightico']) { ?>
+				<div id="f-copyrightico"><?php $this->html('copyrightico') ?></div>
+<?php	}
+
 		// Generate additional footer links
 		$footerlinks = array(
 			'lastmod', 'viewcount', 'numberofwatchingusers', 'credits', 'copyright',
@@ -224,7 +235,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 		$validFooterLinks = array();
 		foreach( $footerlinks as $aLink ) {
 			if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-			$validFooterLinks[] = $aLink;
+				$validFooterLinks[] = $aLink;
 			}
 		}
 		if ( count( $validFooterLinks ) > 0 ) {
@@ -232,9 +243,9 @@ class ArchLinuxTemplate extends QuickTemplate {
 <?php
 			foreach( $validFooterLinks as $aLink ) {
 				if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-?>				<li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
-<?php 		}
-		}
+?>					<li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
+<?php 			}
+			}
 ?>
 			</ul>
 <?php	}
@@ -339,7 +350,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 
 	/*************************************************************************************************/
 	function languageBox() {
-		if( $this->data['language_urls'] ) { 
+		if( $this->data['language_urls'] ) {
 ?>
 	<div id="p-lang" class="portlet">
 		<h5><?php $this->msg('otherlanguages') ?></h5>
-- 
cgit v1.2.2

