Merge "Convert article delete to use OOUI"

[lhc/web/wiklou.git] / includes / specials / SpecialUndelete.php

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 1a2153d..8a59773 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -235,36 +235,66 @@ class SpecialUndelete extends SpecialPage {
        function showSearchForm() {
                $out = $this->getOutput();
                $out->setPageTitle( $this->msg( 'undelete-search-title' ) );
-               $out->addHTML(
-                       Xml::openElement( 'form', [ 'method' => 'get', 'action' => wfScript() ] ) .
-                               Xml::fieldset( $this->msg( 'undelete-search-box' )->text() ) .
+               $fuzzySearch = $this->getRequest()->getVal( 'fuzzy', false );
+
+               $out->enableOOUI();
+
+               $fields[] = new OOUI\ActionFieldLayout(
+                       new OOUI\TextInputWidget( [
+                               'name' => 'prefix',
+                               'inputId' => 'prefix',
+                               'infusable' => true,
+                               'value' => $this->mSearchPrefix,
+                               'autofocus' => true,
+                       ] ),
+                       new OOUI\ButtonInputWidget( [
+                               'label' => $this->msg( 'undelete-search-submit' )->text(),
+                               'flags' => [ 'primary', 'progressive' ],
+                               'inputId' => 'searchUndelete',
+                               'type' => 'submit',
+                       ] ),
+                       [
+                               'label' => new OOUI\HtmlSnippet(
+                                       $this->msg(
+                                               $fuzzySearch ? 'undelete-search-full' : 'undelete-search-prefix'
+                                       )->parse()
+                               ),
+                               'align' => 'left',
+                       ]
+               );
+
+               $fieldset = new OOUI\FieldsetLayout( [
+                       'label' => $this->msg( 'undelete-search-box' )->text(),
+                       'items' => $fields,
+               ] );
+
+               $form = new OOUI\FormLayout( [
+                       'method' => 'get',
+                       'action' => wfScript(),
+               ] );
+
+               $form->appendContent(
+                       $fieldset,
+                       new OOUI\HtmlSnippet(
                                Html::hidden( 'title', $this->getPageTitle()->getPrefixedDBkey() ) .
-                               Html::hidden( 'fuzzy', $this->getRequest()->getVal( 'fuzzy' ) ) .
-                               Html::rawElement(
-                                       'label',
-                                       [ 'for' => 'prefix' ],
-                                       $this->msg( 'undelete-search-prefix' )->parse()
-                               ) .
-                               Xml::input(
-                                       'prefix',
-                                       20,
-                                       $this->mSearchPrefix,
-                                       [ 'id' => 'prefix', 'autofocus' => '' ]
-                               ) .
-                               ' ' .
-                               Xml::submitButton(
-                                       $this->msg( 'undelete-search-submit' )->text(),
-                                       [ 'id' => 'searchUndelete' ]
-                               ) .
-                               Xml::closeElement( 'fieldset' ) .
-                               Xml::closeElement( 'form' )
+                               Html::hidden( 'fuzzy', $this->getRequest()->getVal( 'fuzzy' ) )
+                       )
+               );
+
+               $out->addHTML(
+                       new OOUI\PanelLayout( [
+                               'expanded' => false,
+                               'padded' => true,
+                               'framed' => true,
+                               'content' => $form,
+                       ] )
                );
 
                # List undeletable articles
                if ( $this->mSearchPrefix ) {
                        // For now, we enable search engine match only when specifically asked to
                        // by using fuzzy=1 parameter.
-                       if ( $this->getRequest()->getVal( "fuzzy", false ) ) {
+                       if ( $fuzzySearch ) {
                                $result = PageArchive::listPagesBySearch( $this->mSearchPrefix );
                        } else {
                                $result = PageArchive::listPagesByPrefix( $this->mSearchPrefix );