Author: chris.laprun(a)jboss.com Date: 2008-08-31 18:12:48 -0400 (Sun, 31 Aug 2008) New Revision: 11773 Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 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/editCoordination.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 Log: - Started re-working alias bindings and parameter bindings as current implementation is wrong. - Fixed cancel button for parameter creation (was using wrong manager). - Added cancel buttons on rename actions. Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-08-31 22:12:48 UTC (rev 11773) @@ -0,0 +1,186 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.portal.core.admin.ui.coordination; + +import org.jboss.portal.core.controller.coordination.AliasBindingInfo; +import org.jboss.portal.core.controller.coordination.IllegalCoordinationException; +import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.Window; +import org.jboss.portal.portlet.info.PortletInfo; + +import javax.xml.namespace.QName; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class AliasBindingManagerBean extends CoordinationManagerBean.CoordinationBean +{ + private Map<String, DisplayAliasBinding> displayAliasBindings; + + private String aliasName; + private String originalQName; + + public String getAliasName() + { + return aliasName; + } + + public void setAliasName(String aliasName) + { + this.aliasName = aliasName; + } + + public String getOriginalQName() + { + return originalQName; + } + + public void setOriginalQName(String originalQName) + { + this.originalQName = originalQName; + } + + public void loadInfoFrom(Page page) + { + Collection<? extends AliasBindingInfo> bindings = managerBean.getCoordinationService().getAliasBindings(page); + if (!bindings.isEmpty()) + { + displayAliasBindings = new HashMap<String, DisplayAliasBinding>(); + for (AliasBindingInfo binding : bindings) + { + displayAliasBindings.put(binding.getName(), new DisplayAliasBinding(binding)); + } + } + else + { + displayAliasBindings = Collections.emptyMap(); + } + } + + public List<DisplayAliasBinding> getDisplayAliasBindings() + { + if (displayAliasBindings == null) + { + return Collections.emptyList(); + } + + List<DisplayAliasBinding> result = new LinkedList<DisplayAliasBinding>(displayAliasBindings.values()); + Collections.sort(result); + + return result; + } + + public String createBinding() + { + if (aliasName != null) + { + try + { + HashSet<QName> qNames = new HashSet<QName>(); + qNames.add(QName.valueOf(originalQName)); + managerBean.getCoordinationService().setAliasBinding(managerBean.getSelectedPage(), aliasName, qNames); + } + catch (IllegalCoordinationException e) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } + } + return CoordinationManagerBean.EDIT_COORDINATION; + } + + public String cancelBinding() + { + aliasName = null; + originalQName = null; + + return CoordinationManagerBean.EDIT_COORDINATION; + } + + public String delete(String name) throws IllegalCoordinationException + { + DisplayAliasBinding binding = displayAliasBindings.get(name); + if (binding != null) + { + AliasBindingInfo alias = binding.getAlias(); + managerBean.getCoordinationService().removeAliasBinding(alias); + } + return CoordinationManagerBean.EDIT_COORDINATION; + } + + public String rename(String oldName, String newName) throws IllegalCoordinationException + { + DisplayAliasBinding binding = displayAliasBindings.get(newName); + if (binding != null) + { + AliasBindingInfo alias = binding.getAlias(); + managerBean.getCoordinationService().renameAliasBinding(alias, newName); + } + return CoordinationManagerBean.EDIT_COORDINATION; + } + + public void extractInfoFrom(Window window, PortletInfo info) + { + // nothing to do here as alias bindings don't have any window specific info + } + public static class DisplayAliasBinding implements Comparable + { + private AliasBindingInfo alias; + private List<QName> names; + + public DisplayAliasBinding(AliasBindingInfo binding) + { + alias = binding; + names = new ArrayList<QName>(binding.getNames()); + } + + public List<QName> getNames() + { + return names; + } + + public String getName() + { + return alias.getName(); + } + + public AliasBindingInfo getAlias() + { + return alias; + } + + public int compareTo(Object o) + { + DisplayAliasBinding other = (DisplayAliasBinding) o; + return getName().compareTo(other.getName()); + } + } +} Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-31 20:32:26 UTC (rev 11772) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-31 22:12:48 UTC (rev 11773) @@ -55,6 +55,7 @@ private PortalObjectId selectedObjectId; + private AliasBindingManagerBean aliasManager; private EventWiringManagerBean eventManager; private WindowBindingManagerBean windowManager; @@ -66,6 +67,7 @@ private CoordinationType selectedType; private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>(); private static ThreadLocal<WindowBindingManagerBean> windowManagerHolder = new ThreadLocal<WindowBindingManagerBean>(); + private static ThreadLocal<AliasBindingManagerBean> aliasManagerHolder = new ThreadLocal<AliasBindingManagerBean>(); private String newName; static final String EDIT_COORDINATION = "editCoordination"; @@ -88,7 +90,15 @@ CoordinationBean bean() { return windowManagerHolder.get(); - }}; + }}, + alias() { + String localizationKey() + { + return "COORDINATION_ALIAS"; + }CoordinationBean bean() + { + return aliasManagerHolder.get(); + }}; abstract String localizationKey(); abstract CoordinationBean bean(); } @@ -204,6 +214,17 @@ this.windowManager.setManagerBean(this); } + public AliasBindingManagerBean getAliasManager() + { + return aliasManager; + } + + public void setAliasManager(AliasBindingManagerBean aliasManager) + { + this.aliasManager = aliasManager; + this.aliasManager.setManagerBean(this); + } + public boolean isExplicitEventsUsed() { boolean enabled = false; @@ -265,6 +286,7 @@ eventManager.loadInfoFrom(selectedPage); windowManager.loadInfoFrom(selectedPage); + aliasManager.loadInfoFrom(selectedPage); Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK); if (!children.isEmpty()) @@ -280,6 +302,7 @@ Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef()); PortletInfo info = instance.getPortlet().getInfo(); + // get window specific info (aliasManager doesn't need that) windowManager.extractInfoFrom(window, info); eventManager.extractInfoFrom(window, info); } @@ -330,6 +353,7 @@ // make manager accessible to CoordinationType eventManagerHolder.set(eventManager); windowManagerHolder.set(windowManager); + aliasManagerHolder.set(aliasManager); } public String getSelectedName() Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-08-31 20:32:26 UTC (rev 11772) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-08-31 22:12:48 UTC (rev 11773) @@ -322,12 +322,10 @@ public String delete(String name) throws IllegalCoordinationException { DisplayEventWiring displayEvent = displayEventWirings.get(name); - if (displayEvent != null) { EventWiringInfo event = displayEvent.getEventInfo(); managerBean.getCoordinationService().removeEventWiring(event); - displayEventWirings.remove(name); } return CoordinationManagerBean.EDIT_COORDINATION; } @@ -340,7 +338,6 @@ EventWiringInfo event = displayEvent.getEventInfo(); managerBean.getCoordinationService().renameEventWiring(event, newName); } - return CoordinationManagerBean.EDIT_COORDINATION; } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-08-31 20:32:26 UTC (rev 11772) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-08-31 22:12:48 UTC (rev 11773) @@ -299,14 +299,11 @@ public String delete(String name) throws IllegalCoordinationException { DisplayParameterBinding displayParam = displayParameterBindings.get(name); - if (displayParam != null) { WindowBindingInfo bindingInfo = displayParam.getBindingInfo(); managerBean.getCoordinationService().removeWindowBinding(bindingInfo); - displayParameterBindings.remove(name); } - return CoordinationManagerBean.EDIT_COORDINATION; } @@ -318,7 +315,6 @@ WindowBindingInfo bindingInfo = displayParam.getBindingInfo(); managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName); } - return CoordinationManagerBean.EDIT_COORDINATION; } } 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 2008-08-31 20:32:26 UTC (rev 11772) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-08-31 22:12:48 UTC (rev 11773) @@ -272,6 +272,8 @@ COORDINATION_PARAMETER_BINDINGS=Parameter bindings COORDINATION_PARAMETER_EXPLICIT_MODE=Use explicit parameter binding COORDINATION_PARAMETER_MANAGE_EXISTING=Manage existing parameter bindings: +COORDINATION_PARAMETER_EXISTING_NAME=Name +COORDINATION_PARAMETER_EXISTING_ACTIONS=Actions COORDINATION_PARAMETER_CREATE=Create new parameter binding: COORDINATION_PARAMETER_CREATE_STEP1=1. Select public render parameter: COORDINATION_PARAMETER_CREATE_STEP2=2. Select windows for parameter ''{0}'': @@ -279,10 +281,18 @@ COORDINATION_PARAMETER_CREATE_CREATE=Create binding COORDINATION_WINDOWS=Windows + COORDINATION_ALIAS_BINDINGS=Alias bindings -COORDINATION_WINDOW_BINDINGS=Window bindings +COORDINATION_ALIAS_MANAGE_EXISTING=Manage existing alias bindings: +COORDINATION_ALIAS_EXISTING_NAME=Name +COORDINATION_ALIAS_EXISTING_ORIGINAL=Original QName +COORDINATION_ALIAS_EXISTING_ACTIONS=Actions +COORDINATION_ALIAS_CREATE=Create new alias binding: +COORDINATION_ALIAS_CREATE_STEP1=1. Select public render parameter: +COORDINATION_ALIAS_CREATE_STEP2=2. Name alias binding: +COORDINATION_ALIAS_CREATE_CREATE=Create alias -COORDINATION_EVENT_WIRINGS=event wirings +COORDINATION_EVENT_WIRINGS=Event wirings COORDINATION_EVENT_EXPLICIT_MODE=Use explicit event wiring COORDINATION_EVENT_MANAGE_EXISTING=Manage existing event wirings: COORDINATION_EVENT_EXISTING_NAME=Name @@ -301,3 +311,4 @@ COORDINATION_WIRING=event wiring COORDINATION_PARAMETER=parameter binding +COORDINATION_ALIAS=alias binding 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 2008-08-31 20:32:26 UTC (rev 11772) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-08-31 22:12:48 UTC (rev 11773) @@ -359,6 +359,10 @@ <property-name>windowManager</property-name> <value>#{windowCoordination}</value> </managed-property> + <managed-property> + <property-name>aliasManager</property-name> + <value>#{aliasCoordination}</value> + </managed-property> </managed-bean> <managed-bean> @@ -426,6 +430,11 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.coordination.WindowBindingManagerBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> + <managed-bean> + <managed-bean-name>aliasCoordination</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.admin.ui.coordination.AliasBindingManagerBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> <navigation-rule> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-31 20:32:26 UTC (rev 11772) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-31 22:12:48 UTC (rev 11773) @@ -10,9 +10,75 @@ <ui:define name="content"> <div class="tenpx-top-bottom"> - <h2 class="portlet-area-header">#{coordinationManager.selectedPage.name} #{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> + <h2 class="portlet-area-header">#{bundle.COORDINATION_ALIAS_BINDINGS}</h2> + <!-- Create alias binding --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3> <h:form> + <div class="float-left quarter-width"> + #{bundle.COORDINATION_ALIAS_CREATE_STEP1} + <h:selectOneListbox id="alias" size="5" value="#{aliasCoordination.originalQName}" + immediate="true" onchange="this.form.submit()"> + <f:selectItems value="#{windowCoordination.availableRenderParameters}"/> + </h:selectOneListbox> + </div> + + <h:panelGroup rendered="#{!empty aliasCoordination.originalQName}"> + <div class="float-left quarter-width"> + #{bundle.COORDINATION_ALIAS_CREATE_STEP2} + <h:inputText id="aliasName" value="#{aliasCoordination.aliasName}"/> + <h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}" + action="#{aliasCoordination.createBinding}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasCoordination.cancelBinding}" + styleClass="portlet-form-button"/> + </div> + </h:panelGroup> + + <br class="clear"/> + </h:form> + + <!-- Manage existing alias bindings --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_MANAGE_EXISTING}</h3> + <div class="float-left full-width"> + <h:form> + <h:dataTable var="binding" value="#{aliasCoordination.displayAliasBindings}" + rendered="true" styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="objectNameColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_NAME}</f:facet> + #{binding.name} + </h:column> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ORIGINAL}</f:facet> + <ui:repeat var="qname" value="#{binding.names}"> + #{qname} + </ui:repeat> + </h:column> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}"</f:facet> + <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="name" value="#{binding.name}"/> + <f:param name="type" value="alias"/> + </h:commandLink> | + <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="name" value="#{binding.name}"/> + <f:param name="type" value="alias"/> + </h:commandLink> + </h:column> + </h:dataTable> + </h:form> + </div> + <br class="clear"/> + </div> + + <div class="tenpx-top-bottom"> + <h2 class="portlet-area-header">#{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> + + <h:form> <h:selectBooleanCheckbox id="useImplicitBinding" value="#{coordinationManager.explicitParametersUsed}" onchange="this.form.submit()" immediate="true"/> #{bundle.COORDINATION_PARAMETER_EXPLICIT_MODE} @@ -48,7 +114,7 @@ <h:inputText id="bindingName" value="#{windowCoordination.windowBindingName}"/> <h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}" action="#{windowCoordination.createBinding}" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventCoordination.cancelBinding}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasCoordination.cancelBinding}" styleClass="portlet-form-button"/> </div> </h:panelGroup> @@ -66,7 +132,7 @@ columnClasses="objectNameColumn" headerClass="portlet-section-header"> <h:column> - <f:facet name="header">Binding Name</f:facet> + <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_NAME}</f:facet> #{binding.id} </h:column> <h:column> @@ -74,7 +140,7 @@ #{binding.name} </h:column> <h:column> - <f:facet name="header">Target Windows</f:facet> + <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet> <ui:repeat var="window" value="#{binding.windows}"> <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> <f:param name="id" value="#{window.id}"/> @@ -83,7 +149,7 @@ </ui:repeat> </h:column> <h:column> - <f:facet name="header">Actions</f:facet> + <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet> <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> <f:param name="name" value="#{binding.id}"/> @@ -103,7 +169,7 @@ </div> <!-- Event wirings --> - <h2 class="portlet-area-header">#{coordinationManager.selectedPage.name} #{bundle.COORDINATION_EVENT_WIRINGS}</h2> + <h2 class="portlet-area-header">#{bundle.COORDINATION_EVENT_WIRINGS}</h2> <h:form> <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}" @@ -218,7 +284,7 @@ <h:column> <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"/> + #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}" </f:facet> <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> 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 2008-08-31 20:32:26 UTC (rev 11772) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2008-08-31 22:12:48 UTC (rev 11773) @@ -14,7 +14,10 @@ <p>#{bundle.RENAME_THE} <span class="objectName">#{coordinationManager.selectedName}</span> #{coordinationManager.selectedType} #{bundle.TO}: <h:inputText id="newName" value="#{coordinationManager.newName}"/> - <h:commandButton value="#{bundle.RENAME}" action="#{coordinationManager.renameSelected}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.RENAME}" action="#{coordinationManager.renameSelected}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="editCoordination" + styleClass="portlet-form-button portlet-section-buttonrow"/> </p> </h:form> </ui:define> 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 2008-08-31 20:32:26 UTC (rev 11772) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-08-31 22:12:48 UTC (rev 11773) @@ -14,7 +14,10 @@ <p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObjectType} #{bundle.TO}: <h:inputText id="newName" value="#{renameAction.newName}"/> - <h:commandButton value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.RENAME}" action="#{renameAction.execute}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + <h:commandButton value="#{bundle.CANCEL}" action="objects" + styleClass="portlet-form-button portlet-section-buttonrow"/> </p> </h:form> </ui:define>