Merge pull request #24050 from nextcloud/backport/23915/stable20

[stable20] Use png icons in caldav reminder emails
This commit is contained in:
Roeland Jago Douma 2020-11-11 21:27:53 +01:00 committed by GitHub
commit 8270aed206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions

View 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'));
}
}

View 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

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 B

BIN
core/img/actions/info.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

BIN
core/img/actions/more.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B