jenkins-bot has submitted this change and it was merged.

Change subject: Style changes for unwatch actions
......................................................................


Style changes for unwatch actions

- Reverse 'watch' / 'unwatch' star icons
- Truncate title texts
- Minor indentation fix

Bug: T132975
Change-Id: I1dbd6d1480f6ef5a45184271c932cd27258f7424
---
M includes/formatters/EventPresentationModel.php
1 file changed, 11 insertions(+), 6 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/formatters/EventPresentationModel.php 
b/includes/formatters/EventPresentationModel.php
index 3843ca6..e02f437 100644
--- a/includes/formatters/EventPresentationModel.php
+++ b/includes/formatters/EventPresentationModel.php
@@ -631,7 +631,7 @@
                                        'description' => $this
                                                ->msg( 
'notification-dynamic-actions-' . $availableAction . 
'-confirmation-description' )
                                                ->params(
-                                                       
$title->getPrefixedText(),
+                                                       
$this->getTruncatedTitleText( $title ),
                                                        $title->getFullURL()
                                                ),
                                ),
@@ -645,14 +645,19 @@
 
                return $this->getDynamicActionLink(
                        $title,
-                       $isTitleWatched ? 'unStar' : 'star',
+                       // Design requirements are to flip the star icons
+                       // in their meaning; that is, for the 'unwatch' action
+                       // we should display an empty star, and for the 'watch'
+                       // action a full star. In OOUI icons, their names
+                       // are reversed.
+                       $isTitleWatched ? 'star' : 'unStar',
                        // notification-dynamic-actions-watch
                        // notification-dynamic-actions-unwatch
                        $this->msg( 'notification-dynamic-actions-' . 
$availableAction )
-                       ->params(
-                               $title->getPrefixedText(),
-                               $title->getFullURL( array( 'action' => 
$availableAction ) )
-                       ),
+                               ->params(
+                                       $this->getTruncatedTitleText( $title ),
+                                       $title->getFullURL( array( 'action' => 
$availableAction ) )
+                               ),
                        null,
                        $data,
                        array( 'action' => $availableAction )

-- 
To view, visit https://gerrit.wikimedia.org/r/307023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1dbd6d1480f6ef5a45184271c932cd27258f7424
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to