Menu
▾
▴
[Hyperic-hq-discuss] hq r12784 - in trunk/web: admin/config common/components resource/common/monitor/alerts resource/common/monitor/visibility
|
From: <dcr...@hy...> - 2009-03-17 00:02:35
|
Author: dcrutchf Date: 2009-03-16 17:02:31 -0700 (Mon, 16 Mar 2009) New Revision: 12784 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=12784 Modified: trunk/web/admin/config/NewEscalation.jsp trunk/web/common/components/ActionButton.jsp trunk/web/resource/common/monitor/alerts/ViewAlert.jsp trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp trunk/web/resource/common/monitor/visibility/IndicatorMetrics.jsp Log: [HHQ-2548] - Icon next to Fixed button in Alert details page needs some UI fixes for IE Modified the ActionButton.jsp to use an actual button element instead of spans. The styles have been applied to the button so it should look as it did with the exception of rounded corners in IE. I plan to rework the overall look and feel of the app over time and style inconsistencies such as this will be addressed then. Views affected by this change: Escalation Scheme Configuration view (New & Edit, all buttons) Resource Alert Details view (Fixed button) Group Alert Details view (Fixed button) Indicator Metrics view (View Metrics button) Modified: trunk/web/admin/config/NewEscalation.jsp =================================================================== --- trunk/web/admin/config/NewEscalation.jsp 2009-03-16 22:13:13 UTC (rev 12783) +++ trunk/web/admin/config/NewEscalation.jsp 2009-03-17 00:02:31 UTC (rev 12784) @@ -996,7 +996,6 @@ <td> <tiles:insert page="/common/components/ActionButton.jsp"> <tiles:put name="labelKey" value="common.label.Next"/> - <tiles:put name="buttonHref" value="."/> <tiles:put name="buttonClick" value="return saveNewEscalation();"/> </tiles:insert> </td> Modified: trunk/web/common/components/ActionButton.jsp =================================================================== --- trunk/web/common/components/ActionButton.jsp 2009-03-16 22:13:13 UTC (rev 12783) +++ trunk/web/common/components/ActionButton.jsp 2009-03-17 00:02:31 UTC (rev 12784) @@ -28,38 +28,39 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --%> + +<tiles:importAttribute name="labelKey" /> +<tiles:importAttribute name="buttonHref" ignore="true" /> <%-- This attribute has been deprecated --%> +<tiles:importAttribute name="buttonClick" /> +<tiles:importAttribute name="icon" ignore="true" /> +<tiles:importAttribute name="disabled" ignore="true" /> -<tiles:importAttribute name="labelKey"/> -<tiles:importAttribute name="buttonHref"/> -<tiles:importAttribute name="buttonClick"/> -<tiles:importAttribute name="icon" ignore="true"/> -<tiles:importAttribute name="disabled" ignore="true"/> - -<table cellspacing="0" cellpadding="0"> -<tr><td class="buttonLeft"> -</td> -<td class="buttonRight " valign="middle" nowrap="true"> -<c:choose> -<c:when test="${disabled}"> - <span class="InactiveText"><fmt:message key="${labelKey}"/></span> -</c:when> -<c:otherwise> - <span id="button"><a href="<c:out value="${buttonHref}" escapeXml="false"/>" onclick="<c:out value="${buttonClick}" escapeXml="false"/>"><fmt:message key="${labelKey}"/></a></span> -</c:otherwise> -</c:choose> - -<c:if test="${not empty icon}"> -<c:if test="${disabled}"> - <span style="filter: alpha(opacity=50); opacity: 0.5;"> -</c:if> - <span style="padding-left: 3px;"><c:out value="${icon}" escapeXml="false"/></span> -<c:if test="${disabled}"> - </span> -</c:if> - -</c:if> -</td> - -</tr> -</table> - +<div style="white-space:nowrap; text-align: left;"> + <c:choose> + <c:when test="${disabled}"> + <span class="InactiveText"><fmt:message key="${labelKey}" /></span> + </c:when> + <c:otherwise> + <input type="button" + id="button" + value="<fmt:message key="${labelKey}"/>" + onclick="<c:out value="${buttonClick}" escapeXml="false"/>" + style="color:#fff;font-weight:700;width:auto;overflow:visible;" /> + + <c:if test="${not empty buttonHref}"> + <!-- the buttonHref attribute has been deprecated, use buttonClick attribute instead --> + </c:if> + </c:otherwise> + </c:choose> + <c:if test="${not empty icon}"> + <c:if test="${disabled}"> + <span style="filter: alpha(opacity = 50); opacity: 0.5;"> + </c:if> + <span style="padding-left: 3px;"> + <c:out value="${icon}" escapeXml="false" /> + </span> + <c:if test="${disabled}"> + </span> + </c:if> + </c:if> +</div> \ No newline at end of file Modified: trunk/web/resource/common/monitor/alerts/ViewAlert.jsp =================================================================== --- trunk/web/resource/common/monitor/alerts/ViewAlert.jsp 2009-03-16 22:13:13 UTC (rev 12783) +++ trunk/web/resource/common/monitor/alerts/ViewAlert.jsp 2009-03-17 00:02:31 UTC (rev 12784) @@ -91,8 +91,7 @@ </c:choose> <tiles:insert page="/common/components/ActionButton.jsp"> <tiles:put name="labelKey" value="resource.common.alert.action.fixed.label"/> - <tiles:put name="buttonHref" value="javascript:document.forms[0].submit();"/> - <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.fixed.label"/>')</tiles:put> + <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.fixed.label"/>'); document.forms[0].submit();</tiles:put> <tiles:put name="icon"><html:img page="/images/icon_fixed.gif" alt="Click to mark as Fixed" align="middle"/></tiles:put> <tiles:put name="disabled" beanName="alert" beanProperty="fixed"/> </tiles:insert> Modified: trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp =================================================================== --- trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp 2009-03-16 22:13:13 UTC (rev 12783) +++ trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp 2009-03-17 00:02:31 UTC (rev 12784) @@ -81,8 +81,7 @@ <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="buttonHref" value="javascript:document.forms[0].submit();"/> - <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.acknowledge.label"/>')</tiles:put> + <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.acknowledgeable}"> <tiles:put name="disabled" value="false"/> Modified: trunk/web/resource/common/monitor/visibility/IndicatorMetrics.jsp =================================================================== --- trunk/web/resource/common/monitor/visibility/IndicatorMetrics.jsp 2009-03-16 22:13:13 UTC (rev 12783) +++ trunk/web/resource/common/monitor/visibility/IndicatorMetrics.jsp 2009-03-17 00:02:31 UTC (rev 12784) @@ -44,7 +44,6 @@ <td nowrap style="font-size:10px" width="90"> <tiles:insert page="/common/components/ActionButton.jsp"> <tiles:put name="labelKey" value="common.label.ViewMetrics"/> - <tiles:put name="buttonHref" value="."/> <tiles:put name="buttonClick" value="document.ProblemMetricsDisplayForm.submit(); return false;"/> </tiles:insert> <html:hidden property="fresh" value="false"/> |