diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
commit | 63601400e476c6cf43d985f3e7b9864681695ed4 (patch) | |
tree | f7846203a952e38aaf66989d0a4702779f549962 /skins/ArchLinux.php | |
parent | 8ff01378c9e0207f9169b81966a51def645b6a51 (diff) |
Update to MediaWiki 1.20.2
this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'skins/ArchLinux.php')
-rw-r--r-- | skins/ArchLinux.php | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php index 7a30b6e2..a5ce1714 100644 --- a/skins/ArchLinux.php +++ b/skins/ArchLinux.php @@ -2,6 +2,21 @@ /** * ArchLinux skin (based on MonoBook) * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * * @todo document * @file * @ingroup Skins @@ -88,7 +103,7 @@ class ArchLinuxTemplate extends BaseTemplate { </div><!-- #archnavbar --> <div id="globalWrapper"> -<div id="column-content"><div id="content"> +<div id="column-content"><div id="content" class="mw-body-primary"> <a id="top"></a> <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?> @@ -101,7 +116,7 @@ class ArchLinuxTemplate extends BaseTemplate { <?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" class="mw-jump"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div> + <div id="jump-to-nav" class="mw-jump"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a><?php $this->msg( 'comma-separator' ) ?><a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div> <?php } ?> <!-- start content --> <?php $this->html('bodytext') ?> @@ -181,6 +196,9 @@ echo $footerEnd; /*************************************************************************************************/ + /** + * @param $sidebar array + */ protected function renderPortals( $sidebar ) { if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true; if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true; @@ -288,6 +306,10 @@ echo $footerEnd; } /*************************************************************************************************/ + /** + * @param $bar string + * @param $cont array|string + */ function customBox( $bar, $cont ) { $portletAttribs = array( 'class' => 'generated-sidebar portlet', 'id' => Sanitizer::escapeId( "p-$bar" ) ); $tooltip = Linker::titleAttrib( "p-$bar" ); |