tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge the menu entries for users, groups and roles into "Authentication"

This commit is contained in:
Johannes Meyer 2015-06-01 17:16:24 +02:00
parent 17e7f1e754
commit 7b9983de38
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
library/Icinga/Web/Menu.php
View File

@ -234,64 +234,54 @@ class Menu implements RecursiveIterator
$section = $this->add(t('System'), array( $section = $this->add(t('System'), array(
'icon' => 'services', 'icon' => 'services',
'priority' => 200, 'priority' => 700,
'renderer' => 'ProblemMenuItemRenderer' 'renderer' => 'ProblemMenuItemRenderer'
)); ));
if (Logger::writesToFile()) { if (Logger::writesToFile()) {
$section->add(t('Application Log'), array( $section->add(t('Application Log'), array(
'url' => 'list/applicationlog', 'url' => 'list/applicationlog',
'priority' => 300 'priority' => 710
)); ));
} }
$section = $this->add(t('Configuration'), array( $section = $this->add(t('Configuration'), array(
'icon' => 'wrench', 'icon' => 'wrench',
'permission' => 'config/*', 'permission' => 'config/*',
'priority' => 400 'priority' => 800
)); ));
$section->add(t('Application'), array( $section->add(t('Application'), array(
'url' => 'config', 'url' => 'config',
'permission' => 'config/application/*', 'permission' => 'config/application/*',
'priority' => 450 'priority' => 810
)); ));
$section->add(t('Users'), array( $section->add(t('Authentication'), array(
'url' => 'user/list', 'url' => 'user',
'permission' => 'config/application/user/show', 'permission' => 'config/authentication/*',
'priority' => 500 'priority' => 820
));
$section->add(t('Groups'), array(
'url' => 'group/list',
'permission' => 'config/application/group/show',
'priority' => 550
));
$section->add(t('Roles'), array(
'url' => 'roles',
'permission' => 'config/application/roles',
'priority' => 600
)); ));
$section->add(t('UserGroupBackends'), array( $section->add(t('UserGroupBackends'), array(
'url' => 'usergroupbackend/list', 'url' => 'usergroupbackend/list',
'permission' => 'config/application/usergroupbackend/*', 'permission' => 'config/application/usergroupbackend/*',
'priority' => 650 'priority' => 830
)); ));
$section->add(t('Modules'), array( $section->add(t('Modules'), array(
'url' => 'config/modules', 'url' => 'config/modules',
'permission' => 'config/modules', 'permission' => 'config/modules',
'priority' => 700 'priority' => 890
)); ));
$section = $this->add($auth->getUser()->getUsername(), array( $section = $this->add($auth->getUser()->getUsername(), array(
'icon' => 'user', 'icon' => 'user',
'priority' => 800 'priority' => 900
)); ));
$section->add(t('Preferences'), array( $section->add(t('Preferences'), array(
'url' => 'preference', 'url' => 'preference',
'priority' => 810 'priority' => 910
)); ));
$section->add(t('Logout'), array( $section->add(t('Logout'), array(
'url' => 'authentication/logout', 'url' => 'authentication/logout',
'priority' => 890, 'priority' => 990,
'renderer' => 'ForeignMenuItemRenderer' 'renderer' => 'ForeignMenuItemRenderer'
)); ));
} }

4
modules/doc/configuration.php
View File

@ -7,7 +7,7 @@ $section = $this->menuSection($this->translate('Documentation'), array(
'title' => 'Documentation', 'title' => 'Documentation',
'icon' => 'book', 'icon' => 'book',
'url' => 'doc', 'url' => 'doc',
'priority' => 390 'priority' => 700
)); ));
$section->add('Icinga Web 2', array( $section->add('Icinga Web 2', array(
@ -18,7 +18,7 @@ $section->add('Module documentations', array(
)); ));
$section->add($this->translate('Developer - Style'), array( $section->add($this->translate('Developer - Style'), array(
'url' => 'doc/style/guide', 'url' => 'doc/style/guide',
'priority' => 399 'priority' => 790
)); ));
$this->provideSearchUrl($this->translate('Doc'), 'doc/search', -10); $this->provideSearchUrl($this->translate('Doc'), 'doc/search', -10);

2
modules/monitoring/configuration.php
View File

@ -208,7 +208,7 @@ $section->add($this->translate('Alert Summary'), array(
$section = $this->menuSection($this->translate('System')); $section = $this->menuSection($this->translate('System'));
$section->add($this->translate('Monitoring Health'), array( $section->add($this->translate('Monitoring Health'), array(
'url' => 'monitoring/process/info', 'url' => 'monitoring/process/info',
'priority' => 220, 'priority' => 720,
'renderer' => 'Icinga\Module\Monitoring\Web\Menu\BackendAvailabilityMenuItemRenderer' 'renderer' => 'Icinga\Module\Monitoring\Web\Menu\BackendAvailabilityMenuItemRenderer'
)); ));