** 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
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";
}
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 {
$movearticle = wfMsgHtml( 'movearticle' );
$newtitle = wfMsgHtml( 'newtitle' );
- $movetalk = wfMsgHtml( 'movetalk' );
$movereason = wfMsgHtml( 'movereason' );
$titleObj = SpecialPage::getTitleFor( 'Movepage' );
<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>
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>
'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:',
*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',
'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?==
*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',
'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==