diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php index 36d9c4f3f329e75d5a574a8df1c11ddd7da83780..3240a8ad94f8056f7391dc8a702352a33b144735 100644 --- a/core/ReportRenderer/Html.php +++ b/core/ReportRenderer/Html.php @@ -9,7 +9,9 @@ namespace Piwik\ReportRenderer; use Piwik\Piwik; +use Piwik\Plugin; use Piwik\Plugins\API\API; +use Piwik\Plugins\CoreAdminHome\CustomLogo; use Piwik\ReportRenderer; use Piwik\SettingsPiwik; use Piwik\Site; @@ -85,6 +87,7 @@ class Html extends ReportRenderer private function epilogue() { $view = new View('@CoreHome/ReportRenderer/_htmlReportFooter'); + $view->hasWhiteLabel = Plugin\Manager::getInstance()->isPluginLoaded('WhiteLabel'); $this->rendering .= $view->render(); } @@ -105,6 +108,10 @@ class Html extends ReportRenderer $frontPageView->assign("idSite", $this->idSite); $frontPageView->assign("period", $period); + $customLogo = new CustomLogo(); + $frontPageView->assign("isCustomLogo", $customLogo->isEnabled() && CustomLogo::hasUserLogo()); + $frontPageView->assign("logoHeader", $customLogo->getHeaderLogoUrl($pathOnly = false)); + $date = Date::now()->setTimezone(Site::getTimezoneFor($this->idSite))->toString(); $frontPageView->assign("date", $date); diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig index 825f2753ac87744a8da3d0ce6128b265585f5fe0..47b06c7cc39aeeda0032b8c4dae18550537b484e 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig @@ -1,14 +1,16 @@ {% set fontStyle = 'color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; '%} {% set styleParagraph = 'font-size:15px;line-height:24px;margin:0 0 16px;' %} -<hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));"> +{% if not hasWhiteLabel %} + <hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));"> -<p style='{{styleParagraph}}{{fontStyle}}text-align:center;font-size:13px; color:#666; padding:30px'> - {{'General_PoweredBy'|translate}} - <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a> - <br /> - {{ 'CoreHome_LeadingAnalyticsPlatformRespectsYourPrivacy'|translate }} -</p> + <p style='{{styleParagraph}}{{fontStyle}}text-align:center;font-size:13px; color:#666; padding:30px'> + {{'General_PoweredBy'|translate}} + <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a> + <br /> + {{ 'CoreHome_LeadingAnalyticsPlatformRespectsYourPrivacy'|translate }} + </p> +{% endif %} </div> </body> diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig index 01e21348ff9eb91e84f8b0b45b15f2a58d9ecc49..a30114747783b9d3fa1ed49366b9acb1c85483a4 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig @@ -17,7 +17,11 @@ <tr> <td> <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="{{ piwikUrl }}" style="lineheight:17px"> - <img src="{{ piwikUrl }}/plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, {{ 'General_OpenSourceWebAnalytics'|translate }}" /> + {% if isCustomLogo and logoHeader %} + <img src="{{ logoHeader }}" height="20px" width="auto" alt="Piwik, {{ 'General_OpenSourceWebAnalytics'|translate }}" /> + {% else %} + <img src="{{ piwikUrl }}/plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, {{ 'General_OpenSourceWebAnalytics'|translate }}" /> + {% endif %} </a> </td> <td align="right">