| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -29,7 +29,7 @@ |
| 30 | 30 | global $wgLocalStylePath, $wgRequest; |
| 31 | 31 | |
| 32 | 32 | parent::initPage( $out ); |
| 33 | | - |
| | 33 | + |
| 34 | 34 | // Append CSS which includes IE only behavior fixes for hover support - |
| 35 | 35 | // this is better than including this in a CSS fille since it doesn't |
| 36 | 36 | // wait for the CSS file to load before fetching the HTC file. |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | htmlspecialchars( $wgLocalStylePath ) . |
| 41 | 41 | "/{$this->stylename}/csshover{$min}.htc\")}</style><![endif]-->" |
| 42 | 42 | ); |
| 43 | | - |
| | 43 | + |
| 44 | 44 | $out->addModuleScripts( 'skins.vector' ); |
| 45 | 45 | } |
| 46 | 46 | |
| — | — | @@ -80,7 +80,7 @@ |
| 81 | 81 | // Build additional attributes for navigation urls |
| 82 | 82 | //$nav = $this->skin->buildNavigationUrls(); |
| 83 | 83 | $nav = $this->data['content_navigation']; |
| 84 | | - |
| | 84 | + |
| 85 | 85 | if ( $wgVectorUseIconWatch ) { |
| 86 | 86 | $mode = $this->skin->getTitle()->userIsWatching() ? 'unwatch' : 'watch'; |
| 87 | 87 | if ( isset( $nav['actions'][$mode] ) ) { |
| — | — | @@ -97,7 +97,7 @@ |
| 98 | 98 | if ( $section == 'views' && !( isset( $link['primary'] ) && $link['primary'] ) ) { |
| 99 | 99 | $link['class'] = rtrim( 'collapsible ' . $link['class'], ' ' ); |
| 100 | 100 | } |
| 101 | | - |
| | 101 | + |
| 102 | 102 | $xmlID = isset( $link['id'] ) ? $link['id'] : 'ca-' . $xmlID; |
| 103 | 103 | $nav[$section][$key]['attributes'] = |
| 104 | 104 | ' id="' . Sanitizer::escapeId( $xmlID ) . '"'; |
| — | — | @@ -259,7 +259,7 @@ |
| 260 | 260 | /** |
| 261 | 261 | * Render a series of portals |
| 262 | 262 | * |
| 263 | | - * @params $portals array |
| | 263 | + * @param $portals array |
| 264 | 264 | */ |
| 265 | 265 | private function renderPortals( $portals ) { |
| 266 | 266 | // Force the rendering of the following portals |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -31,13 +31,13 @@ |
| 32 | 32 | parent::setupSkinUserCss( $out ); |
| 33 | 33 | |
| 34 | 34 | $out->addModuleStyles( 'skins.monobook' ); |
| 35 | | - |
| | 35 | + |
| 36 | 36 | // Ugh. Can't do this properly because $wgHandheldStyle may be a URL |
| 37 | 37 | if( $wgHandheldStyle ) { |
| 38 | 38 | // Currently in testing... try 'chick/main.css' |
| 39 | 39 | $out->addStyle( $wgHandheldStyle, 'handheld' ); |
| 40 | 40 | } |
| 41 | | - |
| | 41 | + |
| 42 | 42 | // TODO: Migrate all of these |
| 43 | 43 | //$out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' ); |
| 44 | 44 | //$out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' ); |
| — | — | @@ -103,7 +103,7 @@ |
| 104 | 104 | </div> |
| 105 | 105 | </div></div> |
| 106 | 106 | <div id="column-one"<?php $this->html('userlangattributes') ?>> |
| 107 | | -<?php $this->cactions( $this->skin ); ?> |
| | 107 | +<?php $this->cactions(); ?> |
| 108 | 108 | <div class="portlet" id="p-personal"> |
| 109 | 109 | <h5><?php $this->msg('personaltools') ?></h5> |
| 110 | 110 | <div class="pBody"> |
| — | — | @@ -225,7 +225,7 @@ |
| 226 | 226 | * |
| 227 | 227 | * @param $skin Skin |
| 228 | 228 | */ |
| 229 | | - function cactions( Skin $skin ) { |
| | 229 | + function cactions() { |
| 230 | 230 | ?> |
| 231 | 231 | <div id="p-cactions" class="portlet"> |
| 232 | 232 | <h5><?php $this->msg('views') ?></h5> |
| — | — | @@ -233,7 +233,7 @@ |
| 234 | 234 | <ul><?php |
| 235 | 235 | foreach($this->data['content_actions'] as $key => $tab) { |
| 236 | 236 | $linkAttribs = array( 'href' => $tab['href'] ); |
| 237 | | - |
| | 237 | + |
| 238 | 238 | if( isset( $tab["tooltiponly"] ) && $tab["tooltiponly"] ) { |
| 239 | 239 | $title = Linker::titleAttrib( "ca-$key" ); |
| 240 | 240 | if ( $title !== false ) { |
| — | — | @@ -243,7 +243,7 @@ |
| 244 | 244 | $linkAttribs += Linker::tooltipAndAccesskeyAttribs( "ca-$key" ); |
| 245 | 245 | } |
| 246 | 246 | $linkHtml = Html::element( 'a', $linkAttribs, $tab['text'] ); |
| 247 | | - |
| | 247 | + |
| 248 | 248 | /* Surround with a <li> */ |
| 249 | 249 | $liAttribs = array( 'id' => Sanitizer::escapeId( "ca-$key" ) ); |
| 250 | 250 | if( $tab['class'] ) { |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -63,7 +63,7 @@ |
| 64 | 64 | <div id="mw_main"> |
| 65 | 65 | <div id="mw_contentwrapper"> |
| 66 | 66 | <!-- navigation portlet --> |
| 67 | | -<?php $this->cactions( $skin ); ?> |
| | 67 | +<?php $this->cactions(); ?> |
| 68 | 68 | |
| 69 | 69 | <!-- content --> |
| 70 | 70 | <div id="mw_content"> |