Modified: trunk/opsview-core/lib/Runtime/Searches.pm
===================================================================
--- trunk/opsview-core/lib/Runtime/Searches.pm 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-core/lib/Runtime/Searches.pm 2010-11-02 22:42:28 UTC (rev 5291)
@@ -696,10 +696,9 @@
$this_host->{output} = $hash->{host_output};
if ( my $dt = $downtimes->{ $hash->{host_object_id} } ) {
- $this_host->{downtime} = $dt->{state};
-
- #$this_host->{downtime_username} = $dt->{username};
- #$this_host->{downtime_comment} = $dt->{comment};
+ $this_host->{downtime} = $dt->{state};
+ $this_host->{downtime_username} = $dt->{username};
+ $this_host->{downtime_comment} = $dt->{comment};
}
else {
$this_host->{downtime} = 0;
@@ -776,16 +775,14 @@
my $sdt = $downtimes->{ $hash->{service_object_id} };
my $hdt = $downtimes->{ $hash->{host_object_id} };
if ( ( $sdt->{state} || 0 ) < ( $hdt->{state} || 0 ) ) {
- $this_service->{downtime} = $hdt->{state};
-
- #$this_service->{downtime_username} = $hdt->{username};
- #$this_service->{downtime_comment} = $hdt->{comment};
+ $this_service->{downtime} = $hdt->{state};
+ $this_service->{downtime_username} = $hdt->{username};
+ $this_service->{downtime_comment} = $hdt->{comment};
}
elsif ( $sdt->{state} ) {
- $this_service->{downtime} = $sdt->{state};
-
- #$this_service->{downtime_username} = $sdt->{username};
- #$this_service->{downtime_comment} = $sdt->{comment};
+ $this_service->{downtime} = $sdt->{state};
+ $this_service->{downtime_username} = $sdt->{username};
+ $this_service->{downtime_comment} = $sdt->{comment};
}
else {
$this_service->{downtime} = 0;
@@ -1107,7 +1104,12 @@
state_duration => $service->{state_duration},
acknowledged => $service->{acknowledged},
markdown_filter => $service->{markdown_filter},
+ downtime => $service->{downtime},
};
+ if ( $h->{downtime} ) {
+ $h->{downtime_username} = $service->{downtime_username};
+ $h->{downtime_comment} = $service->{downtime_comment};
+ }
if ( $h->{acknowledged} ) {
$h->{acknowledged_author} = $service->{acknowledged_author};
$h->{acknowledged_comment} = $service->{acknowledged_comment};
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/de.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2010-11-02 22:42:28 UTC (rev 5291)
@@ -5302,6 +5302,10 @@
msgstr ""
#:
+msgid "ui.viewport.state.acknowledged"
+msgstr "Bestätigt"
+
+#:
msgid "ui.viewport.state.notAcknowledgedYet"
msgstr ""
@@ -5362,8 +5366,8 @@
msgstr "Viewport-Zusammenfassung"
#:
-msgid "ui.viewport.table.title.acknowledged"
-msgstr "Bestätigt"
+msgid "ui.viewport.table.title.handled"
+msgstr ""
#:
msgid "ui.viewport.table.title.history"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/es.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2010-11-02 22:42:28 UTC (rev 5291)
@@ -5348,6 +5348,10 @@
msgstr ""
#:
+msgid "ui.viewport.state.acknowledged"
+msgstr "Reconocido"
+
+#:
msgid "ui.viewport.state.notAcknowledgedYet"
msgstr ""
@@ -5408,8 +5412,8 @@
msgstr "Resumen de viewports"
#:
-msgid "ui.viewport.table.title.acknowledged"
-msgstr "Reconocido"
+msgid "ui.viewport.table.title.handled"
+msgstr ""
#:
msgid "ui.viewport.table.title.history"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/fr.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2010-11-02 22:42:28 UTC (rev 5291)
@@ -5300,6 +5300,10 @@
msgstr ""
#:
+msgid "ui.viewport.state.acknowledged"
+msgstr "Reconnu"
+
+#:
msgid "ui.viewport.state.notAcknowledgedYet"
msgstr ""
@@ -5360,8 +5364,8 @@
msgstr "Vue résumé fenêtre d'affichage"
#:
-msgid "ui.viewport.table.title.acknowledged"
-msgstr "Reconnu"
+msgid "ui.viewport.table.title.handled"
+msgstr ""
#:
msgid "ui.viewport.table.title.history"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2010-11-02 22:42:28 UTC (rev 5291)
@@ -280,8 +280,8 @@
msgid "messages.hostgroup.nameNotFound %1"
msgstr "Host group %1 not found"
+#. ($arg)
#. ($hgid)
-#. ($arg)
msgid "messages.hostgroup.notFound %1"
msgstr "Host group id %1 not found"
@@ -1392,6 +1392,7 @@
msgstr "Are you sure you want to delete `%1`?"
#. ($c->stash->{object}->name)
+#. ($o->name)
#. (object_name)
msgid "ui.admin.list.label.edit %1"
msgstr "Edit %1"
@@ -4057,8 +4058,8 @@
msgid "ui.status.service.label.summary.forDowntime %1"
msgstr "Service Status for Downtime Starting At %1"
+#. (failed_services)
#. (host.services.size)
-#. (failed_services)
msgid "ui.status.service.servicesFailed %1"
msgstr "Services failed: %1"
@@ -4136,6 +4137,9 @@
msgid "ui.viewport.performance.historyUnauthorised"
msgstr "Please login to see data"
+msgid "ui.viewport.state.acknowledged"
+msgstr "Acknowledgement"
+
msgid "ui.viewport.state.notAcknowledgedYet"
msgstr "Not yet"
@@ -4185,8 +4189,8 @@
msgid "ui.viewport.summary.title"
msgstr "Viewport Summary"
-msgid "ui.viewport.table.title.acknowledged"
-msgstr "Acknowledgement"
+msgid "ui.viewport.table.title.handled"
+msgstr "Handled"
msgid "ui.viewport.table.title.history"
msgstr "History"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/it.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2010-11-02 22:42:28 UTC (rev 5291)
@@ -5299,6 +5299,10 @@
msgstr ""
#:
+msgid "ui.viewport.state.acknowledged"
+msgstr "Riconosciuto"
+
+#:
msgid "ui.viewport.state.notAcknowledgedYet"
msgstr ""
@@ -5359,8 +5363,8 @@
msgstr "Riepilogo Cruscotto"
#:
-msgid "ui.viewport.table.title.acknowledged"
-msgstr "Riconosciuto"
+msgid "ui.viewport.table.title.handled"
+msgstr ""
#:
msgid "ui.viewport.table.title.history"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/messages.pot
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/messages.pot 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/messages.pot 2010-11-02 22:42:28 UTC (rev 5291)
@@ -56,12 +56,12 @@
#. ($o->class_title, $o->identity_string, $attributes_dump)
#. ($o->class_title, $o->identity_string, $audit_lines)
-#: lib/Opsview/Web/ControllerBase/Admin.pm:441 lib/Opsview/Web/ControllerBase/Admin.pm:491
+#: lib/Opsview/Web/ControllerBase/Admin.pm:442 lib/Opsview/Web/ControllerBase/Admin.pm:492
msgid "messages.auditlog.admin.creatingObject %1 %2 %3"
msgstr ""
#. ($o->class_title, $o->identity_string)
-#: lib/Opsview/Web/ControllerBase/Admin.pm:296
+#: lib/Opsview/Web/ControllerBase/Admin.pm:297
msgid "messages.auditlog.admin.deletingObject %1 %2"
msgstr ""
@@ -72,7 +72,7 @@
#. ($o->class_title, $o->identity_string, $audit_lines)
#. ($o->class_title, $o->identity_string, $attributes_dump)
-#: lib/Opsview/Web/ControllerBase/Admin.pm:494 lib/Opsview/Web/ControllerBase/Admin.pm:584
+#: lib/Opsview/Web/ControllerBase/Admin.pm:495 lib/Opsview/Web/ControllerBase/Admin.pm:585
msgid "messages.auditlog.admin.updatingObject %1 %2 %3"
msgstr ""
@@ -352,8 +352,8 @@
msgid "messages.hostgroup.nameNotFound %1"
msgstr ""
+#. ($arg)
#. ($hgid)
-#. ($arg)
#: lib/Opsview/Web/Controller/Api/Status.pm:82 lib/Opsview/Web/Controller/Status/Host.pm:39 lib/Opsview/Web/Controller/Status/Hostgroup.pm:48 lib/Opsview/Web/Controller/Status/Service.pm:31
msgid "messages.hostgroup.notFound %1"
msgstr ""
@@ -368,33 +368,33 @@
msgid "messages.keyword.viewportNotEnabled %1"
msgstr ""
-#: lib/Opsview/Web/Controller/Admin/Host.pm:234 lib/Opsview/Web/Controller/Admin/Snmptrap.pm:76 lib/Opsview/Web/Controller/Admin/Snmpwalk.pm:216 lib/Opsview/Web/Controller/WrapCGI.pm:150
+#: lib/Opsview/Web/Controller/Admin/Host.pm:247 lib/Opsview/Web/Controller/Admin/Snmptrap.pm:76 lib/Opsview/Web/Controller/Admin/Snmpwalk.pm:216 lib/Opsview/Web/Controller/WrapCGI.pm:150
msgid "messages.noHostname"
msgstr ""
-#: lib/Opsview/Web/Controller/Admin/Host.pm:256
+#: lib/Opsview/Web/Controller/Admin/Host.pm:269
msgid "messages.noSnmpCommunity"
msgstr ""
-#: lib/Opsview/Web/Controller/Admin/Host.pm:248
+#: lib/Opsview/Web/Controller/Admin/Host.pm:261
msgid "messages.noSnmpVersion"
msgstr ""
-#: lib/Opsview/Web/Controller/Admin/Host.pm:300
+#: lib/Opsview/Web/Controller/Admin/Host.pm:313
msgid "messages.queryHost.emptyOutput"
msgstr ""
#. ($err)
-#: lib/Opsview/Web/Controller/Admin/Host.pm:295
+#: lib/Opsview/Web/Controller/Admin/Host.pm:308
msgid "messages.queryHost.error: %1"
msgstr ""
-#: lib/Opsview/Web/Controller/Admin/Host.pm:309
+#: lib/Opsview/Web/Controller/Admin/Host.pm:322
msgid "messages.queryHost.incorrectOutput"
msgstr ""
#. ($reply->{output})
-#: lib/Opsview/Web/Controller/Admin/Host.pm:306
+#: lib/Opsview/Web/Controller/Admin/Host.pm:319
msgid "messages.queryHost.invalidXMLData: %1"
msgstr ""
@@ -624,16 +624,16 @@
msgstr ""
#. (i)
-#: root/admin/attribute/edit_form_fields:40
+#: root/admin/attribute/edit_form_fields:43
msgid "ui.admin.attribute.edit.label.attributeLabel %1"
msgstr ""
#. (i)
-#: root/admin/attribute/edit_form_fields:28
+#: root/admin/attribute/edit_form_fields:31
msgid "ui.admin.attribute.edit.label.defaultArg %1"
msgstr ""
-#: root/admin/attribute/edit_form_fields:16
+#: root/admin/attribute/edit_form_fields:19
msgid "ui.admin.attribute.edit.label.defaultValue"
msgstr ""
@@ -898,16 +898,16 @@
msgstr ""
#. ($c->stash->{title_description}, $c->stash->{object}->name)
-#: lib/Opsview/Web/ControllerBase/Admin.pm:356
+#: lib/Opsview/Web/ControllerBase/Admin.pm:357
msgid "ui.admin.description.clone %1 %2"
msgstr ""
-#: lib/Opsview/Web/ControllerBase/Admin.pm:323
+#: lib/Opsview/Web/ControllerBase/Admin.pm:324
msgid "ui.admin.description.edit"
msgstr ""
#. ($c->stash->{title_description})
-#: lib/Opsview/Web/ControllerBase/Admin.pm:345
+#: lib/Opsview/Web/ControllerBase/Admin.pm:346
msgid "ui.admin.description.new %1"
msgstr ""
@@ -1467,7 +1467,7 @@
msgid "ui.admin.host.label.serviceCheckExcludedFromHostTemplates"
msgstr ""
-#: lib/Opsview/Web/Controller/Admin/Host.pm:111
+#: lib/Opsview/Web/Controller/Admin/Host.pm:119
msgid "ui.admin.host.list.title"
msgstr ""
@@ -1479,7 +1479,7 @@
msgid "ui.admin.host.menu.help.noStatus"
msgstr ""
-#: root/admin/host/menu:16
+#: lib/Opsview/Web/Controller/Admin/Host.pm:112 root/admin/host/menu:16
msgid "ui.admin.host.menu.resolveServiceChecks"
msgstr ""
@@ -1491,7 +1491,7 @@
msgid "ui.admin.host.message.cannotDeleteAsMonitoringServer"
msgstr ""
-#: lib/Opsview/Web/Controller/Admin/Host.pm:413
+#: lib/Opsview/Web/Controller/Admin/Host.pm:426
msgid "ui.admin.host.queryhost.title.editHostInterfaces"
msgstr ""
@@ -1512,7 +1512,7 @@
msgstr ""
#. ($o->name)
-#: lib/Opsview/Web/Controller/Admin/Host.pm:185
+#: lib/Opsview/Web/Controller/Admin/Host.pm:193
msgid "ui.admin.host.title.resolvedServices %1"
msgstr ""
@@ -1824,8 +1824,9 @@
msgstr ""
#. ($c->stash->{object}->name)
+#. ($o->name)
#. (object_name)
-#: lib/Opsview/Web/Controller/Admin/Host.pm:418 lib/Opsview/Web/Controller/State/Host.pm:171 root/admin/list_functions_base:26
+#: lib/Opsview/Web/Controller/Admin/Host.pm:197 lib/Opsview/Web/Controller/Admin/Host.pm:431 lib/Opsview/Web/Controller/State/Host.pm:171 root/admin/list_functions_base:26
msgid "ui.admin.list.label.edit %1"
msgstr ""
@@ -1837,7 +1838,7 @@
msgid "ui.admin.list.pages"
msgstr ""
-#: root/admin/list_footer:30
+#: lib/Opsview/Web/ControllerBase/Admin.pm:288
msgid "ui.admin.list.pagesAll"
msgstr ""
@@ -1974,7 +1975,7 @@
msgid "ui.admin.monitors.eventHandler"
msgstr ""
-#: root/admin/servicecheck_buttons:170
+#: root/admin/servicecheck_buttons:172
msgid "ui.admin.monitors.eventHandler.label.eventHandler"
msgstr ""
@@ -1982,7 +1983,7 @@
msgid "ui.admin.monitors.exception"
msgstr ""
-#: root/admin/servicecheck_buttons:155
+#: root/admin/servicecheck_buttons:157
msgid "ui.admin.monitors.exception.label.args"
msgstr ""
@@ -1998,7 +1999,7 @@
msgid "ui.admin.monitors.timedException"
msgstr ""
-#: root/admin/servicecheck_buttons:159
+#: root/admin/servicecheck_buttons:161
msgid "ui.admin.monitors.timedException.label.timedArgs"
msgstr ""
@@ -3190,7 +3191,7 @@
msgstr ""
#. ($c->stash->{object}->name)
-#: lib/Opsview/Web/ControllerBase/Admin.pm:355
+#: lib/Opsview/Web/ControllerBase/Admin.pm:356
msgid "ui.admin.title.clone %1"
msgstr ""
@@ -3198,7 +3199,7 @@
msgid "ui.admin.title.list"
msgstr ""
-#: lib/Opsview/Web/ControllerBase/Admin.pm:342
+#: lib/Opsview/Web/ControllerBase/Admin.pm:343
msgid "ui.admin.title.new"
msgstr ""
@@ -3601,11 +3602,11 @@
msgid "ui.footer.message.refresh"
msgstr ""
-#: root/wrapper_page_nav_info:12
+#: root/wrapper_page_nav_info:13
msgid "ui.footer.message.start"
msgstr ""
-#: root/wrapper_page_nav_info:10
+#: root/wrapper_page_nav_info:11
msgid "ui.footer.message.stop"
msgstr ""
@@ -3978,16 +3979,16 @@
msgstr ""
#. ($interfaceid)
-#: lib/Opsview/Web/Controller/Admin/Host.pm:348
+#: lib/Opsview/Web/Controller/Admin/Host.pm:361
msgid "ui.host.edit.snmp.interface.blankNameForId %1"
msgstr ""
#. ($interface_hash->{ifAlias}, $interface_hash->{ifSpeed}, $interface_hash->{ifLink}, $interface_hash->{ifStatus})
-#: lib/Opsview/Web/Controller/Admin/Host.pm:340
+#: lib/Opsview/Web/Controller/Admin/Host.pm:353
msgid "ui.host.edit.snmp.interface.extraInfo %1 %2 %3 %4"
msgstr ""
-#: root/event/view_options:5 root/graph/style/graph_common:35 root/viewport/view_options:27 root/viewportsummary/view_options:29 root/wrapper_page_nav:25
+#: root/event/view_options:5 root/graph/style/graph_common:35 root/viewport/view_options:27 root/viewportsummary/view_options:29 root/wrapper_page_nav:21
msgid "ui.icon.close"
msgstr ""
@@ -4764,7 +4765,7 @@
msgid "ui.objecttype.contact"
msgstr ""
-#: lib/Opsview/Web/Controller/Admin/Host.pm:413 lib/Opsview/Web/Controller/Admin/Host.pm:58 lib/Opsview/Web/Controller/State/Host.pm:159 lib/Opsview/Web/Controller/Status/Service.pm:70 root/admin/notificationprofile/list_functions:51
+#: lib/Opsview/Web/Controller/Admin/Host.pm:426 lib/Opsview/Web/Controller/Admin/Host.pm:58 lib/Opsview/Web/Controller/State/Host.pm:159 lib/Opsview/Web/Controller/Status/Service.pm:70 root/admin/notificationprofile/list_functions:51
msgid "ui.objecttype.host"
msgstr ""
@@ -5243,11 +5244,11 @@
msgid "ui.status.label.acknowledged"
msgstr ""
-#: lib/Opsview/Web/Controller/Common.pm:231 lib/Opsview/Web/Controller/Common.pm:239 lib/Opsview/Web/Controller/Event.pm:286 root/opsview_status_lights:51 root/status/status_functions:170 root/status/status_functions:59
+#: lib/Opsview/Web/Controller/Common.pm:231 lib/Opsview/Web/Controller/Common.pm:239 lib/Opsview/Web/Controller/Event.pm:286 root/opsview_status_lights:51 root/status/status_functions:172 root/status/status_functions:59
msgid "ui.status.label.critical"
msgstr ""
-#: lib/Opsview/Web/Controller/Event.pm:281 root/status/status_functions:137 root/status/status_functions:21 root/status/status_functions:70 root/status/status_functions:71
+#: lib/Opsview/Web/Controller/Event.pm:281 root/status/status_functions:139 root/status/status_functions:21 root/status/status_functions:70 root/status/status_functions:71
msgid "ui.status.label.down"
msgstr ""
@@ -5301,7 +5302,7 @@
msgid "ui.status.label.numberOfComments %1"
msgstr ""
-#: lib/Opsview/Web/Controller/Common.pm:229 lib/Opsview/Web/Controller/Common.pm:237 lib/Opsview/Web/Controller/Event.pm:286 root/opsview_status_lights:45 root/opsview_status_lights:63 root/status/status_functions:152 root/status/status_functions:41
+#: lib/Opsview/Web/Controller/Common.pm:229 lib/Opsview/Web/Controller/Common.pm:237 lib/Opsview/Web/Controller/Event.pm:286 root/opsview_status_lights:45 root/opsview_status_lights:63 root/status/status_functions:154 root/status/status_functions:41
msgid "ui.status.label.ok"
msgstr ""
@@ -5325,19 +5326,19 @@
msgid "ui.status.label.unhandled"
msgstr ""
-#: lib/Opsview/Web/Controller/Common.pm:232 lib/Opsview/Web/Controller/Common.pm:240 lib/Opsview/Web/Controller/Event.pm:286 root/status/status_functions:164 root/status/status_functions:53
+#: lib/Opsview/Web/Controller/Common.pm:232 lib/Opsview/Web/Controller/Common.pm:240 lib/Opsview/Web/Controller/Event.pm:286 root/status/status_functions:166 root/status/status_functions:53
msgid "ui.status.label.unknown"
msgstr ""
-#: lib/Opsview/Web/Controller/Event.pm:281 root/status/status_functions:143 root/status/status_functions:27 root/status/status_functions:74 root/status/status_functions:75
+#: lib/Opsview/Web/Controller/Event.pm:281 root/status/status_functions:145 root/status/status_functions:27 root/status/status_functions:74 root/status/status_functions:75
msgid "ui.status.label.unreachable"
msgstr ""
-#: lib/Opsview/Web/Controller/Event.pm:281 root/status/status_functions:131 root/status/status_functions:15 root/status/status_functions:68
+#: lib/Opsview/Web/Controller/Event.pm:281 root/status/status_functions:133 root/status/status_functions:15 root/status/status_functions:68
msgid "ui.status.label.up"
msgstr ""
-#: lib/Opsview/Web/Controller/Common.pm:230 lib/Opsview/Web/Controller/Common.pm:238 lib/Opsview/Web/Controller/Event.pm:286 root/opsview_status_lights:48 root/status/status_functions:158 root/status/status_functions:47
+#: lib/Opsview/Web/Controller/Common.pm:230 lib/Opsview/Web/Controller/Common.pm:238 lib/Opsview/Web/Controller/Event.pm:286 root/opsview_status_lights:48 root/status/status_functions:160 root/status/status_functions:47
msgid "ui.status.label.warning"
msgstr ""
@@ -5362,8 +5363,8 @@
msgid "ui.status.service.label.summary.forDowntime %1"
msgstr ""
+#. (failed_services)
#. (host.services.size)
-#. (failed_services)
#: root/status/service:110 root/viewport/style/group_by_host:74
msgid "ui.status.service.servicesFailed %1"
msgstr ""
@@ -5457,7 +5458,7 @@
msgid "ui.viewport.label.allOkay"
msgstr ""
-#: root/viewport/style/group_by_host:122 root/viewport/style/group_by_service:59
+#: root/viewport/style/group_by_host:124 root/viewport/style/group_by_service:61
msgid "ui.viewport.label.noServices"
msgstr ""
@@ -5465,11 +5466,15 @@
msgid "ui.viewport.performance.historyUnauthorised"
msgstr ""
-#: root/viewport/style/group_by_host:107 root/viewport/style/group_by_service:50
+#: root/viewport/style/group_by_host:103 root/viewport/style/group_by_service:46
+msgid "ui.viewport.state.acknowledged"
+msgstr ""
+
+#: root/viewport/style/group_by_host:109 root/viewport/style/group_by_service:52
msgid "ui.viewport.state.notAcknowledgedYet"
msgstr ""
-#: root/viewport/style/group_by_host:105 root/viewport/style/group_by_service:48
+#: root/viewport/style/group_by_host:106 root/viewport/style/group_by_service:49
msgid "ui.viewport.state.scheduledDowntime"
msgstr ""
@@ -5531,7 +5536,7 @@
msgstr ""
#: root/viewport/style/group_by_host:12 root/viewport/style/group_by_service:7
-msgid "ui.viewport.table.title.acknowledged"
+msgid "ui.viewport.table.title.handled"
msgstr ""
#: root/viewport/style/performance:53
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/pl.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2010-11-02 22:42:28 UTC (rev 5291)
@@ -5298,6 +5298,10 @@
msgstr ""
#:
+msgid "ui.viewport.state.acknowledged"
+msgstr "Potwierdzony"
+
+#:
msgid "ui.viewport.state.notAcknowledgedYet"
msgstr ""
@@ -5358,8 +5362,8 @@
msgstr "Podsumowanie Widoku"
#:
-msgid "ui.viewport.table.title.acknowledged"
-msgstr "Potwierdzony"
+msgid "ui.viewport.table.title.handled"
+msgstr ""
#:
msgid "ui.viewport.table.title.history"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/sv.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2010-11-02 22:42:28 UTC (rev 5291)
@@ -5299,6 +5299,10 @@
msgstr ""
#:
+msgid "ui.viewport.state.acknowledged"
+msgstr "Bekräftad"
+
+#:
msgid "ui.viewport.state.notAcknowledgedYet"
msgstr ""
@@ -5359,8 +5363,8 @@
msgstr "Viewport Sammanfattning"
#:
-msgid "ui.viewport.table.title.acknowledged"
-msgstr "Bekräftad"
+msgid "ui.viewport.table.title.handled"
+msgstr ""
#:
msgid "ui.viewport.table.title.history"
Modified: trunk/opsview-web/root/viewport/style/group_by_host
===================================================================
--- trunk/opsview-web/root/viewport/style/group_by_host 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/root/viewport/style/group_by_host 2010-11-02 22:42:28 UTC (rev 5291)
@@ -9,7 +9,7 @@
<th>[% c.loc("ui.viewport.table.title.servicesSummary") | html %]</th>
[%- ELSE -%]
<th>[% c.loc("ui.viewport.table.title.statusInformation") | html %]</th>
-<th>[% c.loc("ui.viewport.table.title.acknowledged") | html %]</th>
+<th>[% c.loc("ui.viewport.table.title.handled") | html %]</th>
[%- END -%]
</tr>
[%
@@ -100,9 +100,11 @@
IF (object.state != "ok" && object.state != "up");
IF object.acknowledged;
+ c.loc("ui.viewport.state.acknowledged") | html; "<br/>";
object.acknowledged_author | html; ": "; object.acknowledged_comment | html;
ELSIF object.downtime == 2;
- c.loc("ui.viewport.state.scheduledDowntime") | html;
+ c.loc("ui.viewport.state.scheduledDowntime") | html; "<br/>";
+ object.downtime_username | html; ": "; object.downtime_comment | html;
ELSE;
c.loc("ui.viewport.state.notAcknowledgedYet") | html;
END;
Modified: trunk/opsview-web/root/viewport/style/group_by_service
===================================================================
--- trunk/opsview-web/root/viewport/style/group_by_service 2010-11-02 22:04:55 UTC (rev 5290)
+++ trunk/opsview-web/root/viewport/style/group_by_service 2010-11-02 22:42:28 UTC (rev 5291)
@@ -4,7 +4,7 @@
<th>[% c.loc("ui.viewport.table.title.host") | html %]</th>
<th class="centered">[% c.loc("ui.viewport.table.title.status") | html %]</th>
<th>[% c.loc("ui.viewport.table.title.statusInformation") | html %]</th>
-<th>[% c.loc("ui.viewport.table.title.acknowledged") | html %]</th>
+<th>[% c.loc("ui.viewport.table.title.handled") | html %]</th>
</tr>
[%
even = 0;
@@ -43,9 +43,11 @@
IF host.state != "ok";
IF host.acknowledged;
+ c.loc("ui.viewport.state.acknowledged") | html; "<br/>";
host.acknowledged_author | html; ": "; host.acknowledged_comment | html;
ELSIF host.downtime == 2;
- c.loc("ui.viewport.state.scheduledDowntime") | html;
+ c.loc("ui.viewport.state.scheduledDowntime") | html; "<br/>";
+ host.downtime_username | html; ": "; host.downtime_comment | html;
ELSE;
c.loc("ui.viewport.state.notAcknowledgedYet") | html;
END;
