| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -453,7 +453,7 @@ |
| 454 | 454 | <!-- content --> |
| 455 | 455 | <div id="content" <?php $this->html('specialpageattributes') ?>> |
| 456 | 456 | <a id="top"></a> |
| 457 | | - <div id="mw-js-message" style="display:none;" <?php $this->html('userlangattributes') ?>></div> |
| | 457 | + <div id="mw-js-message" style="display:none;"<?php $this->html('userlangattributes') ?>></div> |
| 458 | 458 | <?php if ( $this->data['sitenotice'] ): ?> |
| 459 | 459 | <!-- sitenotice --> |
| 460 | 460 | <div id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div> |
| — | — | @@ -468,7 +468,7 @@ |
| 469 | 469 | <h3 id="siteSub"><?php $this->msg( 'tagline' ) ?></h3> |
| 470 | 470 | <!-- /tagline --> |
| 471 | 471 | <!-- subtitle --> |
| 472 | | - <div id="contentSub" <?php $this->html('userlangattributes') ?>><?php $this->html( 'subtitle' ) ?></div> |
| | 472 | + <div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html( 'subtitle' ) ?></div> |
| 473 | 473 | <!-- /subtitle --> |
| 474 | 474 | <?php if ( $this->data['undelete'] ): ?> |
| 475 | 475 | <!-- undelete --> |
| — | — | @@ -526,7 +526,7 @@ |
| 527 | 527 | </div> |
| 528 | 528 | <!-- /panel --> |
| 529 | 529 | <!-- footer --> |
| 530 | | - <div id="footer" <?php $this->html('userlangattributes') ?>> |
| | 530 | + <div id="footer"<?php $this->html('userlangattributes') ?>> |
| 531 | 531 | <?php foreach( $validFooterLinks as $category => $links ): ?> |
| 532 | 532 | <?php if ( count( $links ) > 0 ): ?> |
| 533 | 533 | <ul id="footer-<?php echo $category ?>"> |
| — | — | @@ -579,7 +579,7 @@ |
| 580 | 580 | case 'TOOLBOX': |
| 581 | 581 | ?> |
| 582 | 582 | <div class="portal" id="p-tb"> |
| 583 | | - <h5 <?php $this->html('userlangattributes') ?>><?php $this->msg( 'toolbox' ) ?></h5> |
| | 583 | + <h5<?php $this->html('userlangattributes') ?>><?php $this->msg( 'toolbox' ) ?></h5> |
| 584 | 584 | <div class="body"> |
| 585 | 585 | <ul> |
| 586 | 586 | <?php if( $this->data['notspecialpage'] ): ?> |
| — | — | @@ -622,7 +622,7 @@ |
| 623 | 623 | if ( $this->data['language_urls'] ) { |
| 624 | 624 | ?> |
| 625 | 625 | <div class="portal" id="p-lang"> |
| 626 | | - <h5 <?php $this->html('userlangattributes') ?>><?php $this->msg( 'otherlanguages' ) ?></h5> |
| | 626 | + <h5<?php $this->html('userlangattributes') ?>><?php $this->msg( 'otherlanguages' ) ?></h5> |
| 627 | 627 | <div class="body"> |
| 628 | 628 | <ul> |
| 629 | 629 | <?php foreach ( $this->data['language_urls'] as $langlink ): ?> |
| — | — | @@ -637,7 +637,7 @@ |
| 638 | 638 | default: |
| 639 | 639 | ?> |
| 640 | 640 | <div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo $this->skin->tooltip( 'p-' . $name ) ?>> |
| 641 | | - <h5 <?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $name ); if ( wfEmptyMsg( $name, $out ) ) echo htmlspecialchars( $name ); else echo htmlspecialchars( $out ); ?></h5> |
| | 641 | + <h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $name ); if ( wfEmptyMsg( $name, $out ) ) echo htmlspecialchars( $name ); else echo htmlspecialchars( $out ); ?></h5> |
| 642 | 642 | <div class="body"> |
| 643 | 643 | <?php if ( is_array( $content ) ): ?> |
| 644 | 644 | <ul> |
| — | — | @@ -680,7 +680,7 @@ |
| 681 | 681 | ?> |
| 682 | 682 | <div id="p-namespaces" class="vectorTabs<?php if ( count( $this->data['namespace_urls'] ) == 0 ) echo ' emptyPortlet'; ?>"> |
| 683 | 683 | <h5><?php $this->msg('namespaces') ?></h5> |
| 684 | | - <ul <?php $this->html('userlangattributes') ?>> |
| | 684 | + <ul<?php $this->html('userlangattributes') ?>> |
| 685 | 685 | <?php foreach ($this->data['namespace_urls'] as $key => $link ): ?> |
| 686 | 686 | <li <?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><span><?php echo htmlspecialchars( $link['text'] ) ?></span></a></li> |
| 687 | 687 | <?php endforeach; ?> |
| — | — | @@ -693,7 +693,7 @@ |
| 694 | 694 | <div id="p-variants" class="vectorMenu<?php if ( count( $this->data['variant_urls'] ) == 0 ) echo ' emptyPortlet'; ?>"> |
| 695 | 695 | <h5><span><?php $this->msg('variants') ?></span><a href="#"></a></h5> |
| 696 | 696 | <div class="menu"> |
| 697 | | - <ul <?php $this->html('userlangattributes') ?>> |
| | 697 | + <ul<?php $this->html('userlangattributes') ?>> |
| 698 | 698 | <?php foreach ($this->data['variant_urls'] as $key => $link ): ?> |
| 699 | 699 | <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li> |
| 700 | 700 | <?php endforeach; ?> |
| — | — | @@ -706,7 +706,7 @@ |
| 707 | 707 | ?> |
| 708 | 708 | <div id="p-views" class="vectorTabs<?php if ( count( $this->data['view_urls'] ) == 0 ) echo ' emptyPortlet'; ?>"> |
| 709 | 709 | <h5><?php $this->msg('views') ?></h5> |
| 710 | | - <ul <?php $this->html('userlangattributes') ?>> |
| | 710 | + <ul<?php $this->html('userlangattributes') ?>> |
| 711 | 711 | <?php foreach ($this->data['view_urls'] as $key => $link ): ?> |
| 712 | 712 | <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo (array_key_exists('img',$link) ? '<img src="'.$link['img'].'" alt="'.$link['text'].'" />' : '<span>'.htmlspecialchars( $link['text'] ).'</span>') ?></a></li> |
| 713 | 713 | <?php endforeach; ?> |
| — | — | @@ -719,7 +719,7 @@ |
| 720 | 720 | <div id="p-cactions" class="vectorMenu<?php if ( count( $this->data['action_urls'] ) == 0 ) echo ' emptyPortlet'; ?>"> |
| 721 | 721 | <h5><span><?php $this->msg('actions') ?></span><a href="#"></a></h5> |
| 722 | 722 | <div class="menu"> |
| 723 | | - <ul <?php $this->html('userlangattributes') ?>> |
| | 723 | + <ul<?php $this->html('userlangattributes') ?>> |
| 724 | 724 | <?php foreach ($this->data['action_urls'] as $key => $link ): ?> |
| 725 | 725 | <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li> |
| 726 | 726 | <?php endforeach; ?> |
| — | — | @@ -732,7 +732,7 @@ |
| 733 | 733 | ?> |
| 734 | 734 | <div id="p-personal" class="<?php if ( count( $this->data['personal_urls'] ) == 0 ) echo ' emptyPortlet'; ?>"> |
| 735 | 735 | <h5><?php $this->msg('personaltools') ?></h5> |
| 736 | | - <ul <?php $this->html('userlangattributes') ?>> |
| | 736 | + <ul<?php $this->html('userlangattributes') ?>> |
| 737 | 737 | <?php foreach($this->data['personal_urls'] as $key => $item): ?> |
| 738 | 738 | <li <?php echo $item['attributes'] ?>><a href="<?php echo htmlspecialchars($item['href']) ?>"<?php echo $item['key'] ?><?php if(!empty($item['class'])): ?> class="<?php echo htmlspecialchars($item['class']) ?>"<?php endif; ?>><?php echo htmlspecialchars($item['text']) ?></a></li> |
| 739 | 739 | <?php endforeach; ?> |
| — | — | @@ -743,7 +743,7 @@ |
| 744 | 744 | case 'SEARCH': |
| 745 | 745 | ?> |
| 746 | 746 | <div id="p-search"> |
| 747 | | - <h5 <?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5> |
| | 747 | + <h5<?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5> |
| 748 | 748 | <form action="<?php $this->text( 'wgScript' ) ?>" id="searchform"> |
| 749 | 749 | <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/> |
| 750 | 750 | <?php if ( $wgVectorUseSimpleSearch ): ?> |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1> |
| 75 | 75 | <div id="bodyContent"> |
| 76 | 76 | <h3 id="siteSub"><?php $this->msg('tagline') ?></h3> |
| 77 | | - <div id="contentSub" <?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div> |
| | 77 | + <div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div> |
| 78 | 78 | <?php if($this->data['undelete']) { ?> |
| 79 | 79 | <div id="contentSub2"><?php $this->html('undelete') ?></div> |
| 80 | 80 | <?php } ?><?php if($this->data['newtalk'] ) { ?> |
| — | — | @@ -89,7 +89,7 @@ |
| 90 | 90 | <div class="visualClear"></div> |
| 91 | 91 | </div> |
| 92 | 92 | </div></div> |
| 93 | | -<div id="column-one" <?php $this->html('userlangattributes') ?>> |
| | 93 | +<div id="column-one"<?php $this->html('userlangattributes') ?>> |
| 94 | 94 | <div id="p-cactions" class="portlet"> |
| 95 | 95 | <h5><?php $this->msg('views') ?></h5> |
| 96 | 96 | <div class="pBody"> |
| — | — | @@ -122,7 +122,7 @@ |
| 123 | 123 | <div class="portlet" id="p-personal"> |
| 124 | 124 | <h5><?php $this->msg('personaltools') ?></h5> |
| 125 | 125 | <div class="pBody"> |
| 126 | | - <ul <?php $this->html('userlangattributes') ?>> |
| | 126 | + <ul<?php $this->html('userlangattributes') ?>> |
| 127 | 127 | <?php foreach($this->data['personal_urls'] as $key => $item) { ?> |
| 128 | 128 | <li id="<?php echo Sanitizer::escapeId( "pt-$key" ) ?>"<?php |
| 129 | 129 | if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php |
| — | — | @@ -159,7 +159,7 @@ |
| 160 | 160 | ?> |
| 161 | 161 | </div><!-- end of the left (by default at least) column --> |
| 162 | 162 | <div class="visualClear"></div> |
| 163 | | -<div id="footer" <?php $this->html('userlangattributes') ?>> |
| | 163 | +<div id="footer"<?php $this->html('userlangattributes') ?>> |
| 164 | 164 | <?php |
| 165 | 165 | if($this->data['poweredbyico']) { ?> |
| 166 | 166 | <div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div> |
| — | — | @@ -300,7 +300,7 @@ |
| 301 | 301 | if( $this->data['language_urls'] ) { |
| 302 | 302 | ?> |
| 303 | 303 | <div id="p-lang" class="portlet"> |
| 304 | | - <h5 <?php $this->html('userlangattributes') ?>><?php $this->msg('otherlanguages') ?></h5> |
| | 304 | + <h5<?php $this->html('userlangattributes') ?>><?php $this->msg('otherlanguages') ?></h5> |
| 305 | 305 | <div class="pBody"> |
| 306 | 306 | <ul> |
| 307 | 307 | <?php foreach($this->data['language_urls'] as $langlink) { ?> |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -106,7 +106,7 @@ |
| 107 | 107 | for the margins --> |
| 108 | 108 | <div id="mw_contentholder" <?php $this->html("specialpageattributes") ?>> |
| 109 | 109 | <div class='mw-topboxes'> |
| 110 | | - <div id="mw-js-message" style="display:none;" <?php $this->html('userlangattributes')?>></div> |
| | 110 | + <div id="mw-js-message" style="display:none;"<?php $this->html('userlangattributes')?>></div> |
| 111 | 111 | <div class="mw-topbox" id="siteSub"><?php $this->msg('tagline') ?></div> |
| 112 | 112 | <?php if($this->data['newtalk'] ) { |
| 113 | 113 | ?><div class="usermessage mw-topbox"><?php $this->html('newtalk') ?></div> |
| — | — | @@ -116,7 +116,7 @@ |
| 117 | 117 | <?php } ?> |
| 118 | 118 | </div> |
| 119 | 119 | |
| 120 | | - <div id="contentSub" <?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div> |
| | 120 | + <div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div> |
| 121 | 121 | |
| 122 | 122 | <?php if($this->data['undelete']) { ?><div id="contentSub2"><?php $this->html('undelete') ?></div><?php } ?> |
| 123 | 123 | <?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#mw_portlets"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?> |
| — | — | @@ -129,7 +129,7 @@ |
| 130 | 130 | </div><!-- mw_content --> |
| 131 | 131 | </div><!-- mw_contentwrapper --> |
| 132 | 132 | |
| 133 | | - <div id="mw_portlets" <?php $this->html("userlangattributes") ?>> |
| | 133 | + <div id="mw_portlets"<?php $this->html("userlangattributes") ?>> |
| 134 | 134 | |
| 135 | 135 | <!-- portlets --> |
| 136 | 136 | <?php |
| — | — | @@ -177,7 +177,7 @@ |
| 178 | 178 | |
| 179 | 179 | |
| 180 | 180 | <!-- footer --> |
| 181 | | - <div id="footer" <?php $this->html('userlangattributes') ?>> |
| | 181 | + <div id="footer"<?php $this->html('userlangattributes') ?>> |
| 182 | 182 | <ul id="f-list"> |
| 183 | 183 | <?php |
| 184 | 184 | $footerlinks = array( |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -314,7 +314,7 @@ |
| 315 | 315 | $lang = $wgLang->getCode(); |
| 316 | 316 | $dir = $wgLang->getDir(); |
| 317 | 317 | if ( $lang !== $wgContLang->getCode() || $dir !== $wgContLang->getDir() ) { |
| 318 | | - $attrs = "lang='$lang' xml:lang='$lang' dir='$dir'"; |
| | 318 | + $attrs = " lang='$lang' xml:lang='$lang' dir='$dir'"; |
| 319 | 319 | |
| 320 | 320 | $tpl->set( 'userlangattributes', $attrs ); |
| 321 | 321 | |