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

Make sure all Matomo emails use correct branding. #13908

Merged
merged 9 commits into from Jan 4, 2019

Conversation

diosmosis
Copy link
Member

Fixes #13251

@diosmosis diosmosis added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Dec 26, 2018
@diosmosis diosmosis added this to the 3.8.0 milestone Dec 26, 2018
@mattab mattab requested review from tsteur and sgiehl December 31, 2018 03:53
@Findus23
Copy link
Member

Findus23 commented Jan 2, 2019

Semi-related:
plugins/Morpheus/images/logo-email.png still shows the old Matomo logo

@tsteur
Copy link
Member

tsteur commented Jan 2, 2019

FYI Updated email logo.

&& \Piwik\Plugin\Manager::getInstance()->isPluginActivated('WhiteLabel')
&& \Piwik\Plugin\Manager::getInstance()->isPluginInFilesystem('WhiteLabel');

$view->idSite = Common::getRequestVar('idSite', false);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about those 3 lines. Are they needed @diosmosis ? For what? Cause the current set idSite in the request might not be related to any sent email. Same for period or date. Sometimes there eg hooks that listen to something like a plugin update, and then send an email about something totally else.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These three params are used in the dashboard link in the email header. Some emails had it, some didn't. Thought I'd add it to all if the params were available.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we want to link the the default report?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is how the code worked before, but I can change it to link to what's configured in settings.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nvm, it already does this (by linking to CoreHome.index).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it need to link to CoreHome.redirectToCoreHomeIndex (requires no site, period, date, ... AFAIK)? I guess the only time we wouldn't want this is when a report is sent for a specific site. In all cases might make sense to load the default report and default time to load.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, would need to link to redirectToCoreHomeIndex or I guess to omit the action. I can make this change, except when a specific site is set.

@tsteur
Copy link
Member

tsteur commented Jan 2, 2019

Not sure if it is due to this PR but the sender is "Matomo Reports"... even when eg getting update notification
image

@tsteur
Copy link
Member

tsteur commented Jan 2, 2019

Likely unrelated to this... noticed the bullet points are smaller in the scheduled reports than the rest of the font... didn't look in the code if it was before already like this

image

@tsteur
Copy link
Member

tsteur commented Jan 2, 2019

I suppose Custom alerts will need to be updated as well? Possibly also the mail send in QueuedTracking https://github.com/matomo-org/plugin-QueuedTracking/blob/3.3.1/Tasks.php#L73-L84 but not too important

@diosmosis
Copy link
Member Author

Not sure if it is due to this PR but the sender is "Matomo Reports"... even when eg getting update notification

Looks like that's the default report name if [General] noreply_email_name isn't set. Wonder if it should just be from Matomo or something?

@diosmosis
Copy link
Member Author

@tsteur re the bullet points, does this look better?

image

@diosmosis
Copy link
Member Author

Forgot to create the PR for CustomAlerts, can find it here: matomo-org/plugin-CustomAlerts#54

@diosmosis
Copy link
Member Author

Created a queued tracking PR as well: matomo-org/plugin-QueuedTracking#93

@tsteur
Copy link
Member

tsteur commented Jan 3, 2019

@diosmosis it should be fine as long as it is using the same font size 👍

@diosmosis
Copy link
Member Author

It is now, think it was using the default chrome font size before.

@tsteur
Copy link
Member

tsteur commented Jan 3, 2019

@diosmosis had a look at the other PRs and looks all good. I reckon can be merged as soon as tests succeed 👍

@diosmosis diosmosis merged commit e922479 into 3.x-dev Jan 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants