diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-01-12 03:10:52 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-01-15 05:59:27 +0300 |
| commit | 2d3c709c6129241bea360fb83383327e1fea7154 (patch) | |
| tree | ef35c98317457a8e9acf490edc1f1e1daa55243b /plugins/UsersManager | |
| parent | 11b56513c260533c89fbef709817944227189e93 (diff) | |
show a menu in the user area, lots of improvements to be more consistent
Diffstat (limited to 'plugins/UsersManager')
| -rw-r--r-- | plugins/UsersManager/Menu.php | 3 | ||||
| -rw-r--r-- | plugins/UsersManager/javascripts/usersManager.js | 2 | ||||
| -rw-r--r-- | plugins/UsersManager/templates/index.twig | 2 | ||||
| -rw-r--r-- | plugins/UsersManager/templates/userSettings.twig | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/plugins/UsersManager/Menu.php b/plugins/UsersManager/Menu.php index 67d9811aad..9f3175a3ef 100644 --- a/plugins/UsersManager/Menu.php +++ b/plugins/UsersManager/Menu.php @@ -18,7 +18,6 @@ class Menu extends \Piwik\Plugin\Menu { if (Piwik::isUserHasSomeAdminAccess()) { $menu->addManageItem('UsersManager_MenuUsers', $this->urlForAction('index'), $order = 2); - $menu->addSettingsItem('UsersManager_MenuPersonal', $this->urlForAction('userSettings'), $order = 1); } if (Piwik::hasUserSuperUserAccess() && API::getInstance()->getSitesAccessFromUser('anonymous')) { @@ -29,7 +28,7 @@ class Menu extends \Piwik\Plugin\Menu public function configureUserMenu(MenuUser $menu) { if (!Piwik::isUserIsAnonymous()) { - $menu->addItem('', 'General_Settings', $this->urlForAction('userSettings'), 0); + $menu->addItem('UsersManager_MenuPersonal', 'General_Settings', $this->urlForAction('userSettings'), 0); } } } diff --git a/plugins/UsersManager/javascripts/usersManager.js b/plugins/UsersManager/javascripts/usersManager.js index 51be3f8063..b9475c29fc 100644 --- a/plugins/UsersManager/javascripts/usersManager.js +++ b/plugins/UsersManager/javascripts/usersManager.js @@ -263,7 +263,7 @@ $(document).ready(function () { } ); - $('.addrow').click(function () { + $('.user .addrow').click(function () { piwikHelper.hideAjaxError(); $(this).toggle(); diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig index f102bce7e1..2a29c9f851 100644 --- a/plugins/UsersManager/templates/index.twig +++ b/plugins/UsersManager/templates/index.twig @@ -110,7 +110,7 @@ {% import 'ajaxMacros.twig' as ajax %} {{ ajax.errorDiv('ajaxErrorUsersManagement') }} {{ ajax.loadingDiv('ajaxLoadingUsersManagement') }} - <div class="entityContainer" style="margin-bottom:50px;"> + <div class="user entityContainer" style="margin-bottom:50px;"> <table class="entityTable dataTable" id="users"> <thead> <tr> diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index cc60903080..769a682a43 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -1,9 +1,8 @@ -{% extends 'admin.twig' %} +{% extends 'user.twig' %} {% block content %} <h2 piwik-enriched-headline>{{ 'UsersManager_PersonalSettings'|translate }}</h2> -<br/> <div class="ui-confirm" id="confirmPasswordChange"> <h2>{{ 'UsersManager_ChangePasswordConfirm'|translate }}</h2> <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/> |