Localization update.

[lhc/web/wiklou.git] / skins / Modern.php

diff --git a/skins/Modern.php b/skins/Modern.php
index b406743..95de1ff 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -25,15 +25,19 @@ class SkinModern extends SkinTemplate {
                return "<div class='mw_poweredby'>Powered by MediaWiki $wgVersion</div>";
        }
 
-       function initPage( &$out ) {
-               Skin::initPage( $out );
+       function initPage( OutputPage $out ) {
+               parent::initPage( $out );
                $this->skinname  = 'modern';
                $this->stylename = 'modern';
                $this->template  = 'ModernTemplate';
-               
-               $this->addStyle( 'common/shared.css', 'screen' );
-               $this->addStyle( 'modern/main.css', 'screen' );
-               $this->addStyle( 'modern/print.css', 'print' );
+       }
+       
+       function setupSkinUserCss( OutputPage $out ){
+               // Do not call parent::setupSkinUserCss(), we have our own print style
+               $out->addStyle( 'common/shared.css', 'screen' );
+               $out->addStyle( 'modern/main.css', 'screen' );
+               $out->addStyle( 'modern/print.css', 'print' );
+               $out->addStyle( 'modern/rtl.css', 'screen', '', 'rtl' );
        }
 }
 
@@ -95,7 +99,7 @@ class ModernTemplate extends QuickTemplate {
        </head>
 <body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
 <?php if($this->data['body_onload'    ]) { ?> onload="<?php     $this->text('body_onload')     ?>"<?php } ?>
- class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>">
+ class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
 
        <!-- heading -->
        <div id="mw_header"><h1 id="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1></div>
@@ -109,7 +113,7 @@ class ModernTemplate extends QuickTemplate {
                        <ul>
        <?php           foreach($this->data['content_actions'] as $key => $tab) {
                                        echo '
-                                <li id="ca-' . Sanitizer::escapeId($key).'"';
+                                <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
                                        if( $tab['class'] ) {
                                                echo ' class="'.htmlspecialchars($tab['class']).'"';
                                        }
@@ -139,6 +143,7 @@ class ModernTemplate extends QuickTemplate {
             for the margins -->
        <div id="mw_contentholder">
                <div class='mw-topboxes'>
+                       <div id="mw-js-message" style="display:none;"></div>
                        <div class="mw-topbox" id="siteSub"><?php $this->msg('tagline') ?></div>
                        <?php if($this->data['newtalk'] ) {
                                ?><div class="usermessage mw-topbox"><?php $this->html('newtalk')  ?></div>
@@ -156,6 +161,7 @@ class ModernTemplate extends QuickTemplate {
                <?php $this->html('bodytext') ?>
                <div class='mw_clear'></div>
                <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
+               <?php $this->html ('dataAfterContent') ?>
        </div><!-- mw_contentholder -->
        </div><!-- mw_content -->
        </div><!-- mw_contentwrapper -->
@@ -195,7 +201,7 @@ class ModernTemplate extends QuickTemplate {
                <div class="pBody">
                        <ul>
 <?php                  foreach($this->data['personal_urls'] as $key => $item) { ?>
-                               <li id="pt-<?php echo Sanitizer::escapeId($key) ?>"<?php
+                               <li id="<?php echo Sanitizer::escapeId( "pt-$key" ) ?>"<?php
                                        if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
                                echo htmlspecialchars($item['href']) ?>"<?php echo $skin->tooltipAndAccesskey('pt-'.$key) ?><?php
                                if(!empty($item['class'])) { ?> class="<?php
@@ -239,6 +245,7 @@ class ModernTemplate extends QuickTemplate {
 
        /*************************************************************************************************/
        function searchBox() {
+               global $wgUseTwoButtonsSearchForm;
 ?>
        <!-- search -->
        <div id="p-search" class="portlet">
@@ -248,8 +255,11 @@ class ModernTemplate extends QuickTemplate {
                                <input id="searchInput" name="search" type="text"<?php echo $this->skin->tooltipAndAccesskey('search');
                                        if( isset( $this->data['search'] ) ) {
                                                ?> value="<?php $this->text('search') ?>"<?php } ?> />
-                               <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> />&nbsp;
-                               <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
+                               <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /><?php if ($wgUseTwoButtonsSearchForm) { ?>&nbsp;
+                               <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /><?php } else { ?>
+
+                               <div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php } ?>
+
                        </div></form>
                </div><!-- pBody -->
        </div><!-- portlet -->
@@ -283,8 +293,8 @@ class ModernTemplate extends QuickTemplate {
 <?php  }
                if($this->data['feeds']) { ?>
                        <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
-                                       ?><span id="feed-<?php echo Sanitizer::escapeId($key) ?>"><a href="<?php
-                                       echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
+                                       ?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
+                                       echo htmlspecialchars($feed['href']) ?>" rel="alternate" type="application/<?php echo $key ?>+xml" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
                                        <?php } ?></li><?php
                }
 
@@ -298,7 +308,7 @@ class ModernTemplate extends QuickTemplate {
 
                if(!empty($this->data['nav_urls']['print']['href'])) { ?>
                                <li id="t-print"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['print']['href'])
-                               ?>"<?php echo $this->skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php
+                               ?>" rel="alternate"<?php echo $this->skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php
                }
 
                if(!empty($this->data['nav_urls']['permalink']['href'])) { ?>
@@ -339,7 +349,7 @@ class ModernTemplate extends QuickTemplate {
        /*************************************************************************************************/
        function customBox( $bar, $cont ) {
 ?>
-               <div class='generated-sidebar portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
+               <div class='generated-sidebar portlet' id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
                <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
                <div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>