$out = $this->getOutput();
$out->allowClickjacking();
$out->addModuleStyles( [
- 'mediawiki.special', 'mediawiki.special.search', 'mediawiki.ui', 'mediawiki.ui.button',
+ 'mediawiki.special', 'mediawiki.special.search.styles', 'mediawiki.ui', 'mediawiki.ui.button',
'mediawiki.ui.input', 'mediawiki.widgets.SearchInputWidget.styles',
] );
$this->addHelpLink( 'Help:Searching' );
protected function getDidYouMeanHtml( SearchResultSet $textMatches ) {
# mirror Go/Search behavior of original request ..
$params = [ 'search' => $textMatches->getSuggestionQuery() ];
- if ( $this->fulltext != null ) {
+ if ( $this->fulltext === null ) {
+ $params['fulltext'] = 'Search';
+ } else {
$params['fulltext'] = $this->fulltext;
}
$stParams = array_merge( $params, $this->powerSearchOptions() );
// Search instead for '$orig'
$params = [ 'search' => $textMatches->getQueryAfterRewrite() ];
- if ( $this->fulltext != null ) {
+ if ( $this->fulltext === null ) {
+ $params['fulltext'] = 'Search';
+ } else {
$params['fulltext'] = $this->fulltext;
}
$stParams = array_merge( $params, $this->powerSearchOptions() );
* @return string
*/
protected function searchProfileTabs( $term ) {
- $out = Xml::openElement( 'div', [ 'class' => 'mw-search-profile-tabs' ] );
+ $out = Html::element( 'div', [ 'class' => 'visualClear' ] ) .
+ Xml::openElement( 'div', [ 'class' => 'mw-search-profile-tabs' ] );
$bareterm = $term;
if ( $this->startsWithImage( $term ) ) {
'name' => 'search',
'autofocus' => trim( $term ) === '',
'value' => $term,
+ 'dataLocation' => 'content',
+ ] );
+
+ $layout = new OOUI\ActionFieldLayout( $searchWidget, new OOUI\ButtonInputWidget( [
+ 'type' => 'submit',
+ 'label' => $this->msg( 'searchbutton' )->text(),
+ 'flags' => [ 'progressive', 'primary' ],
+ ] ), [
+ 'align' => 'top',
] );
$out =
Html::hidden( 'title', $this->getPageTitle()->getPrefixedText() ) .
Html::hidden( 'profile', $this->profile ) .
Html::hidden( 'fulltext', 'Search' ) .
- $searchWidget .
- new OOUI\ButtonInputWidget( [
- 'type' => 'submit',
- 'label' => $this->msg( 'searchbutton' )->text(),
- 'flags' => [ 'progressive', 'primary' ],
- ] );
+ $layout;
// Results-info
if ( $totalNum > 0 && $this->offset < $totalNum ) {
->numParams( $this->offset + 1, $this->offset + $resultsShown, $totalNum )
->numParams( $resultsShown )
->parse();
- $out .= Xml::tags( 'div', [ 'class' => 'results-info' ], $top ) .
- Xml::element( 'div', [ 'style' => 'clear:both' ], '', false );
+ $out .= Xml::tags( 'div', [ 'class' => 'results-info' ], $top );
}
return $out;