From portal-commits at lists.jboss.org Tue Jul 15 13:58:50 2008
Content-Type: multipart/mixed; boundary="===============3999005872880910998=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r11455 -
 branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers.
Date: Tue, 15 Jul 2008 13:58:47 -0400
Message-ID: <E1KIonX-0004J6-Bo@committer01.frg.pub.inap.atl.jboss.com>

--===============3999005872880910998==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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-adm=
in-war/jsf/consumers/editConsumer.xhtml
Log:
- Fixed incorrect markup.

Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-w=
srp-admin-war/jsf/consumers/editConsumer.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-ad=
min-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-ad=
min-war/jsf/consumers/editConsumer.xhtml	2008-07-15 17:58:47 UTC (rev 11455)
@@ -74,38 +74,75 @@
    </td>
 </tr>
 <c:if test=3D"#{consumer.localInfoPresent}">
-   <tr>
-      <th>#{i18n.edit_consumer_registration}</th>
-      <td>
-         <c:choose>
-            <c:when test=3D"#{consumer.localInfoPresent}">
-               <h3 class=3D"portlet-area-header">#{i18n.edit_consumer_regi=
stration_current}</h3>
+<tr>
+   <th>#{i18n.edit_consumer_registration}</th>
+   <td>
+      <c:choose>
+         <c:when test=3D"#{consumer.localInfoPresent}">
+            <h3 class=3D"portlet-area-header">#{i18n.edit_consumer_registr=
ation_current}</h3>
+            <h:panelGroup styleClass=3D"portlet-area-body">
+               <c:choose>
+                  <c:when test=3D"#{!empty consumer.producerInfo.registrat=
ionInfo.registrationProperties}">
+                     <table class=3D"registration-prop-table #{consumer.ac=
tive ? 'active' : 'inactive'}">
+                        <tr>
+                           <th class=3D"nameColumn">#{i18n.edit_consumer_p=
rop_name}</th>
+                           <th class=3D"descColumn">#{i18n.edit_consumer_p=
rop_desc}</th>
+                           <th>#{i18n.edit_consumer_prop_value}</th>
+                        </tr>
+                        <tr jsfc=3D"ui:repeat" value=3D"#{consumer.produce=
rInfo.registrationInfo.registrationProperties}"
+                            var=3D"prop" title=3D"#{prop.value.description=
.label.value}">
+                           <td>#{prop.value..name}</td>
+                           <td>#{prop.value.description.label.value}</td>
+                           <td>
+                              <h:inputText value=3D"#{prop.value.value}" s=
ize=3D"50"
+                                           valueChangeListener=3D"#{consum=
er.regPropListener}"
+                                           disabled=3D"#{consumer.registra=
tionModified}"/>
+                              <h:outputText styleClass=3D"portlet-msg-erro=
r" value=3D"#{prop.value.status}"
+                                            rendered=3D"#{prop.value.deter=
minedInvalid}"/>
+                           </td>
+                        </tr>
+                     </table>
+                     <h:commandLink action=3D"#{consumer.update}"
+                                    value=3D"#{i18n.edit_consumer_registra=
tion_update_props}"
+                                    rendered=3D"#{consumer.registered}"
+                                    styleClass=3D"portlet-form-button port=
let-section-buttonrow"/>
+                  </c:when>
+                  <c:otherwise>
+                     #{i18n.edit_consumer_registration_no_props}
+                  </c:otherwise>
+               </c:choose>
+               <h:commandLink action=3D"#{consumer.modifyRegistration}"
+                              value=3D"#{i18n.edit_consumer_registration_m=
odify}"
+                              rendered=3D"#{consumer.registrationLocallyMo=
dified}"
+                              title=3D"#{i18n.edit_consumer_registration_m=
odify_title}"
+                              styleClass=3D"portlet-form-button portlet-se=
ction-buttonrow"/>
+               <br style=3D"clear:both;"/>
+            </h:panelGroup>
+
+            <br/>
+
+            <c:if test=3D"#{consumer.registrationModified}">
+               <h3 class=3D"portlet-area-header">#{i18n.edit_consumer_regi=
stration_expected}</h3>
                <h:panelGroup styleClass=3D"portlet-area-body">
                   <c:choose>
-                     <c:when test=3D"#{!empty consumer.producerInfo.regist=
rationInfo.registrationProperties}">
+                     <c:when test=3D"#{!empty consumer.expectedRegistratio=
nInfo.registrationProperties}">
                         <table class=3D"registration-prop-table #{consumer=
.active ? 'active' : 'inactive'}">
                            <tr>
                               <th class=3D"nameColumn">#{i18n.edit_consume=
r_prop_name}</th>
                               <th class=3D"descColumn">#{i18n.edit_consume=
r_prop_desc}</th>
                               <th>#{i18n.edit_consumer_prop_value}</th>
                            </tr>
-                           <tr jsfc=3D"ui:repeat" value=3D"#{consumer.prod=
ucerInfo.registrationInfo.registrationProperties}"
-                               var=3D"prop" title=3D"#{prop.description.la=
bel.value}">
-                              <td>#{prop.name}</td>
-                              <td>#{prop.description.label.value}</td>
+                           <tr jsfc=3D"ui:repeat" value=3D"#{consumer.expe=
ctedRegistrationInfo.registrationProperties}"
+                               var=3D"prop" title=3D"#{prop.value.descript=
ion.label.value}">
+                              <td>#{prop.value.name}</td>
+                              <td>#{prop.value.description.label.value}</t=
d>
                               <td>
-                                 <h:inputText value=3D"#{prop.value}" size=
=3D"50"
-                                              valueChangeListener=3D"#{con=
sumer.regPropListener}"
-                                              disabled=3D"#{consumer.regis=
trationModified}"/>
-                                 <h:outputText styleClass=3D"portlet-msg-e=
rror" value=3D"#{prop.status}"
-                                               rendered=3D"#{prop.determin=
edInvalid}"/>
+                                 <h:inputText value=3D"#{prop.value.value}=
" size=3D"50"/>
+                                 <h:outputText styleClass=3D"portlet-msg-e=
rror" value=3D"#{prop.value.status}"
+                                               rendered=3D"#{prop.value.de=
terminedInvalid}"/>
                               </td>
                            </tr>
                         </table>
-                        <h:commandLink action=3D"#{consumer.update}"
-                                       value=3D"#{i18n.edit_consumer_regis=
tration_update_props}"
-                                       rendered=3D"#{consumer.registered}"
-                                       styleClass=3D"portlet-form-button p=
ortlet-section-buttonrow"/>
                      </c:when>
                      <c:otherwise>
                         #{i18n.edit_consumer_registration_no_props}
@@ -113,78 +150,31 @@
                   </c:choose>
                   <h:commandLink action=3D"#{consumer.modifyRegistration}"
                                  value=3D"#{i18n.edit_consumer_registratio=
n_modify}"
-                                 rendered=3D"#{consumer.registrationLocall=
yModified}"
                                  title=3D"#{i18n.edit_consumer_registratio=
n_modify_title}"
                                  styleClass=3D"portlet-form-button portlet=
-section-buttonrow"/>
                   <br style=3D"clear:both;"/>
                </h:panelGroup>
-
-               <br/>
-
-               <c:if test=3D"#{consumer.registrationModified}">
-                  <h3 class=3D"portlet-area-header">#{i18n.edit_consumer_r=
egistration_expected}</h3>
-                  <h:panelGroup styleClass=3D"portlet-area-body">
-                     <c:choose>
-                        <c:when test=3D"#{!empty consumer.expectedRegistra=
tionInfo.registrationProperties}">
-                           <table class=3D"registration-prop-table #{consu=
mer.active ? 'active' : 'inactive'}">
-                              <tr>
-                                 <th class=3D"nameColumn">#{i18n.edit_cons=
umer_prop_name}</th>
-                                 <th class=3D"descColumn">#{i18n.edit_cons=
umer_prop_desc}</th>
-                                 <th>#{i18n.edit_consumer_prop_value}</th>
-                              </tr>
-                              <tr jsfc=3D"ui:repeat" value=3D"#{consumer.e=
xpectedRegistrationInfo.registrationProperties}"
-                                  var=3D"prop" title=3D"#{prop.description=
.label.value}">
-                                 <td>#{prop.name}</td>
-                                 <td>#{prop.description.label.value}</td>
-                                 <td>
-                                    <h:inputText value=3D"#{prop.value}" s=
ize=3D"50"/>
-                                    <h:outputText styleClass=3D"portlet-ms=
g-error" value=3D"#{prop.status}"
-                                                  rendered=3D"#{prop.deter=
minedInvalid}"/>
-                                 </td>
-                              </tr>
-                              <c:forEach var=3D"prop" items=3D"#{consumer.=
expectedRegistrationInfo.registrationProperties}">
-                                 <tr title=3D"#{prop.value.description.lab=
el.value}">
-                                    <td>#{prop.value.name}</td>
-                                    <td>#{prop.value.description.label.val=
ue}</td>
-                                    <td>
-                                       <h:inputText value=3D"#{prop.value.=
value}" size=3D"50"/>
-                                       <h:outputText styleClass=3D"portlet=
-msg-error" value=3D"#{prop.value.status}"
-                                                  rendered=3D"#{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=3D"#{consumer.modifyRegistratio=
n}"
-                                    value=3D"#{i18n.edit_consumer_registra=
tion_modify}"
-                                    title=3D"#{i18n.edit_consumer_registra=
tion_modify_title}"
-                                    styleClass=3D"portlet-form-button port=
let-section-buttonrow"/>
-                     <br style=3D"clear:both;"/>
-                  </h:panelGroup>
-               </c:if>
-            </c:when>
-            <c:when test=3D"#{consumer.registrationChecked and !consumer.r=
egistrationRequired}">
-               #{i18n.edit_consumer_no_registration}
-            </c:when>
-         </c:choose>
+            </c:if>
+         </c:when>
+         <c:when test=3D"#{consumer.registrationChecked and !consumer.regi=
strationRequired}">
+            #{i18n.edit_consumer_no_registration}
+         </c:when>
+      </c:choose>
+   </td>
+</tr>
+<c:if test=3D"#{!empty consumer.producerInfo.registrationInfo.registration=
Handle}">
+   <tr>
+      <th>#{i18n.edit_consumer_registration_context}</th>
+      <td id=3D"handle">
+         #{i18n.edit_consumer_registration_context_handle} <h:outputText
+              value=3D"#{consumer.producerInfo.registrationInfo.registrati=
onHandle}"/>
+         <h:commandLink action=3D"confirmEraseRegistration" value=3D"#{i18=
n.edit_consumer_registration_context_erase}"
+                        title=3D"#{i18n.edit_consumer_registration_context=
_erase_title}"
+                        styleClass=3D"portlet-form-button"/>
       </td>
    </tr>
-   <c:if test=3D"#{!empty consumer.producerInfo.registrationInfo.registrat=
ionHandle}">
-      <tr>
-         <th>#{i18n.edit_consumer_registration_context}</th>
-         <td id=3D"handle">
-            #{i18n.edit_consumer_registration_context_handle} <h:outputText
-                 value=3D"#{consumer.producerInfo.registrationInfo.registr=
ationHandle}"/>
-            <h:commandLink action=3D"confirmEraseRegistration" value=3D"#{=
i18n.edit_consumer_registration_context_erase}"
-                           title=3D"#{i18n.edit_consumer_registration_cont=
ext_erase_title}"
-                           styleClass=3D"portlet-form-button"/>
-         </td>
-      </tr>
-   </c:if>
 </c:if>
+</c:if>
 <tr>
    <th/>
    <td class=3D"portlet-section-buttonrow">


--===============3999005872880910998==--