| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1436,6 +1436,7 @@ |
| 1437 | 1437 | 'watchlist-hide-anons', |
| 1438 | 1438 | 'watchlist-show-liu', |
| 1439 | 1439 | 'watchlist-hide-liu', |
| | 1440 | + 'watchlist-options', |
| 1440 | 1441 | ), |
| 1441 | 1442 | 'watching' => array( |
| 1442 | 1443 | 'watching', |
| Index: trunk/phase3/includes/specials/SpecialWatchlist.php |
| — | — | @@ -241,7 +241,7 @@ |
| 242 | 242 | ); |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | | - $wgOut->addHTML( "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n" ); |
| | 245 | + $cutofflinks = "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n"; |
| 246 | 246 | |
| 247 | 247 | # Spit out some control panel links |
| 248 | 248 | $thisTitle = SpecialPage::getTitleFor( 'Watchlist' ); |
| — | — | @@ -272,10 +272,14 @@ |
| 273 | 273 | $linkBits = wfArrayToCGI( array( 'hideOwn' => 1 - (int)$hideOwn ), $nondefaults ); |
| 274 | 274 | $links[] = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits ); |
| 275 | 275 | |
| 276 | | - $wgOut->addHTML( implode( ' | ', $links ) ); |
| 277 | | - |
| 278 | | - # Form for namespace filtering |
| 279 | | - $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) ); |
| | 276 | + # Namespace filter and put the whole form together. |
| | 277 | + $form = Xml::openElement( 'fieldset', array( 'id' => 'mw-watchlist-options' ) ); |
| | 278 | + $form .= Xml::openElement( 'legend', array( 'id' => 'mw-watchlist-legend' ) ); |
| | 279 | + $form .= wfMsgExt( 'watchlist-options', array('escape') ); |
| | 280 | + $form .= Xml::closeElement( 'legend' ); |
| | 281 | + $form .= $cutofflinks; |
| | 282 | + $form .= implode( ' | ', $links ); |
| | 283 | + $form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) ); |
| 280 | 284 | $form .= '<p>'; |
| 281 | 285 | $form .= Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' '; |
| 282 | 286 | $form .= Xml::namespaceSelector( $nameSpace, '' ) . ' '; |
| — | — | @@ -293,6 +297,7 @@ |
| 294 | 298 | if( $hideOwn ) |
| 295 | 299 | $form .= Xml::hidden( 'hideOwn', 1 ); |
| 296 | 300 | $form .= Xml::closeElement( 'form' ); |
| | 301 | + $form .= Xml::closeElement( 'fieldset' ); |
| 297 | 302 | $wgOut->addHtml( $form ); |
| 298 | 303 | |
| 299 | 304 | # If there's nothing to show, stop here |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2164,6 +2164,7 @@ |
| 2165 | 2165 | 'watchlist-hide-anons' => 'Hide anonymous edits', |
| 2166 | 2166 | 'watchlist-show-liu' => 'Show logged-in user edits', |
| 2167 | 2167 | 'watchlist-hide-liu' => 'Hide logged-in user edits', |
| | 2168 | +'watchlist-options' => 'Watchlist options', |
| 2168 | 2169 | |
| 2169 | 2170 | # Displayed when you click the "watch" button and it is in the process of watching |
| 2170 | 2171 | 'watching' => 'Watching...', |