modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml | 20 +++++++ modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ChangeResourceTemplate.jsp | 26 +++++++--- modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ConfigMetrics.jsp | 15 +++++ modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/EditConfigMetricsVisibility.jsp | 3 + modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ShowOneResourceType.jsp | 13 +++-- 5 files changed, 67 insertions(+), 10 deletions(-)
New commits: commit 733cabfa08d3ca73b943665a65771ee7fef41256 Author: Joseph Marques joseph@redhat.com Date: Thu Aug 12 14:54:11 2010 -0400
mplement "plain" / "nomenu" scheme using iframed-struts for unimplemented metric templates section
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml index 6c08474..61a14fe 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml @@ -1264,6 +1264,16 @@ <forward name="success" path="/resource/platform/monitor/Config.do?mode=configure"/> </action>
+ <action path="/resource/platform/monitor/config/ConfigMetricsNoMenu" + name="MonitoringConfigForm" + scope="request" + input="/resource/platform/monitor/Config.do?mode=configure&nomenu=true" + type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.config.ConfigMetricsAction"> + <forward name="remove" path="/resource/platform/monitor/Config.do?mode=configure&nomenu=true"/> + <forward name="failure" path="/resource/platform/monitor/Config.do?mode=configure&nomenu=true"/> + <forward name="success" path="/resource/platform/monitor/Config.do?mode=configure&nomenu=true"/> + </action> + <!-- / -->
<!-- server monitoring actions --> @@ -3135,6 +3145,16 @@ <forward name="failure" path="/admin/platform/monitor/Config.do?mode=configure"/> <forward name="success" path="/admin/platform/monitor/Config.do?mode=configure"/> </action> + + <action path="/resource/common/monitor/config/ConfigMetricsNoMenu" + name="MonitoringConfigForm" + scope="request" + input="/admin/platform/monitor/Config.do?mode=configure&nomenu=true" + type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.config.ConfigMetricsAction"> + <forward name="remove" path="/admin/platform/monitor/Config.do?mode=configure&nomenu=true"/> + <forward name="failure" path="/admin/platform/monitor/Config.do?mode=configure&nomenu=true"/> + <forward name="success" path="/admin/platform/monitor/Config.do?mode=configure&nomenu=true"/> + </action>
<!-- === Resource Monitor>Events Tab === --> <action path="/resource/common/Events" diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ChangeResourceTemplate.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ChangeResourceTemplate.jsp index 988672f..0ec1a85 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ChangeResourceTemplate.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ChangeResourceTemplate.jsp @@ -32,9 +32,16 @@ <td class="ListCellPrimary"><c:out value="${entry.type.name}"/> <c:out value="${entry.pluginInfo}"/></td> <td class="ListCell" align="left" nowrap="nowrap"> <c:if test="${monitorEnabled}"> - <html:link page="/admin/platform/monitor/Config.do?mode=configure&id=${entry.type.id}&type=${entry.type.id}" styleClass="buttonsmall"> - Edit Metric Template - </html:link> + <c:if test="${not empty param.nomenu}"> + <html:link page="/admin/platform/monitor/Config.do?nomenu=true&mode=configure&id=${entry.type.id}&type=${entry.type.id}" styleClass="buttonsmall"> + Edit Metric Template + </html:link> + </c:if> + <c:if test="${empty param.nomenu}"> + <html:link page="/admin/platform/monitor/Config.do?mode=configure&id=${entry.type.id}&type=${entry.type.id}" styleClass="buttonsmall"> + Edit Metric Template + </html:link> + </c:if> <c:if test="${(entry.enabledMetricCount + entry.disabledMetricCount) > 0}"> <span title="(enabled | disabled)"> (<c:out value="${entry.enabledMetricCount}" /> | <c:out value="${entry.disabledMetricCount}" />) @@ -99,9 +106,16 @@ <td class="ListCellPrimary"><c:out value="${entry.type.name}"/> <c:out value="${entry.pluginInfo}"/></td> <td class="ListCell" align="left"> <c:if test="${monitorEnabled}"> - <html:link page="/admin/platform/monitor/Config.do?mode=configure&type=${entry.type.id}" styleClass="buttonsmall"> - Edit Metric Template - </html:link> + <c:if test="${not empty param.nomenu}"> + <html:link page="/admin/platform/monitor/Config.do?nomenu=true&mode=configure&type=${entry.type.id}" styleClass="buttonsmall"> + Edit Metric Template + </html:link> + </c:if> + <c:if test="${empty param.nomenu}"> + <html:link page="/admin/platform/monitor/Config.do?mode=configure&type=${entry.type.id}" styleClass="buttonsmall"> + Edit Metric Template + </html:link> + </c:if> <c:if test="${(entry.enabledMetricCount + entry.disabledMetricCount) > 0}"> <span title="(enabled | disabled)"> (<c:out value="${entry.enabledMetricCount}" /> | <c:out value="${entry.disabledMetricCount}" />) diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ConfigMetrics.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ConfigMetrics.jsp index 8ce14ae..26b0682 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ConfigMetrics.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ConfigMetrics.jsp @@ -22,17 +22,30 @@ <c:param name="mode" value="configure"/> <c:param name="groupId" value="${groupId}"/> <c:param name="category" value="COMPATIBLE"/> + <c:if test="${not empty param.nomenu}"> + <c:param name="nomenu" value="${param.nomenu}" /> + </c:if> </c:url> </c:when> <c:otherwise> <c:url var="selfAction" value="/resource/common/monitor/Config.do"> <c:param name="mode" value="configure"/> <c:param name="id" value="${Resource.id}"/> + <c:if test="${not empty param.nomenu}"> + <c:param name="nomenu" value="${param.nomenu}" /> + </c:if> </c:url> </c:otherwise> </c:choose>
-<html:form action="/resource/${section}/monitor/config/ConfigMetrics"> +<c:if test="${not empty param.nomenu}"> + <c:set var="actionSuffix" value="NoMenu" /> +</c:if> +<c:if test="${empty param.nomenu}"> + <c:set var="actionSuffix" value="" /> +</c:if> + +<html:form action="/resource/${section}/monitor/config/ConfigMetrics${actionSuffix}"> <c:choose> <c:when test="${not empty ResourceType && empty param.parent}"> <!-- resource type wasn't empty so it is a default--> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/EditConfigMetricsVisibility.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/EditConfigMetricsVisibility.jsp index c89b9e7..6780c28 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/EditConfigMetricsVisibility.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/EditConfigMetricsVisibility.jsp @@ -40,6 +40,9 @@ <c:if test="${not empty param.ps}"> <c:param name="ps" value="${param.ps}"/> </c:if> + <c:if test="${not empty param.nomenu}"> + <c:param name="nomenu" value="${param.nomenu}"/> + </c:if> </c:url> <c:if test="${ResourceType != null && param.parent > 0}"> <c:set var="isAutoGroup" value="true"/> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ShowOneResourceType.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ShowOneResourceType.jsp index 4ce0cf2..9165090 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ShowOneResourceType.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/config/ShowOneResourceType.jsp @@ -50,9 +50,16 @@ </td> <td class="ListCell" align="left" nowrap="nowrap"> <c:if test="${monitorEnabled}"> - <html:link page="/admin/platform/monitor/Config.do?mode=configure&id=${serviceType.type.id}&type=${serviceType.type.id}" styleClass="buttonsmall"> - Edit Metric Template - </html:link> + <c:if test="${not empty param.nomenu}"> + <html:link page="/admin/platform/monitor/Config.do?nomenu=true&mode=configure&id=${serviceType.type.id}&type=${serviceType.type.id}" styleClass="buttonsmall"> + Edit Metric Template + </html:link> + </c:if> + <c:if test="${empty param.nomenu}"> + <html:link page="/admin/platform/monitor/Config.do?mode=configure&id=${serviceType.type.id}&type=${serviceType.type.id}" styleClass="buttonsmall"> + Edit Metric Template + </html:link> + </c:if> <c:if test="${(serviceType.enabledMetricCount + serviceType.disabledMetricCount) > 0}"> <span title="(enabled | disabled)"> (<c:out value="${serviceType.enabledMetricCount}" /> | <c:out value="${serviceType.disabledMetricCount}" />)