jenkins-bot has submitted this change and it was merged.
Change subject: Various small message and UI tweaks
......................................................................
Various small message and UI tweaks
Change-Id: I51cb8b9eae209052e1a96bf88dd5d84c6075092d
---
M frontend/language/MWOAuth.i18n.php
M frontend/modules/ext.MWOAuth.BasicStyles.css
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
3 files changed, 16 insertions(+), 13 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/frontend/language/MWOAuth.i18n.php
b/frontend/language/MWOAuth.i18n.php
index f07c054..0d2ac54 100644
--- a/frontend/language/MWOAuth.i18n.php
+++ b/frontend/language/MWOAuth.i18n.php
@@ -167,8 +167,8 @@
'mwoauthmanagemygrants-grantsallowed' => 'Grants allowed',
'mwoauthmanagemygrants-applicablegrantsallowed' => 'Applicable grants
allowed:',
'mwoauthmanagemygrants-consumerkey' => 'Consumer key',
- 'mwoauthmanagemygrants-review' => 'review/manage access',
- 'mwoauthmanagemygrants-grantaccept' => 'Granted to consumer',
+ 'mwoauthmanagemygrants-review' => 'manage access',
+ 'mwoauthmanagemygrants-grantaccept' => 'Granted',
'mwoauthmanagemygrants-confirm-text' => 'Use the form below to revoke
access or change grants for an OAuth consumer to act on your behalf. A few
notes:
* This form controls a particular access "token", or key, that lets a consumer
access your account.
* If you seperately authorized a consumer to access different projects on your
behalf, then you will have multiple access tokens for that consumer.
@@ -176,7 +176,7 @@
* Using "*" in the wiki field grants access to all projects on this site;
using a wiki project ID limits access to a single project.',
'mwoauthmanagemygrants-confirm-legend' => 'Manage consumer access
token',
'mwoauthmanagemygrants-update' => 'Update grants',
- 'mwoauthmanagemygrants-renounce' => 'Deauthorize consumer',
+ 'mwoauthmanagemygrants-renounce' => 'Deauthorize',
'mwoauthmanagemygrants-action' => 'Change status:',
'mwoauthmanagemygrants-confirm-submit' => 'Update access token status',
'mwoauthmanagemygrants-success-update' => 'The access token for this
consumer has been updated.',
diff --git a/frontend/modules/ext.MWOAuth.BasicStyles.css
b/frontend/modules/ext.MWOAuth.BasicStyles.css
index 7f41119..95dd67f 100644
--- a/frontend/modules/ext.MWOAuth.BasicStyles.css
+++ b/frontend/modules/ext.MWOAuth.BasicStyles.css
@@ -33,3 +33,7 @@
.mw-mwoauthconsumerregistration-disabled {
background-color: #CEB7E1;
}
+
+.mw-mwoauthmanagemygrants-list-item {
+ margin-bottom: 1em;
+}
diff --git a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
index c403cf1..d5c7076 100644
--- a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
+++ b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
@@ -213,15 +213,15 @@
'class' => 'mw-htmlform-submit',
);
$form->suppressDefaultSubmit();
- $form->addButton( 'update',
- $this->msg( 'mwoauthmanagemygrants-update' )->escaped(),
- null,
- array( 'class' => 'mw-ui-button mw-ui-primary' )
- );
$form->addButton( 'renounce',
$this->msg( 'mwoauthmanagemygrants-renounce'
)->escaped(),
null,
array( 'class' => 'mw-ui-button mw-ui-destructive' )
+ );
+ $form->addButton( 'update',
+ $this->msg( 'mwoauthmanagemygrants-update' )->escaped(),
+ null,
+ array( 'class' => 'mw-ui-button mw-ui-primary' )
);
$form->addPreText(
$this->msg( 'mwoauthmanagemygrants-confirm-text'
)->parseAsBlock() );
@@ -273,8 +273,8 @@
return $s . ' [' . $cmr->get( 'version' ) . ']';
} ) );
- $r = '<li class="mw-mwoauthmanagemygrants-body">';
- $r .= "{$encName} (<strong>{$link}</strong>)";
+ $r = '<li class="mw-mwoauthmanagemygrants-list-item">';
+ $r .= "<strong>{$encName}</strong> (<strong>{$link}</strong>)";
$data = array(
'mwoauthmanagemygrants-user' => $cmr->get( 'userId',
'MWOAuthUtils::getCentralUserNameFromId' ),
@@ -282,9 +282,8 @@
'MWOAuthUtils::getWikiIdName' )
);
- foreach ( $data as $msg => $value ) {
- $r .= '<p><strong>' . $this->msg( $msg )->escaped() .
'</strong>: ' .
- htmlspecialchars( $value ) . '</p>';
+ foreach ( $data as $msg => $val ) {
+ $r .= '<p>' . $this->msg( $msg )->escaped() . ': ' .
htmlspecialchars( $val ) . '</p>';
}
$r .= '</li>';
--
To view, visit https://gerrit.wikimedia.org/r/85000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I51cb8b9eae209052e1a96bf88dd5d84c6075092d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
