From: Raimond Spekking Date: Fri, 4 Sep 2009 14:32:07 +0000 (+0000) Subject: Make revdel input form more consistent with other forms: X-Git-Tag: 1.31.0-rc.0~39929 X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=e07735331b193b040adc53f0dd898ad1c77ffe99;p=lhc%2Fweb%2Fwiklou.git Make revdel input form more consistent with other forms: * Use CSS classes for input and label elements for default form design ** Makes it RTL friendly too * Add a "Edit delete reasons" link --- diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php index 6ace1f4143..b9f37449b2 100644 --- a/includes/specials/SpecialRevisiondelete.php +++ b/includes/specials/SpecialRevisiondelete.php @@ -360,31 +360,55 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { // Normal sysops can always see what they did, but can't always change it if( !$UserAllowed ) return; - $wgOut->addHTML( - Xml::openElement( 'form', array( 'method' => 'post', + $out = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalUrl( array( 'action' => 'submit' ) ), 'id' => 'mw-revdel-form-revisions' ) ) . - Xml::openElement( 'fieldset' ) . - Xml::element( 'legend', null, wfMsg( 'revdelete-legend' ) ) . + Xml::fieldset( wfMsg( 'revdelete-legend' ) ) . + Xml::openElement( 'table' ) . $this->buildCheckBoxes( $bitfields ) . - "\n\n" . - '' . - '' . - "\n\n" . - '' . - '' . - "\n
' . Xml::label( wfMsg('revdelete-log'), 'wpRevDeleteReasonList' ) . '' . Xml::listDropDown( 'wpRevDeleteReasonList', - wfMsgForContent( 'revdelete-reason-dropdown' ), - wfMsgForContent( 'revdelete-reasonotherlist' ), '', 'wpReasonDropDown', 1 - ) . '
' . Xml::label( wfMsg( 'revdelete-otherreason' ), 'wpReason' ) . '' . Xml::input( 'wpReason', 60, $this->otherReason, array('id'=>'wpReason') ) . '
\n" . - Xml::submitButton( wfMsg( 'revdelete-submit' ), array( 'name' => 'wpSubmit' ) ) . + "\n" . + '' . + Xml::label( wfMsg( 'revdelete-log' ), 'wpRevDeleteReasonList' ) . + '' . + '' . + Xml::listDropDown( 'wpRevDeleteReasonList', + wfMsgForContent( 'revdelete-reason-dropdown' ), + wfMsgForContent( 'revdelete-reasonotherlist' ), '', 'wpReasonDropDown', 1 + ) . + '' . + "\n" . + '' . + Xml::label( wfMsg( 'revdelete-otherreason' ), 'wpReason' ) . + '' . + '' . + Xml::input( 'wpReason', 60, $this->otherReason, array( 'id' => 'wpReason' ) ) . + '' . + "\n" . + '' . + '' . + Xml::submitButton( wfMsg( 'revdelete-submit' ), array( 'name' => 'wpSubmit' ) ) . + '' . + "\n" . + Xml::closeElement( 'table' ) . Xml::hidden( 'wpEditToken', $wgUser->editToken() ) . Xml::hidden( 'target', $this->targetObj->getPrefixedText() ) . Xml::hidden( 'type', $this->typeName ) . Xml::hidden( 'ids', implode( ',', $this->ids ) ) . - Xml::closeElement( 'fieldset' ) . - Xml::closeElement( 'form' ) . "\n" - ); + Xml::closeElement( 'fieldset' ) . "\n"; + + if( $wgUser->isAllowed( 'editinterface' ) ) { + $title = Title::makeTitle( NS_MEDIAWIKI, 'revdelete-reason-dropdown' ); + $link = $wgUser->getSkin()->link( + $title, + wfMsgHtml( 'revdelete-edit-reasonlist' ), + array(), + array( 'action' => 'edit' ) + ); + $out .= Xml::tags( 'p', array( 'class' => 'mw-revdel-editreasons' ), $link ) . "\n"; + } + $out .= Xml::closeElement( 'form' ) . "\n"; + + $wgOut->addHTML( $out ); } /** @@ -411,8 +435,8 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { $innerHTML = Xml::checkLabel( wfMsg($message), $name, $name, $bitfields & $field ); if( $field == Revision::DELETED_RESTRICTED ) $innerHTML = "$innerHTML"; - $line = Xml::tags( 'div', null, $innerHTML ); - $html .= $line; + $line = Xml::tags( 'td', array( 'class' => 'mw-input' ), $innerHTML ); + $html .= '' . $line . "\n"; } return $html; } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 259159da4c..84a763aa06 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1500,6 +1500,7 @@ Please check the logs.', ** Inappropriate personal information', 'revdelete-otherreason' => 'Other/additional reason:', 'revdelete-reasonotherlist' => 'Other reason', +'revdelete-edit-reasonlist' => 'Edit delete reasons', # Suppression log 'suppressionlog' => 'Suppression log', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index b06e5b723c..816f307f30 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -713,6 +713,7 @@ $wgMessageStructure = array( 'revdelete-reason-dropdown', 'revdelete-otherreason', 'revdelete-reasonotherlist', + 'revdelete-edit-reasonlist', ), 'suppression' => array( 'suppressionlog', diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css index c3345e5a96..cd5212ea8f 100644 --- a/skins/common/common_rtl.css +++ b/skins/common/common_rtl.css @@ -30,7 +30,8 @@ div.tleft, div.floatleft { } /* Convenience links to edit block, delete and protect reasons */ p.mw-ipb-conveniencelinks, p.mw-protect-editreasons, -p.mw-filedelete-editreasons, p.mw-delete-editreasons { +p.mw-filedelete-editreasons, p.mw-delete-editreasons, +p.mw-revdel-editreasons { float: left; } table.filehistory th { diff --git a/skins/common/shared.css b/skins/common/shared.css index 113ca4fbb7..d6cbb7c2e0 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -122,7 +122,8 @@ body.ltr .magnify { float:right; } /* Convenience links to edit block, delete and protect reasons */ p.mw-ipb-conveniencelinks, p.mw-protect-editreasons, -p.mw-filedelete-editreasons, p.mw-delete-editreasons { +p.mw-filedelete-editreasons, p.mw-delete-editreasons, +p.mw-revdel-editreasons { font-size: 90%; float: right; }