Menu
▾
▴
[Hyperic-hq-discuss] hq r14300 - in trunk: src/org/hyperic/hq/ui/action/resource/group/inventory web/resource/common/monitor/alerts
|
From: <dcr...@hy...> - 2010-02-17 00:39:15
|
Author: dcrutchf Date: 2010-02-16 16:34:08 -0800 (Tue, 16 Feb 2010) New Revision: 14300 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14300 Modified: trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/ViewGroupAction.java trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp Log: Added fix for group alerts and acknowledge inputs Modified: trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/ViewGroupAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/ViewGroupAction.java 2010-02-16 22:28:55 UTC (rev 14299) +++ trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/ViewGroupAction.java 2010-02-17 00:34:08 UTC (rev 14300) @@ -25,7 +25,6 @@ package org.hyperic.hq.ui.action.resource.group.inventory; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Locale; Modified: trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp =================================================================== --- trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp 2010-02-16 22:28:55 UTC (rev 14299) +++ trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp 2010-02-17 00:34:08 UTC (rev 14300) @@ -32,88 +32,90 @@ --%> <c:if test="${not empty escalation}"> -<!-- Content Block Title: Notification --> -<tiles:insert definition=".header.tab"> - <tiles:put name="tabKey" value="monitoring.events.MiniTabs.Escalation"/> -</tiles:insert> + <!-- Content Block Title: Notification --> + <tiles:insert definition=".header.tab"> + <tiles:put name="tabKey" value="monitoring.events.MiniTabs.Escalation"/> + </tiles:insert> -<table cellpadding="0" cellspacing="0" border="0" width="100%" class="TableBottomLine" style="margin-bottom: 10px;"> - <tr> - <td width="20%" class="BlockLabel"><fmt:message key="common.header.EscalationName"/></td> - <td class="BlockContent" colspan="2"><c:out value="${escalation.name}"/></td> - </tr> - <tr> - <td colspan="3" class="BlockContent"> - <tiles:insert page="/resource/common/monitor/alerts/config/ViewEscalation.jsp"> - <tiles:put name="chooseScheme" value="false"/> - </tiles:insert> - </td> - </tr> - <tr> - <td width="20%" class="BlockLabel" style="padding-left: 4px;"><fmt:message key="common.label.EscalationActionLogs"/></td> - <td class="BlockContent" colspan="2"> </td> - </tr> - <c:forEach var="log" varStatus="status" items="${alert.actionLog}"> - <%-- No action or alert definition means escalation log --%> - <c:if test="${empty log.action || empty log.action.alertDefinition}"> - <tr> - <td width="20%" class="BlockLabel" style="padding-bottom:3px;"> - <span style="color:#333333;"><hq:dateFormatter value="${log.timeStamp}"/> - </span> - </td> - <td colspan="2" class="BlockContent" style="padding-left: 4px;padding-bottom:3px;"> - <c:out value="${log.detail}"/> - </td> - </tr> - </c:if> - </c:forEach> - <c:if test="${alert.ackable}"> - <tr> - <td width="20%" class="BlockLabel" style="border-top: solid #D5D8DE 1px;" valign="top" align="right"><span class="BoldText"><fmt:message key="resource.common.alert.ackNote"/></span></td> - <td colspan="2" class="BlockContent" style="border-top: solid #D5D8DE 1px;"> - <html:textarea property="ackNote" cols="70" rows="4"/> - </td> - </tr> - </c:if> - <tr> - <td width="20%" class="BlockLabel"> </td> - <td width="80%" class="BlockContent"> - <c:if test="${escalation.pauseAllowed && alert.ackable}"> - <div id="AlertEscalationOption" syle="text-align:left;"> - <input type="checkbox" name="pause" value="true" checked="checked" onclick="dojo11.byId('pauseTimeSel').disabled = !this.checked;" /> <fmt:message key="alert.escalation.pause"/> - </div> - </c:if> - <div style="text-align:left;"> - <tiles:insert page="/common/components/ActionButton.jsp"> - <tiles:put name="labelKey" value="resource.common.alert.action.acknowledge.label"/> - <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.acknowledge.label"/>'); document.forms[0].submit();</tiles:put> - <c:choose> - <c:when test="${alert.ackable}"> - <tiles:put name="disabled" value="false"/> - </c:when> - <c:otherwise> - <tiles:put name="hidden" value="true"/> - </c:otherwise> - </c:choose> - </tiles:insert> - </div> - </td> - </tr> -</table> + <table cellpadding="0" cellspacing="0" border="0" width="100%" class="TableBottomLine" style="margin-bottom: 10px;"> + <tr> + <td width="20%" class="BlockLabel"><fmt:message key="common.header.EscalationName"/></td> + <td class="BlockContent" colspan="2"><c:out value="${escalation.name}"/></td> + </tr> + <tr> + <td colspan="3" class="BlockContent"> + <tiles:insert page="/resource/common/monitor/alerts/config/ViewEscalation.jsp"> + <tiles:put name="chooseScheme" value="false"/> + </tiles:insert> + </td> + </tr> + <tr> + <td width="20%" class="BlockLabel" style="padding-left: 4px;"><fmt:message key="common.label.EscalationActionLogs"/></td> + <td class="BlockContent" colspan="2"> </td> + </tr> + <c:forEach var="log" varStatus="status" items="${alert.actionLog}"> + <%-- No action or alert definition means escalation log --%> + <c:if test="${empty log.action || empty log.action.alertDefinition}"> + <tr> + <td width="20%" class="BlockLabel" style="padding-bottom:3px;"> + <span style="color:#333333;"><hq:dateFormatter value="${log.timeStamp}"/> - </span> + </td> + <td colspan="2" class="BlockContent" style="padding-left: 4px;padding-bottom:3px;"> + <c:out value="${log.detail}"/> + </td> + </tr> + </c:if> + </c:forEach> + <c:if test="${alert.ackable && canTakeAction}"> + <tr> + <td width="20%" class="BlockLabel" style="border-top: solid #D5D8DE 1px;" valign="top" align="right"> + <span class="BoldText"><fmt:message key="resource.common.alert.ackNote"/></span> + </td> + <td colspan="2" class="BlockContent" style="border-top: solid #D5D8DE 1px;"> + <html:textarea property="ackNote" cols="70" rows="4"/> + </td> + </tr> + </c:if> + <tr> + <td width="20%" class="BlockLabel"> </td> + <td width="80%" class="BlockContent"> + <c:if test="${escalation.pauseAllowed && alert.ackable && canTakeAction}"> + <div id="AlertEscalationOption" syle="text-align:left;"> + <input type="checkbox" name="pause" value="true" checked="checked" onclick="dojo11.byId('pauseTimeSel').disabled = !this.checked;" /> <fmt:message key="alert.escalation.pause"/> + </div> + </c:if> + <div style="text-align:left;"> + <tiles:insert page="/common/components/ActionButton.jsp"> + <tiles:put name="labelKey" value="resource.common.alert.action.acknowledge.label"/> + <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.acknowledge.label"/>'); document.forms[0].submit();</tiles:put> + <c:choose> + <c:when test="${alert.ackable}"> + <tiles:put name="disabled" value="false"/> + </c:when> + <c:otherwise> + <tiles:put name="hidden" value="true"/> + </c:otherwise> + </c:choose> + </tiles:insert> + </div> + </td> + </tr> + </table> -<script type="text/javascript"> - var isButtonClicked = false; + <script type="text/javascript"> + var isButtonClicked = false; - function checkSubmit() { - if (isButtonClicked) { - alert('<fmt:message key="error.PreviousRequestEtc"/>'); - return false; - } - } + function checkSubmit() { + if (isButtonClicked) { + alert('<fmt:message key="error.PreviousRequestEtc"/>'); + return false; + } + } - var escalationSpan = dojo11.byId("AlertEscalationOption"); - if (escalationSpan != null) { - escalationSpan.appendChild(hyperic.form.createEscalationPauseOptions({id: "pauseTimeSel", name: "pauseTime"}, <c:out value="${escalation.maxPauseTime}"/>)); - } -</script> + var escalationSpan = dojo11.byId("AlertEscalationOption"); -</c:if> + if (escalationSpan != null) { + escalationSpan.appendChild(hyperic.form.createEscalationPauseOptions({id: "pauseTimeSel", name: "pauseTime"}, <c:out value="${escalation.maxPauseTime}"/>)); + } + </script> +</c:if> \ No newline at end of file |
