summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
dc0dd31)
Switch to OOUI HtmlForm and replace mediawiki.userSuggest with
OOUI HtmlForm type user.
Bug: T117734
Change-Id: I37d9acbdd272c0cc2f2e120aada2e9fcea215509
foreach ( $oldoptions as $text => $data ) {
$options[] = array(
foreach ( $oldoptions as $text => $data ) {
$options[] = array(
- 'data' => $data,
- 'label' => $text,
+ 'data' => (string)$data,
+ 'label' => (string)$text,
$out = $this->getOutput();
$lang = $this->getLanguage();
$out->setPageTitle( $this->msg( 'ipblocklist' ) );
$out = $this->getOutput();
$lang = $this->getLanguage();
$out->setPageTitle( $this->msg( 'ipblocklist' ) );
- $out->addModuleStyles( 'mediawiki.special' );
- $out->addModules( 'mediawiki.userSuggest' );
+ $out->addModuleStyles( array( 'mediawiki.special', 'mediawiki.special.blocklist' ) );
$request = $this->getRequest();
$par = $request->getVal( 'ip', $par );
$request = $this->getRequest();
$par = $request->getVal( 'ip', $par );
# Just show the block list
$fields = array(
'Target' => array(
# Just show the block list
$fields = array(
'Target' => array(
'label-message' => 'ipaddressorusername',
'tabindex' => '1',
'size' => '45',
'default' => $this->target,
'label-message' => 'ipaddressorusername',
'tabindex' => '1',
'size' => '45',
'default' => $this->target,
- 'cssclass' => 'mw-autocomplete-user', // used by mediawiki.userSuggest
),
'Options' => array(
'type' => 'multiselect',
),
'Options' => array(
'type' => 'multiselect',
);
$context = new DerivativeContext( $this->getContext() );
$context->setTitle( $this->getPageTitle() ); // Remove subpage
);
$context = new DerivativeContext( $this->getContext() );
$context->setTitle( $this->getPageTitle() ); // Remove subpage
- $form = new HTMLForm( $fields, $context );
+ $form = HTMLForm::factory( 'ooui', $fields, $context );
$form->setMethod( 'get' );
$form->setWrapperLegendMsg( 'ipblocklist-legend' );
$form->setSubmitTextMsg( 'ipblocklist-submit' );
$form->setMethod( 'get' );
$form->setWrapperLegendMsg( 'ipblocklist-legend' );
$form->setSubmitTextMsg( 'ipblocklist-submit' );
'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css',
'dependencies' => 'mediawiki.util',
),
'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css',
'dependencies' => 'mediawiki.util',
),
+ 'mediawiki.special.blocklist' => array(
+ 'styles' => 'resources/src/mediawiki.special/mediawiki.special.blocklist.css',
+ 'position' => 'top',
+ ),
'mediawiki.special.changeslist' => array(
'position' => 'top',
'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
'mediawiki.special.changeslist' => array(
'position' => 'top',
'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
--- /dev/null
+.mw-htmlform-flatlist-item {\r
+ /* FIXME: There should be an option in OOUI to do that */\r
+ display: inline-block !important;\r
+}
\ No newline at end of file