* Add a nice fieldset to the input form to be consistent with other forms.

* Fix indention

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index cfbef1b..13a6bc7 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -120,121 +120,123 @@ class IPBlockForm {
                $wgOut->addHTML( "
 <script type=\"text/javascript\" src=\"$wgStylePath/common/block.js?$wgStyleVersion\">
 </script>
-<form id=\"blockip\" method=\"post\" action=\"{$action}\">
-       <table border='0'>
-               <tr>
-                       <td align=\"$alignRight\">{$mIpaddress}</td>
-                       <td>
-                               " . Xml::input( 'wpBlockAddress', 45, $this->BlockAddress,
-                                       array(
-                                               'tabindex' => '1',
-                                               'id' => 'mw-bi-target',
-                                               'onchange' => 'updateBlockOptions()' ) ) . "
-                       </td>
-               </tr>
-               <tr>");
-               if ($showblockoptions) {
+<form id=\"blockip\" method=\"post\" action=\"{$action}\">" .
+                       Xml::openElement( 'fieldset' ) .
+                       Xml::element( 'legend', null, wfMsg( 'blockip-legend' ) ) .
+                       Xml::openElement( 'table', array ( 'border' => '0' ) ) .
+                       "<tr>
+                               <td align=\"$alignRight\">{$mIpaddress}</td>
+                               <td>" .
+                                       Xml::input( 'wpBlockAddress', 45, $this->BlockAddress,
+                                               array(
+                                                       'tabindex' => '1',
+                                                       'id' => 'mw-bi-target',
+                                                       'onchange' => 'updateBlockOptions()' ) ). "
+                               </td>
+                       </tr>
+                       <tr>"
+               );
+               if ( $showblockoptions ) {
                        $wgOut->addHTML("
-                       <td align=\"$alignRight\">{$mIpbexpiry}</td>
-                       <td>
-                               <select tabindex='2' id='wpBlockExpiry' name=\"wpBlockExpiry\" onchange=\"considerChangingExpiryFocus()\">
-                                       $blockExpiryFormOptions
-                               </select>
-                       </td>
-                       ");
+                               <td align=\"$alignRight\">{$mIpbexpiry}</td>
+                               <td>
+                                       <select tabindex='2' id='wpBlockExpiry' name=\"wpBlockExpiry\" onchange=\"considerChangingExpiryFocus()\">
+                                               $blockExpiryFormOptions
+                                       </select>
+                               </td>"
+                       );
                }
                $wgOut->addHTML("
-               </tr>
-               <tr id='wpBlockOther'>
-                       <td align=\"$alignRight\">{$mIpbother}</td>
-                       <td>
-                               " . Xml::input( 'wpBlockOther', 45, $this->BlockOther,
-                                       array( 'tabindex' => '3', 'id' => 'mw-bi-other' ) ) . "
-                       </td>
-               </tr>");
-               $wgOut->addHTML("
-               <tr>
-                       <td align=\"$alignRight\">{$mIpbreasonother}</td>
-                       <td>
-                               $reasonDropDown
-                       </td>
-               </tr>");
-               $wgOut->addHTML("
-               <tr id=\"wpBlockReason\">
-                       <td align=\"$alignRight\">{$mIpbreason}</td>
-                       <td>
-                               " . Xml::input( 'wpBlockReason', 45, $this->BlockReason,
-                                       array( 'tabindex' => '5', 'id' => 'mw-bi-reason',
-                                              'maxlength'=> '200' ) ) . "
-                       </td>
-               </tr>
-               <tr id='wpAnonOnlyRow'>
-                       <td>&nbsp;</td>
-                       <td>
-                               " . wfCheckLabel( wfMsgHtml( 'ipbanononly' ),
-                                       'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly,
-                                       array( 'tabindex' => '6' ) ) . "
-                       </td>
-               </tr>
-               <tr id='wpCreateAccountRow'>
-                       <td>&nbsp;</td>
-                       <td>
-                               " . wfCheckLabel( wfMsgHtml( 'ipbcreateaccount' ),
-                                       'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount,
-                                       array( 'tabindex' => '7' ) ) . "
-                       </td>
-               </tr>
-               <tr id='wpEnableAutoblockRow'>
-                       <td>&nbsp;</td>
-                       <td>
-                               " . wfCheckLabel( wfMsgHtml( 'ipbenableautoblock' ),
+                       </tr>
+                       <tr id='wpBlockOther'>
+                               <td align=\"$alignRight\">{$mIpbother}</td>
+                               <td>" .
+                                       Xml::input( 'wpBlockOther', 45, $this->BlockOther,
+                                               array( 'tabindex' => '3', 'id' => 'mw-bi-other' ) ) . "
+                               </td>
+                       </tr>
+                       <tr>
+                               <td align=\"$alignRight\">{$mIpbreasonother}</td>
+                               <td>
+                                       $reasonDropDown
+                               </td>
+                       </tr>
+                       <tr id=\"wpBlockReason\">
+                               <td align=\"$alignRight\">{$mIpbreason}</td>
+                               <td>" .
+                                       Xml::input( 'wpBlockReason', 45, $this->BlockReason,
+                                               array( 'tabindex' => '5', 'id' => 'mw-bi-reason', 'maxlength'=> '200' ) ) . "
+                               </td>
+                       </tr>
+                       <tr id='wpAnonOnlyRow'>
+                               <td>&nbsp;</td>
+                               <td>" .
+                                       wfCheckLabel( wfMsgHtml( 'ipbanononly' ),
+                                               'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly,
+                                               array( 'tabindex' => '6' ) ) . "
+                               </td>
+                       </tr>
+                       <tr id='wpCreateAccountRow'>
+                               <td>&nbsp;</td>
+                               <td>" .
+                                       wfCheckLabel( wfMsgHtml( 'ipbcreateaccount' ),
+                                               'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount,
+                                               array( 'tabindex' => '7' ) ) . "
+                               </td>
+                       </tr>
+                       <tr id='wpEnableAutoblockRow'>
+                               <td>&nbsp;</td>
+                               <td>" .
+                                       wfCheckLabel( wfMsgHtml( 'ipbenableautoblock' ),
                                                'wpEnableAutoblock', 'wpEnableAutoblock', $this->BlockEnableAutoblock,
-                                                       array( 'tabindex' => '8' ) ) . "
-                       </td>
-               </tr>
-               ");
-               
+                                               array( 'tabindex' => '8' ) ) . "
+                               </td>
+                       </tr>"
+               );
+
                global $wgSysopEmailBans;
                if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
                        $wgOut->addHTML("
-                       <tr id='wpEnableEmailBan'>
-                       <td>&nbsp;</td>
-                               <td>
-                                       " . wfCheckLabel( wfMsgHtml( 'ipbemailban' ),
+                               <tr id='wpEnableEmailBan'>
+                               <td>&nbsp;</td>
+                                       <td>" .
+                                               wfCheckLabel( wfMsgHtml( 'ipbemailban' ),
                                                        'wpEmailBan', 'wpEmailBan', $this->BlockEmail,
-                                                               array( 'tabindex' => '10' )) . "
-                               </td>
-                       </tr>
-                       ");
+                                                       array( 'tabindex' => '10' )) . "
+                                       </td>
+                               </tr>"
+                       );
                }
 
                // Allow some users to hide name from block log, blocklist and listusers
                if ( $wgUser->isAllowed( 'hideuser' ) ) {
                        $wgOut->addHTML("
-                       <tr id='wpEnableHideUser'>
-                       <td>&nbsp;</td>
-                               <td>
-                                       " . wfCheckLabel( wfMsgHtml( 'ipbhidename' ),
+                               <tr id='wpEnableHideUser'>
+                               <td>&nbsp;</td>
+                                       <td>" .
+                                               wfCheckLabel( wfMsgHtml( 'ipbhidename' ),
                                                        'wpHideName', 'wpHideName', $this->BlockHideName,
-                                                               array( 'tabindex' => '9' ) ) . "
-                               </td>
-                       </tr>
-                       ");
+                                                       array( 'tabindex' => '9' ) ) . "
+                                       </td>
+                               </tr>"
+                       );
                }
-               
+
                $wgOut->addHTML("
-               <tr>
-                       <td style='padding-top: 1em'>&nbsp;</td>
-                       <td style='padding-top: 1em'>
-                               " . Xml::submitButton( wfMsg( 'ipbsubmit' ),
-                                                       array( 'name' => 'wpBlock', 'tabindex' => '11' ) ) . "
-                       </td>
-               </tr>
-       </table>" .
-       Xml::hidden( 'wpEditToken', $token ) .
+                       <tr>
+                               <td style='padding-top: 1em'>&nbsp;</td>
+                               <td style='padding-top: 1em'>" .
+                                       Xml::submitButton( wfMsg( 'ipbsubmit' ),
+                                               array( 'name' => 'wpBlock', 'tabindex' => '11' ) ) . "
+                               </td>
+                       </tr>" .
+                       Xml::closeElement( 'table' ) .
+                       Xml::hidden( 'wpEditToken', $token ) .
+                       Xml::closeElement( 'fieldset' ) .
 "</form>
 <script type=\"text/javascript\">updateBlockOptions()</script>
-\n" );
+\n"
+               );
 
                $wgOut->addHtml( $this->getConvenienceLinks() );
 

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 2f65998..a32af30 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1699,6 +1699,7 @@ $1',
 
 # Block/unblock
 'blockip'                     => 'IP-Adresse/Benutzer sperren',
+'blockip-legend'              => 'IP-Adresse/Benutzer sperren',
 'blockiptext'                 => 'Mit diesem Formular sperrst du eine IP-Adresse oder einen Benutzernamen, so dass von dort keine Änderungen mehr vorgenommen werden können.
 Dies sollte nur erfolgen, um Vandalismus zu verhindern und in Übereinstimmung mit den [[{{MediaWiki:Policy-url}}|Richtlinien]].
 Bitte gib den Grund für die Sperre an.',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 9fd4cec..8a0b25a 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2033,6 +2033,7 @@ $1',
 
 # Block/unblock
 'blockip'                     => 'Block user',
+'blockip-legend'              => 'Block user',
 'blockiptext'                 => 'Use the form below to block write access from a specific IP address or username.
 This should be done only to prevent vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].
 Fill in a specific reason below (for example, citing particular pages that were vandalized).',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 622ea24..f6d4828 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1407,6 +1407,7 @@ $wgMessageStructure = array(
        ),
        'block' => array(
                'blockip',
+               'blockip-legend',
                'blockiptext',
                'ipaddress',
                'ipadressorusername',