diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-08-06 17:16:51 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-08-06 17:16:51 +0300 |
| commit | 325b38d1179cd213c6217470d4cefd09836d5dd5 (patch) | |
| tree | 97858e6585b60c11e3291b17b56276a1e752671c /plugins/CoreHome/templates | |
| parent | ccff21200988e3ff72c8dcb1d09acdf47560a537 (diff) | |
email theming improvements (#13250)
* Move email/theme style variables to classes and generate LESS based on those.
* Fix uses of email/theme styles.
* Remove debugging code.
Diffstat (limited to 'plugins/CoreHome/templates')
| -rw-r--r-- | plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig | 2 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig index 90333c7ba5..859676df09 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig @@ -2,7 +2,7 @@ {% set styleTableHeader = "border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;" ~ fontStyle %} {% set styleTableCell = "border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;" ~ fontStyle %} -<h2 id="{{ reportId }}" style=" {{fontStyle}} font-size: {{ reportTitleTextSize }}pt; font-weight:normal; margin:45px 0 30px 0;"> +<h2 id="{{ reportId }}" style=" {{fontStyle}} font-size: {{ emailStyles.reportTitleTextSize }}pt; font-weight:normal; margin:45px 0 30px 0;"> {{ reportName }} </h2> diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig index 2de9c44bce..45247efa2d 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig @@ -1,4 +1,4 @@ -{% set fontStyle %}color:{{ themeColorText }};font-family:{{ themeFontFamilyBase }};{% endset %} +{% set fontStyle %}color:{{ themeStyles.colorText }};font-family:{{ themeStyles.fontFamilyBase }};{% endset %} {% set styleParagraph = 'font-size:15px;line-height:24px;margin:0 0 16px;' %} <html style="background-color:#edecec"> @@ -13,19 +13,19 @@ <a name="reportTop"></a> - <table style="width:100%; background-color: {{ themeColorHeaderBackground }}; color: {{ themeColorHeaderText }}; padding:10px 0; margin: 0 0 25px 0; height:64px;"> + <table style="width:100%; background-color: {{ themeStyles.colorHeaderBackground }}; color: {{ themeStyles.colorHeaderText }}; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="{{ fontStyle }}; font-size:16px;padding:0 15px;color: {{ themeColorHeaderText }};height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="{{ piwikUrl }}" style="lineheight:17px"> + <a style="{{ fontStyle }}; font-size:16px;padding:0 15px;color: {{ themeStyles.colorHeaderText }};height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="{{ piwikUrl }}" style="lineheight:17px"> {% if isCustomLogo and logoHeader %} <img src="{{ logoHeader }}" height="20px" width="auto" /> {% else %} - <img src="{{ piwikUrl }}/plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="{{ brandNameLong }}" /> + <img src="{{ piwikUrl }}/plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="{{ emailStyles.brandNameLong }}" /> {% endif %} </a> </td> <td align="right"> - <a style="{{ fontStyle }}; font-size:16px; padding:0 15px; color: {{ themeColorHeaderText }}" title="{{'Dashboard_TopLinkTooltip'|translate(websiteName)}}" 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 }}; font-size:16px; padding:0 15px; color: {{ themeStyles.colorHeaderText }}" title="{{'Dashboard_TopLinkTooltip'|translate(websiteName)}}" 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 }}"> {{ 'Dashboard_Dashboard'|translate }} </a> </td> @@ -55,13 +55,13 @@ {% endif %} {% if reportMetadata|length > 1 %} - <h2 style="{{fontStyle}}font-weight:normal; font-size: {{ reportTitleTextSize }}pt;"> + <h2 style="{{fontStyle}}font-weight:normal; font-size: {{ emailStyles.reportTitleTextSize }}pt;"> {{ 'ScheduledReports_TableOfContent'|translate }} </h2> <ul> {% for metadata in reportMetadata %} <li> - <a href="#{{ metadata.uniqueId }}" style="text-decoration:none; color: {{ reportTextColor }};"> + <a href="#{{ metadata.uniqueId }}" style="text-decoration:none; color: {{ emailStyles.reportTextColor }};"> {{ metadata.name }} </a> </li> |