Skip to content
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.

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

iMIP email improvements (take 2) #17456

Merged
merged 3 commits into from
Sep 4, 2020
Merged

iMIP email improvements (take 2) #17456

merged 3 commits into from
Sep 4, 2020

Commits on Aug 20, 2020

  1. iMIP email improvements (take 2)

    This PR is a replacement for PR #17195. It is intended to be simpler
    to review and approve, with fewer changes, some disabled by default.
    
    It addresses issues #12391 and #13555, with the following changes:
    
    - The plainText of iMIP emails has been upgraded as described in
    issue #12391. The HTML design style has not been changed.
    
    - Some of the HTML and plainText content has been rearranged
    (simplified header language, moving the event title to from text
    body to the first item in the bullet list, spelling corrections,
    moving the description to the end of the list), per issue #12391.
    
    - The interface for EMailTemplate has been extended: addBodyListItem
    now takes an optional `plainIndent` parameter. Existing callers
    see no change. Where new calls set the  new parameter >0, the list
    item label (metaInfo) is put in column 1, and the value is indented
    into column 2 (properly accounting for multiple lines, if any).
    
    - An optional dav config setting has been added,
    `invitation_list_attendees`. It defaults to 'no', leaving emails
    unchanged. If set by the site admin to 'yes', then iMIP emails
    include, for the organizer and each attendee, their name, email,
    and a ✔︎ if they have accepted the invitation.
    
    - Minor refactoring.
    
    Notes:
    
    - The labels for organizers and attendees list items are new, and
    require translation/localization.
    
    - Dav config settings are documented in the code, but not in the
    Administrator's Guide.
    
    Signed-off-by: brad2014 <brad2014@users.noreply.github.com>
    brad2014 committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    781359a View commit details
    Browse the repository at this point in the history
  2. Make icon set for CalDav event presentation, use in iMIP email.

    iMIP e-mails were, as a hack, using filetypes icons for caldav
    elements (titles, locations).  This commit creates a folder of
    caldav element icons. To start, they are used in iMIP emails,
    but eventually should be used by any app that wants to have icon
    labels for caldav elements.
    
    Signed-off-by: brad2014 <brad2014@users.noreply.github.com>
    brad2014 committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    b0687b1 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2020

  1. Minor cleanup: php-cs-fixer, tests, interface consistency

    IMipPlugin.php Removed blank lines to make php-cs-fixer happy.
    Minor cleanup:  bugs found by Psalm static checker
    IEMailTemplate: The public interface to addBodyListItem also needs to include the new plainIndent parameter.
    IMipPlugin: Fixes an undefined variable for events that do not have DTEND.  Also use explicit string conversion for parameters and properties in several places.
    
    The new email template adds an additional blank line before "button" links in plain text, so the tests were fixed to include that additional blank line.
    
    Signed-off-by: Brad Rubenstein <brad@wbr.tech>
    Brad Rubenstein committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    442af8c View commit details
    Browse the repository at this point in the history