jenkins-bot has submitted this change and it was merged.
Change subject: Convert SpecialGoToLinkedPage to HTMLForm
......................................................................
Convert SpecialGoToLinkedPage to HTMLForm
Bug: T48248
Change-Id: Id05a1f6dda4efe7ea11656e51e3cf2695c654e21
---
M repo/includes/specials/SpecialGoToLinkedPage.php
1 file changed, 36 insertions(+), 57 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/specials/SpecialGoToLinkedPage.php
b/repo/includes/specials/SpecialGoToLinkedPage.php
index 15e160d..e5937f9 100644
--- a/repo/includes/specials/SpecialGoToLinkedPage.php
+++ b/repo/includes/specials/SpecialGoToLinkedPage.php
@@ -2,7 +2,7 @@
namespace Wikibase\Repo\Specials;
-use Html;
+use HTMLForm;
use InvalidArgumentException;
use SiteStore;
use Wikibase\DataModel\Entity\ItemId;
@@ -225,64 +225,43 @@
protected function outputForm( $site, $itemString ) {
$this->getOutput()->addModules(
'wikibase.special.goToLinkedPage' );
- $this->getOutput()->addHTML(
- Html::openElement(
- 'form',
- array(
- 'method' => 'get',
- 'action' =>
$this->getPageTitle()->getFullUrl(),
- 'name' => 'gotolinkedpage',
- 'id' => 'wb-gotolinkedpage-form1'
- )
+ // The message for the fieldset's legend is
<wikibase-gotolinkedpage-lookup-fieldset>
+ $formDescriptor = array(
+ 'site' => array(
+ 'name' => 'site',
+ 'section' => 'gotolinkedpage-lookup-fieldset',
+ 'default' => $site ?: '',
+ 'type' => 'text',
+ 'id' => 'wb-gotolinkedpage-sitename',
+ 'size' => 12,
+ 'label-message' =>
'wikibase-gotolinkedpage-lookup-site'
+ ),
+ 'itemid' => array(
+ 'name' => 'itemid',
+ 'section' => 'gotolinkedpage-lookup-fieldset',
+ 'default' => $itemString ?: '',
+ 'type' => 'text',
+ 'id' => 'wb-gotolinkedpage-itemid',
+ 'size' => 36,
+ 'cssclass' => 'wb-input-text',
+ 'label-message' =>
'wikibase-gotolinkedpage-lookup-item'
+ ),
+ 'submit' => array(
+ 'name' => 'submit',
+ 'section' => 'gotolinkedpage-lookup-fieldset',
+ 'default' => $this->msg(
'wikibase-gotolinkedpage-submit' )->text(),
+ 'type' => 'submit',
+ 'id' => 'wb-gotolinkedpage-submit',
+ 'cssclass' => 'wb-input-button'
)
- . Html::openElement( 'fieldset' )
- . Html::element(
- 'legend',
- array(),
- $this->msg(
'wikibase-gotolinkedpage-lookup-fieldset' )->text()
- )
- . Html::element(
- 'label',
- array( 'for' => 'wb-gotolinkedpage-sitename' ),
- $this->msg(
'wikibase-gotolinkedpage-lookup-site' )->text()
- )
- . Html::input(
- 'site',
- $site ? htmlspecialchars( $site ) : '',
- 'text',
- array(
- 'id' => 'wb-gotolinkedpage-sitename',
- 'size' => 12
- )
- )
- . ' '
- . Html::element(
- 'label',
- array( 'for' => 'wb-gotolinkedpage-itemid' ),
- $this->msg(
'wikibase-gotolinkedpage-lookup-item' )->text()
- )
- . Html::input(
- 'itemid',
- $itemString ? htmlspecialchars( $itemString ) :
'',
- 'text',
- array(
- 'id' => 'wb-gotolinkedpage-itemid',
- 'size' => 36,
- 'class' => 'wb-input-text'
- )
- )
- . Html::input(
- 'submit',
- $this->msg( 'wikibase-gotolinkedpage-submit'
)->text(),
- 'submit',
- array(
- 'id' => 'wb-gotolinkedpage-submit',
- 'class' => 'wb-input-button'
- )
- )
- . Html::closeElement( 'fieldset' )
- . Html::closeElement( 'form' )
);
+
+ HTMLForm::factory( 'inline', $formDescriptor,
$this->getContext(), 'wikibase' )
+ ->setId( 'wb-gotolinkedpage-form1' )
+ ->setMethod( 'get' )
+ ->suppressDefaultSubmit()
+ ->setSubmitCallback( function () {// no-op
+ } )->show();
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/233898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id05a1f6dda4efe7ea11656e51e3cf2695c654e21
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa <ricordisa...@openmailbox.org>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
Gerrit-Reviewer: Ricordisamoa <ricordisa...@openmailbox.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
