| Index: trunk/phase3/includes/specials/SpecialNewpages.php |
| — | — | @@ -237,7 +237,16 @@ |
| 238 | 238 | Xml::label( wfMsg( 'namespace' ), 'namespace' ) . |
| 239 | 239 | '</td> |
| 240 | 240 | <td class="mw-input">' . |
| 241 | | - Xml::namespaceSelector( $namespace, 'all' ) . |
| | 241 | + Html::namespaceSelector( |
| | 242 | + array( |
| | 243 | + 'selected' => $namespace, |
| | 244 | + 'all' => 'all', |
| | 245 | + ), array( |
| | 246 | + 'name' => 'namespace', |
| | 247 | + 'id' => 'namespace', |
| | 248 | + 'class' => 'namespaceselector', |
| | 249 | + ) |
| | 250 | + ) . |
| 242 | 251 | '</td> |
| 243 | 252 | </tr>' . ( $tagFilter ? ( |
| 244 | 253 | '<tr> |
| Index: trunk/phase3/includes/specials/SpecialImport.php |
| — | — | @@ -279,7 +279,16 @@ |
| 280 | 280 | Xml::label( $this->msg( 'import-interwiki-namespace' )->text(), 'namespace' ) . |
| 281 | 281 | "</td> |
| 282 | 282 | <td class='mw-input'>" . |
| 283 | | - Xml::namespaceSelector( $this->namespace, '' ) . |
| | 283 | + Html::namespaceSelector( |
| | 284 | + array( |
| | 285 | + 'selected' => $this->namespace, |
| | 286 | + 'all' => '', |
| | 287 | + ), array( |
| | 288 | + 'name' => 'namespace', |
| | 289 | + 'id' => 'namespace', |
| | 290 | + 'class' => 'namespaceselector', |
| | 291 | + ) |
| | 292 | + ) . |
| 284 | 293 | "</td> |
| 285 | 294 | </tr> |
| 286 | 295 | <tr> |
| Index: trunk/phase3/includes/specials/SpecialExport.php |
| — | — | @@ -185,7 +185,16 @@ |
| 186 | 186 | $form .= Xml::submitButton( $this->msg( 'export-addcat' )->text(), array( 'name' => 'addcat' ) ) . '<br />'; |
| 187 | 187 | |
| 188 | 188 | if ( $wgExportFromNamespaces ) { |
| 189 | | - $form .= Xml::namespaceSelector( $nsindex, null, 'nsindex', $this->msg( 'export-addnstext' )->text() ) . ' '; |
| | 189 | + $form .= Html::namespaceSelector( |
| | 190 | + array( |
| | 191 | + 'selected' => $nsindex, |
| | 192 | + 'label' => $this->msg( 'export-addnstext' )->text() |
| | 193 | + ), array( |
| | 194 | + 'name' => 'nsindex', |
| | 195 | + 'id' => 'namespace', |
| | 196 | + 'class' => 'namespaceselector', |
| | 197 | + ) |
| | 198 | + ) . ' '; |
| 190 | 199 | $form .= Xml::submitButton( $this->msg( 'export-addns' )->text(), array( 'name' => 'addns' ) ) . '<br />'; |
| 191 | 200 | } |
| 192 | 201 | |
| Index: trunk/phase3/includes/specials/SpecialWhatlinkshere.php |
| — | — | @@ -413,8 +413,17 @@ |
| 414 | 414 | $f .= ' '; |
| 415 | 415 | |
| 416 | 416 | # Namespace selector |
| 417 | | - $f .= Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) . ' ' . |
| 418 | | - Xml::namespaceSelector( $namespace, '' ); |
| | 417 | + $f .= Html::namespaceSelector( |
| | 418 | + array( |
| | 419 | + 'selected' => $namespace, |
| | 420 | + 'all' => '', |
| | 421 | + 'label' => $this->msg( 'namespace' )->text() |
| | 422 | + ), array( |
| | 423 | + 'name' => 'namespace', |
| | 424 | + 'id' => 'namespace', |
| | 425 | + 'class' => 'namespaceselector', |
| | 426 | + ) |
| | 427 | + ); |
| 419 | 428 | |
| 420 | 429 | $f .= ' '; |
| 421 | 430 | |
| Index: trunk/phase3/includes/specials/SpecialProtectedtitles.php |
| — | — | @@ -138,9 +138,17 @@ |
| 139 | 139 | * @return string |
| 140 | 140 | */ |
| 141 | 141 | function getNamespaceMenu( $namespace = null ) { |
| 142 | | - return Xml::label( wfMsg( 'namespace' ), 'namespace' ) |
| 143 | | - . ' ' |
| 144 | | - . Xml::namespaceSelector( $namespace, '' ); |
| | 142 | + return Html::namespaceSelector( |
| | 143 | + array( |
| | 144 | + 'selected' => $namespace, |
| | 145 | + 'all' => '', |
| | 146 | + 'label' => $this->msg( 'namespace' )->text() |
| | 147 | + ), array( |
| | 148 | + 'name' => 'namespace', |
| | 149 | + 'id' => 'namespace', |
| | 150 | + 'class' => 'namespaceselector', |
| | 151 | + ) |
| | 152 | + ); |
| 145 | 153 | } |
| 146 | 154 | |
| 147 | 155 | /** |
| Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php |
| — | — | @@ -492,8 +492,17 @@ |
| 493 | 493 | 'size' => '20', |
| 494 | 494 | 'required' => '' |
| 495 | 495 | ) + ( $options['target'] ? array() : array( 'autofocus' ) ) ) . ' '. |
| 496 | | - Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) . ' ' . |
| 497 | | - Xml::namespaceSelector( $options['namespace'], '' ) . ' ' . |
| | 496 | + Html::namespaceSelector( |
| | 497 | + array( |
| | 498 | + 'selected' => $options['namespace'], |
| | 499 | + 'all' => '', |
| | 500 | + 'label' => $this->msg( 'namespace' )->text() |
| | 501 | + ), array( |
| | 502 | + 'name' => 'namespace', |
| | 503 | + 'id' => 'namespace', |
| | 504 | + 'class' => 'namespaceselector', |
| | 505 | + ) |
| | 506 | + ) . ' ' . |
| 498 | 507 | Xml::submitButton( $this->msg( 'sp-contributions-submit' )->text() ) . |
| 499 | 508 | Xml::closeElement( 'fieldset' ) . |
| 500 | 509 | Xml::closeElement( 'form' ); |
| Index: trunk/phase3/includes/specials/SpecialWatchlist.php |
| — | — | @@ -328,8 +328,17 @@ |
| 329 | 329 | $form .= $lang->pipeList( $links ); |
| 330 | 330 | $form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalUrl(), 'id' => 'mw-watchlist-form-namespaceselector' ) ); |
| 331 | 331 | $form .= '<hr /><p>'; |
| 332 | | - $form .= Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) . ' '; |
| 333 | | - $form .= Xml::namespaceSelector( $nameSpace, '' ) . ' '; |
| | 332 | + $form .= Html::namespaceSelector( |
| | 333 | + array( |
| | 334 | + 'selected' => $nameSpace, |
| | 335 | + 'all' => '', |
| | 336 | + 'label' => $this->msg( 'namespace' )->text() |
| | 337 | + ), array( |
| | 338 | + 'name' => 'namespace', |
| | 339 | + 'id' => 'namespace', |
| | 340 | + 'class' => 'namespaceselector', |
| | 341 | + ) |
| | 342 | + ) . ' '; |
| 334 | 343 | $form .= Xml::checkLabel( $this->msg( 'invert' )->text(), 'invert', 'nsinvert', $invert ) . ' '; |
| 335 | 344 | $form .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . '</p>'; |
| 336 | 345 | $form .= Html::hidden( 'days', $values['days'] ); |
| Index: trunk/phase3/includes/specials/SpecialProtectedpages.php |
| — | — | @@ -187,8 +187,19 @@ |
| 188 | 188 | */ |
| 189 | 189 | protected function getNamespaceMenu( $namespace = null ) { |
| 190 | 190 | return "<span style='white-space: nowrap'>" . |
| 191 | | - Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' |
| 192 | | - . Xml::namespaceSelector( $namespace, '' ) . "</span>"; |
| | 191 | + Html::rawElement( 'span', array( 'style' => 'white-space:nowrap' ), |
| | 192 | + Html::namespaceSelector( |
| | 193 | + array( |
| | 194 | + 'selected' => $namespace, |
| | 195 | + 'all' => '', |
| | 196 | + 'label' => $this->msg( 'namespace' )->text() |
| | 197 | + ), array( |
| | 198 | + 'name' => 'namespace', |
| | 199 | + 'id' => 'namespace', |
| | 200 | + 'class' => 'namespaceselector', |
| | 201 | + ) |
| | 202 | + ) |
| | 203 | + ); |
| 193 | 204 | } |
| 194 | 205 | |
| 195 | 206 | /** |
| Index: trunk/phase3/includes/specials/SpecialLinkSearch.php |
| — | — | @@ -91,8 +91,17 @@ |
| 92 | 92 | Xml::element( 'legend', array(), $this->msg( 'linksearch' )->text() ) . |
| 93 | 93 | Xml::inputLabel( $this->msg( 'linksearch-pat' )->text(), 'target', 'target', 50, $target ) . ' '; |
| 94 | 94 | if ( !$wgMiserMode ) { |
| 95 | | - $s .= Xml::label( $this->msg( 'linksearch-ns' )->text(), 'namespace' ) . ' ' . |
| 96 | | - Xml::namespaceSelector( $namespace, '' ); |
| | 95 | + $s .= Html::namespaceSelector( |
| | 96 | + array( |
| | 97 | + 'selected' => $namespace, |
| | 98 | + 'all' => '', |
| | 99 | + 'label' => $this->msg( 'linksearch-ns' )->text() |
| | 100 | + ), array( |
| | 101 | + 'name' => 'namespace', |
| | 102 | + 'id' => 'namespace', |
| | 103 | + 'class' => 'namespaceselector', |
| | 104 | + ) |
| | 105 | + ); |
| 97 | 106 | } |
| 98 | 107 | $s .= Xml::submitButton( $this->msg( 'linksearch-ok' )->text() ) . |
| 99 | 108 | '</fieldset>' . |