| Index: trunk/phase3/includes/ProtectionForm.php |
| — | — | @@ -258,14 +258,12 @@ |
| 259 | 259 | if( $wgEnableCascadingProtection ) |
| 260 | 260 | $out .= '<tr><td></td><td>' . $this->buildCascadeInput() . "</td></tr>\n"; |
| 261 | 261 | |
| 262 | | - if( !$this->disabled ) |
| 263 | | - $out .= '<tr><td></td><td>' . $this->buildWatchInput() . "</td></tr>\n"; |
| 264 | | - |
| 265 | 262 | $out .= $this->buildRobotsInput(); |
| 266 | 263 | $out .= $this->buildExpiryInput(); |
| 267 | 264 | |
| 268 | 265 | if( !$this->disabled ) { |
| 269 | 266 | $out .= "<tr><td>" . $this->buildReasonInput() . "</td></tr>\n"; |
| | 267 | + $out .= "<tr><td></td><td>" . $this->buildWatchInput() . "</td></tr>\n"; |
| 270 | 268 | $out .= "<tr><td></td><td>" . $this->buildSubmit() . "</td></tr>\n"; |
| 271 | 269 | } |
| 272 | 270 | |
| Index: trunk/phase3/includes/SpecialMovepage.php |
| — | — | @@ -105,14 +105,10 @@ |
| 106 | 106 | if ( $err == 'articleexists' && $wgUser->isAllowed( 'delete' ) ) { |
| 107 | 107 | $wgOut->addWikiText( wfMsg( 'delete_and_move_text', $encNewTitle ) ); |
| 108 | 108 | $movepagebtn = wfMsgHtml( 'delete_and_move' ); |
| 109 | | - $confirmText = wfMsgHtml( 'delete_and_move_confirm' ); |
| 110 | 109 | $submitVar = 'wpDeleteAndMove'; |
| 111 | 110 | $confirm = " |
| 112 | 111 | <tr> |
| 113 | | - <td align='$end'> |
| 114 | | - <input type='checkbox' name='wpConfirm' id='wpConfirm' value=\"true\" /> |
| 115 | | - </td> |
| 116 | | - <td align='$start'><label for='wpConfirm'>{$confirmText}</label></td> |
| | 112 | + <td></td><td>" . Xml::checkLabel( wfMsg( 'delete_and_move_confirm' ), 'wpConfirm', 'wpConfirm' ) . "</td> |
| 117 | 113 | </tr>"; |
| 118 | 114 | $err = ''; |
| 119 | 115 | } else { |
| — | — | @@ -131,7 +127,6 @@ |
| 132 | 128 | |
| 133 | 129 | $movearticle = wfMsgHtml( 'movearticle' ); |
| 134 | 130 | $newtitle = wfMsgHtml( 'newtitle' ); |
| 135 | | - $movetalk = wfMsgHtml( 'movetalk' ); |
| 136 | 131 | $movereason = wfMsgHtml( 'movereason' ); |
| 137 | 132 | |
| 138 | 133 | $titleObj = SpecialPage::getTitleFor( 'Movepage' ); |
| — | — | @@ -149,18 +144,18 @@ |
| 150 | 145 | <form id=\"movepage\" method=\"post\" action=\"{$action}\"> |
| 151 | 146 | <table border='0'> |
| 152 | 147 | <tr> |
| 153 | | - <td align='$end'>{$movearticle}:</td> |
| | 148 | + <td align='$end'>{$movearticle}</td> |
| 154 | 149 | <td align='$start'><strong>{$oldTitle}</strong></td> |
| 155 | 150 | </tr> |
| 156 | 151 | <tr> |
| 157 | | - <td align='$end'><label for='wpNewTitle'>{$newtitle}:</label></td> |
| | 152 | + <td align='$end'><label for='wpNewTitle'>{$newtitle}</label></td> |
| 158 | 153 | <td align='$start'> |
| 159 | 154 | <input type='text' size='40' name='wpNewTitle' id='wpNewTitle' value=\"{$encNewTitle}\" /> |
| 160 | 155 | <input type='hidden' name=\"wpOldTitle\" value=\"{$encOldTitle}\" /> |
| 161 | 156 | </td> |
| 162 | 157 | </tr> |
| 163 | 158 | <tr> |
| 164 | | - <td align='$end' valign='top'><br /><label for='wpReason'>{$movereason}:</label></td> |
| | 159 | + <td align='$end' valign='top'><br /><label for='wpReason'>{$movereason}</label></td> |
| 165 | 160 | <td align='$start' valign='top'><br /> |
| 166 | 161 | <textarea cols='60' rows='2' name='wpReason' id='wpReason'>{$encReason}</textarea> |
| 167 | 162 | </td> |
| — | — | @@ -169,20 +164,16 @@ |
| 170 | 165 | if ( $considerTalk ) { |
| 171 | 166 | $wgOut->addHTML( " |
| 172 | 167 | <tr> |
| 173 | | - <td align='$end'> |
| 174 | | - <input type='checkbox' id=\"wpMovetalk\" name=\"wpMovetalk\"{$moveTalkChecked} value=\"1\" /> |
| 175 | | - </td> |
| 176 | | - <td><label for=\"wpMovetalk\">{$movetalk}</label></td> |
| | 168 | + <td></td><td>" . Xml::checkLabel( wfMsg( 'movetalk' ), 'wpMovetalk', 'wpMovetalk', $moveTalkChecked ) . "</td> |
| 177 | 169 | </tr>" ); |
| 178 | 170 | } |
| 179 | | - |
| | 171 | + |
| 180 | 172 | $watchChecked = $this->watch || $wgUser->getBoolOption( 'watchmoves' ) || $ot->userIsWatching(); |
| 181 | 173 | $watch = '<tr>'; |
| 182 | | - $watch .= "<td align=\"$end\">" . Xml::check( 'wpWatch', $watchChecked, array( 'id' => 'watch' ) ) . '</td>'; |
| 183 | | - $watch .= '<td>' . Xml::label( wfMsg( 'move-watch' ), 'watch' ) . '</td>'; |
| | 174 | + $watch .= '<td></td><td>' . Xml::checkLabel( wfMsg( 'move-watch' ), 'wpWatch', 'watch', $watchChecked ) . '</td>'; |
| 184 | 175 | $watch .= '</tr>'; |
| 185 | 176 | $wgOut->addHtml( $watch ); |
| 186 | | - |
| | 177 | + |
| 187 | 178 | $wgOut->addHTML( " |
| 188 | 179 | {$confirm} |
| 189 | 180 | <tr> |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2085,11 +2085,11 @@ |
| 2086 | 2086 | *You uncheck the box below. |
| 2087 | 2087 | |
| 2088 | 2088 | In those cases, you will have to move or merge the page manually if desired.", |
| 2089 | | -'movearticle' => 'Move page', |
| | 2089 | +'movearticle' => 'Move page:', |
| 2090 | 2090 | 'movenologin' => 'Not logged in', |
| 2091 | 2091 | 'movenologintext' => 'You must be a registered user and [[Special:Userlogin|logged in]] |
| 2092 | 2092 | to move a page.', |
| 2093 | | -'newtitle' => 'To new title', |
| | 2093 | +'newtitle' => 'To new title:', |
| 2094 | 2094 | 'move-watch' => 'Watch this page', |
| 2095 | 2095 | 'movepagebtn' => 'Move page', |
| 2096 | 2096 | 'pagemovedsub' => 'Move succeeded', |
| — | — | @@ -2106,7 +2106,7 @@ |
| 2107 | 2107 | '1movedto2_redir' => '[[$1]] moved to [[$2]] over redirect', |
| 2108 | 2108 | 'movelogpage' => 'Move log', |
| 2109 | 2109 | 'movelogpagetext' => 'Below is a list of page moved.', |
| 2110 | | -'movereason' => 'Reason', |
| | 2110 | +'movereason' => 'Reason:', |
| 2111 | 2111 | 'revertmove' => 'revert', |
| 2112 | 2112 | 'delete_and_move' => 'Delete and move', |
| 2113 | 2113 | 'delete_and_move_text' => '==Deletion required== |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -1441,6 +1441,8 @@ |
| 1442 | 1442 | 'protect-expiring' => 'bis $1 (UTC)', |
| 1443 | 1443 | 'protect-cascade' => 'Kaskadierende Sperre – alle in diese Seite eingebundenen Vorlagen werden ebenfalls gesperrt.', |
| 1444 | 1444 | 'protect-robotspolicy' => 'Anweisung für Suchroboter:', |
| | 1445 | +'protect-robots-noindex' => 'nicht indizieren (noindex)', |
| | 1446 | +'protect-robots-nofollow' => 'Links nicht folgen (nofollow)', |
| 1445 | 1447 | 'restriction-type' => 'Schutzstatus', |
| 1446 | 1448 | 'restriction-level' => 'Schutzhöhe', |
| 1447 | 1449 | 'minimum-size' => 'Mindestgröße:', |
| — | — | @@ -1644,12 +1646,10 @@ |
| 1645 | 1647 | *Sie wählen die untenstehende Option ab. |
| 1646 | 1648 | |
| 1647 | 1649 | In diesen Fällen müssen Sie, falls gewünscht, den Inhalt der Seite von Hand verschieben oder zusammenführen.", |
| 1648 | | -'movearticle' => 'Seite verschieben', |
| | 1650 | +'movearticle' => 'Seite verschieben:', |
| 1649 | 1651 | 'movenologin' => 'Sie sind nicht angemeldet', |
| 1650 | | -'movenologintext' => 'Sie müssen ein registrierter Benutzer und |
| 1651 | | -[[Special:Userlogin|angemeldet]] sein, |
| 1652 | | -um eine Seite zu verschieben.', |
| 1653 | | -'newtitle' => 'Ziel', |
| | 1652 | +'movenologintext' => 'Sie müssen ein registrierter Benutzer und [[Special:Userlogin|angemeldet]] sein, um eine Seite zu verschieben.', |
| | 1653 | +'newtitle' => 'Ziel:', |
| 1654 | 1654 | 'move-watch' => 'Diese Seite beobachten', |
| 1655 | 1655 | 'movepagebtn' => 'Seite verschieben', |
| 1656 | 1656 | 'pagemovedsub' => 'Verschiebung erfolgreich', |
| — | — | @@ -1665,7 +1665,7 @@ |
| 1666 | 1666 | '1movedto2_redir' => 'hat „[[$1]]“ nach „[[$2]]“ verschoben und dabei eine Weiterleitung überschrieben', |
| 1667 | 1667 | 'movelogpage' => 'Verschiebungs-Logbuch', |
| 1668 | 1668 | 'movelogpagetext' => 'Dies ist eine Liste aller verschobenen Seiten.', |
| 1669 | | -'movereason' => 'Begründung', |
| | 1669 | +'movereason' => 'Begründung:', |
| 1670 | 1670 | 'revertmove' => 'zurück verschieben', |
| 1671 | 1671 | 'delete_and_move' => 'Löschen und Verschieben', |
| 1672 | 1672 | 'delete_and_move_text' => '==Zielseite vorhanden, löschen?== |