diff options
Diffstat (limited to 'skins/ArchLinux.php')
| -rw-r--r-- | skins/ArchLinux.php | 60 |
1 files changed, 34 insertions, 26 deletions
diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php index cd0fecfe..9dba72cc 100644 --- a/skins/ArchLinux.php +++ b/skins/ArchLinux.php @@ -60,7 +60,7 @@ class ArchLinuxTemplate extends QuickTemplate { * @access private */ function execute() { - global $wgRequest, $wgArchNavBar, $wgArchNavBarSelected; + global $wgRequest, $wgArchNavBar; $this->skin = $skin = $this->data['skin']; $action = $wgRequest->getText( 'action' ); @@ -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> @@ -110,26 +109,23 @@ class ArchLinuxTemplate extends QuickTemplate { class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>"> <?php if (empty($_REQUEST['printable'])) {?> - <a id="logo" 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 id="nav_bar"> - <ul id="nav"> - <?php + <div id="archnavbar"><!-- Arch Linux global navigation bar --> + <div id="archnavbarlogo"> + <p><a id="logo" href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php + echo $skin->tooltipAndAccesskey('p-logo') ?>></a></p> + </div> + <div id="archnavbarmenu"> + <ul id="archnavbarlist"> + <?php if (isset($wgArchNavBar)) { foreach ($wgArchNavBar as $name => $url) { - if (isset($wgArchNavBarSelected) && $name == $wgArchNavBarSelected) { - $selected = ' class="selected"'; - } else { - $selected = ''; - } - echo '<li'.$selected.'><a href="'.$url.'">'.$name.'</a></li>'; + echo '<li id="anb-'.strtolower($name).'"><a href="'.$url.'">'.$name.'</a></li>'; } } - ?> - </ul> - </div> - <div id="subnav_bar"></div> + ?> + </ul> + </div> + </div><!-- #archnavbar --> <?php } ?> <div id="globalWrapper"> @@ -197,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; @@ -219,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', @@ -227,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 ) { @@ -235,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 } @@ -342,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> |