Author: chris.laprun(a)jboss.com
Date: 2007-03-16 18:18:56 -0400 (Fri, 16 Mar 2007)
New Revision: 6719
Modified:
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml
trunk/wsrp/src/resources/portal-wsrp-war/style.css
Log:
- Fixed buttons on editConsumer
- Started better display of registration information.
Modified:
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
---
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-03-16
16:47:58 UTC (rev 6718)
+++
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-03-16
22:18:56 UTC (rev 6719)
@@ -10,120 +10,126 @@
<hr/>
<h:form>
- <table width="100%" class="portlet-table-body">
- <tr>
- <th>Producer id:</th>
- <td><h:inputText
value="#{consumersMgr.selectedConsumer.producerId}"/></td>
- </tr>
- <tr>
- <th>Cache expiration:</th>
- <td><h:inputText
value="#{consumersMgr.selectedConsumer.producerInfo.expirationCacheSeconds}"/>
(seconds
- before expiration)
- </td>
- </tr>
- <tr>
- <th>Endpoint configuration:</th>
- <td>
- <h:selectBooleanCheckbox value="#{consumersMgr.useWSDL}"
-
valueChangeListener="#{consumersMgr.useWSDLListener}"
- onchange="submit()"
immediate="true"/>Use WSDL?
+<table width="100%" class="portlet-table-body">
+ <tr>
+ <th>Producer id:</th>
+ <td><h:inputText
value="#{consumersMgr.selectedConsumer.producerId}"/></td>
+ </tr>
+ <tr>
+ <th>Cache expiration:</th>
+ <td><h:inputText
value="#{consumersMgr.selectedConsumer.producerInfo.expirationCacheSeconds}"/>
(seconds
+ before expiration)
+ </td>
+ </tr>
+ <tr>
+ <th>Endpoint configuration:</th>
+ <td>
+ <h:selectBooleanCheckbox value="#{consumersMgr.useWSDL}"
+
valueChangeListener="#{consumersMgr.useWSDLListener}"
+ onchange="submit()"
immediate="true"/>Use WSDL?
- <c:choose>
- <c:when test="#{consumersMgr.useWSDL}">
- <h:inputText size="70"
-
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.wsdlDefinitionURL}"/>
- </c:when>
+ <c:choose>
+ <c:when test="#{consumersMgr.useWSDL}">
+ <h:inputText size="70"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.wsdlDefinitionURL}"/>
+ </c:when>
- <c:otherwise>
- <table border="0" class='portlet-table-body'>
- <tr>
- <th>Service Description URL:</th>
- <td><h:inputText size="70"
-
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.serviceDescriptionURL}"/>
- </td>
- </tr>
- <tr>
- <th>Markup URL:</th>
- <td><h:inputText size="70"
-
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.markupURL}"/>
- </td>
- </tr>
- <tr>
- <th>Registration URL:</th>
- <td><h:inputText size="70"
-
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.registrationURL}"/>
- </td>
- </tr>
- <tr>
- <th>Portlet Management URL:</th>
- <td><h:inputText size="70"
-
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.portletManagementURL}"/>
- </td>
- </tr>
- </table>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
+ <c:otherwise>
+ <table border="0" class='portlet-table-body'>
+ <tr>
+ <th>Service Description URL:</th>
+ <td><h:inputText size="70"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.serviceDescriptionURL}"/>
+ </td>
+ </tr>
+ <tr>
+ <th>Markup URL:</th>
+ <td><h:inputText size="70"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.markupURL}"/>
+ </td>
+ </tr>
+ <tr>
+ <th>Registration URL:</th>
+ <td><h:inputText size="70"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.registrationURL}"/>
+ </td>
+ </tr>
+ <tr>
+ <th>Portlet Management URL:</th>
+ <td><h:inputText size="70"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.portletManagementURL}"/>
+ </td>
+ </tr>
+ </table>
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+ <tr>
+ <th>Registration information</th>
+ <td>
+ <c:choose>
+ <c:when
test="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.requiresRegistration}">
+ <c:choose>
+ <c:when
+ test="#{!empty
consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationPropertyNames}">
+ <table border='1' cellspacing='0'
class='registration-prop-table'>
+ <tr>
+ <th>Name</th>
+ <th>Value</th>
+ </tr>
+ <c:forEach
+
items="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationProperties}"
+ var="prop">
+ <tr title="#{prop.description.label.value}">
+ <td><h:inputText value="#{prop.name}"
size="40"/></td>
+ <td><h:inputText value="#{prop.value}"
size="40"/></td>
+ </tr>
+ </c:forEach>
+ </table>
+ </c:when>
+ <c:otherwise>
+ No required registration properties.
+ </c:otherwise>
+ </c:choose>
+ </c:when>
+ <c:otherwise>
+ Producer doesn't require registration.
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+ <c:if
test="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationValid}">
<tr>
- <th><h:selectBooleanCheckbox
-
value="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.requiresRegistration}"/>Requires
- registration?
- </th>
- <td>
- <c:choose>
- <c:when
- test="#{!empty
consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationPropertyNames}">
- <table border='1' cellspacing='0'
class='registration-prop-table'>
- <tr>
- <th>Name</th>
- <th>Value</th>
- </tr>
- <c:forEach
-
items="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationProperties}"
- var="prop">
- <tr title="#{prop.description.label.value}">
- <td><h:inputText value="#{prop.name}"
size="40"/></td>
- <td><h:inputText value="#{prop.value}"
size="40"/></td>
- </tr>
- </c:forEach>
- </table>
- </c:when>
- <c:otherwise>
- No required registration properties.
- </c:otherwise>
- </c:choose>
+ <th>Registration context:</th>
+ <td>Handle: <h:outputText
+
value="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationContext.registrationHandle}"/>
</td>
</tr>
- <c:if
test="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationValid}">
- <tr>
- <th>Registration context:</th>
- <td>Handle: <h:outputText
-
value="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationContext.registrationHandle}"/>
- </td>
- </tr>
- </c:if>
- </table>
+ </c:if>
+</table>
- <hr/>
+<hr/>
</h:form>
<h:form>
- <h:commandButton action="#{consumersMgr.listConsumers}"
value="Back"/>
- <h:commandButton action="#{consumersMgr.activateConsumer}"
- value="#{consumersMgr.selectedConsumer.producerInfo.active ?
'Deactivate' : 'Activate'}">
+ <h:commandLink action="#{consumersMgr.listConsumers}"
value="Cancel" styleClass="portlet-form-button"/>
+
+ <h:commandLink action="#{consumersMgr.activateConsumer}"
styleClass="portlet-form-button"
+ value="#{consumersMgr.selectedConsumer.producerInfo.active ?
'Deactivate' : 'Activate'}">
<f:param name="id"
value="#{consumersMgr.selectedConsumer.producerId}"/>
<f:param name="activate"
value="#{!consumersMgr.selectedConsumer.producerInfo.active}"/>
- </h:commandButton>
- <c:if test="#{consumersMgr.selectedConsumer.producerInfo.active}">
- <h:commandButton action="#{consumersMgr.registerConsumer}"
-
value="#{consumersMgr.selectedConsumer.producerInfo.registered ? 'Deregister'
: 'Register'}">
- <f:param name="id"
value="#{consumersMgr.selectedConsumer.producerId}"/>
- <f:param name="register"
value="#{!consumersMgr.selectedConsumer.producerInfo.registered}"/>
- </h:commandButton>
- </c:if>
- <h:commandButton action="#{consumersMgr.destroyConsumer}"
value="Destroy">
+ </h:commandLink>
+
+ <h:commandLink action="#{consumersMgr.registerConsumer}"
styleClass="portlet-form-button"
+
rendered="#{consumersMgr.selectedConsumer.producerInfo.active}"
+ value="#{consumersMgr.selectedConsumer.producerInfo.registered ?
'Deregister' : 'Register'}">
<f:param name="id"
value="#{consumersMgr.selectedConsumer.producerId}"/>
- </h:commandButton>
+ <f:param name="register"
value="#{!consumersMgr.selectedConsumer.producerInfo.registered}"/>
+ </h:commandLink>
+
+ <h:commandLink action="#{consumersMgr.destroyConsumer}"
value="Destroy" styleClass="portlet-form-button">
+ <f:param name="id"
value="#{consumersMgr.selectedConsumer.producerId}"/>
+ </h:commandLink>
</h:form>
</div>
\ No newline at end of file
Modified: trunk/wsrp/src/resources/portal-wsrp-war/style.css
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-war/style.css 2007-03-16 16:47:58 UTC (rev 6718)
+++ trunk/wsrp/src/resources/portal-wsrp-war/style.css 2007-03-16 22:18:56 UTC (rev 6719)
@@ -45,4 +45,9 @@
.wsrp-consumer-ui .registration-prop-table th {
border: none;
+}
+
+.wsrp-consumer-ui .portlet-form-button {
+ padding: .2em;
+ margin: .3em;
}
\ No newline at end of file