From 65a396a0fef4961830316c3e6e7a8e207b34de12 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Wed, 2 Apr 2008 07:45:08 +0000 Subject: [PATCH] Move reason field and submit button into fieldset to be consistent with other input forms Use more nice XML functions --- includes/SpecialRevisiondelete.php | 121 +++++++++++++++-------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/includes/SpecialRevisiondelete.php b/includes/SpecialRevisiondelete.php index 70cf53bff5..d9176b82bb 100644 --- a/includes/SpecialRevisiondelete.php +++ b/includes/SpecialRevisiondelete.php @@ -245,51 +245,52 @@ class RevisionDeleteForm { $wgOut->addHtml( $this->historyLine( $rev ) ); $bitfields |= $rev->mDeleted; } - } + } $wgOut->addHtml( "" ); - + $wgOut->addWikiText( wfMsgHtml( 'revdelete-text' ) ); - + // Normal sysops can always see what they did, but can't always change it if( !$UserAllowed ) return; - + $items = array( - wfInputLabel( wfMsgHtml( 'revdelete-log' ), 'wpReason', 'wpReason', 60 ), - wfSubmitButton( wfMsgHtml( 'revdelete-submit' ) ) ); + Xml::inputLabel( wfMsg( 'revdelete-log' ), 'wpReason', 'wpReason', 60 ), + Xml::submitButton( wfMsg( 'revdelete-submit' ) ) + ); $hidden = array( - wfHidden( 'wpEditToken', $wgUser->editToken() ), - wfHidden( 'target', $this->page->getPrefixedText() ), - wfHidden( 'type', $this->deleteKey ) ); + Xml::hidden( 'wpEditToken', $wgUser->editToken() ), + Xml::hidden( 'target', $this->page->getPrefixedText() ), + Xml::hidden( 'type', $this->deleteKey ) + ); if( $this->deleteKey=='oldid' ) { foreach( $revObjs as $rev ) $hidden[] = wfHidden( 'oldid[]', $rev->getID() ); - } else { + } else { foreach( $revObjs as $rev ) $hidden[] = wfHidden( 'artimestamp[]', $rev->getTimestamp() ); } $special = SpecialPage::getTitleFor( 'Revisiondelete' ); - $wgOut->addHtml( wfElement( 'form', array( - 'method' => 'post', - 'action' => $special->getLocalUrl( 'action=submit' ) ), - null ) ); - - $wgOut->addHtml( '
' . wfMsgHtml( 'revdelete-legend' ) . '' ); + $wgOut->addHtml( + Xml::openElement( 'form', array( 'method' => 'post', 'action' => $special->getLocalUrl( 'action=submit' ), 'id' => 'mw-revdel-form-revisions' ) ) . + Xml::openElement( 'fieldset' ) . + xml::element( 'legend', null, wfMsg( 'revdelete-legend' ) ) + ); // FIXME: all items checked for just one rev are checked, even if not set for the others foreach( $this->checks as $item ) { list( $message, $name, $field ) = $item; - $wgOut->addHtml( "
" . - wfCheckLabel( wfMsgHtml( $message), $name, $name, $bitfields & $field ) . - "
\n" ); + $wgOut->addHtml( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) ); } - $wgOut->addHtml( '
' ); foreach( $items as $item ) { - $wgOut->addHtml( '

' . $item . '

' ); + $wgOut->addHtml( Xml::tags( 'p', null, $item ) ); } foreach( $hidden as $item ) { $wgOut->addHtml( $item ); } - - $wgOut->addHtml( '' ); + $wgOut->addHtml( + Xml::closeElement( 'fieldset' ) . + Xml::closeElement( 'form' ) . "\n" + ); + } /** @@ -383,18 +384,20 @@ class RevisionDeleteForm { } } $wgOut->addHtml( "" ); - + $wgOut->addWikiText( wfMsgHtml( 'revdelete-text' ) ); //Normal sysops can always see what they did, but can't always change it if( !$UserAllowed ) return; - + $items = array( - wfInputLabel( wfMsgHtml( 'revdelete-log' ), 'wpReason', 'wpReason', 60 ), - wfSubmitButton( wfMsgHtml( 'revdelete-submit' ) ) ); + Xml::inputLabel( wfMsg( 'revdelete-log' ), 'wpReason', 'wpReason', 60 ), + Xml::submitButton( wfMsg( 'revdelete-submit' ) ) + ); $hidden = array( - wfHidden( 'wpEditToken', $wgUser->editToken() ), - wfHidden( 'target', $this->page->getPrefixedText() ), - wfHidden( 'type', $this->deleteKey ) ); + Xml::hidden( 'wpEditToken', $wgUser->editToken() ), + Xml::hidden( 'target', $this->page->getPrefixedText() ), + Xml::hidden( 'type', $this->deleteKey ) + ); if( $this->deleteKey=='oldimage' ) { foreach( $this->ofiles as $filename ) $hidden[] = wfHidden( 'oldimage[]', $filename ); @@ -403,30 +406,29 @@ class RevisionDeleteForm { $hidden[] = wfHidden( 'fileid[]', $fileid ); } $special = SpecialPage::getTitleFor( 'Revisiondelete' ); - $wgOut->addHtml( wfElement( 'form', array( - 'method' => 'post', - 'action' => $special->getLocalUrl( 'action=submit' ) ), - null ) ); - - $wgOut->addHtml( '
' . wfMsgHtml( 'revdelete-legend' ) . '' ); + $wgOut->addHtml( + Xml::openElement( 'form', array( 'method' => 'post', 'action' => $special->getLocalUrl( 'action=submit' ), 'id' => 'mw-revdel-form-filerevisions' ) ) . + Xml::openElement( 'fieldset' ) . + xml::element( 'legend', null, wfMsg( 'revdelete-legend' ) ) + ); // FIXME: all items checked for just one file are checked, even if not set for the others foreach( $this->checks as $item ) { list( $message, $name, $field ) = $item; - $wgOut->addHtml( '
' . - wfCheckLabel( wfMsgHtml( $message), $name, $name, $bitfields & $field ) . - '
' ); + $wgOut->addHtml( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) ); } - $wgOut->addHtml( '
' ); foreach( $items as $item ) { - $wgOut->addHtml( '

' . $item . '

' ); + $wgOut->addHtml( Xml::tags( 'p', null, $item ) ); } foreach( $hidden as $item ) { $wgOut->addHtml( $item ); } - - $wgOut->addHtml( '' ); + + $wgOut->addHtml( + Xml::closeElement( 'fieldset' ) . + Xml::closeElement( 'form' ) . "\n" + ); } - + /** * This lets a user set restrictions for log items * @param WebRequest $request @@ -474,7 +476,7 @@ class RevisionDeleteForm { $wgOut->addWikiMsg( 'revdelete-text' ); // Normal sysops can always see what they did, but can't always change it if( !$UserAllowed ) return; - + $items = array( Xml::inputLabel( wfMsg( 'revdelete-log' ), 'wpReason', 'wpReason', 60 ), Xml::submitButton( wfMsg( 'revdelete-submit' ) ) ); @@ -484,32 +486,31 @@ class RevisionDeleteForm { foreach( $this->events as $logid ) { $hidden[] = Xml::hidden( 'logid[]', $logid ); } - + $special = SpecialPage::getTitleFor( 'Revisiondelete' ); - $wgOut->addHtml( Xml::element( 'form', array( - 'method' => 'post', - 'action' => $special->getLocalUrl( 'action=submit' ) ), - null ) ); - - $wgOut->addHtml( '
' . wfMsgHtml( 'revdelete-legend' ) . '' ); + $wgOut->addHtml( + Xml::openElement( 'form', array( 'method' => 'post', 'action' => $special->getLocalUrl( 'action=submit' ), 'id' => 'mw-revdel-form-logs' ) ) . + Xml::openElement( 'fieldset' ) . + xml::element( 'legend', null, wfMsg( 'revdelete-legend' ) ) + ); // FIXME: all items checked for just on event are checked, even if not set for the others foreach( $this->checks as $item ) { list( $message, $name, $field ) = $item; - $wgOut->addHtml( '
' . - Xml::checkLabel( wfMsg( $message), $name, $name, $bitfields & $field ) . - '
' ); + $wgOut->addHtml( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) ); } - $wgOut->addHtml( '
' ); foreach( $items as $item ) { - $wgOut->addHtml( '

' . $item . '

' ); + $wgOut->addHtml( Xml::tags( 'p', null, $item ) ); } foreach( $hidden as $item ) { $wgOut->addHtml( $item ); } - - $wgOut->addHtml( '' ); + + $wgOut->addHtml( + Xml::closeElement( 'fieldset' ) . + Xml::closeElement( 'form' ) . "\n" + ); } - + /** * @param Revision $rev * @returns string -- 2.20.1