diff options
author | Fabian Becker <halfdan@xnorfz.de> | 2013-04-29 16:47:52 +0400 |
---|---|---|
committer | Fabian Becker <halfdan@xnorfz.de> | 2013-04-29 16:47:52 +0400 |
commit | b62473e57e1d236bed0a9d4d13f54cf51f55cdc9 (patch) | |
tree | 09f62f2469305882f742803418605f4c8cb6fa77 /core/ReportRenderer/Html.php | |
parent | 7bcfa61a8f5044500c8f20620a4159f6bc7398f5 (diff) | |
parent | 8af5f6443c82e404b9b7855d5978a299bb13d905 (diff) |
Merge branch 'master' into 2.x-twig
Conflicts:
core/ReportRenderer/Html.php
plugins/Annotations/templates/annotations.js
plugins/CoreHome/templates/header.tpl
plugins/CoreHome/templates/index_content.tpl
plugins/CoreHome/templates/period_select.tpl
plugins/Goals/templates/list_goal_edit.tpl
plugins/MultiSites/templates/index.tpl
plugins/PDFReports/templates/report_parameters.tpl
Diffstat (limited to 'core/ReportRenderer/Html.php')
-rw-r--r-- | core/ReportRenderer/Html.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php index 980d623997..a5baeb26ce 100644 --- a/core/ReportRenderer/Html.php +++ b/core/ReportRenderer/Html.php @@ -82,17 +82,18 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer $this->rendering .= $view->render(); } - public function renderFrontPage($websiteName, $prettyDate, $description, $reportMetadata) + public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata) { - $fronPageView = new Piwik_View('@CoreHome/html_report_header'); - $this->assignCommonParameters($fronPageView); + $frontPageView = new Piwik_View('@CoreHome/html_report_header'); + $this->assignCommonParameters($frontPageView); - $fronPageView->assign("websiteName", $websiteName); - $fronPageView->assign("prettyDate", $prettyDate); - $fronPageView->assign("description", $description); - $fronPageView->assign("reportMetadata", $reportMetadata); + // todo rename 'websiteName' to 'reportTitle' once branch twig is merged + $frontPageView->assign("websiteName", $reportTitle); + $frontPageView->assign("prettyDate", $prettyDate); + $frontPageView->assign("description", $description); + $frontPageView->assign("reportMetadata", $reportMetadata); - $this->rendering .= $fronPageView->render(); + $this->rendering .= $frontPageView->render(); } private function assignCommonParameters(Piwik_View $view) |