wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-28 01:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Clarify some notification icons"

Browse source
This commit is contained in:
jenkins-bot 2016-01-13 22:53:27 +00:00 committed by Gerrit Code Review
parent 278404ac64 7d2a15d3bc
commit 2eed540186
9 changed files with 44 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Echo.php
View file

@ -275,9 +275,15 @@ $wgEchoNotificationIcons = array(
'chat' => array( 'chat' => array(
'path' => "$echoIconPath/Talk.png", 'path' => "$echoIconPath/Talk.png",
), ),
'edit-user-talk' => array(
'path' => "$echoIconPath/edit-user-talk.svg",
),
'linked' => array( 'linked' => array(
'path' => "$echoIconPath/link-blue.svg", 'path' => "$echoIconPath/link-blue.svg",
), ),
'mention' => array(
'path' => "$echoIconPath/mention.svg",
),
'featured' => array( 'featured' => array(
'path' => "$echoIconPath/Featured.png", 'path' => "$echoIconPath/Featured.png",
), ),
@ -296,6 +302,12 @@ $wgEchoNotificationIcons = array(
'gratitude' => array( 'gratitude' => array(
'path' => "$echoIconPath/Gratitude.png", 'path' => "$echoIconPath/Gratitude.png",
), ),
'user-rights' => array(
'path' => "$echoIconPath/user-rights.svg",
),
'emailuser' => array(
'path' => "$echoIconPath/emailuser.svg",
),
'site' => array( 'site' => array(
'url' => false 'url' => false
), ),
@ -338,7 +350,7 @@ $wgEchoNotifications = array(
'email-body-batch-params' => array( 'agent' ), 'email-body-batch-params' => array( 'agent' ),
'email-body-batch-bundle-message' => 'notification-edit-user-talk-email-batch-bundle-body', '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' ), 'email-body-batch-bundle-params' => array( 'agent', 'agent-other-display', 'agent-other-count' ),
'icon' => 'chat', 'icon' => 'edit-user-talk',
'immediate' => true, 'immediate' => true,
), ),
'reverted' => array( 'reverted' => array(
@ -399,7 +411,7 @@ $wgEchoNotifications = array(
'email-subject-params' => array( 'agent', 'user' ), 'email-subject-params' => array( 'agent', 'user' ),
'email-body-batch-message' => 'notification-mention-email-batch-body', 'email-body-batch-message' => 'notification-mention-email-batch-body',
'email-body-batch-params' => array( 'agent', 'title', 'section-title', 'main-title-text', 'user' ), 'email-body-batch-params' => array( 'agent', 'title', 'section-title', 'main-title-text', 'user' ),
'icon' => 'chat', 'icon' => 'mention',
), ),
'user-rights' => array( 'user-rights' => array(
'user-locators' => array( 'user-locators' => array(
@ -420,7 +432,7 @@ $wgEchoNotifications = array(
'email-subject-params' => array(), 'email-subject-params' => array(),
'email-body-batch-message' => 'notification-user-rights-email-batch-body', 'email-body-batch-message' => 'notification-user-rights-email-batch-body',
'email-body-batch-params' => array( 'agent', 'user-rights-list' ), 'email-body-batch-params' => array( 'agent', 'user-rights-list' ),
'icon' => 'site', 'icon' => 'user-rights',
), ),
'emailuser' => array( 'emailuser' => array(
'presentation-model' => 'EchoEmailUserPresentationModel', 'presentation-model' => 'EchoEmailUserPresentationModel',
@ -432,7 +444,7 @@ $wgEchoNotifications = array(
'section' => 'alert', 'section' => 'alert',
'title-message' => 'notification-emailuser', 'title-message' => 'notification-emailuser',
'title-params' => array( 'agent' ), 'title-params' => array( 'agent' ),
'icon' => 'site', 'icon' => 'emailuser',
), ),
); );

2
includes/formatters/EditUserTalkPresentationModel.php
View file

@ -7,7 +7,7 @@ class EchoEditUserTalkPresentationModel extends EchoEventPresentationModel {
} }
public function getIconType() { public function getIconType() {
return 'chat'; return 'edit-user-talk';
} }
public function getPrimaryLink() { public function getPrimaryLink() {

2
includes/formatters/EmailUserPresentationModel.php
View file

@ -3,7 +3,7 @@
class EchoEmailUserPresentationModel extends EchoEventPresentationModel { class EchoEmailUserPresentationModel extends EchoEventPresentationModel {
public function getIconType() { public function getIconType() {
return 'site'; return 'emailuser';
} }
public function getPrimaryLink() { public function getPrimaryLink() {

2
includes/formatters/MentionPresentationModel.php
View file

@ -5,7 +5,7 @@ class EchoMentionPresentationModel extends EchoEventPresentationModel {
public function getIconType() { public function getIconType() {
return 'chat'; return 'mention';
} }
private function getSection() { private function getSection() {

2
includes/formatters/UserRightsPresentationModel.php
View file

@ -6,7 +6,7 @@
class EchoUserRightsPresentationModel extends EchoEventPresentationModel { class EchoUserRightsPresentationModel extends EchoEventPresentationModel {
public function getIconType() { public function getIconType() {
return 'site'; return 'user-rights';
} }
public function getHeaderMessage() { public function getHeaderMessage() {

6
modules/icons/edit-user-talk.svg Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
<g id="Page-1" fill="none" fill-rule="evenodd">
<path fill="#165CA0" d="M27.143 10.143V23L30 25.857H10V10.143h17.143zM2.857 3H20v5.714H8.57v10H0l2.857-2.857V3zm18.007 17.636c-.49-.163-.49-.6-.546-1.09v-.055c.764-.654 1.364-1.745 1.364-2.945 0-2.563-1.09-3.545-2.727-3.545-1.146 0-2.728.655-2.728 3.545 0 1.146.6 2.237 1.364 2.946v.055c0 .49-.054.928-.545 1.09 0 0-1.58.6-2.18.82-.71.218-1.365.545-1.365 1.363v.546h10.91v-.546c0-.654-.437-1.09-1.365-1.363-.654-.22-2.18-.82-2.18-.82z" id="path-1"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 665 B

6
modules/icons/emailuser.svg Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="evenodd">
<path fill="#00AF89" d="M15.05 14.6L27 8.95V6H3v2.925L15.05 14.6zm.025 3.3L3 12.25V24h24V12.25L15.075 17.9z" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 315 B

6
modules/icons/mention.svg Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="evenodd">
<path fill="#165CA0" d="M27.143 23L30 25.857H10V10.143h17.143V23zM20 3v5.714H8.57v10H0l2.857-2.857V3H20zm5.016 14.242c0 .613-.083 1.16-.25 1.645-.167.484-.4.893-.7 1.226-.303.333-.655.586-1.058.758-.403.173-.836.26-1.298.26-.43 0-.783-.095-1.057-.283-.274-.188-.433-.438-.476-.75h-.064c-.15.247-.387.48-.71.7-.322.222-.726.332-1.21.332-.365 0-.69-.068-.975-.203-.285-.134-.527-.322-.726-.564-.2-.242-.352-.53-.46-.863-.107-.333-.16-.7-.16-1.097 0-.45.072-.895.217-1.33.144-.436.354-.823.628-1.162.274-.337.6-.612.976-.82.376-.21.8-.316 1.274-.316.408 0 .747.086 1.016.258.27.172.44.377.516.613h.016l.113-.548h1.74l-.5 2.532c-.053.257-.1.504-.144.74-.043.238-.065.436-.065.598 0 .15.034.285.098.403.065.12.188.178.37.178.324 0 .61-.185.864-.556.253-.37.38-.933.38-1.686 0-.623-.103-1.174-.307-1.653-.205-.478-.492-.88-.863-1.2-.37-.324-.812-.57-1.323-.735-.512-.167-1.074-.25-1.686-.25-.656 0-1.256.115-1.8.347-.542.23-1.007.548-1.394.95-.387.404-.688.886-.903 1.445-.215.56-.323 1.16-.323 1.806 0 .688.113 1.307.34 1.855.225.55.545 1.017.96 1.404.413.387.902.686 1.466.895.565.21 1.186.314 1.863.314.774 0 1.465-.12 2.073-.363.607-.24 1.153-.582 1.637-1.023l1.016 1.13c-.625.612-1.353 1.06-2.186 1.346-.834.285-1.74.427-2.718.427-.914 0-1.753-.148-2.516-.444-.764-.295-1.42-.707-1.968-1.233-.548-.527-.976-1.16-1.282-1.896-.307-.736-.46-1.54-.46-2.41 0-.86.164-1.657.492-2.388.328-.732.77-1.367 1.33-1.904.56-.538 1.216-.96 1.968-1.266.753-.307 1.56-.46 2.42-.46.752 0 1.48.11 2.185.33.704.22 1.323.552 1.855.993.532.44.96.986 1.282 1.637.323.65.484 1.41.484 2.282zm-4.984.355c0-.162-.013-.317-.04-.468-.027-.152-.073-.286-.137-.404-.065-.118-.156-.213-.274-.282-.118-.07-.268-.105-.45-.105-.205 0-.388.06-.55.184-.16.124-.3.285-.42.484-.117.2-.208.422-.273.67-.064.247-.097.49-.097.725 0 .27.062.524.186.766.123.24.357.362.7.362.238 0 .442-.062.614-.185.172-.124.312-.282.42-.476.107-.193.188-.402.242-.628.053-.226.08-.44.08-.645z" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

6
modules/icons/user-rights.svg Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="evenodd">
<path fill="#165CA0" d="M14.086 16.562v-.105c1.465-1.256 2.617-3.35 2.617-5.653C16.703 5.884 14.61 4 11.468 4 9.27 4 6.234 5.256 6.234 10.804c0 2.2 1.152 4.293 2.617 5.653v.105c0 .942-.103 1.78-1.046 2.094 0 0-3.035 1.15-4.187 1.57C2.257 20.646 1 21.273 1 22.843v1.047h14.956l-.053-.053.455-.682L17 22l-1.164-.024-.836-.14v-3.23c-.81-.347-.815-1.148-.914-2.044zM29.6 21.075V18.61l-1.53-.255c-.085-.34-.255-.68-.51-1.19l.935-1.275-1.785-1.785-1.275.935c-.425-.255-.85-.425-1.19-.51l-.17-1.53H21.61l-.255 1.53c-.425.085-.765.255-1.19.51l-1.275-.935-1.785 1.785.85 1.275c-.255.425-.34.765-.51 1.19l-1.445.17v2.465l1.53.255c.085.425.255.765.51 1.19l-.85 1.275 1.785 1.785 1.275-.85c.34.17.765.34 1.19.51l.255 1.53h2.55l.255-1.53c.425-.085.765-.255 1.19-.51l1.275.935 1.785-1.785-.935-1.275c.255-.425.425-.85.51-1.19l1.275-.255zm-6.8 1.275c-1.445 0-2.55-1.105-2.55-2.55 0-1.445 1.105-2.55 2.55-2.55 1.445 0 2.55 1.105 2.55 2.55 0 1.445-1.105 2.55-2.55 2.55z" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB