Author: chris.laprun(a)jboss.com Date: 2009-02-21 11:15:29 -0500 (Sat, 21 Feb 2009) New Revision: 12855 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 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/renameCoordination.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties Log: - JBPORTAL-2317: + Updated faces-config.xml to reflect changes in code (added beanContext where needed, plus renamed pageContainer to renamedObject) + Added h:message tags where appropriate and fixed styles. + Updated Resource files. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-02-21 16:12:51 UTC (rev 12854) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-02-21 16:15:29 UTC (rev 12855) @@ -324,7 +324,7 @@ COORDINATION_PARAMETER=parameter binding COORDINATION_ALIAS=alias binding -INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\' or '%5c' +INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\' or '%5c' NO_SELECTED_PORTLET_ERROR=No portlet was selected! DUPLICATE_ERROR=A(n) {1} named ''{0}'' already exists! bean_support_unexpected_error=Unexpected error: @@ -333,3 +333,6 @@ INSTANCE_TYPE=instance PAGE_TYPE=page PORTAL_TYPE=portal +DISPLAY_NAME_TYPE=display name +PROPERTY_TYPE=property +PORTAL_OBJECT_TYPE=portal object Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-02-21 16:12:51 UTC (rev 12854) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-02-21 16:15:29 UTC (rev 12855) @@ -325,6 +325,11 @@ <property-name>listener</property-name> <value>#{sessionScope.dashboard}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -332,7 +337,7 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>pageContainer</property-name> + <property-name>renamedObject</property-name> <value>#{portalobjectmgr.selectedObject}</value> </managed-property> <managed-property> @@ -343,6 +348,11 @@ <property-name>domainConfigurator</property-name> <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -380,7 +390,7 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>pageContainer</property-name> + <property-name>renamedObject</property-name> <value>#{dashboard.selectedPage}</value> </managed-property> <managed-property> @@ -391,6 +401,11 @@ <property-name>domainConfigurator</property-name> <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <!-- Constants --> 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 2009-02-21 16:12:51 UTC (rev 12854) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-02-21 16:15:29 UTC (rev 12855) @@ -52,6 +52,7 @@ <td> <h:inputText id="property" styleClass="portlet-form-input-field" value="#{properties.action.otherPropertyName}"/> + <h:message for="property" errorClass="portlet-msg-error"/> </td> </tr> </tbody> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-02-21 16:12:51 UTC (rev 12854) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-02-21 16:15:29 UTC (rev 12855) @@ -7,13 +7,11 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/> <ui:define name="content"> - <h3>#{bundle.RENAME} #{coordinationManager.selectedType}</h3> + <h3 class="sectionTitle">#{bundle.RENAME} #{coordinationManager.selectedType}</h3> <h:form id="renameForm"> - <h:message for="newName"/> - <p>#{bundle.RENAME_THE} <span class="objectName">#{coordinationManager.selectedName}</span> #{coordinationManager.selectedType} #{bundle.TO}: - <h:inputText id="newName" value="#{coordinationManager.newName}"/> + <h:inputText id="newName" value="#{coordinationManager.newName}"/> <h:message for="newName" errorClass="portlet-msg-error"/> <h:commandButton value="#{bundle.RENAME}" action="#{coordinationManager.renameSelected}" styleClass="portlet-form-button portlet-section-buttonrow"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="editCoordination" Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-02-21 16:12:51 UTC (rev 12854) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-02-21 16:15:29 UTC (rev 12855) @@ -7,13 +7,11 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/> <ui:define name="content"> - <h3>#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> + <h3 class="sectionTitle">#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm"> - <h:message for="newName"/> - <p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObjectType} #{bundle.TO}: - <h:inputText id="newName" value="#{renameAction.newName}"/> + <h:inputText id="newName" value="#{renameAction.newName}"/> <h:message for="newName" errorClass="portlet-msg-error"/> <h:commandButton id="rename" value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button portlet-section-buttonrow"/> <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="objects" Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-02-21 16:12:51 UTC (rev 12854) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-02-21 16:15:29 UTC (rev 12855) @@ -137,6 +137,7 @@ bean_support_unexpected_error = An unexpected error occured: bean_support_cause = Cause: +CONSUMER_TYPE = Consumer # ConsumerBean bean_consumer_cannot_find_consumer = Couldn''t find consumer ''{0}''! Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-02-21 16:12:51 UTC (rev 12854) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-02-21 16:15:29 UTC (rev 12855) @@ -144,4 +144,5 @@ registration_property_status_unchecked_value=Status ind\u00e9termin\u00e9 registration_property_status_valid=Valide org.jboss.portal.object.name.admin.WSRP=WSRP -consumers_table_reload=Recharger consommateurs \ No newline at end of file +consumers_table_reload=Recharger consommateurs +CONSUMER_TYPE=Consommateur \ No newline at end of file