Skip to content

Commit

Permalink
Show a better selection of data, in the default dashboard layout (#10598
Browse files Browse the repository at this point in the history
)
  • Loading branch information
mattab committed Oct 1, 2016
2 parents 5427698 + e040271 commit da030a0
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 25 deletions.
23 changes: 9 additions & 14 deletions plugins/Dashboard/Dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,37 +62,32 @@ public function getDefaultLayout()
$defaultLayout = $this->getLayoutForUser('', 1);

if (empty($defaultLayout)) {
$topWidget = '';
$advertisingWidget = '';

$advertising = StaticContainer::get('Piwik\ProfessionalServices\Advertising');
if ($advertising->areAdsForProfessionalServicesEnabled() && Plugin\Manager::getInstance()->isPluginActivated('ProfessionalServices')) {
$topWidget .= '{"uniqueId":"widgetProfessionalServicespromoServices",'
. '"parameters":{"module":"ProfessionalServices","action":"promoServices"}},';
$advertisingWidget = '{"uniqueId":"widgetProfessionalServicespromoServices","parameters":{"module":"ProfessionalServices","action":"promoServices"}},';
}

if (Piwik::hasUserSuperUserAccess()) {
$topWidget .= '{"uniqueId":"widgetCoreHomegetDonateForm",'
. '"parameters":{"module":"CoreHome","action":"getDonateForm"}},';
$piwikPromoWidget = '{"uniqueId":"widgetCoreHomegetDonateForm","parameters":{"module":"CoreHome","action":"getDonateForm"}}';
} else {
$topWidget .= '{"uniqueId":"widgetCoreHomegetPromoVideo",'
. '"parameters":{"module":"CoreHome","action":"getPromoVideo"}},';
$piwikPromoWidget = '{"uniqueId":"widgetCoreHomegetPromoVideo","parameters":{"module":"CoreHome","action":"getPromoVideo"}}';
}

$defaultLayout = '[
[
{"uniqueId":"widgetVisitsSummarygetEvolutionGraphcolumnsArray","parameters":{"module":"VisitsSummary","action":"getEvolutionGraph","columns":"nb_visits"}},
{"uniqueId":"widgetLivewidget","parameters":{"module":"Live","action":"widget"}},
{"uniqueId":"widgetVisitorInterestgetNumberOfVisitsPerVisitDuration","parameters":{"module":"VisitorInterest","action":"getNumberOfVisitsPerVisitDuration"}}
' . $piwikPromoWidget . '
],
[
' . $topWidget . '
{"uniqueId":"widgetReferrersgetWebsites","parameters":{"module":"Referrers","action":"getWebsites"}},
{"uniqueId":"widgetVisitTimegetVisitInformationPerServerTime","parameters":{"module":"VisitTime","action":"getVisitInformationPerServerTime"}}
{"uniqueId":"widgetVisitsSummarygetEvolutionGraphcolumnsArray","parameters":{"module":"VisitsSummary","action":"getEvolutionGraph","columns":"nb_visits"}},
' . $advertisingWidget . '
{"uniqueId":"widgetVisitsSummarygetSparklines","parameters":{"module":"VisitsSummary","action":"getSparklines"}}
],
[
{"uniqueId":"widgetUserCountryMapvisitorMap","parameters":{"module":"UserCountryMap","action":"visitorMap"}},
{"uniqueId":"widgetDevicesDetectiongetBrowsers","parameters":{"module":"DevicesDetection","action":"getBrowsers"}},
{"uniqueId":"widgetReferrersgetSearchEngines","parameters":{"module":"Referrers","action":"getSearchEngines"}},
{"uniqueId":"widgetReferrersgetReferrerType","parameters":{"module":"Referrers","action":"getReferrerType"}},
{"uniqueId":"widgetExampleRssWidgetrssPiwik","parameters":{"module":"ExampleRssWidget","action":"rssPiwik"}}
]
]';
Expand Down
2 changes: 1 addition & 1 deletion plugins/Referrers/Reports/GetReferrerType.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected function init()
$this->constantRowsCount = true;
$this->hasGoalMetrics = true;
$this->order = 1;
$this->widgetTitle = 'General_Overview';
$this->widgetTitle = 'Referrers_ReferrersOverview';
}

public function getDefaultTypeViewDataTable()
Expand Down
4 changes: 2 additions & 2 deletions tests/UI/expected-screenshots/DashboardManager_create_new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests/UI/expected-screenshots/Dashboard_create_new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests/UI/expected-screenshots/Dashboard_reset.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit da030a0

Please sign in to comment.