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-war/jsf/common/editProperties.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-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
===================================================================
---
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="http://www.w3.org/1999/xhtml"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
-
xmlns:h="http://java.sun.com/jsf/html"
-
xmlns:f="http://java.sun.com/jsf/core"
-
xmlns:c="http://java.sun.com/jstl/core">
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:c="http://java.sun.com/jstl/core">
-<f:loadBundle basename="Resource" var="bundle" />
+<f:loadBundle basename="Resource" var="bundle"/>
+
<div class="portlet-area-header">#{bundle.COMMON_PROPERTIES}</div>
<div class="portlet-area-body">
@@ -24,28 +25,29 @@
<h:form>
<!-- defines layout of property form -->
<table>
- <tbody>
+ <tbody>
<f:subview id="predefined-properties"
rendered="#{not empty properties.propertyItems}">
- <tr>
- <td class="portlet-form-field-label">
- <h:outputLabel for="predefinedProperty"
styleClass="portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
- </td>
- </tr>
- <tr>
- <td>
- <h:selectOneMenu id="predefinedProperty"
value="#{properties.action.selectedProperty}">
- <f:selectItems
value="#{properties.propertyItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr>
- <td
align="center">#{bundle.COMMON_OR}</td>
- </tr>
+ <tr>
+ <td class="portlet-form-field-label">
+ <h:outputLabel for="predefinedProperty"
+
styleClass="portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:selectOneMenu id="predefinedProperty"
value="#{properties.action.selectedProperty}">
+ <f:selectItems
value="#{properties.propertyItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr>
+ <td
align="center">#{bundle.COMMON_OR}</td>
+ </tr>
</f:subview>
<tr>
<td class="portlet-form-field-label">
<h:outputLabel for="property"
styleClass="portlet-form-field-label">
- #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
+
#{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
</td>
</tr>
<tr>
@@ -57,7 +59,8 @@
</tbody>
</table>
<!-- ends layout of property form -->
- <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY}"
styleClass="portlet-form-button portlet-section-buttonrow"
+ <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY}"
+ styleClass="portlet-form-button
portlet-section-buttonrow"
action="#{properties.action.updateProperty}"/></h:form>
</td>
@@ -80,7 +83,8 @@
<h:form>
<!-- defines layout of property table -->
- <h:dataTable value="#{properties.entries}"
width="100%" headerClass="portlet-section-header"
styleClass="datatable full-width"
+ <h:dataTable value="#{properties.entries}"
width="100%" headerClass="portlet-section-header"
+ styleClass="datatable full-width"
rowClasses="portlet-section-body,
portlet-section-alternate" var="prop">
<h:column>
<f:facet
name="header">#{bundle.COMMON_NAME}</f:facet>
@@ -92,7 +96,7 @@
</h:column>
<h:column>
<f:facet
name="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="header">#{bundle.COMMON_VALUE}</f:facet>
@@ -132,7 +136,8 @@
</h:dataTable>
<!-- ends property list -->
- <h:commandButton value="#{bundle.COMMON_UPDATE}"
styleClass="portlet-form-button portlet-section-buttonrow"/></h:form>
+ <h:commandButton value="#{bundle.COMMON_UPDATE}"
+ styleClass="portlet-form-button
portlet-section-buttonrow"/></h:form>
</td>
</tr>
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
===================================================================
---
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="http://www.w3.org/1999/xhtml"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
-
xmlns:h="http://java.sun.com/jsf/html"
-
xmlns:f="http://java.sun.com/jsf/core"
-
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
-
xmlns:pfc="http://www.jboss.com/portal/facelet/common"
-
xmlns:c="http://java.sun.com/jstl/core">
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+
xmlns:pfc="http://www.jboss.com/portal/facelet/common"
+
xmlns:c="http://java.sun.com/jstl/core">
-<f:loadBundle basename="Resource" var="bundle" />
+<f:loadBundle basename="Resource" var="bundle"/>
<h:form>
<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
@@ -42,7 +42,7 @@
#{bundle.THEME}
</h:commandLink>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name !=
'template')}">
+ rendered="#{(object.name != 'admin') and (object.name !=
'template')}">
| <h:commandLink action="renameObject"
actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<h:outputText value="#{bundle.RENAME}"/>
@@ -50,13 +50,13 @@
</h:commandLink>
</h:panelGroup>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name !=
'template') and (not object.default)}">
- | <h:commandLink action="confirm"
styleClass="actionDelete"
-
actionListener="#{portalobjectmgr.selectDeletingObject}">
- <f:param name="id" value="#{object.id}"/>
- #{bundle.COMMON_DELETE}
- </h:commandLink>
- </h:panelGroup>
+ rendered="#{(object.name != 'admin') and (object.name !=
'template') and (not object.default)}">
+ | <h:commandLink action="confirm"
styleClass="actionDelete"
+
actionListener="#{portalobjectmgr.selectDeletingObject}">
+ <f:param name="id" value="#{object.id}"/>
+ #{bundle.COMMON_DELETE}
+ </h:commandLink>
+ </h:panelGroup>
<h:panelGroup rendered="#{not object.default}"> |
<h:commandLink styleClass="actionMakeDefault"
action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
@@ -143,18 +143,18 @@
</f:facet>
<h:graphicImage
-
title="#{object.declaredProperties['portal.windowInitialState'] eq
'MINIMIZED' ? '#{bundle.THIS_MINIMIZED_STATE}.' :
'#{bundle.THIS_NORMAL_STATE}.'}"
- rendered="#{!maximizedStateExists}"
-
value="#{object.declaredProperties['portal.windowInitialState'] eq
'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }"
- styleClass="windowStateIcon"
- alt=""/>
+ title="#{object.declaredProperties['portal.windowInitialState']
eq 'MINIMIZED' ? bundle.THIS_MINIMIZED_STATE : bundle.THIS_NORMAL_STATE}."
+ rendered="#{!maximizedStateExists}"
+ value="#{object.declaredProperties['portal.windowInitialState']
eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif'
}"
+ styleClass="windowStateIcon"
+ alt=""/>
<h:graphicImage
-
title="#{object.declaredProperties['portal.windowInitialState'] eq
'MAXIMIZED' ? '#{bundle.THIS_MAXIMIZED_STATE}.' :
'#{bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}.'}"
- rendered="#{maximizedStateExists}"
-
value="#{object.declaredProperties['portal.windowInitialState'] eq
'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
- styleClass="windowStateIcon"
- alt=""/>
+ title="#{object.declaredProperties['portal.windowInitialState']
eq 'MAXIMIZED' ? bundle.THIS_MAXIMIZED_STATE :
bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}."
+ rendered="#{maximizedStateExists}"
+ value="#{object.declaredProperties['portal.windowInitialState']
eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}"
+ styleClass="windowStateIcon"
+ alt=""/>
<!-- disable edit window for content type widget until JBPORTAL-1561 is
fixed -->
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-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-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29
15:20:44 UTC (rev 10846)
@@ -32,4 +32,4 @@
path_consumers_consumer = Consumer ''{0}'' configuration
path_consumers_active = active
path_consumers_inactive = inactive
-path_consumers_refreshNeeded = refresh needed
+path_consumers_refreshNeeded = (refresh needed)
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-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-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29
15:20:44 UTC (rev 10846)
@@ -32,4 +32,4 @@
path_consumers_consumer = Configuration du consommateur ''{0}''
path_consumers_active = actif
path_consumers_inactive = inactif
-path_consumers_refreshNeeded = rafra\u00eechissement requis
+path_consumers_refreshNeeded = (rafra\u00eechissement requis)
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29
14:16:40 UTC (rev 10845)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29
15:20:44 UTC (rev 10846)
@@ -10,7 +10,7 @@
<li id="currentTab">#{i18n.nav_tabs_consumers}</li>
<li><h:commandLink
value="#{i18n.nav_tabs_producer_config}"
action="producer"/></li>
<ui:remove>
- <li><h:commandLink
value="#{i18n.nav_tabs_producer_management}"
action="management"/></li>
+ <li><h:commandLink
value="#{i18n.nav_tabs_producer_management}"
action="management"/></li>
</ui:remove>
</ul>
</h:form>
@@ -28,12 +28,11 @@
class="#{consumer.active ? 'active' : 'inactive'}
#{consumer.refreshNeeded ? 'needsRefresh' : ''}">
<h:outputFormat
value="#{i18n.path_consumers_consumer}">
<f:param value="#{consumer.id}"/>
- </h:outputFormat> (<h:outputText
value="#{i18n.path_consumers_active}"
rendered="#{consumer.active}"/>
- <h:outputText value="#{i18n.path_consumers_inactive}"
rendered="#{!consumer.active}"/>)
- (<h:outputText
value="#{i18n.path_consumers_refreshNeeded}"
rendered="#{consumer.refreshNeeded}"/>)
+ </h:outputFormat> (#{consumer.active ? i18n.path_consumers_active
: i18n.path_consumers_inactive})
+ #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded :
''}
</li>
</c:if>
</ul>
</h:form>
</ui:define>
-</ui:decorate>
\ No newline at end of file
+</ui:decorate>