tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,499 Commits 121 Branches 71 Tags 80 MiB
Commit Graph

59 Commits

Author SHA1 Message Date
Eric Lippmann 0809caa86b monitoring: Fix indent in the show/components/comments.phtml view script 
refs #9611
 2015-08-03 15:03:02 +02:00
Eric Lippmann a379a448d9 monitoring: Fix code style in the show/components/comments.phtml view script 
refs #9611
 2015-08-03 10:58:57 +02:00
Eric Lippmann b6caeb6c17 monitoring: Use createTicketLinks helper when showing comments of an object 
refs #9611
 2015-08-03 10:53:51 +02:00
Thomas Gelf 59ef6ff71a monitoring/show: choose fitting header tags 2015-06-16 00:35:32 +02:00
Thomas Gelf 6e1ba30acc Styling: re-organize and style comments 2015-06-03 15:35:50 +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 13a38c9d18 Revert "Add new line between comment author and creation time in the detail views" 
This reverts commit 229e266daf.

The new line does not help for improving the layout but makes it more confusing.
 2015-05-18 14:36:35 +02:00
Matthias Jentsch b314c074cc Fix downtime and comment form redirects 
refs #8624
 2015-05-07 16:20:59 +02:00
Johannes Meyer 894457a1c1 Revert "Adjust command links so that they'll use `host_name' instead of `host'" 
This reverts commit b9aee47d1f.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
 2015-04-20 16:11:08 +02:00
Johannes Meyer 9bbb23ae7d Revert "Adjust command links so that they'll use `service_description'" 
This reverts commit cee189a5fc.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
 2015-04-20 16:08:51 +02:00
Eric Lippmann 796cbffbd7 Merge branch 'master' into bugfix/time-formatting-6778 
Conflicts:
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
 2015-04-15 15:43:39 +02:00
Eric Lippmann 229e266daf Add new line between comment author and creation time in the detail views 
refs #6778
 2015-04-15 15:40:40 +02:00
Eric Lippmann e500715bda Use timeAgo() when displaying comments in the detail views 
refs #6778
 2015-04-15 15:33:44 +02:00
Johannes Meyer cee189a5fc Adjust command links so that they'll use `service_description' 
...instead of `service'

refs #8613
 2015-04-09 10:28:34 +02:00
Johannes Meyer b9aee47d1f Adjust command links so that they'll use `host_name' instead of `host' 
refs #8613
 2015-04-09 10:27:41 +02:00
Johannes Meyer 99610bc1bd Avoid sub-tables when showing comments or downtimes in the detail view 
fixes #8625
 2015-03-13 08:32:50 +01:00
Eric Lippmann 8563d5ed3f PHPDoc: Use @var instead of @type 
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
 2015-03-12 16:08:47 +01:00
Johannes Meyer 8e8bab0795 Do only escape a qlink's label manually if necessary 2015-02-24 11:35:25 +01:00
Johannes Meyer 9793bd52c7 Add proper titles to the comments component view 
refs #8458
 2015-02-23 17:27:13 +01:00
Johannes Meyer 5321c2f9e5 Mute icons properly using the new automatic mechanisms of our view helpers 
refs #8360
 2015-02-16 10:52:42 +01:00
Johannes Meyer 9232c5cf22 Add aria-hidden="true" to all icons that exist only for design reasons 
refs #8360
 2015-02-12 13:49:31 +01:00
Johannes Meyer c19ff289bf Open command forms in the same column where their link is located 
refs #8279
 2015-01-28 13:02:37 +01:00
Eric Lippmann 3cb2dd0e8b monitoring/security: Hide 'Acknowledge' link if user lacks the respective permission 2015-01-23 11:01:47 +01:00
Eric Lippmann af2698b075 monitoring: Do not generate 'Schedule downtime' and 'Add comment' links if user lacks the respective permissions 2015-01-23 10:15:55 +01:00
Eric Lippmann d07e1329e8 monitoring: Use nl2br instead of str_replace for downtime comment and comment text 2015-01-23 09:45:43 +01:00
Eric Lippmann 67be1b329b monitoring/security: Hide 'Add comment' link if user lacks the respective permission 2015-01-23 09:41:06 +01:00
Eric Lippmann a19c155d9f monitoring/security: Hide delete comment action if user lacks the respective permission 2015-01-22 17:33:20 +01:00
Bernd Erk 20be45e8da Enable icon font 2014-11-13 20:08:58 +01:00
Eric Lippmann 8afdc3db1a monitoring: Replace show partials calls to getHost() and getService() with getName() 2014-09-17 09:48:30 +02:00
Eric Lippmann 9b5c1f06d0 monitoring/commands: Let detail snippets use the new command forms 
refs #6593
 2014-09-12 16:52:45 +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
Thomas Gelf 51c57520ad iconSubmitForm: replace with labelSubmitForm 
There is no way in ZF to have an input[type=submit] with an unescaped
label ( = value). I temporarily replaced all iconSubmitForms with
inputs labelled with "X" - as all we used them for were delete
operations.
 2014-06-23 14:42:26 +02:00
Thomas Gelf 851bea0725 One more _self-targetting form 2014-03-25 08:03:12 +00:00
Thomas Gelf b5b4d276d1 Add more structure to host and service details 2014-03-21 18:56:55 +00:00
Thomas Gelf 63fd074a4f Comments are still messy, clean up and fix adding / removing them 2014-03-09 19:29:23 +01:00
Thomas Gelf 8e44c66850 Style comment removal. Did it ever work? It doesn't... 2014-03-08 17:16:42 +01:00
Alexander Klimov 75096dd65b PHTML hotfix 2014-03-07 11:30:23 +01:00
Alexander Klimov a4ed32d357 Using new PHP icon helper 2014-03-07 10:54:39 +01:00
Thomas Gelf f929b15651 Object comment snippet now fits the other components 2014-03-06 19:06:14 +00:00
Thomas Gelf 0942a94958 HTML changes in the monitoring module 2014-02-21 14:03:49 +00:00
Matthias Jentsch e19a6ace75 Add missing tooltips and fix typos 
fixes #4921 #4920
 2013-10-23 11:33:15 +02:00
Marius Hein 6f51f40fc0 Add real command button to detail panel 
refs #4869
 2013-10-15 18:10:36 +02:00
Marius Hein a69c7498ec Style comments, cowntimes, properties, flags in detail pane [WIP] 
refs #4869
 2013-10-15 18:10:36 +02:00
Marius Hein 31555fdb6b Detail pane [WIP] 
refs #4824
 2013-10-14 13:30:01 +02:00
Eric Lippmann 907b7f24cc Monitoring/Show actions: Readd tabs 
refs #4823
 2013-10-14 12:57:26 +02:00
Eric Lippmann a42668edb8 Fix tests 
refs #4663
 2013-10-09 09:20:17 +02:00
Eric Lippmann b89d61add3 Monitoring: Refactor data views (WIP) 
refs #4663
 2013-10-09 09:20:16 +02:00
Jannis Moßhammer 015a914aab Fix template code style, use Bootstrap 3, remove icons 
- Icons have now the {{XY_ICON}} format
- custom classes are removed
- A few typos are fixed
- Capitalization

refs #4550
refs #4621
refs #4584
 2013-08-23 10:28:48 +02:00
Jannis Mosshammer e8204f4755 Merge branch 'feature/service-detail-view-4181' of ssh://git.icinga.org/icinga2-web 
Conflicts:
	library/Icinga/Application/Logger.php
	library/Icinga/Application/Web.php
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/Authentication/Credentials.php
	library/Icinga/Authentication/Manager.php
	library/Icinga/Authentication/PhpSession.php
	library/Icinga/Authentication/Session.php
	library/Icinga/Authentication/User.php
	library/Icinga/Authentication/UserBackend.php
	library/Icinga/Backend/AbstractBackend.php
	library/Icinga/Backend/DataView/ObjectRemappingView.php
	library/Icinga/Backend/Query.php
	library/Icinga/Backend/Statusdat/DataView/StatusdatHostView.php
	library/Icinga/Backend/Statusdat/HostgroupsummaryQuery.php
	library/Icinga/Backend/Statusdat/HostlistQuery.php
	library/Icinga/Backend/Statusdat/ServicegroupsummaryQuery.php
	library/Icinga/Backend/Statusdat/ServicelistQuery.php
	library/Icinga/Exception/ConfigurationError.php
	library/Icinga/Exception/MissingParameterException.php
	library/Icinga/Exception/NotImplementedError.php
	library/Icinga/Exception/ProgrammingError.php
	library/Icinga/Exception/SystemPermissionException.php
	library/Icinga/Protocol/AbstractQuery.php
	library/Icinga/Protocol/Commandpipe/Acknowledgement.php
	library/Icinga/Protocol/Commandpipe/CommandPipe.php
	library/Icinga/Protocol/Commandpipe/Comment.php
	library/Icinga/Protocol/Commandpipe/Downtime.php
	library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php
	library/Icinga/Protocol/Commandpipe/IComment.php
	library/Icinga/Protocol/Commandpipe/PropertyModifier.php
	library/Icinga/Protocol/Ldap/Connection.php
	library/Icinga/Protocol/Ldap/Exception.php
	library/Icinga/Protocol/Ldap/LdapUtils.php
	library/Icinga/Protocol/Ldap/Node.php
	library/Icinga/Protocol/Ldap/Query.php
	library/Icinga/Protocol/Ldap/Root.php
	library/Icinga/Protocol/Statusdat/Exception/ParsingException.php
	library/Icinga/Protocol/Statusdat/IReader.php
	library/Icinga/Protocol/Statusdat/ObjectContainer.php
	library/Icinga/Protocol/Statusdat/Parser.php
	library/Icinga/Protocol/Statusdat/Query.php
	library/Icinga/Protocol/Statusdat/Query/Expression.php
	library/Icinga/Protocol/Statusdat/Query/Group.php
	library/Icinga/Protocol/Statusdat/Query/IQueryPart.php
	library/Icinga/Protocol/Statusdat/Reader.php
	library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php
	library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php
	library/Icinga/Web/ActionController.php
	library/Icinga/Web/Form.php
	library/Icinga/Web/Hook/Configuration/ConfigurationTab.php
	library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php
	library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php
	library/Icinga/Web/Hook/Grapher.php
	library/Icinga/Web/Hook/Toptray.php
	library/Icinga/Web/ModuleActionController.php
	library/Icinga/Web/Notification.php
	library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
	library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
	library/Icinga/Web/Widget.php
	modules/monitoring/application/views/helpers/MonitoringCommands.php
	modules/monitoring/application/views/helpers/MonitoringFlags.php
	modules/monitoring/application/views/helpers/MonitoringProperties.php
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/flags.phtml
	modules/monitoring/application/views/scripts/show/components/properties.phtml
	modules/monitoring/application/views/scripts/show/header.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/application/views/scripts/show/service.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
	modules/monitoring/library/Monitoring/Backend/Statusdat.php
	modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php
	modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php
	modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
	modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
	modules/monitoring/library/Monitoring/Command/Meta.php
	modules/monitoring/library/Monitoring/View/DowntimeView.php
	modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php
	modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php
	modules/monitoring/test/php/library/Command/MetaTest.php
 2013-07-23 16:33:07 +02:00
Marius Hein 1492245788 Service detail view: Template fixes 
refs #4181
 2013-07-23 14:03:32 +02:00