From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 27 Aug 2008 15:22:50 +0000 (+0000)
Subject: Reverting my reversions of the fieldset on Special:Watchlist. I liked it, and apparen... 
X-Git-Tag: 1.31.0-rc.0~45622
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=587057f379c45712726f26a7b61c45675cec929d;p=lhc%2Fweb%2Fwiklou.git

Reverting my reversions of the fieldset on Special:Watchlist. I liked it, and apparently some other people did too (although some don't). Plus, it's been pointed out that semantically, a fieldset belongs around fields. Who knew? Could use some CSS tweaks maybe.
---

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index d281cd6094..5a0404239c 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -269,7 +269,11 @@ function wfSpecialWatchlist( $par ) {
 	$links[] = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
 
 	# Namespace filter and put the whole form together.
-	$form  = $wlInfo;
+	$form  = Xml::openElement( 'fieldset', array( 'id' => 'mw-watchlist-options' ) );
+	$form .= Xml::openElement( 'legend', array( 'id' => 'mw-watchlist-legend' ) );
+	$form .= wfMsgExt( 'watchlist-options', array('escape') );
+	$form .= Xml::closeElement( 'legend' );
+	$form .= $wlInfo;
 	$form .= $cutofflinks;
 	$form .= implode( ' | ', $links );
 	$form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );
@@ -290,6 +294,7 @@ function wfSpecialWatchlist( $par ) {
 	if( $hideOwn )
 		$form .= Xml::hidden( 'hideOwn', 1 );
 	$form .= Xml::closeElement( 'form' );
+	$form .= Xml::closeElement( 'fieldset' );
 	$wgOut->addHtml( $form );
 
 	# If there's nothing to show, stop here
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 61676af94a..45d2af521c 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2164,6 +2164,7 @@ Future changes to this page and its associated talk page will be listed there, a
 'watchlist-hide-anons' => 'Hide anonymous edits',
 'watchlist-show-liu'   => 'Show logged-in user edits',
 'watchlist-hide-liu'   => 'Hide logged-in user edits',
+'watchlist-options'    => 'Watchlist options',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Watching...',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 50700a2a71..e4a97d1185 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1437,6 +1437,7 @@ $wgMessageStructure = array(
 		'watchlist-hide-anons',
 		'watchlist-show-liu',
 		'watchlist-hide-liu',
+		'watchlist-options',
 	),
 	'watching' => array(
 		'watching',