diff options
Diffstat (limited to 'skins/MonoBook.php')
| -rw-r--r-- | skins/MonoBook.php | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 0bd7134b..f03d31b8 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -80,11 +80,14 @@ class MonoBookTemplate extends BaseTemplate { $this->html( 'headelement' ); ?><div id="globalWrapper"> -<div id="column-content"><div id="content" class="mw-body-primary"> +<div id="column-content"><div id="content" class="mw-body-primary" role="main"> <a id="top"></a> <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?> - <h1 id="firstHeading" class="firstHeading"><span dir="auto"><?php $this->html('title') ?></span></h1> + <h1 id="firstHeading" class="firstHeading" lang="<?php + $this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getCode(); + $this->html( 'pageLanguage' ); + ?>"><span dir="auto"><?php $this->html('title') ?></span></h1> <div id="bodyContent" class="mw-body"> <div id="siteSub"><?php $this->msg('tagline') ?></div> <div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div> @@ -104,9 +107,10 @@ class MonoBookTemplate extends BaseTemplate { </div> </div></div> <div id="column-one"<?php $this->html('userlangattributes') ?>> + <h2><?php $this->msg( 'navigation-heading' ) ?></h2> <?php $this->cactions(); ?> - <div class="portlet" id="p-personal"> - <h5><?php $this->msg('personaltools') ?></h5> + <div class="portlet" id="p-personal" role="navigation"> + <h3><?php $this->msg('personaltools') ?></h3> <div class="pBody"> <ul<?php $this->html('userlangattributes') ?>> <?php foreach($this->getPersonalTools() as $key => $item) { ?> @@ -116,7 +120,7 @@ class MonoBookTemplate extends BaseTemplate { </ul> </div> </div> - <div class="portlet" id="p-logo"> + <div class="portlet" id="p-logo" role="banner"> <?php echo Html::element( 'a', array( 'href' => $this->data['nav_urls']['mainpage']['href'], @@ -134,7 +138,7 @@ class MonoBookTemplate extends BaseTemplate { $validFooterLinks = $this->getFooterLinks( "flat" ); // Additional footer links if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 0 ) { ?> -<div id="footer"<?php $this->html('userlangattributes') ?>> +<div id="footer" role="contentinfo"<?php $this->html('userlangattributes') ?>> <?php $footerEnd = '</div>'; } else { @@ -200,8 +204,8 @@ echo $footerEnd; function searchBox() { global $wgUseTwoButtonsSearchForm; ?> - <div id="p-search" class="portlet"> - <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5> + <div id="p-search" class="portlet" role="search"> + <h3><label for="searchInput"><?php $this->msg('search') ?></label></h3> <div id="searchBody" class="pBody"> <form action="<?php $this->text('wgScript') ?>" id="searchform"> <input type='hidden' name="title" value="<?php $this->text('searchtitle') ?>"/> @@ -227,8 +231,8 @@ echo $footerEnd; */ function cactions() { ?> - <div id="p-cactions" class="portlet"> - <h5><?php $this->msg('views') ?></h5> + <div id="p-cactions" class="portlet" role="navigation"> + <h3><?php $this->msg('views') ?></h3> <div class="pBody"> <ul><?php foreach($this->data['content_actions'] as $key => $tab) { @@ -244,8 +248,8 @@ echo $footerEnd; /*************************************************************************************************/ function toolbox() { ?> - <div class="portlet" id="p-tb"> - <h5><?php $this->msg('toolbox') ?></h5> + <div class="portlet" id="p-tb" role="navigation"> + <h3><?php $this->msg('toolbox') ?></h3> <div class="pBody"> <ul> <?php @@ -267,8 +271,8 @@ echo $footerEnd; function languageBox() { if( $this->data['language_urls'] ) { ?> - <div id="p-lang" class="portlet"> - <h5<?php $this->html('userlangattributes') ?>><?php $this->msg('otherlanguages') ?></h5> + <div id="p-lang" class="portlet" role="navigation"> + <h3<?php $this->html('userlangattributes') ?>><?php $this->msg('otherlanguages') ?></h3> <div class="pBody"> <ul> <?php foreach($this->data['language_urls'] as $key => $langlink) { ?> @@ -288,7 +292,7 @@ echo $footerEnd; * @param $cont array|string */ function customBox( $bar, $cont ) { - $portletAttribs = array( 'class' => 'generated-sidebar portlet', 'id' => Sanitizer::escapeId( "p-$bar" ) ); + $portletAttribs = array( 'class' => 'generated-sidebar portlet', 'id' => Sanitizer::escapeId( "p-$bar" ), 'role' => 'navigation' ); $tooltip = Linker::titleAttrib( "p-$bar" ); if ( $tooltip !== false ) { $portletAttribs['title'] = $tooltip; @@ -296,7 +300,7 @@ echo $footerEnd; echo ' ' . Html::openElement( 'div', $portletAttribs ); ?> - <h5><?php $msg = wfMessage( $bar ); echo htmlspecialchars( $msg->exists() ? $msg->text() : $bar ); ?></h5> + <h3><?php $msg = wfMessage( $bar ); echo htmlspecialchars( $msg->exists() ? $msg->text() : $bar ); ?></h3> <div class='pBody'> <?php if ( is_array( $cont ) ) { ?> <ul> |