1036 Commits

Author SHA1 Message Date
Thomas Gelf
cd70c27519 Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-18 15:18:42 +02:00
Thomas Gelf
1f5db2f8c1 ActionController: introduce showCompact
Works like view=compact, it will allow us to "free" the "view" parameter
2015-06-18 13:41:12 +02:00
Thomas Gelf
2f62a4383a Layout: add showFullscreen parameter
refs #6729
2015-06-18 13:41:12 +02:00
Thomas Gelf
3462f0ee9a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361
Conflicts:
	modules/monitoring/application/views/scripts/host/history.phtml
	modules/monitoring/application/views/scripts/list/services.phtml
2015-06-18 11:26:51 +02:00
Johannes Meyer
4d06bff5e8 Merge branch 'master' into feature/Move-notifications-to-the-bottom-of-the-page-8247 2015-06-17 12:47:58 +02:00
Johannes Meyer
ba4dd255ec Tabs: Merge the action's params into the current request url's params 2015-06-16 16:02:32 +02:00
Johannes Meyer
68be11b929 UrlParams: Allow conversion to an associative array 2015-06-16 16:01:42 +02:00
Thomas Gelf
b3028e9988 Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-16 11:49:03 +02:00
Thomas Gelf
7a18638504 Revert "Web/Menu: move "About" to config section"
Has been fixed in current master.
This reverts commit 56d67def0085676c0a5c16efe3af7436403ec7ef.
2015-06-16 11:48:40 +02:00
Johannes Meyer
aa0b1d43ef Menu: Move about page into the system menu as sub-entry 2015-06-16 11:43:58 +02:00
Thomas Gelf
56d67def00 Web/Menu: move "About" to config section
This is IMO never worth a main menu entry, at least not in it's current
implementation and look-a-like.
2015-06-16 00:18:31 +02:00
Thomas Gelf
0170d9941a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-15 23:08:17 +02:00
Johannes Meyer
eba862a290 view->url(): Clone $path if it's already of type Icinga\Web\Url
Avoids side effects in case of url params adjustments.

fixes #9351
2015-06-09 09:21:12 +02:00
Alexander A. Klimov
1bd18c5adb Merge branch 'feature/Show-Icinga-Web-2-s-version-in-the-frontend-9247'
resolves #9247
2015-06-08 12:40:14 +02:00
Johannes Meyer
24cb6bfc6e Form: Preserve defaults for subforms as well 2015-06-05 16:01:52 +02:00
Thomas Gelf
edeb24792e CSS: move monitoring styles to monitoring module 2015-06-05 12:49:07 +02:00
Alexander A. Klimov
5b8de49cdf Link to the about page
refs #9247
2015-06-02 17:16:27 +02:00
Johannes Meyer
7213379cac AuthBackendController: Add final indexAction
Required to automatically redirect to the first permitted list action.

refs #8826
2015-06-02 11:59:04 +02:00
Johannes Meyer
00c31ffd28 RolesController: Rename to RoleController 2015-06-02 11:57:13 +02:00
Johannes Meyer
cd0c418854 Merge branch 'master' into feature/user-and-group-management-8826 2015-06-02 10:44:13 +02:00
Johannes Meyer
ae30a62055 ConfigController: Add tab for the user group backend configuration
refs #8826
2015-06-02 10:23:40 +02:00
Johannes Meyer
cf96e66ff2 Rename permission config/application/roles* to config/authentication/...
Does also split it into *, show, add, edit, remove as this should behave like
any other authentication configuration.

refs #8826
2015-06-02 09:07:06 +02:00
Johannes Meyer
3fffd90135 Rename permission config/application/groups* to config/authentication/...
refs #8826
2015-06-02 09:04:34 +02:00
Johannes Meyer
a558f2873a Rename permission config/application/users* to config/authentication/...
refs #8826
2015-06-02 09:02:57 +02:00
Johannes Meyer
46e2393074 UsergroupbackendController: Do only assert that the user has one permission
The configuration of a backend itself should not be that granular.

refs #8826
2015-06-02 08:58:21 +02:00
Eric Lippmann
44968266f6 Fix no-op searches
Depeding on the current filter, Filter::andFilter() may return a new filter object w/ the and filter applied or the and filter is applied to the object itself.
The FilterEditor did not make use of the return value of Filter::andFilter() thus resulting in no-op searches in some scenarios.
2015-06-01 17:22:52 +02:00
Johannes Meyer
7b9983de38 Merge the menu entries for users, groups and roles into "Authentication" 2015-06-01 17:16:24 +02:00
Johannes Meyer
17e7f1e754 Link the roles configuration with the user and group management
refs #8826
2015-06-01 16:43:11 +02:00
Johannes Meyer
66fd7dfd93 ConfigController: Rename applicationAction to generalAction 2015-06-01 16:35:27 +02:00
Johannes Meyer
49bb09d9d3 Add dedicated menu entries to manage users, groups and roles
refs #8826
2015-06-01 16:31:48 +02:00
Johannes Meyer
c7ce1498bf Introduce menu entry "Configuration" 2015-06-01 16:10:23 +02:00
Johannes Meyer
d097f7fe8f Add menu entry for the user group backend configuration
That's definitely just a placeholder...

refs #8826
2015-05-29 16:36:05 +02:00
Alexander A. Klimov
0ba4d24880 Move notifications to the bottom of the page
refs #8247
2015-05-29 14:17:12 +02:00
Eric Lippmann
31400ea16a monitoring: Fix that searching for specific columns is no longer possible if default search columns are set 2015-05-28 13:17:00 +02:00
Johannes Meyer
8713f59e66 AuthBackendController: Only show tabs the user is permitted to view
refs #8826
2015-05-27 10:38:35 +02:00
Johannes Meyer
20f0b46574 Introduce class AuthBackendController
refs #8826
2015-05-26 10:11:40 +02:00
Johannes Meyer
ec556edc65 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-26 09:28:35 +02:00
Johannes Meyer
4f0b4e55ef ErrorLabeller: Use an element's name if no label is set 2015-05-22 14:01:26 +02:00
Eric Lippmann
53ca68903a Merge branch 'bugfix/time-formatting-6778'
fixes #6778
2015-05-22 11:34:43 +02:00
Johannes Meyer
265725447d Merge branch 'master' into feature/user-and-group-management-8826 2015-05-22 10:06:31 +02:00
Eric Lippmann
de9be044b3 lib: Provide formatDuration() in our views
refs #6778
2015-05-22 10:04:00 +02:00
Eric Lippmann
2bdb725370 Merge branch 'bugfix/monitoring-controllers-response-codes-6281'
fixes #6281
2015-05-22 09:27:51 +02:00
Eric Lippmann
d2bb74a2f9 lib: Move HttpNotFoundException beneath the Http Exception namespace
refs #6281
2015-05-22 09:25:49 +02:00
Eric Lippmann
71a2324cb9 lib: Let Controller::assertHttpMethod() throw a HttpMethodNotAllowedException
refs #6281
2015-05-22 09:12:42 +02:00
Eric Lippmann
dd1025119d Throw HttpNotFoundException on Controller::httpNotFound()
refs #6281
2015-05-21 16:54:00 +02:00
Eric Lippmann
54577d04bd Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/hostgroups.phtml
	modules/monitoring/application/views/scripts/process/info.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
	modules/monitoring/public/css/module.less
2015-05-21 14:57:01 +02:00
Eric Lippmann
c47465a732 lib/filter: Fix check against unset search columns
refs #8241
2015-05-21 14:04:04 +02:00
Eric Lippmann
b9a6e1042d Merge branch 'master' into bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241
Conflicts:
	modules/monitoring/application/controllers/ListController.php
2015-05-20 17:02:49 +02:00
Johannes Meyer
71fa736144 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-20 10:46:55 +02:00
Eric Lippmann
902c00e836 lib: Introduce Controller::httpNotFound()
Many actions require loading specific objects from database or any other storage.
If the object isn't found, Controller::httpNotFound($message) should be used
for immediately returning w/ HTTP 404.
2015-05-20 10:30:01 +02:00