Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/242478
Change subject: Use native methods from core's Html class
......................................................................
Use native methods from core's Html class
I prefer to use the native methods Html::label and so on, if possible.
It's shorter and, in my opinion, easier to read and less error-prone.
This is split from I16b20d3.
Change-Id: I865c1ab4a2f9e880d8eea83e0b830d6b5dc0b6d4
---
M repo/includes/actions/EditEntityAction.php
M repo/includes/specials/SpecialModifyTerm.php
M repo/includes/specials/SpecialSetSiteLink.php
3 files changed, 38 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/78/242478/1
diff --git a/repo/includes/actions/EditEntityAction.php
b/repo/includes/actions/EditEntityAction.php
index f9867aa..3c7d044 100644
--- a/repo/includes/actions/EditEntityAction.php
+++ b/repo/includes/actions/EditEntityAction.php
@@ -451,7 +451,7 @@
$label = null;
if ( $labelText ) {
- $label = Html::element( 'label', $inputAttrs['id'] ?
array( 'for' => $inputAttrs['id'] ) : null, $labelText );
+ $label = Html::label( $labelText, $inputAttrs['id'] );
$label = Html::rawElement( 'span', $spanLabelAttrs,
$label );
}
@@ -499,17 +499,19 @@
}
/**
- * @return string
+ * @return string HTML
*/
private function getEditButton() {
- return Html::element( 'input', array(
- 'id' => 'wpSave',
- 'name' => 'wpSave',
- 'type' => 'submit',
- 'value' => $this->msg( 'savearticle' )->text(),
- 'accesskey' => $this->msg( 'accesskey-save' )->text(),
- 'title' => $this->msg( 'tooltip-save' )->text() . '
[' . $this->msg( 'accesskey-save' )->text() . ']',
- ) );
+ return Html::input(
+ 'wpSave',
+ $this->msg( 'savearticle' )->text(),
+ 'submit',
+ array(
+ 'id' => 'wpSave',
+ 'accesskey' => $this->msg( 'accesskey-save'
)->text(),
+ 'title' => $this->msg( 'tooltip-save' )->text()
. ' [' . $this->msg( 'accesskey-save' )->text() . ']',
+ )
+ );
}
/**
diff --git a/repo/includes/specials/SpecialModifyTerm.php
b/repo/includes/specials/SpecialModifyTerm.php
index 143d03b..85b9a1d 100644
--- a/repo/includes/specials/SpecialModifyTerm.php
+++ b/repo/includes/specials/SpecialModifyTerm.php
@@ -230,13 +230,12 @@
)
. parent::getFormElements( $entity )
. Html::element( 'br' )
- . Html::element(
- 'label',
+ . Html::label(
+ $this->msg( 'wikibase-modifyterm-language'
)->text(),
+ 'wb-modifyterm-language',
array(
- 'for' => 'wb-modifyterm-language',
'class' => 'wb-label'
- ),
- $this->msg( 'wikibase-modifyterm-language'
)->text()
+ )
)
. Html::input(
'language',
@@ -248,15 +247,16 @@
)
)
. Html::element( 'br' )
- . Html::element(
- 'label',
- array(
- 'for' => 'wb-modifyterm-value',
- 'class' => 'wb-label'
- ),
- // Messages: wikibase-setlabel-label,
wikibase-setdescription-label,
+ . Html::label(
+ // Messages:
+ // wikibase-setlabel-label
+ // wikibase-setdescription-label
// wikibase-setaliases-label
- $this->msg( 'wikibase-' . strtolower(
$this->getName() ) . '-label' )->text()
+ $this->msg( 'wikibase-' . strtolower(
$this->getName() ) . '-label' )->text(),
+ 'wb-modifyterm-value',
+ array(
+ 'class' => 'wb-label'
+ )
)
. $valueinput
. Html::element( 'br' );
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index 9344563..ea15347 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -213,13 +213,12 @@
$this->badges = $this->site === null ? array() :
$this->getBadges( $entity, $this->site );
}
$pageinput = Html::element( 'br' )
- . Html::element(
- 'label',
+ . Html::label(
+ $this->msg( 'wikibase-setsitelink-label'
)->text(),
+ 'wb-setsitelink-page',
array(
- 'for' => 'wb-setsitelink-page',
'class' => 'wb-label'
- ),
- $this->msg( 'wikibase-setsitelink-label'
)->text()
+ )
) .
Html::input(
'page',
@@ -233,12 +232,12 @@
if ( !empty( $this->badgeItems ) ) {
$pageinput .= Html::element( 'br' )
- . Html::element(
- 'label',
+ . Html::label(
+ $this->msg( 'wikibase-setsitelink-badges'
)->text(),
+ 'wb-setsitelink-badges',
array(
'class' => 'wb-label'
- ),
- $this->msg( 'wikibase-setsitelink-badges'
)->text()
+ )
)
. $this->getHtmlForBadges();
}
@@ -274,13 +273,12 @@
)
. parent::getFormElements( $entity )
. Html::element( 'br' )
- . Html::element(
- 'label',
+ . Html::label(
+ $this->msg( 'wikibase-setsitelink-site'
)->text(),
+ 'wb-setsitelink-site',
array(
- 'for' => 'wb-setsitelink-site',
'class' => 'wb-label'
- ),
- $this->msg( 'wikibase-setsitelink-site'
)->text()
+ )
)
. Html::input(
'site',
@@ -335,13 +333,7 @@
'id' => $name
)
)
- . Html::element(
- 'label',
- array(
- 'for' => $name
- ),
- $label
- )
+ . Html::label( $label, $name )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/242478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I865c1ab4a2f9e880d8eea83e0b830d6b5dc0b6d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
