Commit Graph

405 Commits

Author SHA1 Message Date
Johannes Meyer 11063495b2 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	modules/monitoring/application/controllers/ConfigController.php
2014-08-21 10:22:16 +02:00
Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ConfigController.php
	application/forms/Authentication/LoginForm.php
	application/forms/Preference/GeneralForm.php
	modules/monitoring/application/controllers/ChartController.php
2014-08-20 13:13:50 +02:00
Alexander Klimov bb65fb396a Merge branch 'bugfix/sensitive-custom-vars-6641'
fixes #6641
2014-08-20 12:29:45 +02:00
Johannes Meyer 4ceecf1146 Let comment view look more standardized and add limit control
refs #6637
2014-08-20 11:34:24 +02:00
Alexander Klimov 071937910b Monitoring/Object: filter protected customvars
Move the responsibility from the viewscript to Monitoring/Object

refs #6641
2014-08-19 18:46:37 +02:00
Alexander Klimov ea0248ecf4 Remove '{{SAVE_ICON}}', tiny design fixes
refs #6641
2014-08-19 17:54:22 +02:00
Johannes Meyer 3573908071 Let downtime view look more list-like and fix downtime end calculation
refs #6637
2014-08-19 17:03:35 +02:00
Alexander Klimov 65473ac8ee Monitoring config: use SecurityForm
refs #6641
2014-08-19 14:04:00 +02:00
Alexander Klimov 0464099764 Monitoring: implement "Security" config tab 2014-08-19 11:19:30 +02:00
Johannes Meyer 332be22f7e Fix object history dates make output look similar to the event history
refs #6637
2014-08-18 15:32:12 +02:00
Johannes Meyer bbddb9ed87 Add limit-control and fix indentation of the eventhistory view
refs #6637
2014-08-18 15:30:59 +02:00
Johannes Meyer 043688e514 Make event history view more fancier
refs #6637
2014-08-15 17:03:03 +02:00
Johannes Meyer cae84a5d7f Fix float formatting of timeline circle margins and widths
fixes #6926
2014-08-15 13:39:02 +02:00
Johannes Meyer dc8181cdc5 Escape linefeeds and carriage returns in commands and show them as html
fixes #6088
2014-08-14 10:23:04 +02:00
Johannes Meyer b5d6481c12 Make it possible to translate the process info view
refs #6610
2014-08-13 15:52:33 +02:00
Johannes Meyer be14844fa8 Merge EditInstanceForm with CreateInstanceForm and rename it
As with the backend form, a user might like to change the name of an
instance. The new form and its actions are also adjusted to suit the new form interface.

refs #5525
2014-08-11 14:49:42 +02:00
Johannes Meyer d7ed6bd249 Adjust removebackend-action to suit the new backend form interface
Drops additionally the ConfirmRemovalForm of the monitoring module
as there is already one in icingaweb2's form-set.

refs #5525
2014-07-25 16:00:38 +02:00
Johannes Meyer a78d11345b Adjust createbackend-action to suit the new backend form interface
refs #5525
2014-07-25 15:58:44 +02:00
Johannes Meyer b743cf8143 Adjust editbackend-action to suit the new backend-form interface
refs #5525
2014-07-25 14:55:36 +02:00
Alexander Klimov a4b7204e23 Contactgroups view: correct links to contacts detail pages
fixes #6514
2014-07-23 13:10:09 +02:00
Alexander Klimov a2809552f2 Do not use htmlspecialchars in view scripts
fixes #6759
2014-07-23 12:41:05 +02:00
Eric Lippmann 9269a0cbd5 Revert "Do not use htmlspecialchars in view scripts"
This reverts commit 607aa9b203.

`Perfdata::escape()' does not exist. But `Perfdata::view::escape()' does.
2014-07-23 12:29:27 +02:00
Alexander Klimov 607aa9b203 Do not use htmlspecialchars in view scripts
fixes #6759
2014-07-23 12:12:49 +02:00
Matthias Jentsch cb27a3d0f1 Do not use height and width in bar charts, to avoid layout errors 2014-07-22 17:57:40 +02:00
Matthias Jentsch 53c9292b41 Fix BarChart padding in Dashboard
Use max-width instead of width in the chart layout to make better use of the available space, but prevent the charts from growing too big. Use a bigger weight and height in the default dashboard configuration.

fixes #6744
2014-07-21 13:06:35 +02:00
Alexander Klimov f9a274d079 Add contact detail view
refs #4804
refs #6514
2014-07-18 17:35:24 +02:00
Alexander Klimov 882699201d Contacts: replace foreach loop with hardcoded HTML and move the styles to a CSS file 2014-07-17 17:33:45 +02:00
Alexander Klimov eca0d50bae Don't use printf format strings as array keys
An array with printf format strings as keys looks pretty ugly
2014-07-17 11:26:18 +02:00
Alexander Klimov b23e36aa1a Swap array keys and values
Non-hardcoded keys may be not unique
2014-07-16 17:54:06 +02:00
Alexander Klimov 62da942159 Don't close and re-open php tags, remove unneeded spaces
To close and re-open php tags makes no sense if there's nothing between them
2014-07-16 17:54:06 +02:00
Alexander Klimov 1ad263170e Revert "Small fixes"
This reverts commit 8086292b1b.

The commit included too many changes.
2014-07-16 15:30:20 +02:00
Alexander Klimov cb04c42bab Use htmlspecialchars to prevent attacks 2014-07-16 13:10:28 +02:00
Alexander Klimov 8086292b1b Small fixes 2014-07-15 18:00:52 +02:00
Alexander Klimov 4c415aac5c Make contacts' view look more like contactgroups' view 2014-07-15 16:17:02 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Alexander Klimov d021ddebee Make contacts' view work like the downtimes' one
fixes #6513
2014-07-15 10:47:12 +02:00
Johannes Meyer bacea36ad9 Improve piechart limitation and show non-piechart perfdata as well
The perfdata helper did an improper limitation as it might have skipped
valid values due to applying the limit before the filter. When not in compact
view the helper now also shows non-piechart values by using their raw
representation.

refs #6515
2014-07-14 13:48:30 +02:00
Johannes Meyer 5908e9fc70 Do not show pie charts for perfdata values when no percentage is available
refs #6515
2014-07-11 16:32:05 +02:00
Johannes Meyer ec2d1daa6b Perfdata plugin should also have a knowledge about labels
Prior to this change the PerfdataSet only knew the labels of a performance
data value which prevented the Perfdata object from being used
individually.

refs #6515
2014-07-11 16:31:00 +02:00
Johannes Meyer 53f3d74103 Fix word wrapping in perfdata labels and values
fixes #6377
2014-07-10 14:54:53 +02:00
Thomas Gelf 9a6821c860 monitoring/list/hosts: restore page behaviour
The problem here was that an accidentally removed closing div tag in
15325949 caused the application to missbehave badly. Host details where
rendered below the list in some scenarios and the whole multicolumn
thingy started to feel broken.
2014-07-08 15:17:00 +02:00
Thomas Gelf e3b2f15863 list/hosts: show unhandled services righthand
This way we automagically fix the problem with the wrong row links.
I guess we should re-introduce the "row-action" class allowing "precedence"
rules, so also a link not being the first one in a row could act as "row-link".

Changed formatting / text output a little bit, IMO even more cure is needed.

fixes #6645
2014-07-04 18:13:44 +02:00
Matthias Jentsch d2098be625 Only display header when not in compact mode
fixes #6508
2014-07-04 12:45:17 +02:00
Johannes Meyer 7eb0f3c472 Remove @codingStandardsIgnoreStart/-Stop annotations
refs #6091
2014-06-30 13:59:58 +02:00
Matthias Jentsch 9a1b7179e1 Fix violations of coding guidelines 2014-06-30 12:33:51 +02:00
Matthias Jentsch 7fe056d03a Display note when host and service is not found
When the show/host and show/service views do not find a host or service,
don't show a non-working view, but display a error message

fixes #6469
2014-06-30 12:33:51 +02:00
Matthias Jentsch a2fa5c055c Display a message when a list view is empty
fixes #6469
2014-06-30 12:33:51 +02:00
Alexander Klimov 1532594948 Deduplicate code: lists/hosts.phtml VS lists/hosts-compact.phtml
fixes #6541
2014-06-27 11:53:08 +02:00
Thomas Gelf c85a0ac11e list/limits: special treatment for 0 only, not null 2014-06-26 00:39:10 +02:00
Thomas Gelf d44f89f287 list/hosts: fix downtime icon
I re-enabled host list icons, they have been missing for a while. The
downtime icon logic used to be inverted, this fixes it. Also showing
acknowledgements now even if object is in downtime.
2014-06-25 21:46:03 +02:00