diff options
| author | Thomas ZILLIOX <thomas@zilliox.me> | 2013-05-30 23:42:25 +0400 |
|---|---|---|
| committer | Thomas ZILLIOX <thomas@zilliox.me> | 2013-05-30 23:42:25 +0400 |
| commit | 5e39f1cebcf7453047cb7b7712342f0dd4ae7be2 (patch) | |
| tree | d6af25da76d681a14a2f51d367bd89df203dc7e5 /plugins/Widgetize | |
| parent | 4d3b77ed8e2498c5fd4eb6eb35a6dd1a08d6f7d1 (diff) | |
Rename template file names
Diffstat (limited to 'plugins/Widgetize')
| -rw-r--r-- | plugins/Widgetize/Controller.php | 6 | ||||
| -rw-r--r-- | plugins/Widgetize/templates/iframe.twig | 4 | ||||
| -rw-r--r-- | plugins/Widgetize/templates/iframe_empty.twig (renamed from plugins/Widgetize/templates/empty.twig) | 0 | ||||
| -rw-r--r-- | plugins/Widgetize/templates/index.twig | 2 | ||||
| -rw-r--r-- | plugins/Widgetize/templates/testJsInclude1.twig (renamed from plugins/Widgetize/templates/test_jsinclude.twig) | 0 | ||||
| -rw-r--r-- | plugins/Widgetize/templates/testJsInclude2.twig (renamed from plugins/Widgetize/templates/test_jsinclude2.twig) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php index e478d992c8..1f326563b8 100644 --- a/plugins/Widgetize/Controller.php +++ b/plugins/Widgetize/Controller.php @@ -25,7 +25,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller public function testJsInclude1() { - $view = new Piwik_View('@Widgetize/test_jsinclude'); + $view = new Piwik_View('@Widgetize/testJsInclude1'); $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday'; $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=API&actionToWidgetize=index&method=ExamplePlugin.getGoldenRatio&format=original'; echo $view->render(); @@ -33,7 +33,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller public function testJsInclude2() { - $view = new Piwik_View('@Widgetize/test_jsinclude2'); + $view = new Piwik_View('@Widgetize/testJsInclude2'); $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday'; $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0'; $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0'; @@ -49,7 +49,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller $parameters = array($fetch = true); $outputDataTable = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters); if ($controllerName == 'Dashboard' && $actionName == 'index') { - $view = new Piwik_View('@Widgetize/empty'); + $view = new Piwik_View('@Widgetize/iframe_empty'); } else { $view = new Piwik_View('@Widgetize/iframe'); } diff --git a/plugins/Widgetize/templates/iframe.twig b/plugins/Widgetize/templates/iframe.twig index 5413450d9c..ea34ef8936 100644 --- a/plugins/Widgetize/templates/iframe.twig +++ b/plugins/Widgetize/templates/iframe.twig @@ -4,11 +4,11 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> {{ loadJavascriptTranslations(['CoreHome']) }} - {% include "@CoreHome/js_global_variables.twig" %} + {% include "_jsGlobalVariables.twig" %} <!--[if lt IE 9]> <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script> <![endif]--> - {% include "@CoreHome/js_css_includes.twig" %} + {% include "_jsCssIncludes.twig" %} <!--[if IE]> <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/> <![endif]--> diff --git a/plugins/Widgetize/templates/empty.twig b/plugins/Widgetize/templates/iframe_empty.twig index b40340ba39..b40340ba39 100644 --- a/plugins/Widgetize/templates/empty.twig +++ b/plugins/Widgetize/templates/iframe_empty.twig diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig index 558bc2ec37..359551f968 100644 --- a/plugins/Widgetize/templates/index.twig +++ b/plugins/Widgetize/templates/index.twig @@ -75,7 +75,7 @@ </script> <div class="top_controls_inner"> - {% include "@CoreHome/period_select.twig" %} + {% include "@CoreHome/_periodSelect.twig" %} </div> <div class="widgetize"> diff --git a/plugins/Widgetize/templates/test_jsinclude.twig b/plugins/Widgetize/templates/testJsInclude1.twig index 95c4a3945c..95c4a3945c 100644 --- a/plugins/Widgetize/templates/test_jsinclude.twig +++ b/plugins/Widgetize/templates/testJsInclude1.twig diff --git a/plugins/Widgetize/templates/test_jsinclude2.twig b/plugins/Widgetize/templates/testJsInclude2.twig index 92dba2b47b..92dba2b47b 100644 --- a/plugins/Widgetize/templates/test_jsinclude2.twig +++ b/plugins/Widgetize/templates/testJsInclude2.twig |