X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=skins%2FModern.php;h=8d778cf6211e3179d83d8555645d064546987aed;hb=f10285fc18179208266d268d8bf0779329f9c4fb;hp=9dbefb11bd7e4085a1bf0c72c787890c49892477;hpb=4f741418fcb0a85f1ccfa3a72e5faa34259b8e53;p=lhc%2Fweb%2Fwiklou.git

diff --git a/skins/Modern.php b/skins/Modern.php
index 9dbefb11bd..8d778cf621 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -22,8 +22,9 @@
  * @ingroup Skins
  */
 
-if( !defined( 'MEDIAWIKI' ) )
+if ( !defined( 'MEDIAWIKI' ) ) {
 	die( -1 );
+}
 
 /**
  * Inherit main code from SkinTemplate, set the CSS and template filter.
@@ -39,7 +40,7 @@ class SkinModern extends SkinTemplate {
 	 */
 	function setupSkinUserCss( OutputPage $out ) {
 		parent::setupSkinUserCss( $out );
-		$out->addModuleStyles ('skins.modern');
+		$out->addModuleStyles( 'skins.modern' );
 	}
 }
 
@@ -66,9 +67,9 @@ class ModernTemplate extends MonoBookTemplate {
 
 	<!-- heading -->
 	<div id="mw_header"><h1 id="firstHeading" lang="<?php
-		$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getCode();
-		$this->html( 'pageLanguage' );
-	?>"><span dir="auto"><?php $this->html('title') ?></span></h1></div>
+		$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+		$this->text( 'pageLanguage' );
+	?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1></div>
 
 	<div id="mw_main">
 	<div id="mw_contentwrapper">
@@ -82,30 +83,30 @@ class ModernTemplate extends MonoBookTemplate {
 	     for the margins -->
 	<div id="mw_contentholder" class="mw-body">
 		<div class='mw-topboxes'>
-			<div id="mw-js-message" style="display:none;"<?php $this->html('userlangattributes')?>></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>
+			<div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></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>
 			<?php } ?>
-			<?php if($this->data['sitenotice']) {
-				?><div class="mw-topbox" id="siteNotice"><?php $this->html('sitenotice') ?></div>
+			<?php if ( $this->data['sitenotice'] ) {
+				?><div class="mw-topbox" id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div>
 			<?php } ?>
 		</div>
 
-		<div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div>
+		<div id="contentSub"<?php $this->html( 'userlangattributes' ) ?>><?php $this->html( 'subtitle' ) ?></div>
 
-		<?php if($this->data['undelete']) { ?><div id="contentSub2"><?php     $this->html('undelete') ?></div><?php } ?>
-		<?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#mw_portlets"><?php $this->msg('jumptonavigation') ?></a><?php $this->msg( 'comma-separator' ) ?><a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?>
+		<?php if ( $this->data['undelete'] ) { ?><div id="contentSub2"><?php $this->html( 'undelete' ) ?></div><?php } ?>
+		<div id="jump-to-nav"><?php $this->msg( 'jumpto' ) ?> <a href="#mw_portlets"><?php $this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?><a href="#searchInput"><?php $this->msg( 'jumptosearch' ) ?></a></div>
 
-		<?php $this->html('bodytext') ?>
+		<?php $this->html( 'bodytext' ) ?>
 		<div class='mw_clear'></div>
-		<?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
-		<?php $this->html ('dataAfterContent') ?>
+		<?php if ( $this->data['catlinks'] ) { $this->html( 'catlinks' ); } ?>
+		<?php $this->html( 'dataAfterContent' ) ?>
 	</div><!-- mw_contentholder -->
 	</div><!-- mw_content -->
 	</div><!-- mw_contentwrapper -->
 
-	<div id="mw_portlets"<?php $this->html("userlangattributes") ?>>
+	<div id="mw_portlets"<?php $this->html( "userlangattributes" ) ?>>
 	<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
 
 	<!-- portlets -->
@@ -120,11 +121,11 @@ class ModernTemplate extends MonoBookTemplate {
 
 	<!-- personal portlet -->
 	<div class="portlet" id="p-personal" role="navigation">
-		<h3><?php $this->msg('personaltools') ?></h3>
+		<h3><?php $this->msg( 'personaltools' ) ?></h3>
 		<div class="pBody">
 			<ul>
-<?php		foreach($this->getPersonalTools() as $key => $item) { ?>
-				<?php echo $this->makeListItem($key, $item); ?>
+<?php		foreach ( $this->getPersonalTools() as $key => $item ) { ?>
+				<?php echo $this->makeListItem( $key, $item ); ?>
 
 <?php		} ?>
 			</ul>
@@ -133,19 +134,19 @@ class ModernTemplate extends MonoBookTemplate {
 
 
 	<!-- footer -->
-	<div id="footer" role="contentinfo"<?php $this->html('userlangattributes') ?>>
+	<div id="footer" role="contentinfo"<?php $this->html( 'userlangattributes' ) ?>>
 			<ul id="f-list">
 <?php
-		foreach( $this->getFooterLinks("flat") as $aLink ) {
-			if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-?>				<li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
+		foreach ( $this->getFooterLinks( "flat" ) as $aLink ) {
+			if ( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
+?>				<li id="<?php echo $aLink ?>"><?php $this->html( $aLink ) ?></li>
 <?php 		}
 		}
 ?>
 			</ul>
 <?php
-		foreach ( $this->getFooterIcons("nocopyright") as $blockName => $footerIcons ) { ?>
-			<div id="mw_<?php echo htmlspecialchars($blockName); ?>">
+		foreach ( $this->getFooterIcons( "nocopyright" ) as $blockName => $footerIcons ) { ?>
+			<div id="mw_<?php echo htmlspecialchars( $blockName ); ?>">
 <?php
 			foreach ( $footerIcons as $icon ) { ?>
 				<?php echo $this->getSkin()->makeFooterIcon( $icon, 'withoutImage' ); ?>