From a6e3bf6a5967d84a1c8f590f83e11f72edb31eec Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Thu, 5 Nov 2020 18:18:40 +0100 Subject: [PATCH] Use png icons in caldav reminder emails Signed-off-by: Richard Steinmetz --- .../NotificationProvider/EmailProvider.php | 8 ++++---- .../NotificationProvider/EmailProviderTest.php | 8 ++++---- core/img/actions/address.png | Bin 0 -> 438 bytes core/img/actions/info.png | Bin 0 -> 230 bytes core/img/actions/more.png | Bin 0 -> 182 bytes core/img/places/calendar.png | Bin 0 -> 294 bytes 6 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 core/img/actions/address.png create mode 100644 core/img/actions/info.png create mode 100644 core/img/actions/more.png create mode 100644 core/img/places/calendar.png diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php index 4152e02dc8..d0dc8f7f55 100644 --- a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php +++ b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php @@ -155,18 +155,18 @@ class EmailProvider extends AbstractProvider { string $calendarDisplayName, VEvent $vevent):void { $template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'), - $this->getAbsoluteImagePath('actions/info.svg')); + $this->getAbsoluteImagePath('actions/info.png')); $template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'), - $this->getAbsoluteImagePath('places/calendar.svg')); + $this->getAbsoluteImagePath('places/calendar.png')); if (isset($vevent->LOCATION)) { $template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'), - $this->getAbsoluteImagePath('actions/address.svg')); + $this->getAbsoluteImagePath('actions/address.png')); } if (isset($vevent->DESCRIPTION)) { $template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'), - $this->getAbsoluteImagePath('actions/more.svg')); + $this->getAbsoluteImagePath('actions/more.png')); } } diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php index 9a22f63c1b..93673758ad 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php @@ -500,7 +500,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest { $this->urlGenerator ->expects($this->at(8 * $i)) ->method('imagePath') - ->with('core', 'actions/info.svg') + ->with('core', 'actions/info.png') ->willReturn('imagePath1'); $this->urlGenerator @@ -512,7 +512,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest { $this->urlGenerator ->expects($this->at(8 * $i + 2)) ->method('imagePath') - ->with('core', 'places/calendar.svg') + ->with('core', 'places/calendar.png') ->willReturn('imagePath2'); $this->urlGenerator @@ -524,7 +524,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest { $this->urlGenerator ->expects($this->at(8 * $i + 4)) ->method('imagePath') - ->with('core', 'actions/address.svg') + ->with('core', 'actions/address.png') ->willReturn('imagePath3'); $this->urlGenerator @@ -536,7 +536,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest { $this->urlGenerator ->expects($this->at(8 * $i + 6)) ->method('imagePath') - ->with('core', 'actions/more.svg') + ->with('core', 'actions/more.png') ->willReturn('imagePath4'); $this->urlGenerator diff --git a/core/img/actions/address.png b/core/img/actions/address.png new file mode 100644 index 0000000000000000000000000000000000000000..8c5c4ccbc35f6133285bd75525d568d3261258e0 GIT binary patch literal 438 zcmV;n0ZIOeP)M#Vcoo*Pzm>rRD@4r3SX8%6ZuiX8 zU)yk!n{=h?+;i&Qs_KS+m>~cvKn;k2_atKAD0vqYB_08{K&waG0INQQ2Y?+7VHw*% zzYhbu7UF4axr#?QNk4%qFb@nTQ3m#aX3qQ-Tk(Kw&+mY#E}Rgk3(hr`8*`oP%BMAW zA=yeqHU?@UN!5V6FSv&`1};UCIRkE4a4&2Oyon?w1MZ06zIK{ua!&gk=C*7MJc#jx zfq_XeezY-gCdL~E2ISmR1MUwhWRGE}!JEO;F$_>2mi9#T9wugid%?K^hHMOgx<=*I z+C-i61=MaY0gJ!^*_D3*OSa-E;v5sYaqcP(Foyc+Fctp*#(fw7Shg^*=1V-qiGldB zZ*hQ8prIlDjA~mU&}oJD(o1w}MIoh^=+ufrOD~bvio#1T(cX$*DZND63a8Q!Iv98X gHk0Qkhdh5A-%}>(x*P&|@c;k-07*qoM6N<$f^S~9YXATM literal 0 HcmV?d00001 diff --git a/core/img/actions/info.png b/core/img/actions/info.png new file mode 100644 index 0000000000000000000000000000000000000000..69503b54dcdd199d9bf10a9a4e74820fc13b0e0c GIT binary patch literal 230 zcmVY_h+FFks{6WWH)SHjx1A!)gAgcW<~0fVkZ7EM3-BK265V_- z#yLvhS`lcY1p10VuN2!0YwnfrH$_09VDCT^B``^}z-ydCnNc~hy@Qb!<@0x6IJDc}*PrQw{_Qqq$Ha!PJ~1RlI; gX#M?h1K&U61N#7FMrVhy)c^nh07*qoM6N<$f_^|=U;qFB literal 0 HcmV?d00001 diff --git a/core/img/actions/more.png b/core/img/actions/more.png new file mode 100644 index 0000000000000000000000000000000000000000..70cac71e7efd0126cf547a9b1546d5c87b21e03b GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJT2B|pkcif|lO4Gl6a-x3FU2kj zox4yk^uongLb2{E%-oc&c@W8L@>C+%-w_Q>!#BW=i)Z9>09N_x;6F fPq`FZen^T}E(y4}K*TK{=nw`^S3j3^P60oneEP)_$G?Ox5WtvQYQc0joDgiK! z6()$I;vCa0qPYN|FMh8BC>4hd-8R|@0Q%w!9e|qP+9ZjA1+WDw0f0+9@ZK7>;_;yf zey|M#z}Gdk%t_DwK52`5^c@HQ0U!Vb0QDq%05j#^=k;8@KGYq!cwDfpvu