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
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
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
Eric Lippmann
df7a3a4cbe
Fix PHP short open tags, DO NOT use <? ...
...
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
