diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CoreHome/templates/graph.tpl | 2 | ||||
| -rw-r--r-- | plugins/Dashboard/Controller.php | 47 | ||||
| -rw-r--r-- | plugins/Dashboard/templates/index.tpl | 26 | ||||
| -rw-r--r-- | plugins/Widgetize/templates/widgetize.js | 4 |
4 files changed, 44 insertions, 35 deletions
diff --git a/plugins/CoreHome/templates/graph.tpl b/plugins/CoreHome/templates/graph.tpl index ff4f282a1b..487a7139b0 100644 --- a/plugins/CoreHome/templates/graph.tpl +++ b/plugins/CoreHome/templates/graph.tpl @@ -14,10 +14,10 @@ "{$flashParameters.requiredFlashVersion}", "{$flashParameters.swfLibraryPath}expressInstall.swf", {literal}{{/literal} + "{if $flashParameters.includeData}x-{/if}data-file":"{$urlGraphData|escape:"url"}", {if $flashParameters.includeData} "id":"{$chartDivId}", {/if} - "{if $flashParameters.includeData}x-{/if}data-file":"{$urlGraphData|escape:"url"}", "loading":"{'General_Loading'|translate|escape:"html"}" {literal}}, {{/literal} diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php index c778dab567..2e623863f1 100644 --- a/plugins/Dashboard/Controller.php +++ b/plugins/Dashboard/Controller.php @@ -21,7 +21,11 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $view = Piwik_View::factory($template); $this->setGeneralVariablesView($view); - $view->layout = $this->getLayout(); + $layout = $this->getLayout(); + if(empty($layout)) { + $layout = $this->getDefaultLayout(); + } + $view->layout = $layout; $view->availableWidgets = json_encode(Piwik_GetWidgetsList()); return $view; } @@ -131,7 +135,12 @@ class Piwik_Dashboard_Controller extends Piwik_Controller && strstr($layout, '[[') == false) { $layout = "'$layout'"; } - + $layout = $this->removeDisabledPluginFromLayout($layout); + return $layout; + } + + protected function removeDisabledPluginFromLayout($layout) + { // if the json decoding works (ie. new Json format) // we will only return the widgets that are from enabled plugins if($layoutObject = json_decode($layout, $assoc = true)) @@ -140,10 +149,12 @@ class Piwik_Dashboard_Controller extends Piwik_Controller { foreach($row as $widgetId => $widget) { - $pluginName = $widget['parameters']['module']; - if(!Piwik_PluginsManager::getInstance()->isPluginActivated($pluginName)) - { - unset($row[$widgetId]); + if(isset($widget->parameters->module)) { + $pluginName = $widget->parameters->module; + if(!Piwik_PluginsManager::getInstance()->isPluginActivated($pluginName)) + { + unset($row[$widgetId]); + } } } } @@ -151,6 +162,30 @@ class Piwik_Dashboard_Controller extends Piwik_Controller } return $layout; } + + protected function getDefaultLayout() + { + $defaultLayout = '[ + [ + {"uniqueId":"widgetVisitsSummarygetEvolutionGraph","parameters":{"module":"VisitsSummary","action":"getEvolutionGraph","columns":["nb_visits"]}}, + {"uniqueId":"widgetVisitorInterestgetNumberOfVisitsPerVisitDuration","parameters":{"module":"VisitorInterest","action":"getNumberOfVisitsPerVisitDuration"}}, + {"uniqueId":"widgetUserSettingsgetBrowser","parameters":{"module":"UserSettings","action":"getBrowser"}}, + {"uniqueId":"widgetUserCountrygetCountry","parameters":{"module":"UserCountry","action":"getCountry"}}, + {"uniqueId":"widgetExampleFeedburnerfeedburner","parameters":{"module":"ExampleFeedburner","action":"feedburner"}} + ], + [ + {"uniqueId":"widgetReferersgetKeywords","parameters":{"module":"Referers","action":"getKeywords"}}, + {"uniqueId":"widgetReferersgetWebsites","parameters":{"module":"Referers","action":"getWebsites"}} + ], + [ + {"uniqueId":"widgetReferersgetSearchEngines","parameters":{"module":"Referers","action":"getSearchEngines"}}, + {"uniqueId":"widgetVisitTimegetVisitInformationPerServerTime","parameters":{"module":"VisitTime","action":"getVisitInformationPerServerTime"}}, + {"uniqueId":"widgetExampleRssWidgetrssPiwik","parameters":{"module":"ExampleRssWidget","action":"rssPiwik"}} + ] + ]'; + $defaultLayout = $this->removeDisabledPluginFromLayout($defaultLayout); + return $defaultLayout; + } } diff --git a/plugins/Dashboard/templates/index.tpl b/plugins/Dashboard/templates/index.tpl index faf0a11323..2ac7a0f26b 100644 --- a/plugins/Dashboard/templates/index.tpl +++ b/plugins/Dashboard/templates/index.tpl @@ -1,36 +1,12 @@ {loadJavascriptTranslations plugins='CoreHome Dashboard'} <script type="text/javascript"> -{if !empty($layout) } piwik.dashboardLayout = {$layout}; -{else} -{literal} - piwik.dashboardLayout = - [ - [ - {"uniqueId":"widgetVisitsSummarygetEvolutionGraph","parameters":{"module":"VisitsSummary","action":"getEvolutionGraph","columns":["nb_visits"]}}, - {"uniqueId":"widgetVisitorInterestgetNumberOfVisitsPerVisitDuration","parameters":{"module":"VisitorInterest","action":"getNumberOfVisitsPerVisitDuration"}}, - {"uniqueId":"widgetUserSettingsgetBrowser","parameters":{"module":"UserSettings","action":"getBrowser"}}, - {"uniqueId":"widgetUserCountrygetCountry","parameters":{"module":"UserCountry","action":"getCountry"}}, - {"uniqueId":"widgetExampleFeedburnerfeedburner","parameters":{"module":"ExampleFeedburner","action":"feedburner"}} - ], - [ - {"uniqueId":"widgetReferersgetKeywords","parameters":{"module":"Referers","action":"getKeywords"}}, - {"uniqueId":"widgetReferersgetWebsites","parameters":{"module":"Referers","action":"getWebsites"}} - ], - [ - {"uniqueId":"widgetReferersgetSearchEngines","parameters":{"module":"Referers","action":"getSearchEngines"}}, - {"uniqueId":"widgetVisitTimegetVisitInformationPerServerTime","parameters":{"module":"VisitTime","action":"getVisitInformationPerServerTime"}}, - {"uniqueId":"widgetExampleRssWidgetrssPiwik","parameters":{"module":"ExampleRssWidget","action":"rssPiwik"}} - ] - ]; -{/literal} {* the old dashboard layout style is: piwik.dashboardLayout = 'VisitsSummary.getEvolutionGraph~VisitorInterest.getNumberOfVisitsPerVisitDuration~UserSettings.getBrowser~ExampleFeedburner.feedburner|Referers.getKeywords~Referers.getWebsites|Referers.getSearchEngines~VisitTime.getVisitInformationPerServerTime~ExampleRssWidget.rssPiwik|'; *} -{/if} -piwik.availableWidgets = {$availableWidgets}; + piwik.availableWidgets = {$availableWidgets}; </script> {literal} diff --git a/plugins/Widgetize/templates/widgetize.js b/plugins/Widgetize/templates/widgetize.js index 46382eacbe..f596c4bbb8 100644 --- a/plugins/Widgetize/templates/widgetize.js +++ b/plugins/Widgetize/templates/widgetize.js @@ -67,9 +67,8 @@ function widgetize() '</div>' ); - // Add the Flash Export if a flash <embed> is found in the widget - // 0.5: removing temporarily this feature as it seems not working if(false) { + // Add the Flash Export if a flash <embed> is found in the widget $(loadedWidgetElement) .find('embed,object') .each(function() { @@ -88,7 +87,6 @@ function widgetize() ); }); } - // 0.5: Removing launchpad feature as it doesn't seem to work well despite us contacting Clearspring if(false) { $(exportButtonsElement).append( |