[portal-commits] JBoss Portal SVN: r12015 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war: jsf/consumers and 1 other directory.

Wednesday, 1 October 2008


Author: chris.laprun(a)jboss.com
Date: 2008-10-01 15:03:41 -0400 (Wed, 01 Oct 2008)
New Revision: 12015

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/style.css
Log:
- JBPORTAL-2103: fixed issue with duplicated ids.
- Improved display of registration properties a little bit using dataTable instead of
forEach.
- Improved CSS.

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-10-01
15:39:38 UTC (rev 12014)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml	2008-10-01
19:03:41 UTC (rev 12015)
@@ -82,30 +82,33 @@
             <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>
-                        <c:forEach
items="#{consumer.producerInfo.registrationInfo.registrationProperties}"
-                                   var="prop">
-                           <tr
title="#{prop.value.description.label.value}">
-                              <td>#{prop.value.name}</td>
-                              <td>#{prop.value.description.label.value}</td>
-                              <td>
-                                 <!-- todo: valueChangeListener not needed anymore
when events on RegistrationProperties work -->
-                                 <h:inputText id="prop-value-input"
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}"
-                                              
converter="faces.convert.RegistrationProperty.Status"/>
-                              </td>
-                           </tr>
-                        </c:forEach>
-                     </table>
+                  <c:when
test="#{consumer.registrationPropertiesEmpty}">
+                     <h:dataTable id="existingProps"
+                                  value="#{consumer.registrationProperties}"
var="prop"
+                                 
rowClasses="portlet-section-body,portlet-section-alternate"
+                                  columnClasses="nameColumn,descColumn,"
+                                  headerClass="portlet-section-header
#{consumer.active ? 'active' : 'inactive'}"
+                                  styleClass="registration-prop-table
#{consumer.active ? 'active' : 'inactive'}"
+                                  width="100%">
+                        <h:column>
+                           <f:facet
name="header">#{i18n.edit_consumer_prop_name}</f:facet>
+                           #{prop.name}
+                        </h:column>
+                        <h:column>
+                           <f:facet
name="header">#{i18n.edit_consumer_prop_desc}</f:facet>
+                           #{prop.description.label.value}
+                        </h:column>
+                        <h:column>
+                           <f:facet
name="header">#{i18n.edit_consumer_prop_value}</f:facet>
+                           <!-- todo: valueChangeListener not needed anymore when
events on RegistrationProperties work -->
+                           <h:inputText id="prop-value-input"
value="#{prop.value}" size="50"
+                                       
valueChangeListener="#{consumer.regPropListener}"
+                                       
disabled="#{consumer.registrationModified}"/>
+                           <h:outputText styleClass="portlet-msg-error"
value="#{prop.status}"
+                                         rendered="#{prop.determinedInvalid}"
+                                        
converter="faces.convert.RegistrationProperty.Status"/>
+                        </h:column>
+                     </h:dataTable>
                       <h:commandLink id="cons-update-link"
action="#{consumer.update}"
                                    
value="#{i18n.edit_consumer_registration_update_props}"
                                     rendered="#{consumer.registered}"
@@ -115,7 +118,7 @@
                      #{i18n.edit_consumer_registration_no_props}
                   </c:otherwise>
                </c:choose>
-                <h:commandLink id="modify-reg-link"
action="#{consumer.modifyRegistration}"
+               <h:commandLink id="modify-reg-link"
action="#{consumer.modifyRegistration}"
                              
value="#{i18n.edit_consumer_registration_modify}"
                              
rendered="#{consumer.registrationLocallyModified}"
                              
title="#{i18n.edit_consumer_registration_modify_title}"
@@ -130,32 +133,35 @@
                <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>
-
-                           <c:forEach
items="#{consumer.expectedRegistrationInfo.registrationProperties}"
var="prop">
-                              <tr
title="#{prop.value.description.label.value}">
-                                 <td>#{prop.value.name}</td>
-                                
<td>#{prop.value.description.label.value}</td>
-                                 <td>
-                                    <h:inputText id="prop-value-input"
value="#{prop.value.value}" size="50"/>
-                                    <h:outputText
styleClass="portlet-msg-error" value="#{prop.value.status}"
-                                                 
rendered="#{prop.value.determinedInvalid}"
-                                                 
converter="faces.convert.RegistrationProperty.Status"/>
-                                 </td>
-                              </tr>
-                           </c:forEach>
-                        </table>
+                        <h:dataTable id="expectedProps"
+                                    
value="#{consumer.expectedRegistrationProperties}" var="prop"
+                                    
rowClasses="portlet-section-body,portlet-section-alternate"
+                                     columnClasses="nameColumn,descColumn,"
+                                     headerClass="portlet-section-header
#{consumer.active ? 'active' : 'inactive'}"
+                                     styleClass="registration-prop-table
#{consumer.active ? 'active' : 'inactive'}"
+                                     width="100%">
+                           <h:column>
+                              <f:facet
name="header">#{i18n.edit_consumer_prop_name}</f:facet>
+                              #{prop.name}
+                           </h:column>
+                           <h:column>
+                              <f:facet
name="header">#{i18n.edit_consumer_prop_desc}</f:facet>
+                              #{prop.description.label.value}
+                           </h:column>
+                           <h:column>
+                              <f:facet
name="header">#{i18n.edit_consumer_prop_value}</f:facet>
+                              <h:inputText id="prop-value-input"
value="#{prop.value}" size="50"/>
+                              <h:outputText styleClass="portlet-msg-error"
value="#{prop.status}"
+                                           
rendered="#{prop.determinedInvalid}"
+                                           
converter="faces.convert.RegistrationProperty.Status"/>
+                           </h:column>
+                        </h:dataTable>
                      </c:when>
                      <c:otherwise>
                         #{i18n.edit_consumer_registration_no_props}
                      </c:otherwise>
                   </c:choose>
-                    <h:commandLink id="edit-reg-link"
action="#{consumer.modifyRegistration}"
+                  <h:commandLink id="edit-reg-link"
action="#{consumer.modifyRegistration}"
                                 
value="#{i18n.edit_consumer_registration_modify}"
                                 
title="#{i18n.edit_consumer_registration_modify_title}"
                                  styleClass="portlet-form-button
portlet-section-buttonrow"/>

Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css	2008-10-01
15:39:38 UTC (rev 12014)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css	2008-10-01
19:03:41 UTC (rev 12015)
@@ -17,7 +17,7 @@
 /* Top nav. */
 
 .wsrp-consumers-ui ul.topnav {
-   padding: 4px 0px 3px;
+   padding: 4px 0 3px;
    border-bottom: 1px solid #b3c0c7;
    margin: 0;
 }
@@ -25,9 +25,8 @@
 .wsrp-consumers-ui ul.topnav li {
    list-style-type: none;
    display: inline;
-   margin: 0;
+   margin: 0 0 0 5px;
    padding: 3px 0.5em;
-   margin-left: 5px;
    border: 1px solid #b3c0c7;
    border-bottom: none;
    background-color: #f2f4f5;
@@ -60,14 +59,10 @@
    border: solid 1px #bbb;
    border-left: solid 1px #eee;
    border-right: solid 1px #eee;
-   background-color: #d5d5d5;
-   background-image: url( img/pathBackground.png );
-   background-position: left;
-   background-repeat: repeat-x;
+   background: url( img/pathBackground.png ) repeat-x left;
    height: 21px;
-   margin: 0px;
-   padding: 0px;
-   padding-left: 2px;
+   margin: 0;
+   padding: 0 0 0 2px;
 }
 
 .wsrp-consumers-ui ul.objectpath li {
@@ -105,16 +100,12 @@
    color: #315896;
    font-size: 11px;
    padding: 3px 0 3px 3px;
-   background-image: url( img/section-subHeader-bg.gif );
-   background-position: left top;
-   background-repeat: repeat-x;
+   background: url( img/section-subHeader-bg.gif ) repeat-x left top;
    border: 1px solid #b9c6d7;
 }
 
 .wsrp-consumers-ui .portlet-section-header {
-   background-image: url( img/pathBackground.png );
-   background-position: left;
-   background-repeat: repeat-x;
+   background: url( img/pathBackground.png ) repeat-x left;
    font-weight: bold;
    color: #656565;
    font-size: 10px;
@@ -124,9 +115,7 @@
 }
 
 .wsrp-consumers-ui .portlet-section-header th {
-   background-image: url( img/pathBackground.png );
-   background-position: left;
-   background-repeat: repeat-x;
+   background: url( img/pathBackground.png ) repeat-x left;
    font-weight: bold;
    color: #656565;
    font-size: 10px;
@@ -136,72 +125,51 @@
 }
 
 .wsrp-consumers-ui .actionConfigure {
-   padding: 5px;
-   background-image: url( img/jbp-icon-set/settings.gif );
-   background-position: left;
-   background-repeat: no-repeat;
+   padding: 5px 5px 5px 20px;
+   background: url( img/jbp-icon-set/settings.gif ) no-repeat left;
    line-height: 18px;
-   padding-left: 20px;
    white-space: nowrap;
 }
 
 .wsrp-consumers-ui .actionRefresh {
-   padding: 5px;
-   background-image: url( img/jbp-icon-set/refresh.gif );
-   background-position: left;
-   background-repeat: no-repeat;
+   padding: 5px 5px 5px 20px;
+   background: url( img/jbp-icon-set/refresh.gif ) no-repeat left;
    line-height: 18px;
-   padding-left: 20px;
    white-space: nowrap;
 }
 
 .wsrp-consumers-ui .actionRegister {
-   padding: 5px;
-   background-image: url( img/jbp-icon-set/register.gif );
-   background-position: left;
-   background-repeat: no-repeat;
+   padding: 5px 5px 5px 24px;
+   background: url( img/jbp-icon-set/register.gif ) no-repeat left;
    line-height: 18px;
-   padding-left: 24px;
    white-space: nowrap;
 }
 
 .wsrp-consumers-ui .actionDeregister {
-   padding: 5px;
-   background-image: url( img/jbp-icon-set/deregister.gif );
-   background-position: left;
-   background-repeat: no-repeat;
+   padding: 5px 5px 5px 24px;
+   background: url( img/jbp-icon-set/deregister.gif ) no-repeat left;
    line-height: 18px;
-   padding-left: 24px;
    white-space: nowrap;
 }
 
 .wsrp-consumers-ui .actionDelete {
-   padding: 5px;
-   background-image: url( img/jbp-icon-set/delete2.gif );
-   background-position: left;
-   background-repeat: no-repeat;
+   padding: 5px 5px 5px 20px;
+   background: url( img/jbp-icon-set/delete2.gif ) no-repeat left;
    line-height: 18px;
-   padding-left: 20px;
    white-space: nowrap;
 }
 
 .wsrp-consumers-ui .actionActivate {
-   padding: 5px;
-   background-image: url( img/jbp-icon-set/activate.gif );
-   background-position: left;
-   background-repeat: no-repeat;
+   padding: 5px 5px 5px 23px;
+   background: url( img/jbp-icon-set/activate.gif ) no-repeat left;
    line-height: 18px;
-   padding-left: 23px;
    white-space: nowrap;
 }
 
 .wsrp-consumers-ui .actionDeactivate {
-   padding: 5px;
-   background-image: url( img/jbp-icon-set/deactivate.gif );
-   background-position: left;
-   background-repeat: no-repeat;
+   padding: 5px 5px 5px 20px;
+   background: url( img/jbp-icon-set/deactivate.gif ) no-repeat left;
    line-height: 18px;
-   padding-left: 20px;
    white-space: nowrap;
 }
 
@@ -287,25 +255,34 @@
 }
 
 .wsrp-consumers-ui .registration-prop-table.active th {
-   background-color: #C7DDB7;
+   background: #C7DDB7 none;
 }
 
-.wsrp-consumers-ui .registration-prop-table.inactive {
+.wsrp-consumers-ui .registration-prop-table.active .portlet-section-alternate
+{
+   background: #dcf0d0;
+}
+
+.wsrp-consumers-ui .registration-prop-table.inactive, .wsrp-consumers-ui span.inactive {
    border: 1px solid #EBD1B8;
 }
 
 .wsrp-consumers-ui .registration-prop-table.inactive th {
-   background-color: #EBD1B8;
+   background: #EBD1B8 none;
 }
 
-.wsrp-consumers-ui .registration-prop-table th.nameColumn {
-   width: 25%;
+.wsrp-consumers-ui .registration-prop-table.inactive .portlet-section-alternate {
+   background: #f0f0dd;
 }
 
-.wsrp-consumers-ui .registration-prop-table th.descColumn {
-   width: 25%;
+.wsrp-consumers-ui .registration-prop-table .nameColumn {
+   width: 20%;
 }
 
+.wsrp-consumers-ui .registration-prop-table .descColumn {
+   width: 20%;
+}
+
 .wsrp-consumers-ui .portlet-section-buttonrow {
    margin-top: 6px;
    margin-bottom: 6px;
@@ -340,8 +317,7 @@
    color: #fff;
    font-size: 11px;
    background-color: #5986b3;
-   padding: 2px;
-   padding-left: 4px;
+   padding: 2px 2px 2px 4px;
    margin: 0;
    display: block;
 }


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r12015 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war: jsf/consumers and 1 other directory.