Author: chris.laprun(a)jboss.com
Date: 2008-07-15 13:58:47 -0400 (Tue, 15 Jul 2008)
New Revision: 11455
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
Log:
- Fixed incorrect markup.
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-07-15
15:53:56 UTC (rev 11454)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-07-15
17:58:47 UTC (rev 11455)
@@ -74,38 +74,75 @@
</td>
</tr>
<c:if test="#{consumer.localInfoPresent}">
- <tr>
- <th>#{i18n.edit_consumer_registration}</th>
- <td>
- <c:choose>
- <c:when test="#{consumer.localInfoPresent}">
- <h3
class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3>
+<tr>
+ <th>#{i18n.edit_consumer_registration}</th>
+ <td>
+ <c:choose>
+ <c:when test="#{consumer.localInfoPresent}">
+ <h3
class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3>
+ <h:panelGroup styleClass="portlet-area-body">
+ <c:choose>
+ <c:when test="#{!empty
consumer.producerInfo.registrationInfo.registrationProperties}">
+ <table class="registration-prop-table #{consumer.active ?
'active' : 'inactive'}">
+ <tr>
+ <th
class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
+ <th
class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
+ <th>#{i18n.edit_consumer_prop_value}</th>
+ </tr>
+ <tr jsfc="ui:repeat"
value="#{consumer.producerInfo.registrationInfo.registrationProperties}"
+ var="prop"
title="#{prop.value.description.label.value}">
+ <td>#{prop.value..name}</td>
+ <td>#{prop.value.description.label.value}</td>
+ <td>
+ <h:inputText value="#{prop.value.value}"
size="50"
+
valueChangeListener="#{consumer.regPropListener}"
+
disabled="#{consumer.registrationModified}"/>
+ <h:outputText styleClass="portlet-msg-error"
value="#{prop.value.status}"
+
rendered="#{prop.value.determinedInvalid}"/>
+ </td>
+ </tr>
+ </table>
+ <h:commandLink action="#{consumer.update}"
+
value="#{i18n.edit_consumer_registration_update_props}"
+ rendered="#{consumer.registered}"
+ styleClass="portlet-form-button
portlet-section-buttonrow"/>
+ </c:when>
+ <c:otherwise>
+ #{i18n.edit_consumer_registration_no_props}
+ </c:otherwise>
+ </c:choose>
+ <h:commandLink action="#{consumer.modifyRegistration}"
+
value="#{i18n.edit_consumer_registration_modify}"
+
rendered="#{consumer.registrationLocallyModified}"
+
title="#{i18n.edit_consumer_registration_modify_title}"
+ styleClass="portlet-form-button
portlet-section-buttonrow"/>
+ <br style="clear:both;"/>
+ </h:panelGroup>
+
+ <br/>
+
+ <c:if test="#{consumer.registrationModified}">
+ <h3
class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3>
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
- <c:when test="#{!empty
consumer.producerInfo.registrationInfo.registrationProperties}">
+ <c:when test="#{!empty
consumer.expectedRegistrationInfo.registrationProperties}">
<table class="registration-prop-table #{consumer.active ?
'active' : 'inactive'}">
<tr>
<th
class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
<th
class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
<th>#{i18n.edit_consumer_prop_value}</th>
</tr>
- <tr jsfc="ui:repeat"
value="#{consumer.producerInfo.registrationInfo.registrationProperties}"
- var="prop"
title="#{prop.description.label.value}">
- <td>#{prop.name}</td>
- <td>#{prop.description.label.value}</td>
+ <tr jsfc="ui:repeat"
value="#{consumer.expectedRegistrationInfo.registrationProperties}"
+ var="prop"
title="#{prop.value.description.label.value}">
+ <td>#{prop.value.name}</td>
+ <td>#{prop.value.description.label.value}</td>
<td>
- <h:inputText value="#{prop.value}"
size="50"
-
valueChangeListener="#{consumer.regPropListener}"
-
disabled="#{consumer.registrationModified}"/>
- <h:outputText
styleClass="portlet-msg-error" value="#{prop.status}"
-
rendered="#{prop.determinedInvalid}"/>
+ <h:inputText value="#{prop.value.value}"
size="50"/>
+ <h:outputText
styleClass="portlet-msg-error" value="#{prop.value.status}"
+
rendered="#{prop.value.determinedInvalid}"/>
</td>
</tr>
</table>
- <h:commandLink action="#{consumer.update}"
-
value="#{i18n.edit_consumer_registration_update_props}"
- rendered="#{consumer.registered}"
- styleClass="portlet-form-button
portlet-section-buttonrow"/>
</c:when>
<c:otherwise>
#{i18n.edit_consumer_registration_no_props}
@@ -113,78 +150,31 @@
</c:choose>
<h:commandLink action="#{consumer.modifyRegistration}"
value="#{i18n.edit_consumer_registration_modify}"
-
rendered="#{consumer.registrationLocallyModified}"
title="#{i18n.edit_consumer_registration_modify_title}"
styleClass="portlet-form-button
portlet-section-buttonrow"/>
<br style="clear:both;"/>
</h:panelGroup>
-
- <br/>
-
- <c:if test="#{consumer.registrationModified}">
- <h3
class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3>
- <h:panelGroup styleClass="portlet-area-body">
- <c:choose>
- <c:when test="#{!empty
consumer.expectedRegistrationInfo.registrationProperties}">
- <table class="registration-prop-table
#{consumer.active ? 'active' : 'inactive'}">
- <tr>
- <th
class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
- <th
class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
- <th>#{i18n.edit_consumer_prop_value}</th>
- </tr>
- <tr jsfc="ui:repeat"
value="#{consumer.expectedRegistrationInfo.registrationProperties}"
- var="prop"
title="#{prop.description.label.value}">
- <td>#{prop.name}</td>
- <td>#{prop.description.label.value}</td>
- <td>
- <h:inputText value="#{prop.value}"
size="50"/>
- <h:outputText
styleClass="portlet-msg-error" value="#{prop.status}"
-
rendered="#{prop.determinedInvalid}"/>
- </td>
- </tr>
- <c:forEach var="prop"
items="#{consumer.expectedRegistrationInfo.registrationProperties}">
- <tr
title="#{prop.value.description.label.value}">
- <td>#{prop.value.name}</td>
-
<td>#{prop.value.description.label.value}</td>
- <td>
- <h:inputText
value="#{prop.value.value}" size="50"/>
- <h:outputText
styleClass="portlet-msg-error" value="#{prop.value.status}"
-
rendered="#{prop.value.determinedInvalid}"/></td>
- </tr>
- </c:forEach>
- </table>
- </c:when>
- <c:otherwise>
- #{i18n.edit_consumer_registration_no_props}
- </c:otherwise>
- </c:choose>
- <h:commandLink action="#{consumer.modifyRegistration}"
-
value="#{i18n.edit_consumer_registration_modify}"
-
title="#{i18n.edit_consumer_registration_modify_title}"
- styleClass="portlet-form-button
portlet-section-buttonrow"/>
- <br style="clear:both;"/>
- </h:panelGroup>
- </c:if>
- </c:when>
- <c:when test="#{consumer.registrationChecked and
!consumer.registrationRequired}">
- #{i18n.edit_consumer_no_registration}
- </c:when>
- </c:choose>
+ </c:if>
+ </c:when>
+ <c:when test="#{consumer.registrationChecked and
!consumer.registrationRequired}">
+ #{i18n.edit_consumer_no_registration}
+ </c:when>
+ </c:choose>
+ </td>
+</tr>
+<c:if test="#{!empty
consumer.producerInfo.registrationInfo.registrationHandle}">
+ <tr>
+ <th>#{i18n.edit_consumer_registration_context}</th>
+ <td id="handle">
+ #{i18n.edit_consumer_registration_context_handle} <h:outputText
+
value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
+ <h:commandLink action="confirmEraseRegistration"
value="#{i18n.edit_consumer_registration_context_erase}"
+
title="#{i18n.edit_consumer_registration_context_erase_title}"
+ styleClass="portlet-form-button"/>
</td>
</tr>
- <c:if test="#{!empty
consumer.producerInfo.registrationInfo.registrationHandle}">
- <tr>
- <th>#{i18n.edit_consumer_registration_context}</th>
- <td id="handle">
- #{i18n.edit_consumer_registration_context_handle} <h:outputText
-
value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
- <h:commandLink action="confirmEraseRegistration"
value="#{i18n.edit_consumer_registration_context_erase}"
-
title="#{i18n.edit_consumer_registration_context_erase_title}"
- styleClass="portlet-form-button"/>
- </td>
- </tr>
- </c:if>
</c:if>
+</c:if>
<tr>
<th/>
<td class="portlet-section-buttonrow">