Glaisher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/278749
Change subject: Use HTMLForm on Special:SearchWiki
......................................................................
Use HTMLForm on Special:SearchWiki
Change-Id: If0dac192be177456091c1b8482fffab61a487de4
---
M SpecialSearchWiki.php
1 file changed, 33 insertions(+), 21 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaIncubator
refs/changes/49/278749/1
diff --git a/SpecialSearchWiki.php b/SpecialSearchWiki.php
index 0714fae..fc3ac20 100644
--- a/SpecialSearchWiki.php
+++ b/SpecialSearchWiki.php
@@ -28,20 +28,7 @@
$projectQuery = $this->getRequest()->getText( 'searchproject',
isset( $subpage[0] ) ? $subpage[0] : '' );
$languageQuery = $this->getRequest()->getText(
'searchlanguage', isset( $subpage[1] ) ? $subpage[1] : '' );
- # Show form
- $uselang = $this->getRequest()->getVal( 'uselang' );
- $this->getOutput()->addHTML(
- Xml::fieldset( wfMessage( 'wminc-searchwiki' )->plain(),
- Html::rawElement( 'form', [ 'method' => 'get', 'action'
=> $wgScript, 'id' => 'wminc-searchwiki-form' ],
- Html::hidden( 'title',
SpecialPage::getTitleFor( 'SearchWiki' ) ) .
- ( $uselang ? Html::hidden( 'uselang', $uselang
) : '' ) .
- '<p>' . Xml::label( wfMessage(
'wminc-searchwiki-selectproject' )->text(), 'wminc-searchproject' ) .
- ' ' . $this->makeProjectSelector(
$projectQuery ) . '</p>' .
- '<p>' . Xml::inputLabel( wfMessage(
'wminc-searchwiki-inputlanguage' )->text(), 'searchlanguage',
- 'wminc-searchlanguage', 30, $languageQuery ) .
' ' .
- Xml::submitButton( wfMessage(
'wminc-searchwiki-go' )->text() ) . '</p>'
- ) )
- );
+ $this->showForm( $projectQuery, $languageQuery );
# Search
if ( $projectQuery || $languageQuery ) {
@@ -53,14 +40,39 @@
}
/**
- * Make a <select> box with projects (Wikipedia, Wiktionary, ...)
- * @param $selected
- * @return string
+ * Output the search form.
+ * @param string $project Default value for project field
+ * @param string $language Default value for language field
*/
- protected function makeProjectSelector( $selected ) {
- $select = new XmlSelect( 'searchproject',
'wminc-searchproject', $selected );
- $select->addOptions( array_flip( $this->mProjects ) );
- return $select->getHTML();
+ protected function showForm( $project, $language ) {
+ $form = HTMLForm::factory(
+ 'table',
+ [
+ 'Project' => [
+ 'type' => 'select',
+ 'name' => 'searchproject',
+ 'id' => 'wminc-searchproject',
+ 'options' => array_flip(
$this->mProjects ),
+ 'label-message' =>
'wminc-searchwiki-selectproject',
+ 'default' => $project,
+ ],
+ 'Language' => [
+ 'type' => 'text',
+ 'name' => 'searchlanguage',
+ 'id' => 'wminc-searchlanguage',
+ 'size' => 30,
+ 'label-message' =>
'wminc-searchwiki-inputlanguage',
+ 'default' => $language,
+ ],
+ ],
+ $this->getContext()
+ );
+ $form->setMethod( 'get' )
+ ->setWrapperLegendMsg( 'wminc-searchwiki' )
+ ->setSubmitTextMsg( 'wminc-searchwiki-go' )
+ ->setId( 'wminc-searchwiki-form' )
+ ->prepareForm()
+ ->displayForm( false );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/278749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0dac192be177456091c1b8482fffab61a487de4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaIncubator
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
