Skip to content

WIP: Redesign iMIP email to better format both HTML and plain text. #17195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brad2014 wants to merge 2 commits into from
Closed

WIP: Redesign iMIP email to better format both HTML and plain text. #17195

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
975ef55
Redesign iMIP email to better format both HTML and plain text.
brad2014 Sep 18, 2019
7b8e069
In iMIP event tables, put CSS inline.
brad2014 Sep 18, 2019
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
Prev Previous commit
In iMIP event tables, put CSS inline. 
Fixes presentation on mail programs (like gmail) that don't accept style blocks in HTML body.

Signed-off-by: [email protected]
  • Loading branch information
@brad2014
brad2014 committed Sep 18, 2019
commit 7b8e069f8c92bd820680605771c71944b1ce404a
34 changes: 17 additions & 17 deletions apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,39 +497,39 @@ private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
* @param VEvent $vevent
*/
private function addEventTable(IEMailTemplate $template, IL10N $l10n, VEvent $vevent) {
/* TODO [brad2014]: should event-title background be a theme color? */
$htmlText = '
<style>
table.event-table { border: 2px solid black; border-collapse: collapse; }
table.event-table tr { vertical-align: top; }
table.event-table td { padding: 2px .5em; }
td.event-title { background: #8cf; font-weight: bold; text-align: right; }
</style>
<table class="event-table">
';
$plainText = '';
$htmlText = vsprintf('<table style="%s">',[
"border: 2px solid black; border-collapse: collapse;"
]);
/* TODO [brad2014]: should tdHeadStyle background be a theme color? */
$trHtml = vsprintf('<tr style="%s"><td style="%s">%%s</td><td style="%s">%%s</td></tr>',
[
"vertical-align:top;",
"padding:3px .5em;background:#8cf;font-weight:bold;text-align:right;",
"padding:3px .5em;"
]);
if ($vevent->SUMMARY) {
$htmlText .= vsprintf('<tr><td class="event-title">%s</td><td>%s</td></tr>', [
$htmlText .= vsprintf($trHtml, [
htmlspecialchars($l10n->t('Title:')), htmlspecialchars($vevent->SUMMARY)
]);
$plainText .= vsprintf("%15s %s\n", [$l10n->t('Title:'), $vevent->SUMMARY]);
}
if ($vevent->LOCATION) {
$htmlText .= vsprintf('<tr><td class="event-title">%s</td><td>%s</td></tr>', [
$htmlText .= vsprintf($trHtml, [
htmlspecialchars($l10n->t('Location:')), htmlspecialchars($vevent->LOCATION)
]);
$plainText .= vsprintf("%15s %s\n", [$l10n->t('Location:'), $vevent->LOCATION]);
}
if ($vevent->URL) {
$htmlText .= vsprintf('<tr><td class="event-title">%s</td><td>%s</td></tr>', [
$htmlText .= vsprintf($trHtml, [
htmlspecialchars($l10n->t('Link:')), htmlspecialchars($vevent->URL)
]);
$plainText .= vsprintf("%15s %s\n", [$l10n->t('Link:'), $vevent->URL]);
}
if (true) {
$meetingWhen = $this->generateWhenString($l10n, $vevent);

$htmlText .= vsprintf('<tr><td class="event-title">%s</td><td>%s</td></tr>', [
$htmlText .= vsprintf($trHtml, [
htmlspecialchars($l10n->t('Time:')), htmlspecialchars($meetingWhen)
]);
$plainText .= vsprintf("%15s %s\n", [$l10n->t('Time:'), $meetingWhen]);
Expand All @@ -542,13 +542,13 @@ private function addEventTable(IEMailTemplate $template, IL10N $l10n, VEvent $ve
$organizerName .= ' ✔︎';
}

$htmlText .= vsprintf('<tr><td class="event-title">%s</td><td>%s</td></tr>', [
$htmlText .= vsprintf($trHtml, [
htmlspecialchars($l10n->t('Organizer:')), htmlspecialchars($organizerName)
]);
$plainText .= vsprintf("%15s %s\n", [$l10n->t('Organizer:'), $organizerName]);
}
if ($vevent->DESCRIPTION) {
$htmlText .= vsprintf('<tr><td class="event-title">%s</td><td>%s</td></tr>', [
$htmlText .= vsprintf($trHtml, [
htmlspecialchars($l10n->t('Description:')), str_replace(PHP_EOL,'<br/>', htmlspecialchars($vevent->DESCRIPTION))
]);
$plainText .= vsprintf("%15s %s\n", [
Expand All @@ -566,7 +566,7 @@ private function addEventTable(IEMailTemplate $template, IL10N $l10n, VEvent $ve
}
array_push($attendeeNames, $attendeeName);
}
$htmlText .= vsprintf('<tr><td class="event-title">%s</td><td>%s</td></tr>', [
$htmlText .= vsprintf($trHtml, [
htmlspecialchars($l10n->t('Attendees:')), implode('<br/>',$attendeeNames)
]);
$plainText .= vsprintf("%15s %s\n", [$l10n->t('Attendees:'), implode(PHP_EOL.str_repeat(' ',16),$attendeeNames)]);
Expand Down