Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52169
Change subject: Added mw-ui-button classes (Agora) to various buttons.
......................................................................
Added mw-ui-button classes (Agora) to various buttons.
DO NOT MERGE yet. In progress.
Change-Id: I63e073b420675b2882ab2717073d6a6d84179a7b
---
M includes/EditPage.php
M includes/HTMLForm.php
M includes/actions/HistoryAction.php
M includes/logging/LogEventsList.php
M includes/specials/SpecialLog.php
M includes/specials/SpecialRevisiondelete.php
M includes/specials/SpecialUndelete.php
M includes/templates/Userlogin.php
8 files changed, 44 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/69/52169/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index d42edd7..9636b2b 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3354,6 +3354,7 @@
'id' => 'wpSave',
'name' => 'wpSave',
'type' => 'submit',
+ 'class' => 'mw-ui-button primary',
'tabindex' => ++$tabindex,
'value' => wfMessage( 'savearticle' )->text(),
'accesskey' => wfMessage( 'accesskey-save' )->text(),
@@ -3366,6 +3367,7 @@
'id' => 'wpPreview',
'name' => 'wpPreview',
'type' => 'submit',
+ 'class' => 'mw-ui-button',
'tabindex' => $tabindex,
'value' => wfMessage( 'showpreview' )->text(),
'accesskey' => wfMessage( 'accesskey-preview' )->text(),
@@ -3378,6 +3380,7 @@
'id' => 'wpDiff',
'name' => 'wpDiff',
'type' => 'submit',
+ 'class' => 'mw-ui-button',
'tabindex' => ++$tabindex,
'value' => wfMessage( 'showdiff' )->text(),
'accesskey' => wfMessage( 'accesskey-diff' )->text(),
diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 86eb38d..5d0918d 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -2366,7 +2366,7 @@
return Xml::submitButton(
$value,
array(
- 'class' => 'mw-htmlform-submit ' .
$this->mClass,
+ 'class' => 'mw-ui-button mw-htmlform-submit ' .
$this->mClass,
'name' => $this->mName,
'id' => $this->mID,
)
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index d26228a..9d72197 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -179,7 +179,9 @@
Xml::dateMenu( ( $year == null ? date( "Y" ) : $year ),
$month ) . ' ' .
( $tagSelector ? ( implode( ' ', $tagSelector ) .
' ' ) : '' ) .
$checkDeleted .
- Xml::submitButton( $this->msg( 'allpagessubmit'
)->text() ) . "\n" .
+ Xml::submitButton(
+ $this->msg( 'allpagessubmit' )->text(), array(
'class' => 'mw-ui-button' )
+ ) . "\n" .
'</fieldset></form>'
);
@@ -446,7 +448,8 @@
// Button container stored in $this->buttons for re-use in
getEndBody()
$this->buttons = '<div>';
$this->buttons .= $this->submitButton( $this->msg(
'compareselectedversions' )->text(),
- array( 'class' => 'historysubmit
mw-history-compareselectedversions-button' )
+ array( 'class' => 'historysubmit
mw-history-compareselectedversions-button' .
+ ' mw-ui-button primary' )
+ Linker::tooltipAndAccesskeyAttribs(
'compareselectedversions' )
) . "\n";
@@ -468,7 +471,7 @@
'type' => 'submit',
'name' => $name,
'value' => '1',
- 'class' => "historysubmit
mw-history-$name-button",
+ 'class' => "historysubmit
mw-history-$name-button mw-ui-button"
),
$this->msg( $msg )->text()
) . "\n";
diff --git a/includes/logging/LogEventsList.php
b/includes/logging/LogEventsList.php
index 47b2231..b068794 100644
--- a/includes/logging/LogEventsList.php
+++ b/includes/logging/LogEventsList.php
@@ -135,7 +135,7 @@
}
// Submit button
- $html .= Xml::submitButton( $this->msg( 'allpagessubmit'
)->text() );
+ $html .= Xml::submitButton( $this->msg( 'allpagessubmit'
)->text(), array( 'class' => 'mw-ui-button' ) );
// Fieldset
$html = Xml::fieldset( $this->msg( 'log' )->text(), $html );
diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php
index 7800e56..2c5f299 100644
--- a/includes/specials/SpecialLog.php
+++ b/includes/specials/SpecialLog.php
@@ -173,7 +173,11 @@
$s .= Html::hidden( 'target', SpecialPage::getTitleFor( 'Log' )
) . "\n";
$s .= Html::hidden( 'type', 'logging' ) . "\n";
$button = Html::element( 'button',
- array( 'type' => 'submit', 'class' =>
"deleterevision-log-submit mw-log-deleterevision-button" ),
+ array(
+ 'type' => 'submit',
+ 'class' => "deleterevision-log-submit
mw-log-deleterevision-button' .
+ ' mw-ui-button primary"
+ ),
$this->msg( 'showhideselectedlogentries' )->text()
) . "\n";
$s .= $button . $formcontents . $button;
diff --git a/includes/specials/SpecialRevisiondelete.php
b/includes/specials/SpecialRevisiondelete.php
index 6f75da4..3d6a4a3 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -420,7 +420,11 @@
'<td></td>' .
'<td class="mw-submit">' .
Xml::submitButton( $this->msg(
'revdelete-submit', $numRevisions )->text(),
- array( 'name' =>
'wpSubmit' ) ) .
+ array(
+ 'name' =>
'wpSubmit',
+ 'class' =>
'mw-ui-button destructive'
+ )
+ ) .
'</td>' .
"</tr>\n" .
Xml::closeElement( 'table' ) .
diff --git a/includes/specials/SpecialUndelete.php
b/includes/specials/SpecialUndelete.php
index b6578a3..6465538 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -787,7 +787,10 @@
Xml::inputLabel( $this->msg( 'undelete-search-prefix'
)->text(),
'prefix', 'prefix', 20,
$this->mSearchPrefix ) . ' ' .
- Xml::submitButton( $this->msg( 'undelete-search-submit'
)->text() ) .
+ Xml::submitButton(
+ $this->msg( 'undelete-search-submit' )->text(),
+ array( 'class' => 'mw-ui-button primary' )
+ ) .
Xml::closeElement( 'fieldset' ) .
Xml::closeElement( 'form' )
);
@@ -946,6 +949,7 @@
$previewButton = Xml::element( 'input', array(
'type' => 'submit',
'name' => 'preview',
+ 'class' => 'mw-ui-button',
'value' => $this->msg( 'showpreview' )->text()
) );
} else {
$sourceView = '';
@@ -1219,8 +1223,22 @@
<tr>
<td> </td>
<td class='mw-submit'>" .
- Xml::submitButton(
$this->msg( 'undeletebtn' )->text(), array( 'name' => 'restore', 'id' =>
'mw-undelete-submit' ) ) . ' ' .
- Xml::submitButton(
$this->msg( 'undeleteinvert' )->text(), array( 'name' => 'invert', 'id' =>
'mw-undelete-invert' ) ) .
+ Xml::submitButton(
+ $this->msg(
'undeletebtn' )->text(),
+ array(
+ 'name'
=> 'restore',
+ 'id' =>
'mw-undelete-submit',
+ 'class'
=> 'mw-ui-button primary'
+ )
+ ) . ' ' .
+ Xml::submitButton(
+ $this->msg(
'undeleteinvert' )->text(),
+ array(
+ 'name'
=> 'invert',
+ 'id' =>
'mw-undelete-invert',
+ 'class'
=> 'mw-ui-button'
+ )
+ ) .
"</td>
</tr>" .
$unsuppressBox .
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 7bc0241..6623a2c 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -141,7 +141,8 @@
<?php
echo Html::input( 'wpLoginAttempt', wfMessage( 'login'
)->text(), 'submit', array(
'id' => 'wpLoginAttempt',
- 'tabindex' => '9'
+ 'tabindex' => '9',
+ 'class' => 'mw-ui-button primary'
) );
if ( $this->data['useemail'] && $this->data['canreset'] ) {
if( $this->data['resetlink'] === true ) {
--
To view, visit https://gerrit.wikimedia.org/r/52169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63e073b420675b2882ab2717073d6a6d84179a7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
