jenkins-bot has submitted this change and it was merged. Change subject: Added tooltip to watchlist star (T71811) ......................................................................
Added tooltip to watchlist star (T71811) Change-Id: I3657d53786870441683a0c2f016506387fd175e9 --- M Resources.php M handlebars/compiled/flow_block_topic.handlebars.php M handlebars/compiled/flow_block_topiclist.handlebars.php M handlebars/flow_topic_titlebar_watch.partial.handlebars M i18n/en.json M i18n/qqq.json 6 files changed, 10 insertions(+), 4 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index de03a2b..402ec5c 100644 --- a/Resources.php +++ b/Resources.php @@ -147,6 +147,8 @@ 'flow-topic-action-unsuppress-topic', 'flow-topic-action-restore-topic', 'flow-topic-action-undo-moderation', + 'flow-topic-action-watchlist-add', + 'flow-topic-action-watchlist-remove', 'flow-hide-post-content', 'flow-delete-post-content', 'flow-suppress-post-content', diff --git a/handlebars/compiled/flow_block_topic.handlebars.php b/handlebars/compiled/flow_block_topic.handlebars.php index fa8a44a..dfcdc32 100644 --- a/handlebars/compiled/flow_block_topic.handlebars.php +++ b/handlebars/compiled/flow_block_topic.handlebars.php @@ -69,7 +69,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="wikiglyph wikiglyph-star"></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="wikiglyph wikiglyph-unstar"></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="wikiglyph wikiglyph-star" 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="wikiglyph wikiglyph-unstar" 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 class="flow-js">'.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" '.$sp.' href="'.htmlentities((string)((isset($in['actions']['edit']['url']) && is_array($in['actions']['edit'])) ? $in['actions']['edit']['url'] : null), ENT_QUOTES, 'UTF-8').'" diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php b/handlebars/compiled/flow_block_topiclist.handlebars.php index 480fdd8..46bc874 100644 --- a/handlebars/compiled/flow_block_topiclist.handlebars.php +++ b/handlebars/compiled/flow_block_topiclist.handlebars.php @@ -170,7 +170,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="wikiglyph wikiglyph-star"></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="wikiglyph wikiglyph-unstar"></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="wikiglyph wikiglyph-star" 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="wikiglyph wikiglyph-unstar" 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 class="flow-js">'.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" '.$sp.' href="'.htmlentities((string)((isset($in['actions']['edit']['url']) && is_array($in['actions']['edit'])) ? $in['actions']['edit']['url'] : null), ENT_QUOTES, 'UTF-8').'" diff --git a/handlebars/flow_topic_titlebar_watch.partial.handlebars b/handlebars/flow_topic_titlebar_watch.partial.handlebars index 17ac2cc..371e968 100644 --- a/handlebars/flow_topic_titlebar_watch.partial.handlebars +++ b/handlebars/flow_topic_titlebar_watch.partial.handlebars @@ -11,7 +11,7 @@ data-flow-api-handler="watchItem" data-flow-api-target="< .flow-topic-watchlist" data-flow-api-method="POST"> - {{~noop~}}<span class="wikiglyph wikiglyph-star"></span>{{~noop~}} - {{~noop~}}<span class="wikiglyph wikiglyph-unstar"></span>{{~noop~}} + {{~noop~}}<span class="wikiglyph wikiglyph-star" title="{{l10n "flow-topic-action-watchlist-remove"}}"></span>{{~noop~}} + {{~noop~}}<span class="wikiglyph wikiglyph-unstar" title="{{l10n "flow-topic-action-watchlist-add"}}"></span>{{~noop~}} </a> </div> diff --git a/i18n/en.json b/i18n/en.json index 3225446..6522e75 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -117,6 +117,8 @@ "flow-topic-notification-subscribe-description": "{{GENDER:$1|You}} will receive notifications on all activities on this topic.", "flow-board-notification-subscribe-title": "{{GENDER:$1|You're}} subscribed to this discussion board!", "flow-board-notification-subscribe-description": "{{GENDER:$1|You}} will get a notification when a new topic is created on this board.", + "flow-topic-action-watchlist-add": "Add this topic to your watchlist", + "flow-topic-action-watchlist-remove": "Remove this topic from your watchlist", "flow-error-allowcreation-no-usedb": "allowCreation requires <var>$wgContentHandlerUseDB</var> to be <code>true</code>.", "flow-error-allowcreation-already-exists": "Page already exists, but was required not to", "flow-error-allowcreation-flow-create-board": "User does not have the \"{{int:right-flow-create-board}}\" permission", diff --git a/i18n/qqq.json b/i18n/qqq.json index 9778dfe..45ec5a4 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -118,6 +118,8 @@ "flow-topic-action-unsuppress-topic": "Used as a link in a dropdown menu to unsuppress a topic.\n{{Related|Flow-action}}", "flow-topic-action-restore-topic": "Used as a link in a dropdown menu to clear the moderation state of a topic.\n{{Related|Flow-action}}\n{{Identical|Restore}}", "flow-topic-action-undo-moderation": "Used as link text to undo a recently performed moderation action.\n{{Identical|Undo}}", + "flow-topic-action-watchlist-add": "Title text for the hover state when a individual topic can be added to a watchlist.", + "flow-topic-action-watchlist-remove": "Title text for the hover state when a individual topic can be removed from a watchlist", "flow-topic-notification-subscribe-title": "Title text for the overlay when a topic is added to watchlist.", "flow-topic-notification-subscribe-description": "Description text for the overlay when a topic is added to watchlist.", "flow-board-notification-subscribe-title": "Title text for the overlay when a board is added to watchlist.", -- To view, visit https://gerrit.wikimedia.org/r/213549 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3657d53786870441683a0c2f016506387fd175e9 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Ckoerner <nob...@gmail.com> Gerrit-Reviewer: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org> Gerrit-Reviewer: Mooeypoo <mor...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits