Miscellaneous aesthetic improvements to Special:Ipblocklist

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fa683a2..c3f72e3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -166,6 +166,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   Special:Protectedpages (implicit protection, doesn't make sense to have it)
 * (bug 10793) "Mark patrolled" links will now be shown for users with
   patrol permissions on all eligible diff pages
+* (bug 10655) Show standard tool links for blocked users in block log messages
+* Show standard tool links for blocked users in Special:Ipblocklist
+* Miscellaneous aesthetic improvements to Special:Ipblocklist
 
 == Bugfixes since 1.10 ==
 
@@ -359,8 +362,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10765) img_auth.php will now refuse logged-out requests where
   $wgWhitelistRead is undefined, instead of (incorrectly) honouring them
 * Fixed img_auth.php file name extraction for whitelist checking
-* (bug 10655) Show standard tool links for blocked users in block log messages
-* Show standard tool links for blocked users in Special:Ipblocklist
 
 == API changes since 1.10 ==
 

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 34c6dbd..4b27bbd 100644 (file)
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -245,8 +245,11 @@ class IPUnblockForm {
                return
                        Xml::tags( 'form', array( 'action' => $wgScript ),
                                Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ) .
-                               Xml::input( 'ip', /*size*/ false, $this->ip ) .
-                               Xml::submitButton( wfMsg( 'ipblocklist-submit' ) )
+                               Xml::openElement( 'fieldset' ) .
+                               Xml::element( 'legend', null, wfMsg( 'ipblocklist-legend' ) ) .
+                               Xml::inputLabel( wfMsg( 'ipblocklist-username' ), 'ip', 'ip', /* size */ false, $this->ip ) .
+                               Xml::submitButton( wfMsg( 'ipblocklist-submit' ) ) .
+                               Xml::closeElement( 'fieldset' )
                        );
        }
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index a9c799a..bdd08a2 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2018,6 +2018,8 @@ to a previously blocked IP address or username.',
 'unblocked'                   => '[[User:$1|$1]] has been unblocked',
 'unblocked-id'                => 'Block $1 has been removed',
 'ipblocklist'                 => 'List of blocked IP addresses and usernames',
+'ipblocklist-legend' => 'Find a blocked user',
+'ipblocklist-username' => 'Username or IP address:',
 'ipblocklist-summary'         => '', # only translate this message to other languages if you have to change it
 'ipblocklist-submit'          => 'Search',
 'blocklistline'               => '$1, $2 blocked $3 ($4)',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 49c84ee..a8e5014 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1337,6 +1337,8 @@ $wgMessageStructure = array(
                'unblocked',
                'unblocked-id',
                'ipblocklist',
+               'ipblocklist-legend',
+               'ipblocklist-username',
                'ipblocklist-summary',
                'ipblocklist-submit',
                'blocklistline',