diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-02-02 13:02:00 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-02-02 13:02:00 +0300 |
| commit | dbd1d12642f534639117eabe302790ba8576a91d (patch) | |
| tree | 97bc37e3d3bf82db1f2c5c7d101be642dee0813a /plugins/MultiSites | |
| parent | 888ade738e5e1367406cf7865c5feb5da94ab0fd (diff) | |
refs #9686 add help links in error message to Piwik PRO
Diffstat (limited to 'plugins/MultiSites')
4 files changed, 17 insertions, 0 deletions
diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php index 1fb90cfeae..d104db301b 100644 --- a/plugins/MultiSites/MultiSites.php +++ b/plugins/MultiSites/MultiSites.php @@ -62,6 +62,10 @@ class MultiSites extends \Piwik\Plugin $translations[] = 'General_ErrorRequest'; $translations[] = 'General_Pagination'; $translations[] = 'General_ClickToSearch'; + $translations[] = 'General_NeedMoreHelp'; + $translations[] = 'General_Faq'; + $translations[] = 'Feedback_CommunityHelp'; + $translations[] = 'Feedback_ProfessionalHelp'; } public function getJsFiles(&$jsFiles) diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js index 3ba1b15a21..35cf26a5de 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js @@ -19,6 +19,7 @@ $scope.idSite = piwik.broadcast.getValueFromUrl('idSite'); $scope.url = piwik.piwik_url; $scope.period = piwik.period; + $scope.arePiwikProAdsEnabled = piwik.config && piwik.config.are_ads_enabled; this.refresh = function (interval) { multisitesDashboardModel.refreshInterval = interval; diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html index a0f183a7c6..06a7fb6613 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html @@ -59,6 +59,15 @@ <td colspan="7"> <div class="notification system notification-error"> {{ 'General_ErrorRequest'|translate:(''):('') }} + + <br /><br /> + {{ 'General_NeedMoreHelp'|translate }} + + <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> + – + <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> + <span ng-show="arePiwikProAdsEnabled"> – </span> + <a ng-show="arePiwikProAdsEnabled" rel="noreferrer" target="_blank" href="https://piwik.pro/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>. </div> </td> </tr> diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less index a200b3d626..c83ab162aa 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less @@ -21,6 +21,9 @@ .notification-error { margin-top: 15px; + a { + text-decoration: underline !important; + } } .add_new_site, |