From: <cl...@hy...> - 2008-08-07 20:48:24
|
Author: clee Date: 2008-08-07 13:48:23 -0700 (Thu, 07 Aug 2008) New Revision: 10564 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=10564 Modified: branches/HQ_3_2/web/WEB-INF/classes/ApplicationResources.properties branches/HQ_3_2/web/resource/common/monitor/alerts/config/ViewDefinitionNotificationsTabs.jsp Log: Add resource string support for script action [merge from HEAD] Modified: branches/HQ_3_2/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- branches/HQ_3_2/web/WEB-INF/classes/ApplicationResources.properties 2008-08-07 20:38:47 UTC (rev 10563) +++ branches/HQ_3_2/web/WEB-INF/classes/ApplicationResources.properties 2008-08-07 20:48:23 UTC (rev 10564) @@ -1796,6 +1796,9 @@ alert.config.server.props.ViewDef.openNMS.Title=HQ View Server Alert Definition, OpenNMS - {0} alert.config.service.props.ViewDef.openNMS.Title=HQ View Service Alert Definition, OpenNMS - {0} +# view definition, Script +alert.config.edit.script.path=Full path to script + alert.config.edit.page.Cond.PageTitle=Edit {0}: {1}: Alert Condition Set # edit alert condition set alert.config.application.edit.page.Cond.Title=HQ Edit Application Alert Definition - {0} @@ -1904,6 +1907,7 @@ monitoring.events.MiniTabs.Others=Notify Other Recipients monitoring.events.MiniTabs.SNMP=SNMP Trap monitoring.events.MiniTabs.Escalation=Escalation +monitoring.events.MiniTabs.Script=Script monitoring.events.MiniTabs.OpenNMS=OpenNMS monitoring.baseline.BlockTitle.MetricBaseline={0} : Metric Baseline Modified: branches/HQ_3_2/web/resource/common/monitor/alerts/config/ViewDefinitionNotificationsTabs.jsp =================================================================== --- branches/HQ_3_2/web/resource/common/monitor/alerts/config/ViewDefinitionNotificationsTabs.jsp 2008-08-07 20:38:47 UTC (rev 10563) +++ branches/HQ_3_2/web/resource/common/monitor/alerts/config/ViewDefinitionNotificationsTabs.jsp 2008-08-07 20:48:23 UTC (rev 10564) @@ -36,6 +36,7 @@ <tiles:importAttribute name="viewRolesUrl" ignore="true"/> <tiles:importAttribute name="viewEscalationUrl"/> <tiles:importAttribute name="viewSnmpUrl" ignore="true"/> +<tiles:importAttribute name="viewScriptUrl" ignore="true"/> <tiles:importAttribute name="viewOpenNMSUrl" ignore="true"/> <c:set var="mode" value="${param.mode}"/> @@ -68,6 +69,9 @@ <c:when test="${tab.value == 'SNMP'}"> <c:set var="tabUrl" value="${viewSnmpUrl}"/> </c:when> + <c:when test="${tab.value == 'Script'}"> + <c:set var="tabUrl" value="${viewScriptUrl}"/> + </c:when> <c:when test="${tab.value == 'OpenNMS'}"> <c:set var="tabUrl" value="${viewOpenNMSUrl}"/> </c:when> |