From portal-commits at lists.jboss.org Thu May 29 11:20:44 2008
Content-Type: multipart/mixed; boundary="===============4033079028807739023=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10846 - in
 branches/JBoss_Portal_Branch_2_7:
 core-admin/src/resources/portal-admin-war/jsf/common and 2 other directories.
Date: Thu, 29 May 2008 11:20:44 -0400
Message-ID: <E1K1jvo-00066O-Gu@committer01.frg.pub.inap.atl.jboss.com>

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

Author: chris.laprun(a)jboss.com
Date: 2008-05-29 11:20:44 -0400 (Thu, 29 May 2008)
New Revision: 10846

Modified:
   branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-w=
ar/jsf/common/editProperties.xhtml
   branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-w=
ar/jsf/objectNavigation.xhtml
   branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-adm=
in-war/WEB-INF/classes/WSRPConfigurationResource.properties
   branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-adm=
in-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
   branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-adm=
in-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
Log:
- Fixed some EL errors.
- Minor modification to WSRP i18n.

Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-=
admin-war/jsf/common/editProperties.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-admin/src/resources/portal-admin-=
war/jsf/common/editProperties.xhtml	2008-05-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-=
war/jsf/common/editProperties.xhtml	2008-05-29 15:20:44 UTC (rev 10846)
@@ -1,10 +1,11 @@
 <ui:composition xmlns=3D"http://www.w3.org/1999/xhtml"
-   xmlns:ui=3D"http://java.sun.com/jsf/facelets"
-   xmlns:h=3D"http://java.sun.com/jsf/html"
-   xmlns:f=3D"http://java.sun.com/jsf/core"
-   xmlns:c=3D"http://java.sun.com/jstl/core">
+                xmlns:ui=3D"http://java.sun.com/jsf/facelets"
+                xmlns:h=3D"http://java.sun.com/jsf/html"
+                xmlns:f=3D"http://java.sun.com/jsf/core"
+                xmlns:c=3D"http://java.sun.com/jstl/core">
 =

-<f:loadBundle basename=3D"Resource" var=3D"bundle" />
+<f:loadBundle basename=3D"Resource" var=3D"bundle"/>
+
 <div class=3D"portlet-area-header">#{bundle.COMMON_PROPERTIES}</div>
 <div class=3D"portlet-area-body">
 =

@@ -24,28 +25,29 @@
             <h:form>
                <!-- defines layout of property form -->
                <table>
-                  <tbody>                                                 =
       =

+                  <tbody>
                      <f:subview id=3D"predefined-properties" rendered=3D"#=
{not empty properties.propertyItems}">
-                     <tr>
-                        <td class=3D"portlet-form-field-label">
-                           <h:outputLabel for=3D"predefinedProperty" style=
Class=3D"portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPER=
TY}:</h:outputLabel>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td>
-                           <h:selectOneMenu id=3D"predefinedProperty" valu=
e=3D"#{properties.action.selectedProperty}">
-                              <f:selectItems value=3D"#{properties.propert=
yItems}"/>
-                           </h:selectOneMenu>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td align=3D"center">#{bundle.COMMON_OR}</td>
-                     </tr>
+                        <tr>
+                           <td class=3D"portlet-form-field-label">
+                              <h:outputLabel for=3D"predefinedProperty"
+                                             styleClass=3D"portlet-form-fi=
eld-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
+                           </td>
+                        </tr>
+                        <tr>
+                           <td>
+                              <h:selectOneMenu id=3D"predefinedProperty" v=
alue=3D"#{properties.action.selectedProperty}">
+                                 <f:selectItems value=3D"#{properties.prop=
ertyItems}"/>
+                              </h:selectOneMenu>
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align=3D"center">#{bundle.COMMON_OR}</td>
+                        </tr>
                      </f:subview>
                      <tr>
                         <td class=3D"portlet-form-field-label">
                            <h:outputLabel for=3D"property" styleClass=3D"p=
ortlet-form-field-label">
-                           #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:output=
Label>
+                              #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:out=
putLabel>
                         </td>
                      </tr>
                      <tr>
@@ -57,7 +59,8 @@
                   </tbody>
                </table>
                <!-- ends layout of property form -->
-               <h:commandButton value=3D"#{bundle.COMMON_ADD_PROPERTY}" st=
yleClass=3D"portlet-form-button portlet-section-buttonrow"
+               <h:commandButton value=3D"#{bundle.COMMON_ADD_PROPERTY}"
+                                styleClass=3D"portlet-form-button portlet-=
section-buttonrow"
                                 action=3D"#{properties.action.updateProper=
ty}"/></h:form>
 =

          </td>
@@ -80,7 +83,8 @@
 =

                <h:form>
                   <!-- defines layout of property table -->
-                  <h:dataTable value=3D"#{properties.entries}" width=3D"10=
0%" headerClass=3D"portlet-section-header" styleClass=3D"datatable full-wid=
th"
+                  <h:dataTable value=3D"#{properties.entries}" width=3D"10=
0%" headerClass=3D"portlet-section-header"
+                               styleClass=3D"datatable full-width"
                                rowClasses=3D"portlet-section-body, portlet=
-section-alternate" var=3D"prop">
                      <h:column>
                         <f:facet name=3D"header">#{bundle.COMMON_NAME}</f:=
facet>
@@ -92,7 +96,7 @@
                      </h:column>
                      <h:column>
                         <f:facet name=3D"header">#{bundle.COMMON_INHERITED=
}</f:facet>
-                        <h:outputText>#{prop.inherited ? '#{bundle.COMMON_=
YES}' : '#{bundle.COMMON_NO}'}</h:outputText>
+                        <h:outputText>#{prop.inherited ? bundle.COMMON_YES=
 : bundle.COMMON_NO}</h:outputText>
                      </h:column>
                      <h:column>
                         <f:facet name=3D"header">#{bundle.COMMON_VALUE}</f=
:facet>
@@ -132,7 +136,8 @@
                   </h:dataTable>
 =

                   <!-- ends property list -->
-                  <h:commandButton value=3D"#{bundle.COMMON_UPDATE}" style=
Class=3D"portlet-form-button portlet-section-buttonrow"/></h:form>
+                  <h:commandButton value=3D"#{bundle.COMMON_UPDATE}"
+                                   styleClass=3D"portlet-form-button portl=
et-section-buttonrow"/></h:form>
 =

             </td>
          </tr>

Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-=
admin-war/jsf/objectNavigation.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-admin/src/resources/portal-admin-=
war/jsf/objectNavigation.xhtml	2008-05-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-=
war/jsf/objectNavigation.xhtml	2008-05-29 15:20:44 UTC (rev 10846)
@@ -1,14 +1,14 @@
 <div
-      xmlns=3D"http://www.w3.org/1999/xhtml"
-      xmlns:ui=3D"http://java.sun.com/jsf/facelets"
-      xmlns:h=3D"http://java.sun.com/jsf/html"
-      xmlns:f=3D"http://java.sun.com/jsf/core"
-      xmlns:fn=3D"http://java.sun.com/jsp/jstl/functions"
-      xmlns:pfc=3D"http://www.jboss.com/portal/facelet/common"
-      xmlns:c=3D"http://java.sun.com/jstl/core">
+   xmlns=3D"http://www.w3.org/1999/xhtml"
+   xmlns:ui=3D"http://java.sun.com/jsf/facelets"
+   xmlns:h=3D"http://java.sun.com/jsf/html"
+   xmlns:f=3D"http://java.sun.com/jsf/core"
+   xmlns:fn=3D"http://java.sun.com/jsp/jstl/functions"
+   xmlns:pfc=3D"http://www.jboss.com/portal/facelet/common"
+   xmlns:c=3D"http://java.sun.com/jstl/core">
 =

 =

-<f:loadBundle basename=3D"Resource" var=3D"bundle" />
+<f:loadBundle basename=3D"Resource" var=3D"bundle"/>
 <h:form>
 =

 <c:if test=3D"#{not empty portalobjectmgr.selectedObject.portals}">
@@ -42,7 +42,7 @@
          #{bundle.THEME}
       </h:commandLink>
          <h:panelGroup
-               rendered=3D"#{(object.name !=3D 'admin') and (object.name !=
=3D 'template')}">
+            rendered=3D"#{(object.name !=3D 'admin') and (object.name !=3D=
 'template')}">
             | <h:commandLink action=3D"renameObject" actionListener=3D"#{p=
ortalobjectmgr.selectObject}"
                              styleClass=3D"actionRename">
             <h:outputText value=3D"#{bundle.RENAME}"/>
@@ -50,13 +50,13 @@
          </h:commandLink>
          </h:panelGroup>
          <h:panelGroup
-               rendered=3D"#{(object.name !=3D 'admin') and (object.name !=
=3D 'template') and (not object.default)}">
-         | <h:commandLink action=3D"confirm" styleClass=3D"actionDelete"
-                          actionListener=3D"#{portalobjectmgr.selectDeleti=
ngObject}">
-         <f:param name=3D"id" value=3D"#{object.id}"/>
-         #{bundle.COMMON_DELETE}
-       </h:commandLink>
-      </h:panelGroup>
+            rendered=3D"#{(object.name !=3D 'admin') and (object.name !=3D=
 'template') and (not object.default)}">
+            | <h:commandLink action=3D"confirm" styleClass=3D"actionDelete"
+                             actionListener=3D"#{portalobjectmgr.selectDel=
etingObject}">
+            <f:param name=3D"id" value=3D"#{object.id}"/>
+            #{bundle.COMMON_DELETE}
+         </h:commandLink>
+         </h:panelGroup>
          <h:panelGroup rendered=3D"#{not object.default}"> | <h:commandLin=
k styleClass=3D"actionMakeDefault"
                                                                           =
action=3D"#{portalobjectmgr.makeObjectDefault}">
             <f:param name=3D"id" value=3D"#{object.id}"/>
@@ -143,18 +143,18 @@
          </f:facet>
 =

          <h:graphicImage
-               title=3D"#{object.declaredProperties['portal.windowInitialS=
tate'] eq 'MINIMIZED' ? '#{bundle.THIS_MINIMIZED_STATE}.' : '#{bundle.THIS_=
NORMAL_STATE}.'}"
-               rendered=3D"#{!maximizedStateExists}"
-               value=3D"#{object.declaredProperties['portal.windowInitialS=
tate'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }"
-               styleClass=3D"windowStateIcon"
-               alt=3D""/>
+            title=3D"#{object.declaredProperties['portal.windowInitialStat=
e'] eq 'MINIMIZED' ? bundle.THIS_MINIMIZED_STATE : bundle.THIS_NORMAL_STATE=
}."
+            rendered=3D"#{!maximizedStateExists}"
+            value=3D"#{object.declaredProperties['portal.windowInitialStat=
e'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }"
+            styleClass=3D"windowStateIcon"
+            alt=3D""/>
 =

          <h:graphicImage
-               title=3D"#{object.declaredProperties['portal.windowInitialS=
tate'] eq 'MAXIMIZED' ? '#{bundle.THIS_MAXIMIZED_STATE}.' : '#{bundle.THIS_=
MINIMIZED_STATE_BECAUSE_MAXIMIZED}.'}"
-               rendered=3D"#{maximizedStateExists}"
-               value=3D"#{object.declaredProperties['portal.windowInitialS=
tate'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
-               styleClass=3D"windowStateIcon"
-               alt=3D""/>
+            title=3D"#{object.declaredProperties['portal.windowInitialStat=
e'] eq 'MAXIMIZED' ? bundle.THIS_MAXIMIZED_STATE : bundle.THIS_MINIMIZED_ST=
ATE_BECAUSE_MAXIMIZED}."
+            rendered=3D"#{maximizedStateExists}"
+            value=3D"#{object.declaredProperties['portal.windowInitialStat=
e'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
+            styleClass=3D"windowStateIcon"
+            alt=3D""/>
 =

 =

          <!-- disable edit window for content type widget until JBPORTAL-1=
561  is fixed -->

Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-w=
srp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
=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/WEB-INF/classes/WSRPConfigurationResource.properties	2008-05-29 14:=
16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-ad=
min-war/WEB-INF/classes/WSRPConfigurationResource.properties	2008-05-29 15:=
20:44 UTC (rev 10846)
@@ -32,4 +32,4 @@
 path_consumers_consumer =3D Consumer ''{0}'' configuration
 path_consumers_active =3D active
 path_consumers_inactive =3D inactive
-path_consumers_refreshNeeded =3D refresh needed
+path_consumers_refreshNeeded =3D (refresh needed)

Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-w=
srp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
=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/WEB-INF/classes/WSRPConfigurationResource_fr.properties	2008-05-29 =
14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-ad=
min-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties	2008-05-29 =
15:20:44 UTC (rev 10846)
@@ -32,4 +32,4 @@
 path_consumers_consumer =3D Configuration du consommateur ''{0}''
 path_consumers_active =3D actif
 path_consumers_inactive =3D inactif
-path_consumers_refreshNeeded =3D rafra\u00eechissement requis
+path_consumers_refreshNeeded =3D (rafra\u00eechissement requis)

Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-w=
srp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.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/WEB-INF/jsf/consumers/consumerTemplate.xhtml	2008-05-29 14:16:40 UT=
C (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-ad=
min-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml	2008-05-29 15:20:44 UT=
C (rev 10846)
@@ -10,7 +10,7 @@
             <li id=3D"currentTab">#{i18n.nav_tabs_consumers}</li>
             <li><h:commandLink value=3D"#{i18n.nav_tabs_producer_config}" =
action=3D"producer"/></li>
             <ui:remove>
-            <li><h:commandLink value=3D"#{i18n.nav_tabs_producer_managemen=
t}" action=3D"management"/></li>
+               <li><h:commandLink value=3D"#{i18n.nav_tabs_producer_manage=
ment}" action=3D"management"/></li>
             </ui:remove>
          </ul>
       </h:form>
@@ -28,12 +28,11 @@
                   class=3D"#{consumer.active ? 'active' : 'inactive'} #{co=
nsumer.refreshNeeded ? 'needsRefresh' : ''}">
                   <h:outputFormat value=3D"#{i18n.path_consumers_consumer}=
">
                      <f:param value=3D"#{consumer.id}"/>
-                  </h:outputFormat> (<h:outputText value=3D"#{i18n.path_co=
nsumers_active}" rendered=3D"#{consumer.active}"/>
-                  <h:outputText value=3D"#{i18n.path_consumers_inactive}" =
rendered=3D"#{!consumer.active}"/>)
-                  (<h:outputText value=3D"#{i18n.path_consumers_refreshNee=
ded}" rendered=3D"#{consumer.refreshNeeded}"/>)
+                  </h:outputFormat> (#{consumer.active ? i18n.path_consume=
rs_active : i18n.path_consumers_inactive})
+                  #{consumer.refreshNeeded ? i18n.path_consumers_refreshNe=
eded : ''}
                </li>
             </c:if>
          </ul>
       </h:form>
    </ui:define>
-</ui:decorate>
\ No newline at end of file
+</ui:decorate>


--===============4033079028807739023==--