* Some cosmetic tweaks

** ProtectionForm: move 'watch this page' checkbox between reason field and submit button like in all other forms too
** SpecialMovepage.php: right shift checkboxes a bit like in all other forms too, move hardcoded colons to message file for better localization

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 7b6c9eb..258dabc 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -258,14 +258,12 @@ class ProtectionForm {
                if( $wgEnableCascadingProtection )
                        $out .= '<tr><td></td><td>' . $this->buildCascadeInput() . "</td></tr>\n";
 
-               if( !$this->disabled )
-                       $out .= '<tr><td></td><td>' . $this->buildWatchInput() . "</td></tr>\n";
-
                $out .= $this->buildRobotsInput();
                $out .= $this->buildExpiryInput();
 
                if( !$this->disabled ) {
                        $out .= "<tr><td>" . $this->buildReasonInput() . "</td></tr>\n";
+                       $out .= "<tr><td></td><td>" . $this->buildWatchInput() . "</td></tr>\n";
                        $out .= "<tr><td></td><td>" . $this->buildSubmit() . "</td></tr>\n";
                }
 

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index c22acef..1a22fbc 100644 (file)
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -105,14 +105,10 @@ class MovePageForm {
                if ( $err == 'articleexists' && $wgUser->isAllowed( 'delete' ) ) {
                        $wgOut->addWikiText( wfMsg( 'delete_and_move_text', $encNewTitle ) );
                        $movepagebtn = wfMsgHtml( 'delete_and_move' );
-                       $confirmText = wfMsgHtml( 'delete_and_move_confirm' );
                        $submitVar = 'wpDeleteAndMove';
                        $confirm = "
                                <tr>
-                                       <td align='$end'>
-                                               <input type='checkbox' name='wpConfirm' id='wpConfirm' value=\"true\" />
-                                       </td>
-                                       <td align='$start'><label for='wpConfirm'>{$confirmText}</label></td>
+                                       <td></td><td>" . Xml::checkLabel( wfMsg( 'delete_and_move_confirm' ), 'wpConfirm', 'wpConfirm' ) . "</td>
                                </tr>";
                        $err = '';
                } else {
@@ -131,7 +127,6 @@ class MovePageForm {
 
                $movearticle = wfMsgHtml( 'movearticle' );
                $newtitle = wfMsgHtml( 'newtitle' );
-               $movetalk = wfMsgHtml( 'movetalk' );
                $movereason = wfMsgHtml( 'movereason' );
 
                $titleObj = SpecialPage::getTitleFor( 'Movepage' );
@@ -149,18 +144,18 @@ class MovePageForm {
 <form id=\"movepage\" method=\"post\" action=\"{$action}\">
        <table border='0'>
                <tr>
-                       <td align='$end'>{$movearticle}:</td>
+                       <td align='$end'>{$movearticle}</td>
                        <td align='$start'><strong>{$oldTitle}</strong></td>
                </tr>
                <tr>
-                       <td align='$end'><label for='wpNewTitle'>{$newtitle}:</label></td>
+                       <td align='$end'><label for='wpNewTitle'>{$newtitle}</label></td>
                        <td align='$start'>
                                <input type='text' size='40' name='wpNewTitle' id='wpNewTitle' value=\"{$encNewTitle}\" />
                                <input type='hidden' name=\"wpOldTitle\" value=\"{$encOldTitle}\" />
                        </td>
                </tr>
                <tr>
-                       <td align='$end' valign='top'><br /><label for='wpReason'>{$movereason}:</label></td>
+                       <td align='$end' valign='top'><br /><label for='wpReason'>{$movereason}</label></td>
                        <td align='$start' valign='top'><br />
                                <textarea cols='60' rows='2' name='wpReason' id='wpReason'>{$encReason}</textarea>
                        </td>
@@ -169,20 +164,16 @@ class MovePageForm {
                if ( $considerTalk ) {
                        $wgOut->addHTML( "
                <tr>
-                       <td align='$end'>
-                               <input type='checkbox' id=\"wpMovetalk\" name=\"wpMovetalk\"{$moveTalkChecked} value=\"1\" />
-                       </td>
-                       <td><label for=\"wpMovetalk\">{$movetalk}</label></td>
+                       <td></td><td>" . Xml::checkLabel( wfMsg( 'movetalk' ), 'wpMovetalk', 'wpMovetalk', $moveTalkChecked ) . "</td>
                </tr>" );
                }
-               
+
                $watchChecked = $this->watch || $wgUser->getBoolOption( 'watchmoves' ) || $ot->userIsWatching();
                $watch  = '<tr>';
-               $watch .= "<td align=\"$end\">" . Xml::check( 'wpWatch', $watchChecked, array( 'id' => 'watch' ) ) . '</td>';
-               $watch .= '<td>' . Xml::label( wfMsg( 'move-watch' ), 'watch' ) . '</td>';
+               $watch .= '<td></td><td>' . Xml::checkLabel( wfMsg( 'move-watch' ), 'wpWatch', 'watch', $watchChecked ) . '</td>';
                $watch .= '</tr>';
                $wgOut->addHtml( $watch );
-               
+
                $wgOut->addHTML( "
                {$confirm}
                <tr>

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 45d2d5a..f01d963 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1441,6 +1441,8 @@ Bitte gehen Sie zurück und versuchen den Vorgang erneut auszuführen.',
 'protect-expiring'            => 'bis $1 (UTC)',
 'protect-cascade'             => 'Kaskadierende Sperre – alle in diese Seite eingebundenen Vorlagen werden ebenfalls gesperrt.',
 'protect-robotspolicy'        => 'Anweisung für Suchroboter:',
+'protect-robots-noindex'      => 'nicht indizieren (noindex)',
+'protect-robots-nofollow'     => 'Links nicht folgen (nofollow)',
 'restriction-type'            => 'Schutzstatus',
 'restriction-level'           => 'Schutzhöhe',
 'minimum-size'                => 'Mindestgröße:',
@@ -1644,12 +1646,10 @@ Zur Aufhebung der Sperre siehe die [[{{ns:special}}:Ipblocklist|Liste aller akti
 *Sie wählen die untenstehende Option ab.
 
 In diesen Fällen müssen Sie, falls gewünscht, den Inhalt der Seite von Hand verschieben oder zusammenführen.",
-'movearticle'             => 'Seite verschieben',
+'movearticle'             => 'Seite verschieben:',
 'movenologin'             => 'Sie sind nicht angemeldet',
-'movenologintext'         => 'Sie müssen ein registrierter Benutzer und
-[[Special:Userlogin|angemeldet]] sein,
-um eine Seite zu verschieben.',
-'newtitle'                => 'Ziel',
+'movenologintext'         => 'Sie müssen ein registrierter Benutzer und [[Special:Userlogin|angemeldet]] sein, um eine Seite zu verschieben.',
+'newtitle'                => 'Ziel:',
 'move-watch'              => 'Diese Seite beobachten',
 'movepagebtn'             => 'Seite verschieben',
 'pagemovedsub'            => 'Verschiebung erfolgreich',
@@ -1665,7 +1665,7 @@ Bitte wählen Sie einen anderen Namen.',
 '1movedto2_redir'         => 'hat „[[$1]]“ nach „[[$2]]“ verschoben und dabei eine Weiterleitung überschrieben',
 'movelogpage'             => 'Verschiebungs-Logbuch',
 'movelogpagetext'         => 'Dies ist eine Liste aller verschobenen Seiten.',
-'movereason'              => 'Begründung',
+'movereason'              => 'Begründung:',
 'revertmove'              => 'zurück verschieben',
 'delete_and_move'         => 'Löschen und Verschieben',
 'delete_and_move_text'    => '==Zielseite vorhanden, löschen?==

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index ab800ca..6747ba6 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2085,11 +2085,11 @@ proceeding.",
 *You uncheck the box below.
 
 In those cases, you will have to move or merge the page manually if desired.",
-'movearticle'             => 'Move page',
+'movearticle'             => 'Move page:',
 'movenologin'             => 'Not logged in',
 'movenologintext'         => 'You must be a registered user and [[Special:Userlogin|logged in]]
 to move a page.',
-'newtitle'                => 'To new title',
+'newtitle'                => 'To new title:',
 'move-watch'              => 'Watch this page',
 'movepagebtn'             => 'Move page',
 'pagemovedsub'            => 'Move succeeded',
@@ -2106,7 +2106,7 @@ Please choose another name.',
 '1movedto2_redir'         => '[[$1]] moved to [[$2]] over redirect',
 'movelogpage'             => 'Move log',
 'movelogpagetext'         => 'Below is a list of page moved.',
-'movereason'              => 'Reason',
+'movereason'              => 'Reason:',
 'revertmove'              => 'revert',
 'delete_and_move'         => 'Delete and move',
 'delete_and_move_text'    => '==Deletion required==