]> source.dussan.org Git - nextcloud-server.git/commitdiff
Use png icons in caldav reminder emails 24050/head
authorRichard Steinmetz <richard@steinmetz.cloud>
Thu, 5 Nov 2020 17:18:40 +0000 (18:18 +0100)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Wed, 11 Nov 2020 12:38:21 +0000 (12:38 +0000)
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
core/img/actions/address.png [new file with mode: 0644]
core/img/actions/info.png [new file with mode: 0644]
core/img/actions/more.png [new file with mode: 0644]
core/img/places/calendar.png [new file with mode: 0644]

index ef824821e316b28bd90de009c5dccb8fd1504139..6b026753d62b453ca7ae8be2f06bef3081507930 100644 (file)
@@ -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'));
                }
        }
 
index 226a7a28baf495b9f79514f2b04aab0a7878b46c..76b2a0c4f657c0bb1c29e0deedd4a0f8fe943000 100644 (file)
@@ -478,7 +478,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
@@ -490,7 +490,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
@@ -502,7 +502,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
@@ -514,7 +514,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 (file)
index 0000000..8c5c4cc
Binary files /dev/null and b/core/img/actions/address.png differ
diff --git a/core/img/actions/info.png b/core/img/actions/info.png
new file mode 100644 (file)
index 0000000..69503b5
Binary files /dev/null and b/core/img/actions/info.png differ
diff --git a/core/img/actions/more.png b/core/img/actions/more.png
new file mode 100644 (file)
index 0000000..70cac71
Binary files /dev/null and b/core/img/actions/more.png differ
diff --git a/core/img/places/calendar.png b/core/img/places/calendar.png
new file mode 100644 (file)
index 0000000..06efc29
Binary files /dev/null and b/core/img/places/calendar.png differ