jenkins-bot has submitted this change and it was merged.
Change subject: Replace deprecated .mw-ui-constructive with .mw-ui-progressive
......................................................................
Replace deprecated .mw-ui-constructive with .mw-ui-progressive
Bug: T146923
Change-Id: Ic4e3b903b1dcc16380e3cdd97ede328ae5219d94
---
M handlebars/compiled/flow_block_header_edit.handlebars.php
M handlebars/compiled/flow_block_header_undo_edit.handlebars.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_edit_title.handlebars.php
M handlebars/compiled/flow_block_topic_lock.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_block_topic_undo_edit.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
M handlebars/compiled/flow_block_topicsummary_edit.handlebars.php
M handlebars/compiled/flow_block_topicsummary_undo_edit.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_block_header_edit.handlebars
M handlebars/flow_block_header_undo_edit.handlebars
M handlebars/flow_block_topic_undo_edit.handlebars
M handlebars/flow_block_topicsummary_edit.handlebars
M handlebars/flow_block_topicsummary_undo_edit.handlebars
M handlebars/flow_edit_post.partial.handlebars
M handlebars/flow_edit_topic_title.partial.handlebars
M handlebars/flow_moderate_post.partial.handlebars
M handlebars/flow_moderate_topic.partial.handlebars
M handlebars/flow_newtopic_form.partial.handlebars
M handlebars/flow_post_meta_actions.partial.handlebars
M handlebars/flow_reply_form.partial.handlebars
M handlebars/flow_topic_titlebar_lock.partial.handlebars
M handlebars/flow_topic_titlebar_watch.partial.handlebars
M modules/engine/misc/mw-ui.enhance.js
M modules/engine/misc/mw-ui.modal.js
M modules/flow/ui/widgets/editor/mw.flow.ui.EditorControlsWidget.js
M modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
M modules/styles/mediawiki.ui/tooltips.less
32 files changed, 43 insertions(+), 51 deletions(-)
Approvals:
Mattflaschen: Looks good to me, but someone else must approve
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_header_edit.handlebars.php
b/handlebars/compiled/flow_block_header_edit.handlebars.php
index e6d6e28..0d4823a 100644
--- a/handlebars/compiled/flow_block_header_edit.handlebars.php
+++ b/handlebars/compiled/flow_block_header_edit.handlebars.php
@@ -58,7 +58,7 @@
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
- class="mw-ui-button
mw-ui-constructive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-edit-header-submit'),array()), 'encq').'</button>
+ class="mw-ui-button
mw-ui-progressive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-edit-header-submit'),array()), 'encq').'</button>
'.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()), '
').' <small
class="flow-terms-of-use plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-edit'),array()), 'encq').'</small>
</div>
</form>
diff --git a/handlebars/compiled/flow_block_header_undo_edit.handlebars.php
b/handlebars/compiled/flow_block_header_undo_edit.handlebars.php
index 284e010..256f122 100644
--- a/handlebars/compiled/flow_block_header_undo_edit.handlebars.php
+++ b/handlebars/compiled/flow_block_header_undo_edit.handlebars.php
@@ -48,7 +48,7 @@
</div>
<div class="flow-form-actions flow-form-collapsible">
- <button class="mw-ui-button
mw-ui-constructive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-edit-header-submit'),array()), 'encq').'</button>
+ <button class="mw-ui-button
mw-ui-progressive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-edit-header-submit'),array()), 'encq').'</button>
<small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-edit'),array()), 'encq').'
</small>
</div>
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index 460a884..f9a506e 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -83,7 +83,7 @@
';},'flow_topic_titlebar_watch' => function ($cx, $in, $sp) {return
''.$sp.'<div class="flow-topic-watchlist flow-watch-link">
'.$sp.''.LCRun3::p($cx, 'flow_errors', array(array($in),array()), ' ').'
'.$sp.' <a href="'.((LCRun3::ifvar($cx, ((isset($in['isWatched']) &&
is_array($in)) ? $in['isWatched'] : null))) ?
''.htmlentities((string)((isset($in['links']['unwatch-topic']['url']) &&
is_array($in['links']['unwatch-topic'])) ? $in['links']['unwatch-topic']['url']
: null), ENT_QUOTES, 'UTF-8').'' :
''.htmlentities((string)((isset($in['links']['watch-topic']['url']) &&
is_array($in['links']['watch-topic'])) ? $in['links']['watch-topic']['url'] :
null), ENT_QUOTES, 'UTF-8').'').'"
-'.$sp.' class="mw-ui-anchor mw-ui-hovericon mw-ui-constructive
'.((!LCRun3::ifvar($cx, ((isset($in['isWatched']) && is_array($in)) ?
$in['isWatched'] : null))) ? 'mw-ui-quiet' : '').'
+'.$sp.' class="mw-ui-anchor mw-ui-hovericon mw-ui-progressive
'.((!LCRun3::ifvar($cx, ((isset($in['isWatched']) && is_array($in)) ?
$in['isWatched'] : null))) ? 'mw-ui-quiet' : '').'
'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isWatched']) && is_array($in)) ?
$in['isWatched'] : null))) ? 'flow-watch-link-unwatch' :
'flow-watch-link-watch').'"
'.$sp.' data-flow-api-handler="watchItem"
'.$sp.' data-flow-api-target="< .flow-topic-watchlist"
@@ -186,7 +186,7 @@
'.$sp.'
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
'.$sp.' <button data-role="submit"
-'.$sp.' class="mw-ui-button mw-ui-constructive"
+'.$sp.' class="mw-ui-button mw-ui-progressive"
'.$sp.' >'.LCRun3::ch($cx, 'l10n',
array(array('flow-reply-link'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-reply'),array()), 'encq').'</small>
'.$sp.' </div>
diff --git a/handlebars/compiled/flow_block_topic_edit_title.handlebars.php
b/handlebars/compiled/flow_block_topic_edit_title.handlebars.php
index cca136c..d7f3108 100644
--- a/handlebars/compiled/flow_block_topic_edit_title.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_edit_title.handlebars.php
@@ -30,7 +30,7 @@
'.$sp.' <input name="topic_content" class="mw-ui-input"
value="'.((LCRun3::ifvar($cx,
((isset($cx['sp_vars']['root']['submitted']['content']) &&
is_array($cx['sp_vars']['root']['submitted'])) ?
$cx['sp_vars']['root']['submitted']['content'] : null))) ?
''.htmlentities((string)((isset($cx['sp_vars']['root']['submitted']['content'])
&& is_array($cx['sp_vars']['root']['submitted'])) ?
$cx['sp_vars']['root']['submitted']['content'] : null), ENT_QUOTES, 'UTF-8').''
: ''.htmlentities((string)((isset($in['content']['content']) &&
is_array($in['content'])) ? $in['content']['content'] : null), ENT_QUOTES,
'UTF-8').'').'" />
'.$sp.' <div class="flow-form-actions">
'.$sp.' <button data-role="submit"
-'.$sp.' class="mw-ui-button
mw-ui-constructive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-edit-title-submit'),array()), 'encq').'</button>
+'.$sp.' class="mw-ui-button
mw-ui-progressive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-edit-title-submit'),array()), 'encq').'</button>
'.$sp.' </div>
'.$sp.'</form>
';},),
diff --git a/handlebars/compiled/flow_block_topic_lock.handlebars.php
b/handlebars/compiled/flow_block_topic_lock.handlebars.php
index 1a7eec7..8eba7a9 100644
--- a/handlebars/compiled/flow_block_topic_lock.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_lock.handlebars.php
@@ -40,7 +40,7 @@
'.$sp.' <input type="hidden" name="flow_reason"
value="'.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? ''.LCRun3::ch($cx, 'l10n',
array(array('flow-rev-message-restore-topic-reason'),array()), 'encq').'' :
''.LCRun3::ch($cx, 'l10n',
array(array('flow-rev-message-lock-topic-reason'),array()), 'encq').'').'" />
'.$sp.' <div class="flow-form-actions
flow-form-collapsible">
'.$sp.' <button data-role="submit"
-'.$sp.' class="mw-ui-button
mw-ui-constructive"
+'.$sp.' class="mw-ui-button
mw-ui-progressive"
'.$sp.' >
'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? '
'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-unlock-topic'),array()), 'encq').'
'.$sp.'' : '
'.LCRun3::ch($cx, 'l10n', array(array('flow-topic-action-lock-topic'),array()),
'encq').'
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 4505db8..cc44277 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -49,7 +49,7 @@
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
'.$sp.' <button data-flow-interactive-handler="apiRequest"
'.$sp.' data-flow-api-handler="moderatePost"
-'.$sp.' class="mw-ui-button mw-ui-constructive"
+'.$sp.' class="mw-ui-button mw-ui-progressive"
'.$sp.' data-role="submit">'.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-moderation-confirm-',((isset($cx['sp_vars']['root']['submitted']['moderationState'])
&& is_array($cx['sp_vars']['root']['submitted'])) ?
$cx['sp_vars']['root']['submitted']['moderationState'] :
null),'-post'),array()), 'raw')),array()), 'encq').'</button>
'.$sp.' <a data-flow-interactive-handler="cancelForm"
'.$sp.' class="mw-ui-button mw-ui-destructive mw-ui-quiet"
@@ -83,7 +83,7 @@
'.$sp.' <
.flow-post:not([data-flow-post-max-depth=\'1\']) .flow-reply-form
[data-role=\'submit\']
'.$sp.' "
'.$sp.'
>'.htmlentities((string)((isset($in['actions']['reply']['text']) &&
is_array($in['actions']['reply'])) ? $in['actions']['reply']['text'] : null),
ENT_QUOTES, 'UTF-8').'</a>
-'.$sp.'' : '').''.((LCRun3::ifvar($cx, ((isset($in['actions']['thank']) &&
is_array($in['actions'])) ? $in['actions']['thank'] : null))) ? '
<a class="mw-ui-anchor mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link"
+'.$sp.'' : '').''.((LCRun3::ifvar($cx, ((isset($in['actions']['thank']) &&
is_array($in['actions'])) ? $in['actions']['thank'] : null))) ? '
<a class="mw-ui-anchor mw-ui-progressive mw-ui-quiet
mw-thanks-flow-thank-link"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['thank']['url']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
'.$sp.'
title="'.htmlentities((string)((isset($in['actions']['thank']['title']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['title'] : null),
ENT_QUOTES,
'UTF-8').'">'.htmlentities((string)((isset($in['actions']['thank']['text']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['text'] : null),
ENT_QUOTES, 'UTF-8').'</a>
'.$sp.'' : '').' </span>
@@ -191,7 +191,7 @@
'.$sp.' </div>
'.$sp.'
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
-'.$sp.' <button class="mw-ui-button mw-ui-constructive"
+'.$sp.' <button class="mw-ui-button mw-ui-progressive"
'.$sp.'
data-flow-api-handler="submitEditPost">'.LCRun3::ch($cx, 'l10n',
array(array('flow-post-action-edit-post-submit'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-edit'),array()), 'encq').'</small>
'.$sp.' </div>
@@ -222,7 +222,7 @@
'.$sp.'
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
'.$sp.' <button data-role="submit"
-'.$sp.' class="mw-ui-button mw-ui-constructive"
+'.$sp.' class="mw-ui-button mw-ui-progressive"
'.$sp.' >'.LCRun3::ch($cx, 'l10n',
array(array('flow-reply-link'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-reply'),array()), 'encq').'</small>
'.$sp.' </div>
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index 5520bd8..3be435b 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -47,7 +47,7 @@
'.$sp.' placeholder="'.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-moderation-placeholder-',((isset($cx['sp_vars']['root']['submitted']['moderationState'])
&& is_array($cx['sp_vars']['root']['submitted'])) ?
$cx['sp_vars']['root']['submitted']['moderationState'] :
null),'-topic'),array()), 'raw')),array()), 'encq').'"
'.$sp.' autofocus'.((LCRun3::ifvar($cx,
((isset($cx['sp_vars']['root']['submitted']['reason']) &&
is_array($cx['sp_vars']['root']['submitted'])) ?
$cx['sp_vars']['root']['submitted']['reason'] : null))) ?
'value="'.htmlentities((string)((isset($cx['sp_vars']['root']['submitted']['reason'])
&& is_array($cx['sp_vars']['root']['submitted'])) ?
$cx['sp_vars']['root']['submitted']['reason'] : null), ENT_QUOTES, 'UTF-8').'"'
: '').'>
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
-'.$sp.' <button class="mw-ui-button mw-ui-constructive"
+'.$sp.' <button class="mw-ui-button mw-ui-progressive"
'.$sp.' data-flow-interactive-handler="apiRequest"
'.$sp.' data-flow-api-handler="moderateTopic"
'.$sp.' data-role="submit">'.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-moderation-confirm-',((isset($cx['sp_vars']['root']['submitted']['moderationState'])
&& is_array($cx['sp_vars']['root']['submitted'])) ?
$cx['sp_vars']['root']['submitted']['moderationState'] :
null),'-topic'),array()), 'raw')),array()), 'encq').'</button>
@@ -83,7 +83,7 @@
'.$sp.' <
.flow-post:not([data-flow-post-max-depth=\'1\']) .flow-reply-form
[data-role=\'submit\']
'.$sp.' "
'.$sp.'
>'.htmlentities((string)((isset($in['actions']['reply']['text']) &&
is_array($in['actions']['reply'])) ? $in['actions']['reply']['text'] : null),
ENT_QUOTES, 'UTF-8').'</a>
-'.$sp.'' : '').''.((LCRun3::ifvar($cx, ((isset($in['actions']['thank']) &&
is_array($in['actions'])) ? $in['actions']['thank'] : null))) ? '
<a class="mw-ui-anchor mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link"
+'.$sp.'' : '').''.((LCRun3::ifvar($cx, ((isset($in['actions']['thank']) &&
is_array($in['actions'])) ? $in['actions']['thank'] : null))) ? '
<a class="mw-ui-anchor mw-ui-progressive mw-ui-quiet
mw-thanks-flow-thank-link"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['thank']['url']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
'.$sp.'
title="'.htmlentities((string)((isset($in['actions']['thank']['title']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['title'] : null),
ENT_QUOTES,
'UTF-8').'">'.htmlentities((string)((isset($in['actions']['thank']['text']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['text'] : null),
ENT_QUOTES, 'UTF-8').'</a>
'.$sp.'' : '').' </span>
@@ -191,7 +191,7 @@
'.$sp.' </div>
'.$sp.'
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
-'.$sp.' <button class="mw-ui-button mw-ui-constructive"
+'.$sp.' <button class="mw-ui-button mw-ui-progressive"
'.$sp.'
data-flow-api-handler="submitEditPost">'.LCRun3::ch($cx, 'l10n',
array(array('flow-post-action-edit-post-submit'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-edit'),array()), 'encq').'</small>
'.$sp.' </div>
@@ -222,7 +222,7 @@
'.$sp.'
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
'.$sp.' <button data-role="submit"
-'.$sp.' class="mw-ui-button mw-ui-constructive"
+'.$sp.' class="mw-ui-button mw-ui-progressive"
'.$sp.' >'.LCRun3::ch($cx, 'l10n',
array(array('flow-reply-link'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-reply'),array()), 'encq').'</small>
'.$sp.' </div>
diff --git a/handlebars/compiled/flow_block_topic_undo_edit.handlebars.php
b/handlebars/compiled/flow_block_topic_undo_edit.handlebars.php
index 4417192..48ee825 100644
--- a/handlebars/compiled/flow_block_topic_undo_edit.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_undo_edit.handlebars.php
@@ -49,7 +49,7 @@
</div>
<div class="flow-form-actions flow-form-collapsible">
- <button class="mw-ui-button
mw-ui-constructive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-edit-post-submit'),array()), 'encq').'</button>
+ <button class="mw-ui-button
mw-ui-progressive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-edit-post-submit'),array()), 'encq').'</button>
<small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-edit'),array()), 'encq').'
</small>
</div>
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 81462b4..0af46fb 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -76,7 +76,7 @@
'.$sp.'
'.$sp.' <div class="flow-form-actions
flow-form-collapsible'.((LCRun3::ifvar($cx, ((isset($in['isOnFlowBoard']) &&
is_array($in)) ? $in['isOnFlowBoard'] : null))) ? '
flow-form-collapsible-collapsed' : '').'">
'.$sp.' <button data-role="submit"
-'.$sp.' class="mw-ui-button mw-ui-constructive
mw-ui-flush-right">'.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-save'),array()), 'encq').'</button>
+'.$sp.' class="mw-ui-button mw-ui-progressive
mw-ui-flush-right">'.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-save'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small
class="flow-terms-of-use plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-new-topic'),array()), 'encq').'</small>
'.$sp.' </div>
'.$sp.' </form>
@@ -128,7 +128,7 @@
';},'flow_topic_titlebar_watch' => function ($cx, $in, $sp) {return
''.$sp.'<div class="flow-topic-watchlist flow-watch-link">
'.$sp.''.LCRun3::p($cx, 'flow_errors', array(array($in),array()), ' ').'
'.$sp.' <a href="'.((LCRun3::ifvar($cx, ((isset($in['isWatched']) &&
is_array($in)) ? $in['isWatched'] : null))) ?
''.htmlentities((string)((isset($in['links']['unwatch-topic']['url']) &&
is_array($in['links']['unwatch-topic'])) ? $in['links']['unwatch-topic']['url']
: null), ENT_QUOTES, 'UTF-8').'' :
''.htmlentities((string)((isset($in['links']['watch-topic']['url']) &&
is_array($in['links']['watch-topic'])) ? $in['links']['watch-topic']['url'] :
null), ENT_QUOTES, 'UTF-8').'').'"
-'.$sp.' class="mw-ui-anchor mw-ui-hovericon mw-ui-constructive
'.((!LCRun3::ifvar($cx, ((isset($in['isWatched']) && is_array($in)) ?
$in['isWatched'] : null))) ? 'mw-ui-quiet' : '').'
+'.$sp.' class="mw-ui-anchor mw-ui-hovericon mw-ui-progressive
'.((!LCRun3::ifvar($cx, ((isset($in['isWatched']) && is_array($in)) ?
$in['isWatched'] : null))) ? 'mw-ui-quiet' : '').'
'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isWatched']) && is_array($in)) ?
$in['isWatched'] : null))) ? 'flow-watch-link-unwatch' :
'flow-watch-link-watch').'"
'.$sp.' data-flow-api-handler="watchItem"
'.$sp.' data-flow-api-target="< .flow-topic-watchlist"
@@ -217,7 +217,7 @@
'.$sp.'
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
'.$sp.' <button data-role="submit"
-'.$sp.' class="mw-ui-button mw-ui-constructive"
+'.$sp.' class="mw-ui-button mw-ui-progressive"
'.$sp.' >'.LCRun3::ch($cx, 'l10n',
array(array('flow-reply-link'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-reply'),array()), 'encq').'</small>
'.$sp.' </div>
diff --git a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
index a1a4c0c..c5d5982 100644
--- a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
@@ -65,7 +65,7 @@
'.$sp.'
'.$sp.' <div class="flow-form-actions
flow-form-collapsible'.((LCRun3::ifvar($cx, ((isset($in['isOnFlowBoard']) &&
is_array($in)) ? $in['isOnFlowBoard'] : null))) ? '
flow-form-collapsible-collapsed' : '').'">
'.$sp.' <button data-role="submit"
-'.$sp.' class="mw-ui-button mw-ui-constructive
mw-ui-flush-right">'.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-save'),array()), 'encq').'</button>
+'.$sp.' class="mw-ui-button mw-ui-progressive
mw-ui-flush-right">'.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-save'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small
class="flow-terms-of-use plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-new-topic'),array()), 'encq').'</small>
'.$sp.' </div>
'.$sp.' </form>
diff --git a/handlebars/compiled/flow_block_topicsummary_edit.handlebars.php
b/handlebars/compiled/flow_block_topicsummary_edit.handlebars.php
index ead913d..5130cf7 100644
--- a/handlebars/compiled/flow_block_topicsummary_edit.handlebars.php
+++ b/handlebars/compiled/flow_block_topicsummary_edit.handlebars.php
@@ -58,7 +58,7 @@
<div class="flow-form-actions flow-form-collapsible">
<button
data-role="submit"
- class="mw-ui-button mw-ui-constructive"
+ class="mw-ui-button mw-ui-progressive"
data-flow-api-target="<
.flow-topic-summary-container">
'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-update-topic-summary'),array()), 'encq').'
</button>
diff --git
a/handlebars/compiled/flow_block_topicsummary_undo_edit.handlebars.php
b/handlebars/compiled/flow_block_topicsummary_undo_edit.handlebars.php
index 5cd4890..aa0c6eb 100644
--- a/handlebars/compiled/flow_block_topicsummary_undo_edit.handlebars.php
+++ b/handlebars/compiled/flow_block_topicsummary_undo_edit.handlebars.php
@@ -51,7 +51,7 @@
</div>
<div class="flow-form-actions flow-form-collapsible">
- <button class="mw-ui-button
mw-ui-constructive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-summarize-topic'),array()), 'encq').'</button>
+ <button class="mw-ui-button
mw-ui-progressive">'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-summarize-topic'),array()), 'encq').'</button>
<small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-summarize'),array()), 'encq').'
</small>
</div>
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index f6e52c6..a1323e7 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -60,7 +60,7 @@
'.$sp.' <
.flow-post:not([data-flow-post-max-depth=\'1\']) .flow-reply-form
[data-role=\'submit\']
'.$sp.' "
'.$sp.'
>'.htmlentities((string)((isset($in['actions']['reply']['text']) &&
is_array($in['actions']['reply'])) ? $in['actions']['reply']['text'] : null),
ENT_QUOTES, 'UTF-8').'</a>
-'.$sp.'' : '').''.((LCRun3::ifvar($cx, ((isset($in['actions']['thank']) &&
is_array($in['actions'])) ? $in['actions']['thank'] : null))) ? '
<a class="mw-ui-anchor mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link"
+'.$sp.'' : '').''.((LCRun3::ifvar($cx, ((isset($in['actions']['thank']) &&
is_array($in['actions'])) ? $in['actions']['thank'] : null))) ? '
<a class="mw-ui-anchor mw-ui-progressive mw-ui-quiet
mw-thanks-flow-thank-link"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['thank']['url']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
'.$sp.'
title="'.htmlentities((string)((isset($in['actions']['thank']['title']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['title'] : null),
ENT_QUOTES,
'UTF-8').'">'.htmlentities((string)((isset($in['actions']['thank']['text']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['text'] : null),
ENT_QUOTES, 'UTF-8').'</a>
'.$sp.'' : '').' </span>
@@ -168,7 +168,7 @@
'.$sp.' </div>
'.$sp.'
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
-'.$sp.' <button class="mw-ui-button mw-ui-constructive"
+'.$sp.' <button class="mw-ui-button mw-ui-progressive"
'.$sp.'
data-flow-api-handler="submitEditPost">'.LCRun3::ch($cx, 'l10n',
array(array('flow-post-action-edit-post-submit'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-edit'),array()), 'encq').'</small>
'.$sp.' </div>
@@ -199,7 +199,7 @@
'.$sp.'
'.$sp.' <div class="flow-form-actions flow-form-collapsible">
'.$sp.' <button data-role="submit"
-'.$sp.' class="mw-ui-button mw-ui-constructive"
+'.$sp.' class="mw-ui-button mw-ui-progressive"
'.$sp.' >'.LCRun3::ch($cx, 'l10n',
array(array('flow-reply-link'),array()), 'encq').'</button>
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small class="flow-terms-of-use
plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-reply'),array()), 'encq').'</small>
'.$sp.' </div>
diff --git a/handlebars/flow_block_header_edit.handlebars
b/handlebars/flow_block_header_edit.handlebars
index 3ada234..ac11e7b 100644
--- a/handlebars/flow_block_header_edit.handlebars
+++ b/handlebars/flow_block_header_edit.handlebars
@@ -24,7 +24,7 @@
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
- class="mw-ui-button mw-ui-constructive">
+ class="mw-ui-button mw-ui-progressive">
{{~l10n
"flow-edit-header-submit"~}}
</button>
{{> flow_form_cancel_button }}
diff --git a/handlebars/flow_block_header_undo_edit.handlebars
b/handlebars/flow_block_header_undo_edit.handlebars
index 6ecdbaa..84fb620 100644
--- a/handlebars/flow_block_header_undo_edit.handlebars
+++ b/handlebars/flow_block_header_undo_edit.handlebars
@@ -30,7 +30,7 @@
</div>
<div class="flow-form-actions flow-form-collapsible">
- <button class="mw-ui-button mw-ui-constructive">
+ <button class="mw-ui-button mw-ui-progressive">
{{~l10n "flow-edit-header-submit"~}}
</button>
<small class="flow-terms-of-use plainlinks">
diff --git a/handlebars/flow_block_topic_undo_edit.handlebars
b/handlebars/flow_block_topic_undo_edit.handlebars
index 804f349..91cc9bf 100644
--- a/handlebars/flow_block_topic_undo_edit.handlebars
+++ b/handlebars/flow_block_topic_undo_edit.handlebars
@@ -31,7 +31,7 @@
</div>
<div class="flow-form-actions flow-form-collapsible">
- <button class="mw-ui-button mw-ui-constructive">
+ <button class="mw-ui-button mw-ui-progressive">
{{~l10n "flow-edit-post-submit"~}}
</button>
<small class="flow-terms-of-use plainlinks">
diff --git a/handlebars/flow_block_topicsummary_edit.handlebars
b/handlebars/flow_block_topicsummary_edit.handlebars
index 6dcefb3..66d3aba 100644
--- a/handlebars/flow_block_topicsummary_edit.handlebars
+++ b/handlebars/flow_block_topicsummary_edit.handlebars
@@ -28,7 +28,7 @@
<div class="flow-form-actions flow-form-collapsible">
<button
data-role="submit"
- class="mw-ui-button mw-ui-constructive"
+ class="mw-ui-button mw-ui-progressive"
data-flow-api-target="<
.flow-topic-summary-container">
{{l10n
"flow-topic-action-update-topic-summary"}}
</button>
diff --git a/handlebars/flow_block_topicsummary_undo_edit.handlebars
b/handlebars/flow_block_topicsummary_undo_edit.handlebars
index 03794f8..79ffad9 100644
--- a/handlebars/flow_block_topicsummary_undo_edit.handlebars
+++ b/handlebars/flow_block_topicsummary_undo_edit.handlebars
@@ -33,7 +33,7 @@
</div>
<div class="flow-form-actions flow-form-collapsible">
- <button class="mw-ui-button mw-ui-constructive">
+ <button class="mw-ui-button mw-ui-progressive">
{{~l10n "flow-topic-action-summarize-topic"~}}
</button>
<small class="flow-terms-of-use plainlinks">
diff --git a/handlebars/flow_edit_post.partial.handlebars
b/handlebars/flow_edit_post.partial.handlebars
index 60b6683..bb6d42a 100644
--- a/handlebars/flow_edit_post.partial.handlebars
+++ b/handlebars/flow_edit_post.partial.handlebars
@@ -20,7 +20,7 @@
</div>
<div class="flow-form-actions flow-form-collapsible">
- <button class="mw-ui-button mw-ui-constructive"
+ <button class="mw-ui-button mw-ui-progressive"
data-flow-api-handler="submitEditPost">
{{~l10n "flow-post-action-edit-post-submit"~}}
</button>
diff --git a/handlebars/flow_edit_topic_title.partial.handlebars
b/handlebars/flow_edit_topic_title.partial.handlebars
index ba3ed92..6ba5961 100644
--- a/handlebars/flow_edit_topic_title.partial.handlebars
+++ b/handlebars/flow_edit_topic_title.partial.handlebars
@@ -12,6 +12,6 @@
" />
<div class="flow-form-actions">
<button data-role="submit"
- class="mw-ui-button mw-ui-constructive">{{l10n
"flow-edit-title-submit"}}</button>
+ class="mw-ui-button mw-ui-progressive">{{l10n
"flow-edit-title-submit"}}</button>
</div>
</form>
diff --git a/handlebars/flow_moderate_post.partial.handlebars
b/handlebars/flow_moderate_post.partial.handlebars
index 864c299..54d6939 100644
--- a/handlebars/flow_moderate_post.partial.handlebars
+++ b/handlebars/flow_moderate_post.partial.handlebars
@@ -17,7 +17,7 @@
<div class="flow-form-actions flow-form-collapsible">
<button data-flow-interactive-handler="apiRequest"
data-flow-api-handler="moderatePost"
- class="mw-ui-button mw-ui-constructive"
+ class="mw-ui-button mw-ui-progressive"
data-role="submit">
{{~l10n (concat "flow-moderation-confirm-"
@root.submitted.moderationState "-post")~}}
</button>
diff --git a/handlebars/flow_moderate_topic.partial.handlebars
b/handlebars/flow_moderate_topic.partial.handlebars
index f5d3cae..38a0c75 100644
--- a/handlebars/flow_moderate_topic.partial.handlebars
+++ b/handlebars/flow_moderate_topic.partial.handlebars
@@ -15,7 +15,7 @@
{{~/if~}}
>
<div class="flow-form-actions flow-form-collapsible">
- <button class="mw-ui-button mw-ui-constructive"
+ <button class="mw-ui-button mw-ui-progressive"
data-flow-interactive-handler="apiRequest"
data-flow-api-handler="moderateTopic"
data-role="submit">
diff --git a/handlebars/flow_newtopic_form.partial.handlebars
b/handlebars/flow_newtopic_form.partial.handlebars
index 2bd8332..8a73bf4 100644
--- a/handlebars/flow_newtopic_form.partial.handlebars
+++ b/handlebars/flow_newtopic_form.partial.handlebars
@@ -28,7 +28,7 @@
<div class="flow-form-actions flow-form-collapsible{{#if
isOnFlowBoard}} flow-form-collapsible-collapsed{{/if}}">
<button data-role="submit"
- class="mw-ui-button mw-ui-constructive
mw-ui-flush-right">{{l10n "flow-newtopic-save"}}</button>
+ class="mw-ui-button mw-ui-progressive
mw-ui-flush-right">{{l10n "flow-newtopic-save"}}</button>
{{> flow_form_cancel_button }}
<small class="flow-terms-of-use plainlinks">{{l10nParse
"flow-terms-of-use-new-topic"}}</small>
</div>
diff --git a/handlebars/flow_post_meta_actions.partial.handlebars
b/handlebars/flow_post_meta_actions.partial.handlebars
index a338f14..4a91016 100644
--- a/handlebars/flow_post_meta_actions.partial.handlebars
+++ b/handlebars/flow_post_meta_actions.partial.handlebars
@@ -34,7 +34,7 @@
progressive enhancement happens in the Thank
extension
based on the mw-thanks-flow-thank-link class
--}}
- <a class="mw-ui-anchor mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link"
+ <a class="mw-ui-anchor mw-ui-progressive mw-ui-quiet
mw-thanks-flow-thank-link"
href="{{actions.thank.url}}"
title="{{actions.thank.title}}">
{{~actions.thank.text~}}
diff --git a/handlebars/flow_reply_form.partial.handlebars
b/handlebars/flow_reply_form.partial.handlebars
index f35d666..a66ec3a 100644
--- a/handlebars/flow_reply_form.partial.handlebars
+++ b/handlebars/flow_reply_form.partial.handlebars
@@ -45,7 +45,7 @@
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
- class="mw-ui-button mw-ui-constructive"
+ class="mw-ui-button mw-ui-progressive"
>
{{~l10n "flow-reply-link"~}}
</button>
diff --git a/handlebars/flow_topic_titlebar_lock.partial.handlebars
b/handlebars/flow_topic_titlebar_lock.partial.handlebars
index bd6aba9..9eda3e7 100644
--- a/handlebars/flow_topic_titlebar_lock.partial.handlebars
+++ b/handlebars/flow_topic_titlebar_lock.partial.handlebars
@@ -19,7 +19,7 @@
" />
<div class="flow-form-actions
flow-form-collapsible">
<button data-role="submit"
- class="mw-ui-button
mw-ui-constructive"
+ class="mw-ui-button
mw-ui-progressive"
>
{{#if isLocked}}
{{l10n
"flow-topic-action-unlock-topic"}}
diff --git a/handlebars/flow_topic_titlebar_watch.partial.handlebars
b/handlebars/flow_topic_titlebar_watch.partial.handlebars
index 933d1ed..f16bade 100644
--- a/handlebars/flow_topic_titlebar_watch.partial.handlebars
+++ b/handlebars/flow_topic_titlebar_watch.partial.handlebars
@@ -2,7 +2,7 @@
{{> flow_errors}}
<a href="{{#if
isWatched}}{{links.unwatch-topic.url}}{{else}}{{links.watch-topic.url}}{{/if}}"
- class="mw-ui-anchor mw-ui-hovericon mw-ui-constructive {{#unless
isWatched}}mw-ui-quiet{{/unless}}
+ class="mw-ui-anchor mw-ui-hovericon mw-ui-progressive {{#unless
isWatched}}mw-ui-quiet{{/unless}}
{{#if isWatched~}}
flow-watch-link-unwatch
{{~else~}}
diff --git a/modules/engine/misc/mw-ui.enhance.js
b/modules/engine/misc/mw-ui.enhance.js
index d40f3a4..c4f5c85 100644
--- a/modules/engine/misc/mw-ui.enhance.js
+++ b/modules/engine/misc/mw-ui.enhance.js
@@ -162,7 +162,7 @@
* Renders a tooltip at target.
* Options (either given as param, or fetched from target as
data-tooltip-x params):
* tooltipSize=String (small,large,block)
- * tooltipContext=String
(constructive,destructive,progressive,regressive)
+ * tooltipContext=String (progressive,destructive)
* tooltipPointing=String (up,down,left,right)
* tooltipClosable=Boolean
* tooltipContentCallback=Function
@@ -252,8 +252,6 @@
if ( !optionsUnreferenced.tooltipContext ) {
if ( $target.hasClass( 'mw-ui-progressive' ) ) {
optionsUnreferenced.tooltipContext =
'progressive';
- } else if ( $target.hasClass(
'mw-ui-constructive' ) ) {
- optionsUnreferenced.tooltipContext =
'constructive';
} else if ( $target.hasClass(
'mw-ui-destructive' ) ) {
optionsUnreferenced.tooltipContext =
'destructive';
}
@@ -274,7 +272,7 @@
// Tooltip style context
if ( optionsUnreferenced.tooltipContext ) {
- $tooltip.removeClass( 'mw-ui-progressive
mw-ui-constructive mw-ui-destructive' );
+ $tooltip.removeClass( 'mw-ui-progressive
mw-ui-destructive' );
$tooltip.addClass( 'mw-ui-' +
optionsUnreferenced.tooltipContext );
}
diff --git a/modules/engine/misc/mw-ui.modal.js
b/modules/engine/misc/mw-ui.modal.js
index 6085e5c..7d14f5d 100644
--- a/modules/engine/misc/mw-ui.modal.js
+++ b/modules/engine/misc/mw-ui.modal.js
@@ -77,7 +77,7 @@
'<div class="flow-ui-modal-layout">' +
'<div class="flow-ui-modal-heading">' +
'<a href="#" class="mw-ui-anchor mw-ui-quiet mw-ui-destructive
flow-ui-modal-heading-prev"
data-flow-interactive-handler="modalPrevOrClose"><span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-close"></span></a>' +
- '<a href="#" class="mw-ui-anchor mw-ui-quiet mw-ui-constructive
flow-ui-modal-heading-next"
data-flow-interactive-handler="modalNextOrSubmit"><span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-check"></span></a>' +
+ '<a href="#" class="mw-ui-anchor mw-ui-quiet mw-ui-progressive
flow-ui-modal-heading-next"
data-flow-interactive-handler="modalNextOrSubmit"><span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-check"></span></a>' +
// title
'</div>' +
diff --git a/modules/flow/ui/widgets/editor/mw.flow.ui.EditorControlsWidget.js
b/modules/flow/ui/widgets/editor/mw.flow.ui.EditorControlsWidget.js
index 9ec253a..83ed457 100644
--- a/modules/flow/ui/widgets/editor/mw.flow.ui.EditorControlsWidget.js
+++ b/modules/flow/ui/widgets/editor/mw.flow.ui.EditorControlsWidget.js
@@ -27,7 +27,7 @@
} );
this.saveButton = new OO.ui.ButtonWidget( {
- flags: [ 'primary', 'constructive' ],
+ flags: [ 'primary', 'progressive' ],
label: mw.msg( config.saveMsgKey ||
'flow-newtopic-save' ),
classes: [ 'flow-ui-editorControlsWidget-saveButton' ]
} );
diff --git a/modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
index 281ab2f..143139e 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
@@ -43,7 +43,7 @@
this.$controls = $( '<div>' ).addClass(
'flow-ui-topicTitleWidget-controls' );
this.$buttons = $( '<div>' ).addClass(
'flow-ui-topicTitleWidget-buttons' );
this.saveButton = new OO.ui.ButtonWidget( {
- flags: [ 'primary', 'constructive' ],
+ flags: [ 'primary', 'progressive' ],
label: mw.msg( 'flow-edit-title-submit' ),
classes: [ 'flow-ui-topicTitleWidget-saveButton' ]
} );
diff --git a/modules/styles/mediawiki.ui/tooltips.less
b/modules/styles/mediawiki.ui/tooltips.less
index 3aac504..2450da2 100644
--- a/modules/styles/mediawiki.ui/tooltips.less
+++ b/modules/styles/mediawiki.ui/tooltips.less
@@ -194,12 +194,6 @@
fill: @colorProgressive;
}
}
- &.mw-ui-constructive {
- .flow-ui-tooltip-color( @colorConstructive );
- .mw-ui-icon {
- fill: @colorConstructive;
- }
- }
&.mw-ui-destructive {
.flow-ui-tooltip-color( @colorDestructive );
.mw-ui-button.mw-ui-destructive.mw-ui-quiet:hover,
--
To view, visit https://gerrit.wikimedia.org/r/313513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4e3b903b1dcc16380e3cdd97ede328ae5219d94
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
