Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
change calendar invite emails to use pngs instead of svgs
Signed-off-by: Nick Sweeting <[email protected]>
  • Loading branch information
pirate authored and backportbot[bot] committed Mar 29, 2021
commit 03df8abca3d6438a70c909fd6634d242d2e0e4bc
14 changes: 7 additions & 7 deletions apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -531,24 +531,24 @@ private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
if ($vevent->SUMMARY) {
$template->addBodyListItem($vevent->SUMMARY, $l10n->t('Title:'),
$this->getAbsoluteImagePath('caldav/title.svg'),'','',self::IMIP_INDENT);
$this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT);
}
$meetingWhen = $this->generateWhenString($l10n, $vevent);
if ($meetingWhen) {
$template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
$this->getAbsoluteImagePath('caldav/time.svg'),'','',self::IMIP_INDENT);
$this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT);
}
if ($vevent->LOCATION) {
$template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
$this->getAbsoluteImagePath('caldav/location.svg'),'','',self::IMIP_INDENT);
$this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT);
}
if ($vevent->URL) {
$url = $vevent->URL->getValue();
$template->addBodyListItem(sprintf('<a href="%s">%s</a>',
htmlspecialchars($url),
htmlspecialchars($url)),
$l10n->t('Link:'),
$this->getAbsoluteImagePath('caldav/link.svg'),
$this->getAbsoluteImagePath('caldav/link.png'),
$url,'',self::IMIP_INDENT);
}

Expand All @@ -557,7 +557,7 @@ private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
/* Put description last, like an email body, since it can be arbitrarily long */
if ($vevent->DESCRIPTION) {
$template->addBodyListItem($vevent->DESCRIPTION->getValue(), $l10n->t('Description:'),
$this->getAbsoluteImagePath('caldav/description.svg'),'','',self::IMIP_INDENT);
$this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT);
}
}

Expand Down Expand Up @@ -603,7 +603,7 @@ private function addAttendees(IEMailTemplate $template, IL10N $l10n, VEvent $vev
}
}
$template->addBodyListItem($organizerHTML, $l10n->t('Organizer:'),
$this->getAbsoluteImagePath('caldav/organizer.svg'),
$this->getAbsoluteImagePath('caldav/organizer.png'),
$organizerText,'',self::IMIP_INDENT);
}

Expand Down Expand Up @@ -632,7 +632,7 @@ private function addAttendees(IEMailTemplate $template, IL10N $l10n, VEvent $vev
}

$template->addBodyListItem(implode('<br/>',$attendeesHTML), $l10n->t('Attendees:'),
$this->getAbsoluteImagePath('caldav/attendees.svg'),
$this->getAbsoluteImagePath('caldav/attendees.png'),
implode("\n",$attendeesText),'',self::IMIP_INDENT);
}

Expand Down
Binary file added core/img/caldav/attendees.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/img/caldav/description.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/img/caldav/link.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/img/caldav/location.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/img/caldav/organizer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/img/caldav/time.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/img/caldav/title.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.