SG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150729
Change subject: Use mw-ui-anchor and mw-ui-button from Core
......................................................................
Use mw-ui-anchor and mw-ui-button from Core
Change-Id: Ia77951388d46ec09d26878f355a13028f54e3c6f
---
M Resources.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_post_meta_actions.handlebars
M handlebars/flow_tooltip_topic_subscription.handlebars
M handlebars/flow_topic_titlebar_content.handlebars
M handlebars/flow_topic_titlebar_watch.handlebars
M modules/new/styles/board/topic/watchlist.less
8 files changed, 16 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/29/150729/1
diff --git a/Resources.php b/Resources.php
index 2bf993b..27510d4 100644
--- a/Resources.php
+++ b/Resources.php
@@ -308,6 +308,8 @@
'mediawiki.Title',
'mediawiki.user',
'mediawiki.util',
+ 'mediawiki.ui.anchor',
+ 'mediawiki.ui.button',
),
'messages' => array(
'flow-error-external',
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 8ae4be3..a519821 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -145,7 +145,7 @@
' : '').'
<span class="flow-author">'.LCRun3::ch($cx, 'l10n',
Array(Array('started_with_participants',$in),Array()), 'encq').'</span>
<div class="flow-topic-meta">
- <a class="mw-ui-button mw-ui-progressive mw-ui-quiet flow-ui-inline"
+ <a class="mw-ui-progressive mw-ui-quiet"
data-flow-interactive-handler="activateForm"
href="#flow-post-'.htmlentities(((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null), ENT_QUOTES,
'UTF-8').'-form-content">'.LCRun3::ch($cx, 'l10n',
Array(Array('Reply',((is_array($in) && isset($in['author'])) ? $in['author'] :
null)),Array()), 'encq').'</a>
• '.LCRun3::ch($cx, 'l10n',
Array(Array('comment_count',$in),Array()), 'encq').' •
@@ -186,7 +186,7 @@
<span class="flow-ui-quiet flow-ui-constructive
flow-ui-active">'.htmlentities(((is_array($in) && isset($in['null'])) ?
$in['null'] : null), ENT_QUOTES, 'UTF-8').'<span class="wikiglyph
wikiglyph-star"></span>'.htmlentities(((is_array($in) && isset($in['null'])) ?
$in['null'] : null), ENT_QUOTES, 'UTF-8').'</span>
' : '
<a href="'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['isWatched'])) ? $in['isWatched'] : null))) ?
''.htmlentities(((is_array($in['links']['unwatch-topic']) &&
isset($in['links']['unwatch-topic']['url'])) ?
$in['links']['unwatch-topic']['url'] : null), ENT_QUOTES, 'UTF-8').'' :
''.htmlentities(((is_array($in['links']['watch-topic']) &&
isset($in['links']['watch-topic']['url'])) ? $in['links']['watch-topic']['url']
: null), ENT_QUOTES, 'UTF-8').'').'"
- class="flow-ui-quiet flow-ui-constructive
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['isWatched'])) ?
$in['isWatched'] : null))) ? 'flow-ui-active' : '').'"
+ class="mw-ui-quiet mw-ui-constructive '.((LCRun3::ifvar($cx,
((is_array($in) && isset($in['isWatched'])) ? $in['isWatched'] : null))) ?
'mw-ui-active' : '').'"
data-flow-api-handler="watchTopic"
data-flow-api-target="< .flow-topic-watchlist"
data-flow-api-method="POST">'.htmlentities(((is_array($in)
&& isset($in['null'])) ? $in['null'] : null), ENT_QUOTES, 'UTF-8').'<span
class="wikiglyph wikiglyph-star"></span>'.htmlentities(((is_array($in) &&
isset($in['null'])) ? $in['null'] : null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in) && isset($in['null'])) ? $in['null'] :
null), ENT_QUOTES, 'UTF-8').'<span class="wikiglyph
wikiglyph-unstar"></span>'.htmlentities(((is_array($in) && isset($in['null']))
? $in['null'] : null), ENT_QUOTES, 'UTF-8').'</a>
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index d2a37f4..355e0a8 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -98,7 +98,7 @@
'.((LCRun3::ifvar($cx, ((is_array($in['actions']) &&
isset($in['actions']['reply'])) ? $in['actions']['reply'] : null))) ? '
<a
href="'.htmlentities(((is_array($in['actions']['reply']) &&
isset($in['actions']['reply']['url'])) ? $in['actions']['reply']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['actions']['reply']) &&
isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title'] :
null), ENT_QUOTES, 'UTF-8').'"
- class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline"
+ class="mw-ui-progressive mw-ui-quiet"
data-flow-interactive-handler="activateReplyPost">'.htmlentities(((is_array($in['actions']['reply'])
&& isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title']
: null), ENT_QUOTES, 'UTF-8').'</a>
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in['actions']) &&
isset($in['actions']['edit'])) ? $in['actions']['edit'] : null))) ? '
@@ -108,14 +108,14 @@
data-flow-api-handler="activateEditPost"
data-flow-api-target="< .flow-post-main"
data-flow-interactive-handler="apiRequest"
- class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline">
+ class="mw-ui-progressive mw-ui-quiet">
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-post-action-edit-post'),Array()), 'encq').'
</a>
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in['actions']) &&
isset($in['actions']['thank'])) ? $in['actions']['thank'] : null))) ? '
•
'.'
- <a class="mw-ui-button mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link flow-ui-inline"
+ <a class="mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link"
href="'.htmlentities(((is_array($in['actions']['thank']) &&
isset($in['actions']['thank']['url'])) ? $in['actions']['thank']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['actions']['thank']) &&
isset($in['actions']['thank']['title'])) ? $in['actions']['thank']['title'] :
null), ENT_QUOTES,
'UTF-8').'">'.htmlentities(((is_array($in['actions']['thank']) &&
isset($in['actions']['thank']['title'])) ? $in['actions']['thank']['title'] :
null), ENT_QUOTES, 'UTF-8').'</a>
' : '').'
@@ -123,7 +123,7 @@
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['previousRevisionId'])) ? $in['previousRevisionId'] : null))) ? '
'.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['diff-prev'])) ? $in['links']['diff-prev'] : null))) ? '
<a
href="'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['url'])) ? $in['links']['diff-prev']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
- class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline"
+ class="mw-ui-progressive mw-ui-quiet"
title="'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES, 'UTF-8').'">
' : '').'
'.LCRun3::ch($cx, 'uuidTimestamp',
Array(Array(((is_array($in) && isset($in['revisionId'])) ? $in['revisionId'] :
null),'edited_ago'),Array()), 'encq').'
diff --git a/handlebars/flow_post_meta_actions.handlebars
b/handlebars/flow_post_meta_actions.handlebars
index 2af4f36..5186539 100644
--- a/handlebars/flow_post_meta_actions.handlebars
+++ b/handlebars/flow_post_meta_actions.handlebars
@@ -3,7 +3,7 @@
{{#if actions.reply}}
<a href="{{actions.reply.url}}"
title="{{actions.reply.title}}"
- class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline"
+ class="mw-ui-progressive mw-ui-quiet"
data-flow-interactive-handler="activateReplyPost">
{{~actions.reply.title~}}
</a>
@@ -15,7 +15,7 @@
data-flow-api-handler="activateEditPost"
data-flow-api-target="< .flow-post-main"
data-flow-interactive-handler="apiRequest"
- class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline">
+ class="mw-ui-progressive mw-ui-quiet">
{{l10n "flow-post-action-edit-post"}}
</a>
{{/if}}
@@ -25,7 +25,7 @@
progressive enhancement happens in the Thank
extension
based on the mw-thanks-flow-thank-link class
--}}
- <a class="mw-ui-button mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link flow-ui-inline"
+ <a class="mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link"
href="{{actions.thank.url}}"
title="{{actions.thank.title}}">
{{~actions.thank.title~}}
@@ -35,7 +35,7 @@
{{#if previousRevisionId}}
{{#if links.diff-prev}}
<a href="{{links.diff-prev.url}}"
- class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline"
+ class="mw-ui-progressive mw-ui-quiet"
title="{{links.diff-prev.title}}">
{{/if}}
{{uuidTimestamp revisionId "edited_ago"}}
diff --git a/handlebars/flow_tooltip_topic_subscription.handlebars
b/handlebars/flow_tooltip_topic_subscription.handlebars
index ecba95c..8a1adc7 100644
--- a/handlebars/flow_tooltip_topic_subscription.handlebars
+++ b/handlebars/flow_tooltip_topic_subscription.handlebars
@@ -2,7 +2,7 @@
positionClass="left"
extraClass="flow-notification-tooltip-topicsub"
}}
- <div class="flow-notification-tooltip-icon"><span class="wikiglyph
wikiglyph-star-list flow-ui-constructive"></span></div>
+ <div class="flow-notification-tooltip-icon"><span class="wikiglyph
wikiglyph-star-list mw-ui-constructive"></span></div>
<p class="flow-notification-tooltip-title">{{l10n
"flow-topic-notification-subscribe-title"}}</p>
<p class="flow-notification-tooltip-content">{{l10n
"flow-topic-notification-subscribe-description"}}</p>
{{/tooltip}}
\ No newline at end of file
diff --git a/handlebars/flow_topic_titlebar_content.handlebars
b/handlebars/flow_topic_titlebar_content.handlebars
index 33ef1b5..b470eec 100644
--- a/handlebars/flow_topic_titlebar_content.handlebars
+++ b/handlebars/flow_topic_titlebar_content.handlebars
@@ -7,7 +7,7 @@
{{/if}}
<span class="flow-author">{{l10n "started_with_participants" this}}</span>
<div class="flow-topic-meta">
- <a class="mw-ui-button mw-ui-progressive mw-ui-quiet flow-ui-inline"
+ <a class="mw-ui-progressive mw-ui-quiet"
data-flow-interactive-handler="activateForm"
href="#flow-post-{{postId}}-form-content">{{l10n "Reply"
author}}</a>
• {{l10n "comment_count" this}} •
diff --git a/handlebars/flow_topic_titlebar_watch.handlebars
b/handlebars/flow_topic_titlebar_watch.handlebars
index 8f8a14f..1db4cba 100644
--- a/handlebars/flow_topic_titlebar_watch.handlebars
+++ b/handlebars/flow_topic_titlebar_watch.handlebars
@@ -5,7 +5,7 @@
</span>
{{else}}
<a href="{{#if
isWatched}}{{links.unwatch-topic.url}}{{else}}{{links.watch-topic.url}}{{/if}}"
- class="flow-ui-quiet flow-ui-constructive {{#if
isWatched}}flow-ui-active{{/if}}"
+ class="mw-ui-quiet mw-ui-constructive {{#if
isWatched}}mw-ui-active{{/if}}"
data-flow-api-handler="watchTopic"
data-flow-api-target="< .flow-topic-watchlist"
data-flow-api-method="POST">
diff --git a/modules/new/styles/board/topic/watchlist.less
b/modules/new/styles/board/topic/watchlist.less
index 02aa07c..643f2bf 100644
--- a/modules/new/styles/board/topic/watchlist.less
+++ b/modules/new/styles/board/topic/watchlist.less
@@ -15,7 +15,7 @@
padding: .25em .5em;
font-size: 2em;
- &.flow-ui-active {
+ &.mw-ui-active {
// Active mode shows the full star
.wikiglyph-unstar {
display: none;
--
To view, visit https://gerrit.wikimedia.org/r/150729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia77951388d46ec09d26878f355a13028f54e3c6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: SG <shah...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
