diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-01-13 06:06:14 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-01-15 05:59:32 +0300 |
| commit | d430fa2874aa92316883ff121cacbb4abdde1aee (patch) | |
| tree | 6f09acf1ce4eb03514032ea105e2874f5cc62acf /plugins | |
| parent | 6d6d3661eca16447075f78bbce33ee3a43f047c9 (diff) | |
privacy opt out was shown in general settings and privacy settings. we leave it in privacy settings. as admin users do not have access to general settings we need to link to privacy settings
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CoreAdminHome/Controller.php | 2 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/Menu.php | 16 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/templates/generalSettings.twig | 11 | ||||
| -rw-r--r-- | plugins/Morpheus/templates/admin.twig | 9 |
4 files changed, 20 insertions, 18 deletions
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 53a8500dd0..96a788b064 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -47,7 +47,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin public function generalSettings() { - Piwik::checkUserHasSomeAdminAccess(); + Piwik::checkUserHasSuperUserAccess(); $view = new View('@CoreAdminHome/generalSettings'); if (Piwik::hasUserSuperUserAccess()) { diff --git a/plugins/CoreAdminHome/Menu.php b/plugins/CoreAdminHome/Menu.php index 3d99ba6a4b..ad309a0852 100644 --- a/plugins/CoreAdminHome/Menu.php +++ b/plugins/CoreAdminHome/Menu.php @@ -28,9 +28,11 @@ class Menu extends \Piwik\Plugin\Menu $menu->addDiagnosticItem(null, "", $order = 10); $menu->addDevelopmentItem(null, "", $order = 15); - $menu->addSettingsItem('General_General', - $this->urlForAction('generalSettings'), - $order = 6); + if (Piwik::hasUserSuperUserAccess()) { + $menu->addSettingsItem('General_General', + $this->urlForAction('generalSettings'), + $order = 6); + } } if (Piwik::hasUserSuperUserAccess() && SettingsManager::hasSystemPluginsSettingsForCurrentUser()) { @@ -43,7 +45,13 @@ class Menu extends \Piwik\Plugin\Menu public function configureTopMenu(MenuTop $menu) { if (Piwik::isUserHasSomeAdminAccess()) { - $menu->addItem('CoreAdminHome_Administration', null, $this->urlForAction('generalSettings'), 10); + $url = $this->urlForModuleAction('PrivacyManager', 'privacySettings'); + + if (Piwik::hasUserSuperUserAccess()) { + $url = $this->urlForAction('generalSettings'); + } + + $menu->addItem('CoreAdminHome_Administration', null, $url, 10); } } diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index 5ee3f91389..1a1497ada5 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -335,16 +335,5 @@ </p> {% endif %} {% endif %} -<h2>{{ 'CoreAdminHome_OptOutForYourVisitors'|translate }}</h2> - -<p>{{ 'CoreAdminHome_OptOutExplanation'|translate }} - {% set optOutUrl %}{{ piwikUrl }}index.php?module=CoreAdminHome&action=optOut&language={{ language }}{% endset %} - {% set iframeOptOut %} - <iframe style="border: 0; height: 200px; width: 600px;" src="{{ optOutUrl }}"></iframe> - {% endset %} - <code>{{ iframeOptOut|escape }}</code> - <br/> - {{ 'CoreAdminHome_OptOutExplanationBis'|translate("<a href='" ~ optOutUrl ~ "' rel='noreferrer' target='_blank'>","</a>")|raw }} -</p> {% endblock %} diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig index 6d37a6c290..faf06ca36e 100644 --- a/plugins/Morpheus/templates/admin.twig +++ b/plugins/Morpheus/templates/admin.twig @@ -24,8 +24,13 @@ <!--[if (gte IE 9)|!(IE)]><!--> <body ng-app="app" class="{{ postEvent('Template.bodyClass', 'admin') }}"><!--<![endif]--> - {% set topMenuModule = 'CoreAdminHome' %} - {% set topMenuAction = 'generalSettings' %} + {% if isSuperUser %} + {% set topMenuModule = 'CoreAdminHome' %} + {% set topMenuAction = 'generalSettings' %} + {% else %} + {% set topMenuModule = 'PrivacyManager' %} + {% set topMenuAction = 'privacySettings' %} + {% endif %} {% include "_iframeBuster.twig" %} {% include "@CoreHome/_javaScriptDisabled.twig" %} |