4568 Commits

Author SHA1 Message Date
Jannis Moßhammer
b045650a19 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179
Conflicts:
	application/layouts/scripts/layout.phtml
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/components/contacts.phtml
	modules/monitoring/application/views/scripts/show/components/customvars.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
2013-07-12 15:55:31 +02:00
Eric Lippmann
51755209b6 Adapt usage of config class
refs #4354
2013-07-12 15:43:23 +02:00
Jannis Moßhammer
c10752a05a Add host_* prefix to fields for hostoverview
A few fields didn't have the host_ prefix (as in the host-detail branch).
This is fixed with this commit

refs #4179
2013-07-12 15:14:55 +02:00
Jannis Moßhammer
30040eaa1b Add Host detail to hostoverview
This is merge to prevent the host-overview nad
host-detail branch from diverging too much

refs #4179

Conflicts:
	application/views/helpers/TimeSince.php
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/header.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
	public/css/base.less
	public/css/components/details.less
2013-07-12 15:12:26 +02:00
Eric Lippmann
d871b3c287 Update the monitoring module 2013-07-12 14:33:17 +02:00
Jannis Moßhammer
7116cfd60a Host list markup and less changes (WIP)
Modified the host list markup to reflect host information.
Comments are currently missing as well as behaviour and final styling.
The styling part is not really part of the ticket, as we decided
not to style or add additional markup, but as the work
has been done in sprint 1.0-4 it makes no sense to
throw it away at this time

refs #4179
2013-07-12 14:14:32 +02:00
Jannis Moßhammer
8598743cc1 Modified ListController hostfields
This is a preliminary change to get the required fields, although
the views and queries will heavily change during the sprint, so
it's work in progress

refs #4179
2013-07-12 14:01:31 +02:00
Marius Hein
b9711aecc2 Host detail view: Add tests for properties
Add tests for the property view helper.

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein
1da7ea9c36 Host detail view: Add object properties
Add property component and helper which output all information
about an object (host or service).

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein
e817b9b790 Host detail view
Add downtime sub component.

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein
6b37fcf24f Host detail view
Add commands to detail view

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein
e05f46c587 Host detail view
Command widgets [WIP]

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein
f455b32464 Host detail view
Add flags container to detail view

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein
ffc1a2b43f Host detail view
Fix psr, adapt output for layouting, add fields to adapt original
views from icinga.

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein
a0f96379a9 Host detail view
Fix psr, adapt output for layouting, add fields to adapt original
views from icinga.

refs #4182
2013-07-02 16:00:41 +02:00
Eric Lippmann
df7a3a4cbe Fix PHP short open tags, DO NOT use <? ...
refs #4301
2013-06-28 09:13:08 +02:00
Eric Lippmann
6eade9c023 Fix use of already replaced class Icinga\Web\Session
refs #4301
2013-06-28 09:13:08 +02:00
Eric Lippmann
1e9fa28433 Add the monitoring module from the incubator 2013-06-28 09:11:12 +02:00