| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -713,6 +713,7 @@ |
| 714 | 714 | 'revdelete-reason-dropdown', |
| 715 | 715 | 'revdelete-otherreason', |
| 716 | 716 | 'revdelete-reasonotherlist', |
| | 717 | + 'revdelete-edit-reasonlist', |
| 717 | 718 | ), |
| 718 | 719 | 'suppression' => array( |
| 719 | 720 | 'suppressionlog', |
| Index: trunk/phase3/skins/common/common_rtl.css |
| — | — | @@ -30,7 +30,8 @@ |
| 31 | 31 | } |
| 32 | 32 | /* Convenience links to edit block, delete and protect reasons */ |
| 33 | 33 | p.mw-ipb-conveniencelinks, p.mw-protect-editreasons, |
| 34 | | -p.mw-filedelete-editreasons, p.mw-delete-editreasons { |
| | 34 | +p.mw-filedelete-editreasons, p.mw-delete-editreasons, |
| | 35 | +p.mw-revdel-editreasons { |
| 35 | 36 | float: left; |
| 36 | 37 | } |
| 37 | 38 | table.filehistory th { |
| Index: trunk/phase3/skins/common/shared.css |
| — | — | @@ -122,7 +122,8 @@ |
| 123 | 123 | |
| 124 | 124 | /* Convenience links to edit block, delete and protect reasons */ |
| 125 | 125 | p.mw-ipb-conveniencelinks, p.mw-protect-editreasons, |
| 126 | | -p.mw-filedelete-editreasons, p.mw-delete-editreasons { |
| | 126 | +p.mw-filedelete-editreasons, p.mw-delete-editreasons, |
| | 127 | +p.mw-revdel-editreasons { |
| 127 | 128 | font-size: 90%; |
| 128 | 129 | float: right; |
| 129 | 130 | } |
| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -360,31 +360,55 @@ |
| 361 | 361 | // Normal sysops can always see what they did, but can't always change it |
| 362 | 362 | if( !$UserAllowed ) return; |
| 363 | 363 | |
| 364 | | - $wgOut->addHTML( |
| 365 | | - Xml::openElement( 'form', array( 'method' => 'post', |
| | 364 | + $out = Xml::openElement( 'form', array( 'method' => 'post', |
| 366 | 365 | 'action' => $this->getTitle()->getLocalUrl( array( 'action' => 'submit' ) ), |
| 367 | 366 | 'id' => 'mw-revdel-form-revisions' ) ) . |
| 368 | | - Xml::openElement( 'fieldset' ) . |
| 369 | | - Xml::element( 'legend', null, wfMsg( 'revdelete-legend' ) ) . |
| | 367 | + Xml::fieldset( wfMsg( 'revdelete-legend' ) ) . |
| | 368 | + Xml::openElement( 'table' ) . |
| 370 | 369 | $this->buildCheckBoxes( $bitfields ) . |
| 371 | | - "\n<table><tr>\n" . |
| 372 | | - '<td>' . Xml::label( wfMsg('revdelete-log'), 'wpRevDeleteReasonList' ) . '</td>' . |
| 373 | | - '<td>' . Xml::listDropDown( 'wpRevDeleteReasonList', |
| 374 | | - wfMsgForContent( 'revdelete-reason-dropdown' ), |
| 375 | | - wfMsgForContent( 'revdelete-reasonotherlist' ), '', 'wpReasonDropDown', 1 |
| 376 | | - ) . '</td>' . |
| 377 | | - "\n</tr><tr>\n" . |
| 378 | | - '<td>' . Xml::label( wfMsg( 'revdelete-otherreason' ), 'wpReason' ) . '</td>' . |
| 379 | | - '<td>' . Xml::input( 'wpReason', 60, $this->otherReason, array('id'=>'wpReason') ) . '</td>' . |
| 380 | | - "\n</tr></table>\n" . |
| 381 | | - Xml::submitButton( wfMsg( 'revdelete-submit' ), array( 'name' => 'wpSubmit' ) ) . |
| | 370 | + "<tr>\n" . |
| | 371 | + '<td class="mw-label">' . |
| | 372 | + Xml::label( wfMsg( 'revdelete-log' ), 'wpRevDeleteReasonList' ) . |
| | 373 | + '</td>' . |
| | 374 | + '<td class="mw-input">' . |
| | 375 | + Xml::listDropDown( 'wpRevDeleteReasonList', |
| | 376 | + wfMsgForContent( 'revdelete-reason-dropdown' ), |
| | 377 | + wfMsgForContent( 'revdelete-reasonotherlist' ), '', 'wpReasonDropDown', 1 |
| | 378 | + ) . |
| | 379 | + '</td>' . |
| | 380 | + "</tr><tr>\n" . |
| | 381 | + '<td class="mw-label">' . |
| | 382 | + Xml::label( wfMsg( 'revdelete-otherreason' ), 'wpReason' ) . |
| | 383 | + '</td>' . |
| | 384 | + '<td class="mw-input">' . |
| | 385 | + Xml::input( 'wpReason', 60, $this->otherReason, array( 'id' => 'wpReason' ) ) . |
| | 386 | + '</td>' . |
| | 387 | + "</tr><tr>\n" . |
| | 388 | + '<td></td>' . |
| | 389 | + '<td class="mw-submit">' . |
| | 390 | + Xml::submitButton( wfMsg( 'revdelete-submit' ), array( 'name' => 'wpSubmit' ) ) . |
| | 391 | + '</td>' . |
| | 392 | + "</tr>\n" . |
| | 393 | + Xml::closeElement( 'table' ) . |
| 382 | 394 | Xml::hidden( 'wpEditToken', $wgUser->editToken() ) . |
| 383 | 395 | Xml::hidden( 'target', $this->targetObj->getPrefixedText() ) . |
| 384 | 396 | Xml::hidden( 'type', $this->typeName ) . |
| 385 | 397 | Xml::hidden( 'ids', implode( ',', $this->ids ) ) . |
| 386 | | - Xml::closeElement( 'fieldset' ) . |
| 387 | | - Xml::closeElement( 'form' ) . "\n" |
| 388 | | - ); |
| | 398 | + Xml::closeElement( 'fieldset' ) . "\n"; |
| | 399 | + |
| | 400 | + if( $wgUser->isAllowed( 'editinterface' ) ) { |
| | 401 | + $title = Title::makeTitle( NS_MEDIAWIKI, 'revdelete-reason-dropdown' ); |
| | 402 | + $link = $wgUser->getSkin()->link( |
| | 403 | + $title, |
| | 404 | + wfMsgHtml( 'revdelete-edit-reasonlist' ), |
| | 405 | + array(), |
| | 406 | + array( 'action' => 'edit' ) |
| | 407 | + ); |
| | 408 | + $out .= Xml::tags( 'p', array( 'class' => 'mw-revdel-editreasons' ), $link ) . "\n"; |
| | 409 | + } |
| | 410 | + $out .= Xml::closeElement( 'form' ) . "\n"; |
| | 411 | + |
| | 412 | + $wgOut->addHTML( $out ); |
| 389 | 413 | } |
| 390 | 414 | |
| 391 | 415 | /** |
| — | — | @@ -411,8 +435,8 @@ |
| 412 | 436 | $innerHTML = Xml::checkLabel( wfMsg($message), $name, $name, $bitfields & $field ); |
| 413 | 437 | if( $field == Revision::DELETED_RESTRICTED ) |
| 414 | 438 | $innerHTML = "<b>$innerHTML</b>"; |
| 415 | | - $line = Xml::tags( 'div', null, $innerHTML ); |
| 416 | | - $html .= $line; |
| | 439 | + $line = Xml::tags( 'td', array( 'class' => 'mw-input' ), $innerHTML ); |
| | 440 | + $html .= '<tr><td></td>' . $line . "</tr>\n"; |
| 417 | 441 | } |
| 418 | 442 | return $html; |
| 419 | 443 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1500,6 +1500,7 @@ |
| 1501 | 1501 | ** Inappropriate personal information', |
| 1502 | 1502 | 'revdelete-otherreason' => 'Other/additional reason:', |
| 1503 | 1503 | 'revdelete-reasonotherlist' => 'Other reason', |
| | 1504 | +'revdelete-edit-reasonlist' => 'Edit delete reasons', |
| 1504 | 1505 | |
| 1505 | 1506 | # Suppression log |
| 1506 | 1507 | 'suppressionlog' => 'Suppression log', |