Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351704 )
Change subject: Fix unwatch icon in monobook
......................................................................
Fix unwatch icon in monobook
We were using mw-ui-icon-unStar-constructive, but Monobook uses the Apex theme
which doesn't have icon variants, so that didn't work.
As a workaround for now, use both mw-ui-icon-unStar and
mw-ui-icon-unStar-constructive.
In Vector, both exist and the latter will win, and in Monobook the latter
doesn't
exist so the former will be used.
Bug: T164350
Change-Id: I8ee7a9f8b7f05fb5e15393fdab1c2aabce39014f
---
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_topic_titlebar_watch.partial.handlebars
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/04/351704/1
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index 20fd011..d275721 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -87,7 +87,7 @@
'.$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"
-'.$sp.'
data-flow-api-method="POST">'.htmlentities((string)((isset($in['noop']) &&
is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'<span
class="flow-unwatch mw-ui-icon mw-ui-icon-before
mw-ui-icon-unStar-constructive" title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-watchlist-remove'),array()),
'encq').'"></span>'.htmlentities((string)((isset($in['noop']) && is_array($in))
? $in['noop'] : null), ENT_QUOTES,
'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<span class="flow-watch mw-ui-icon
mw-ui-icon-before mw-ui-icon-star mw-ui-icon-star-constructive-hover"
title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-watchlist-add'),array()),
'encq').'"></span>'.htmlentities((string)((isset($in['noop']) && is_array($in))
? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'</a>
+'.$sp.'
data-flow-api-method="POST">'.htmlentities((string)((isset($in['noop']) &&
is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'<span
class="flow-unwatch mw-ui-icon mw-ui-icon-before mw-ui-icon-unStar
mw-ui-icon-unStar-constructive" title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-watchlist-remove'),array()),
'encq').'"></span>'.htmlentities((string)((isset($in['noop']) && is_array($in))
? $in['noop'] : null), ENT_QUOTES,
'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<span class="flow-watch mw-ui-icon
mw-ui-icon-before mw-ui-icon-star mw-ui-icon-star-constructive-hover"
title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-watchlist-add'),array()),
'encq').'"></span>'.htmlentities((string)((isset($in['noop']) && is_array($in))
? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'</a>
'.$sp.'</div>
';},'flow_moderation_actions_list' => function ($cx, $in, $sp) {return
''.$sp.'<section>'.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] : null),'===','topic'),array()), $in, false,
function($cx, $in)use($sp){return ''.((LCRun3::ifvar($cx,
((isset($in['actions']['edit']) && is_array($in['actions'])) ?
$in['actions']['edit'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-progressive mw-ui-quiet mw-ui-hovericon flow-ui-edit-title-link"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['edit']['url']) &&
is_array($in['actions']['edit'])) ? $in['actions']['edit']['url'] : null),
ENT_QUOTES, 'UTF-8').'">'.((LCRun3::ifvar($cx, ((isset($in['moderationIcons'])
&& is_array($in)) ? $in['moderationIcons'] : null))) ? '<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-edit mw-ui-icon-edit-progressive-hover"></span> '
: '').''.LCRun3::ch($cx, 'l10n', array(array(LCRun3::ch($cx, 'concat',
array(array('flow-topic-action-edit-title'),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['links']['topic-history']) && is_array($in['links'])) ?
$in['links']['topic-history'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-quiet"
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 915b23b..7ef5313 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -132,7 +132,7 @@
'.$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"
-'.$sp.'
data-flow-api-method="POST">'.htmlentities((string)((isset($in['noop']) &&
is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'<span
class="flow-unwatch mw-ui-icon mw-ui-icon-before
mw-ui-icon-unStar-constructive" title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-watchlist-remove'),array()),
'encq').'"></span>'.htmlentities((string)((isset($in['noop']) && is_array($in))
? $in['noop'] : null), ENT_QUOTES,
'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<span class="flow-watch mw-ui-icon
mw-ui-icon-before mw-ui-icon-star mw-ui-icon-star-constructive-hover"
title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-watchlist-add'),array()),
'encq').'"></span>'.htmlentities((string)((isset($in['noop']) && is_array($in))
? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'</a>
+'.$sp.'
data-flow-api-method="POST">'.htmlentities((string)((isset($in['noop']) &&
is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'<span
class="flow-unwatch mw-ui-icon mw-ui-icon-before mw-ui-icon-unStar
mw-ui-icon-unStar-constructive" title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-watchlist-remove'),array()),
'encq').'"></span>'.htmlentities((string)((isset($in['noop']) && is_array($in))
? $in['noop'] : null), ENT_QUOTES,
'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<span class="flow-watch mw-ui-icon
mw-ui-icon-before mw-ui-icon-star mw-ui-icon-star-constructive-hover"
title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-topic-action-watchlist-add'),array()),
'encq').'"></span>'.htmlentities((string)((isset($in['noop']) && is_array($in))
? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'</a>
'.$sp.'</div>
';},'flow_moderation_actions_list' => function ($cx, $in, $sp) {return
''.$sp.'<section>'.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] : null),'===','topic'),array()), $in, false,
function($cx, $in)use($sp){return ''.((LCRun3::ifvar($cx,
((isset($in['actions']['edit']) && is_array($in['actions'])) ?
$in['actions']['edit'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-progressive mw-ui-quiet mw-ui-hovericon flow-ui-edit-title-link"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['edit']['url']) &&
is_array($in['actions']['edit'])) ? $in['actions']['edit']['url'] : null),
ENT_QUOTES, 'UTF-8').'">'.((LCRun3::ifvar($cx, ((isset($in['moderationIcons'])
&& is_array($in)) ? $in['moderationIcons'] : null))) ? '<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-edit mw-ui-icon-edit-progressive-hover"></span> '
: '').''.LCRun3::ch($cx, 'l10n', array(array(LCRun3::ch($cx, 'concat',
array(array('flow-topic-action-edit-title'),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['links']['topic-history']) && is_array($in['links'])) ?
$in['links']['topic-history'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-quiet"
diff --git a/handlebars/flow_topic_titlebar_watch.partial.handlebars
b/handlebars/flow_topic_titlebar_watch.partial.handlebars
index e2978c9..8f8151e 100644
--- a/handlebars/flow_topic_titlebar_watch.partial.handlebars
+++ b/handlebars/flow_topic_titlebar_watch.partial.handlebars
@@ -10,8 +10,8 @@
{{~/if~}}"
data-flow-api-handler="watchItem"
data-flow-api-target="< .flow-topic-watchlist"
- data-flow-api-method="POST">
- {{~noop~}}<span class="flow-unwatch mw-ui-icon
mw-ui-icon-before mw-ui-icon-unStar-constructive" title="{{l10n
"flow-topic-action-watchlist-remove"}}"></span>{{~noop~}}
+ data-flow-api-method="POST">{{!-- HACK: using both unStar and
unStar-constructive to work around the latter not working in monobook T164350
--}}
+ {{~noop~}}<span class="flow-unwatch mw-ui-icon
mw-ui-icon-before mw-ui-icon-unStar mw-ui-icon-unStar-constructive"
title="{{l10n "flow-topic-action-watchlist-remove"}}"></span>{{~noop~}}
{{~noop~}}<span class="flow-watch mw-ui-icon mw-ui-icon-before
mw-ui-icon-star mw-ui-icon-star-constructive-hover" title="{{l10n
"flow-topic-action-watchlist-add"}}"></span>{{~noop~}}
</a>
</div>
--
To view, visit https://gerrit.wikimedia.org/r/351704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ee7a9f8b7f05fb5e15393fdab1c2aabce39014f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
