From 5f260156afe0f0dbab0f1e61d97117f52a2f8503 Mon Sep 17 00:00:00 2001 From: Pankajeshkr Date: Sat, 12 Mar 2016 15:23:20 +0530 Subject: [PATCH] Special:NewPages: Change to use OOUI Bug: T117739 Change-Id: I802d215374c0b5247247dd4ae2facce251e8d369 --- includes/specials/SpecialNewpages.php | 41 ++++++++++--------- resources/Resources.php | 1 + resources/src/mediawiki.special/newpages.less | 15 +++++++ 3 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 resources/src/mediawiki.special/newpages.less diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index da2b688144..ddf52f186a 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -229,7 +229,7 @@ class SpecialNewpages extends IncludableSpecialPage { } $hidden = implode( "\n", $hidden ); - $form = [ + $formDescriptor = [ 'namespace' => [ 'type' => 'namespaceselect', 'name' => 'namespace', @@ -264,25 +264,26 @@ class SpecialNewpages extends IncludableSpecialPage { ], ]; - $htmlForm = new HTMLForm( $form, $this->getContext() ); - - $htmlForm->setSubmitText( $this->msg( 'newpages-submit' )->text() ); - // The form should be visible on each request (inclusive requests with submitted forms), so - // return always false here. - $htmlForm->setSubmitCallback( - function () { - return false; - } - ); - $htmlForm->setMethod( 'get' ); - $htmlForm->setWrapperLegend( true ); - $htmlForm->setWrapperLegendMsg( 'newpages' ); - $htmlForm->addFooterText( Html::rawElement( - 'div', - null, - $this->filterLinks() - ) ); - $htmlForm->show(); + $htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() ); + $htmlForm + ->setMethod( 'get' ) + ->setFormIdentifier( 'newpagesform' ) + // The form should be visible on each request (inclusive requests with submitted forms), so + // return always false here. + ->setSubmitCallback( + function () { + return false; + } + ) + ->setSubmitText( $this->msg( 'newpages-submit' )->text() ) + ->setWrapperLegend( $this->msg( 'newpages' )->text() ) + ->addFooterText( Html::rawElement( + 'div', + null, + $this->filterLinks() + ) ) + ->show(); + $out->addModuleStyles( 'mediawiki.special' ); } /** diff --git a/resources/Resources.php b/resources/Resources.php index c591c7c82d..92cbdfca1d 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1979,6 +1979,7 @@ return [ 'resources/src/mediawiki.special/comparepages.less', 'resources/src/mediawiki.special/edittags.css', 'resources/src/mediawiki.special/movePage.css', + 'resources/src/mediawiki.special/newpages.less', 'resources/src/mediawiki.special/pagesWithProp.css', 'resources/src/mediawiki.special/upload.css', 'resources/src/mediawiki.special/userrights.css', diff --git a/resources/src/mediawiki.special/newpages.less b/resources/src/mediawiki.special/newpages.less new file mode 100644 index 0000000000..bac0846c90 --- /dev/null +++ b/resources/src/mediawiki.special/newpages.less @@ -0,0 +1,15 @@ +/*! + * Styling for Special:NewPages + */ + +// OOUIHTMLForm styles +@ooui-font-size-browser: 16; // assumed browser default of `16px` +@ooui-font-size-base: 0.875em; // equals `14px` at browser default of `16px` + +@ooui-spacing-medium: 12 / @ooui-font-size-browser / @ooui-font-size-base; // equals `0.8571429em`≈`12px` +@ooui-spacing-large: 16 / @ooui-font-size-browser / @ooui-font-size-base; // equals `1.1428571em`≈`16px` + +.mw-htmlform-ooui .mw-htmlform-field-HTMLSizeFilterField, +.mw-htmlform-ooui .mw-htmlform-submit-buttons + div { + margin-top: @ooui-spacing-medium; +} -- 2.20.1