jenkins-bot has submitted this change and it was merged. Change subject: Rework UserContribs options section ......................................................................
Rework UserContribs options section It will make it more mobile friendly and fixes several issues. Bug: T143518 Bug: T50544 Change-Id: Ie353af860aaec7d6921ae83fa59980ab0a5c8d9b --- M includes/specials/SpecialContributions.php M resources/src/mediawiki.legacy/shared.css 2 files changed, 19 insertions(+), 17 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index 68289a7..0858b18 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -496,12 +496,12 @@ if ( $tagFilter ) { $filterSelection = Html::rawElement( - 'td', + 'div', [], implode( ' ', $tagFilter ) ); } else { - $filterSelection = Html::rawElement( 'td', [ 'colspan' => 2 ], '' ); + $filterSelection = Html::rawElement( 'div', [], '' ); } $this->getOutput()->addModules( 'mediawiki.userSuggest' ); @@ -542,13 +542,13 @@ ); $targetSelection = Html::rawElement( - 'td', - [ 'colspan' => 2 ], - $labelNewbies . '<br />' . $labelUsername . ' ' . $input . ' ' + 'div', + [], + $labelNewbies . '<br>' . $labelUsername . ' ' . $input . ' ' ); $namespaceSelection = Xml::tags( - 'td', + 'div', [], Xml::label( $this->msg( 'namespace' )->text(), @@ -647,12 +647,12 @@ ); $extraOptions = Html::rawElement( - 'td', - [ 'colspan' => 2 ], + 'div', + [], implode( '', $filters ) ); - $dateSelectionAndSubmit = Xml::tags( 'td', [ 'colspan' => 2 ], + $dateSelectionAndSubmit = Xml::tags( 'div', [], Xml::dateMenu( $this->opts['year'] === '' ? MWTimestamp::getInstance()->format( 'Y' ) : $this->opts['year'], $this->opts['month'] @@ -663,13 +663,14 @@ ) ); - $form .= Xml::fieldset( $this->msg( 'sp-contributions-search' )->text() ); - $form .= Html::rawElement( 'table', [ 'class' => 'mw-contributions-table' ], "\n" . - Html::rawElement( 'tr', [], $targetSelection ) . "\n" . - Html::rawElement( 'tr', [], $namespaceSelection ) . "\n" . - Html::rawElement( 'tr', [], $filterSelection ) . "\n" . - Html::rawElement( 'tr', [], $extraOptions ) . "\n" . - Html::rawElement( 'tr', [], $dateSelectionAndSubmit ) . "\n" + $form .= Xml::fieldset( + $this->msg( 'sp-contributions-search' )->text(), + $targetSelection . + $namespaceSelection . + $filterSelection . + $extraOptions . + $dateSelectionAndSubmit, + [ 'class' => 'mw-contributions-table' ] ); $explain = $this->msg( 'sp-contributions-explain' ); @@ -677,7 +678,7 @@ $form .= "<p id='mw-sp-contributions-explain'>{$explain->parse()}</p>"; } - $form .= Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ); + $form .= Xml::closeElement( 'form' ); return $form; } diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index de442e9..84ab8c4 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -162,6 +162,7 @@ .mw-input-with-label { white-space: nowrap; + display: inline-block; } /** -- To view, visit https://gerrit.wikimedia.org/r/307077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie353af860aaec7d6921ae83fa59980ab0a5c8d9b Gerrit-PatchSet: 8 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgr...@gmail.com> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: VolkerE <volke...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits