modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml | 66 ++++++++-- 2 files changed, 59 insertions(+), 9 deletions(-)
New commits: commit 878f8250c2036b55b48bc2ece5cdd62c4f8b4244 Author: John Sanda john@localhost.localdomain Date: Thu Feb 25 12:52:56 2010 -0500
Removing unused code
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml index f91b86b..23abda0 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml @@ -235,17 +235,6 @@ <h:form id="viewResourceConfigurationForm">
<input type="hidden" name="id" value="#{ResourceUIBean.id}"/> - <input type="hidden" name="configId" value="#{param.configId}"/> - - ui:remove - <onc:config configurationDefinition="#{ViewResourceConfigurationUpdateUIBean.configurationDefinition}" - configuration="#{ViewResourceConfigurationUpdateUIBean.configuration}" - readOnly="true" - nullConfigurationDefinitionMessage="#{ViewResourceConfigurationUpdateUIBean.nullConfigurationDefinitionMessage}" - nullConfigurationMessage="#{ViewResourceConfigurationUpdateUIBean.nullConfigurationMessage}" - prevalidate="true"/> - </ui:remove> -
<c:choose> <c:when test="${configurationViewer.rawSupported}">
commit 29f1e948b83f8e0e53352d8ff49b56856e65da43 Author: John Sanda john@localhost.localdomain Date: Thu Feb 25 12:51:38 2010 -0500
[BZ 553293] Adding support for raw config on the history page
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml index 9f975c6..f7fa56c 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml @@ -12,6 +12,8 @@ </navigation> </page>
+ <page view-id="/rhq/resource/configuration/history.xhtml" action="#{configurationViewer.initialize}"/> + <page view-id="/rhq/resource/configuration/view-map.xhtml" action="#{configurationViewer.initialize}"/>
<page view-id="/rhq/resource/configuration/edit.xhtml" concurrent-request-timeout="15000" timeout="180000"> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml index ac824f8..f91b86b 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml @@ -11,7 +11,8 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:onc="http://jboss.org/on/component" xmlns:onf="http://jboss.org/on/function" - xmlns:rich="http://richfaces.ajax4jsf.org/rich" xmlns:a4j="https://ajax4jsf.dev.java.net/ajax%22%3E + xmlns:rich="http://richfaces.ajax4jsf.org/rich" xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:s="http://jboss.com/products/seam/taglib%22%3E
<ui:composition template="/rhq/resource/layout/main.xhtml">
@@ -22,6 +23,18 @@
<ui:param name="latestConfig" value="#{GetLatestConfigurationUpdateUIBean.latestConfigurationUpdate}"/>
+ <script type="text/javascript"> + function cursor_wait() { + document.body.style.cursor = 'wait'; + return true; + } + + function cursor_clear() { + document.body.style.cursor = 'default'; + return true; + } + </script> + <h:form id="historyForm"> <input type="hidden" name="id" value="${ResourceUIBean.id}"/>
@@ -224,12 +237,58 @@ <input type="hidden" name="id" value="#{ResourceUIBean.id}"/> <input type="hidden" name="configId" value="#{param.configId}"/>
+ ui:remove <onc:config configurationDefinition="#{ViewResourceConfigurationUpdateUIBean.configurationDefinition}" configuration="#{ViewResourceConfigurationUpdateUIBean.configuration}" readOnly="true" nullConfigurationDefinitionMessage="#{ViewResourceConfigurationUpdateUIBean.nullConfigurationDefinitionMessage}" nullConfigurationMessage="#{ViewResourceConfigurationUpdateUIBean.nullConfigurationMessage}" prevalidate="true"/> + </ui:remove> + + + <c:choose> + <c:when test="${configurationViewer.rawSupported}"> + rich:tabPanel + <rich:tab label="Advanced Mode"> + <ui:include src="raw.xhtml"/> + </rich:tab> + </rich:tabPanel> + </c:when> + + <c:when test="${configurationViewer.structuredSupported}"> + rich:tabPanel + <rich:tab label="Basic Mode"> + <ui:include src="structured.xhtml"/> + </rich:tab> + </rich:tabPanel> + </c:when> + + <c:when test="${configurationViewer.structuredAndRawSupported}"> + <rich:tabPanel id="resourceConfigurationTabPanel" + switchType="ajax" + valueChangeListener="#{configurationViewer.changeTabs}"> + <rich:tab id="structuredTab" + label="Basic Mode" + onlabelclick="cursor_wait();" + oncomplete="cursor_clear();" + limitToList="true" + reRender="upperEditButton,lowerEditButton,modalEditor"> + <ui:include src="structured.xhtml"/> + </rich:tab> + <rich:tab id="rawTab" + label="Advanced Mode" + onlabelclick="cursor_wait();" + oncomplete="cursor_clear();" + limitToList="true" + reRender="upperEditButton,lowerEditButton,modalEditor"> + <ui:include src="raw.xhtml"/> + </rich:tab> + </rich:tabPanel> + </c:when> + </c:choose> + + <ui:include src="view-raw-modal.xhtml"/>
</h:form>
rhq-commits@lists.fedorahosted.org