Commit Graph

6 Commits

Author SHA1 Message Date
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
Matthias Jentsch ee6c669441 Deduplicate code and fix layout
Move icon rendering code into a separate for better maintainabillity.

refs #8665
2015-05-21 11:40:08 +02:00
Matthias Jentsch c0cf6e4918 Display icon_images in all host and service detail views
refs #8665
2015-05-19 18:08:26 +02:00
Johannes Meyer b9f9ea6142 service/show: Ensure dashboard compliance
refs #7876
2015-04-17 16:19:38 +02:00
Eric Lippmann a6a9bd28eb Use timeSince() for the last status change in the service's detail view
Instead of using prefixedTimeSince() which will be removed.

refs #6778
2015-04-15 15:06:15 +02:00
Johannes Meyer afa3431aed Introduce new object- and command-view scripts
Represents how we plan to handle view scripts that are re-usable. Should
supersede all <action>/component/* view scripts in the upcoming future.
2015-02-02 16:26:55 +01:00