diff --git a/Echo.php b/Echo.php index 0f2bc56c4..ae7843da8 100644 --- a/Echo.php +++ b/Echo.php @@ -275,9 +275,15 @@ $wgEchoNotificationIcons = array( 'chat' => array( 'path' => "$echoIconPath/Talk.png", ), + 'edit-user-talk' => array( + 'path' => "$echoIconPath/edit-user-talk.svg", + ), 'linked' => array( 'path' => "$echoIconPath/link-blue.svg", ), + 'mention' => array( + 'path' => "$echoIconPath/mention.svg", + ), 'featured' => array( 'path' => "$echoIconPath/Featured.png", ), @@ -296,6 +302,12 @@ $wgEchoNotificationIcons = array( 'gratitude' => array( 'path' => "$echoIconPath/Gratitude.png", ), + 'user-rights' => array( + 'path' => "$echoIconPath/user-rights.svg", + ), + 'emailuser' => array( + 'path' => "$echoIconPath/emailuser.svg", + ), 'site' => array( 'url' => false ), @@ -338,7 +350,7 @@ $wgEchoNotifications = array( 'email-body-batch-params' => array( 'agent' ), 'email-body-batch-bundle-message' => 'notification-edit-user-talk-email-batch-bundle-body', 'email-body-batch-bundle-params' => array( 'agent', 'agent-other-display', 'agent-other-count' ), - 'icon' => 'chat', + 'icon' => 'edit-user-talk', 'immediate' => true, ), 'reverted' => array( @@ -399,7 +411,7 @@ $wgEchoNotifications = array( 'email-subject-params' => array( 'agent', 'user' ), 'email-body-batch-message' => 'notification-mention-email-batch-body', 'email-body-batch-params' => array( 'agent', 'title', 'section-title', 'main-title-text', 'user' ), - 'icon' => 'chat', + 'icon' => 'mention', ), 'user-rights' => array( 'user-locators' => array( @@ -420,7 +432,7 @@ $wgEchoNotifications = array( 'email-subject-params' => array(), 'email-body-batch-message' => 'notification-user-rights-email-batch-body', 'email-body-batch-params' => array( 'agent', 'user-rights-list' ), - 'icon' => 'site', + 'icon' => 'user-rights', ), 'emailuser' => array( 'presentation-model' => 'EchoEmailUserPresentationModel', @@ -432,7 +444,7 @@ $wgEchoNotifications = array( 'section' => 'alert', 'title-message' => 'notification-emailuser', 'title-params' => array( 'agent' ), - 'icon' => 'site', + 'icon' => 'emailuser', ), ); diff --git a/includes/formatters/EditUserTalkPresentationModel.php b/includes/formatters/EditUserTalkPresentationModel.php index 3a6d4ba6a..a853dec0b 100644 --- a/includes/formatters/EditUserTalkPresentationModel.php +++ b/includes/formatters/EditUserTalkPresentationModel.php @@ -7,7 +7,7 @@ class EchoEditUserTalkPresentationModel extends EchoEventPresentationModel { } public function getIconType() { - return 'chat'; + return 'edit-user-talk'; } public function getPrimaryLink() { diff --git a/includes/formatters/EmailUserPresentationModel.php b/includes/formatters/EmailUserPresentationModel.php index c8b531cf3..7c4599a0e 100644 --- a/includes/formatters/EmailUserPresentationModel.php +++ b/includes/formatters/EmailUserPresentationModel.php @@ -3,7 +3,7 @@ class EchoEmailUserPresentationModel extends EchoEventPresentationModel { public function getIconType() { - return 'site'; + return 'emailuser'; } public function getPrimaryLink() { diff --git a/includes/formatters/MentionPresentationModel.php b/includes/formatters/MentionPresentationModel.php index 1200385b1..b715a085a 100644 --- a/includes/formatters/MentionPresentationModel.php +++ b/includes/formatters/MentionPresentationModel.php @@ -5,7 +5,7 @@ class EchoMentionPresentationModel extends EchoEventPresentationModel { public function getIconType() { - return 'chat'; + return 'mention'; } private function getSection() { diff --git a/includes/formatters/UserRightsPresentationModel.php b/includes/formatters/UserRightsPresentationModel.php index a64d676e3..fdf563fcc 100644 --- a/includes/formatters/UserRightsPresentationModel.php +++ b/includes/formatters/UserRightsPresentationModel.php @@ -6,7 +6,7 @@ class EchoUserRightsPresentationModel extends EchoEventPresentationModel { public function getIconType() { - return 'site'; + return 'user-rights'; } public function getHeaderMessage() { diff --git a/modules/icons/edit-user-talk.svg b/modules/icons/edit-user-talk.svg new file mode 100644 index 000000000..a25a2a1c5 --- /dev/null +++ b/modules/icons/edit-user-talk.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/modules/icons/emailuser.svg b/modules/icons/emailuser.svg new file mode 100644 index 000000000..3284c6b19 --- /dev/null +++ b/modules/icons/emailuser.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/modules/icons/mention.svg b/modules/icons/mention.svg new file mode 100644 index 000000000..1fff77814 --- /dev/null +++ b/modules/icons/mention.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/modules/icons/user-rights.svg b/modules/icons/user-rights.svg new file mode 100644 index 000000000..363b8f48c --- /dev/null +++ b/modules/icons/user-rights.svg @@ -0,0 +1,6 @@ + + + + + +