diff options
author | diosmosis <diosmosis@users.noreply.github.com> | 2019-01-04 09:34:37 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-04 09:34:37 +0300 |
commit | e92247972a99092eb300bcbc163492542017d1b5 (patch) | |
tree | 96396004aab1e2e7010c31388707a99b66d78a90 /plugins/CoreHome/templates | |
parent | 8e499448926af8870aa6f011128ba4031e4cfcb8 (diff) |
Make sure all Matomo emails use correct branding. (#13908)
* Make sure all Matomo emails use correct branding.
* update email logo
* reuse variables
* Change default from to Matomo Analytics.
* Fix list style in report emails, update customalerts submodule and make dashboard link got to default erport in emails.
* Updated submodule.
* Bump version + update submodules.
* Remove submodule update so plugins can be merged after rc2 merged.
Diffstat (limited to 'plugins/CoreHome/templates')
-rw-r--r-- | plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig | 2 | ||||
-rw-r--r-- | plugins/CoreHome/templates/_htmlEmailHeader.twig | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig index c6b2fdf98f..a9b44fa6f6 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig @@ -27,7 +27,7 @@ </h2> <ul> {% for metadata in reportMetadata %} - <li> + <li style="{{ styleParagraphText }}"> <a href="#{{ metadata.uniqueId }}" style="text-decoration:none; color: {{ emailStyles.reportTextColor }};"> {{ metadata.name }} </a> diff --git a/plugins/CoreHome/templates/_htmlEmailHeader.twig b/plugins/CoreHome/templates/_htmlEmailHeader.twig index 30d0eedbab..b992ee0dea 100644 --- a/plugins/CoreHome/templates/_htmlEmailHeader.twig +++ b/plugins/CoreHome/templates/_htmlEmailHeader.twig @@ -1,5 +1,3 @@ -{% set fontStyle %}color:{{ themeStyles.colorText|e('html_attr') }};font-family:{{ themeStyles.fontFamilyBase|e('html_attr') }};{% endset %} - <html style="background-color:#edecec"> <head> @@ -15,7 +13,7 @@ <table style="width:100%; background-color: {{ themeStyles.colorHeaderBackground|e('html_attr') }}; color: {{ themeStyles.colorHeaderText|e('html_attr') }}; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="{{ fontStyle|raw }}; font-size:16px;padding:0 15px;color: {{ themeStyles.colorHeaderText|e('html_attr') }};height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="{{ piwikUrl }}" style="lineheight:17px"> + <a style="{{ fontStyle|raw }}; font-size:16px;padding:0 15px;color: {{ themeStyles.colorHeaderText|e('html_attr') }};height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="{{ piwikUrl }}"> {% if isCustomLogo and logoHeader %} <img src="{{ logoHeader }}" height="20px" width="auto" /> {% else %} @@ -25,7 +23,7 @@ </td> <td align="right"> {% if idSite|default is not empty %} - <a style="{{ fontStyle|raw }}; font-size:16px; padding:0 15px; color: {{ themeStyles.colorHeaderText|e('html_attr') }}" {% if websiteName|default is not empty %}title="{{'Dashboard_TopLinkTooltip'|translate(websiteName)}}"{% endif %} target="_blank" href="{{ piwikUrl }}{{ linkTo({'module': 'CoreHome', 'action': 'index', 'idSite': idSite, 'period': period, 'date': date, 'token_auth': null, 'method': null, 'idReport': null, 'outputType': null, 'format': null})|raw }}"> + <a style="{{ fontStyle|raw }}; font-size:16px; padding:0 15px; color: {{ themeStyles.colorHeaderText|e('html_attr') }}" {% if websiteName|default is not empty %}title="{{'Dashboard_TopLinkTooltip'|translate(websiteName)}}"{% endif %} target="_blank" href="{{ piwikUrl }}{{ linkTo({'module': 'CoreHome', 'action': 'redirectToCoreHomeIndex', 'idSite': idSite, 'period': period|default, 'date': date|default, 'token_auth': null, 'method': null, 'idReport': null, 'outputType': null, 'format': null})|raw }}"> {{ 'Dashboard_Dashboard'|translate }} </a> {% endif %} |