diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/ReportRenderer/Html.php | 6 | ||||
-rw-r--r-- | core/View.php | 2 | ||||
-rw-r--r-- | core/View/ReportsByDimension.php | 4 | ||||
-rw-r--r-- | core/ViewDataTable/Cloud.php | 2 | ||||
-rw-r--r-- | core/ViewDataTable/GenerateGraphHTML.php | 2 | ||||
-rw-r--r-- | core/ViewDataTable/HtmlTable.php | 2 | ||||
-rw-r--r-- | core/testMinimumPhpVersion.php | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php index a5baeb26ce..07412c3913 100644 --- a/core/ReportRenderer/Html.php +++ b/core/ReportRenderer/Html.php @@ -78,13 +78,13 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer private function epilogue() { - $view = new Piwik_View('@CoreHome/html_report_footer'); + $view = new Piwik_View('@CoreHome/ReportRenderer/_html_report_footer'); $this->rendering .= $view->render(); } public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata) { - $frontPageView = new Piwik_View('@CoreHome/html_report_header'); + $frontPageView = new Piwik_View('@CoreHome/ReportRenderer/_html_report_header'); $this->assignCommonParameters($frontPageView); // todo rename 'websiteName' to 'reportTitle' once branch twig is merged @@ -114,7 +114,7 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer public function renderReport($processedReport) { - $reportView = new Piwik_View('@CoreHome/html_report_body'); + $reportView = new Piwik_View('@CoreHome/ReportRenderer/_html_report_body'); $this->assignCommonParameters($reportView); $reportMetadata = $processedReport['metadata']; diff --git a/core/View.php b/core/View.php index 3e45fb6400..6c88b66370 100644 --- a/core/View.php +++ b/core/View.php @@ -210,7 +210,7 @@ class Piwik_View implements Piwik_View_Interface */ static public function singleReport($title, $reportHtml, $fetch = false) { - $view = new Piwik_View('@CoreHome/single_report'); + $view = new Piwik_View('@CoreHome/_singleReport'); $view->title = $title; $view->report = $reportHtml; diff --git a/core/View/ReportsByDimension.php b/core/View/ReportsByDimension.php index a13ee95bb7..3cd06b53dc 100644 --- a/core/View/ReportsByDimension.php +++ b/core/View/ReportsByDimension.php @@ -10,7 +10,7 @@ */ /** - * A facade that makes it easier to use the 'reports_by_dimension.tpl' template. + * A facade that makes it easier to use the 'reports_by_dimension.twig' template. * * This view will output HTML that displays a list of report names by category and * loads them by AJAX when clicked. The loaded report is displayed to the right @@ -23,7 +23,7 @@ class Piwik_View_ReportsByDimension extends Piwik_View */ public function __construct() { - parent::__construct('@CoreHome/reports_by_dimension'); + parent::__construct('@CoreHome/ReportsByDimension/reports_by_dimension'); $this->dimensionCategories = array(); } diff --git a/core/ViewDataTable/Cloud.php b/core/ViewDataTable/Cloud.php index be44984756..517a326a09 100644 --- a/core/ViewDataTable/Cloud.php +++ b/core/ViewDataTable/Cloud.php @@ -46,7 +46,7 @@ class Piwik_ViewDataTable_Cloud extends Piwik_ViewDataTable $currentControllerAction, $apiMethodToRequestDataTable, $controllerActionCalledWhenRequestSubTable); - $this->dataTableTemplate = '@CoreHome/cloud'; + $this->dataTableTemplate = '@CoreHome/_dataTableCloud'; $this->disableOffsetInformation(); $this->disableExcludeLowPopulation(); } diff --git a/core/ViewDataTable/GenerateGraphHTML.php b/core/ViewDataTable/GenerateGraphHTML.php index 7db2a78fdc..39dd0bf167 100644 --- a/core/ViewDataTable/GenerateGraphHTML.php +++ b/core/ViewDataTable/GenerateGraphHTML.php @@ -48,7 +48,7 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable $apiMethodToRequestDataTable, $controllerActionCalledWhenRequestSubTable); - $this->dataTableTemplate = '@CoreHome/graph'; + $this->dataTableTemplate = '@CoreHome/_dataTableGraph'; $this->disableOffsetInformationAndPaginationControls(); $this->disableExcludeLowPopulation(); diff --git a/core/ViewDataTable/HtmlTable.php b/core/ViewDataTable/HtmlTable.php index 44cbbfcdca..f1b2cca44c 100644 --- a/core/ViewDataTable/HtmlTable.php +++ b/core/ViewDataTable/HtmlTable.php @@ -50,7 +50,7 @@ class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable $currentControllerAction, $apiMethodToRequestDataTable, $controllerActionCalledWhenRequestSubTable); - $this->dataTableTemplate = '@CoreHome/datatable'; + $this->dataTableTemplate = '@CoreHome/_dataTable'; $this->variablesDefault['enable_sort'] = '1'; $this->setSortedColumn('nb_visits', 'desc'); $this->setLimit(Piwik_Config::getInstance()->General['datatable_default_limit']); diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php index 97cdeea7af..210fea76a8 100644 --- a/core/testMinimumPhpVersion.php +++ b/core/testMinimumPhpVersion.php @@ -77,8 +77,8 @@ if (!function_exists('Piwik_ExitWithMessage')) { <li><a target="_blank" href="http://demo.piwik.org">Piwik Online Demo</a></li> </ul>'; } - $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_header.tpl'); - $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_footer.tpl'); + $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl'); + $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl'); $headerPage = str_replace('{$HTML_TITLE}', 'Piwik › Error', $headerPage); $content = '<p>' . $message . '</p> |