Author: sohil.shah(a)jboss.com Date: 2007-06-13 01:09:41 -0400 (Wed, 13 Jun 2007) New Revision: 7411 Added: branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ajax/ branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ajax/DragAndDropBean.java branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ajax/TransactionFilter.java branches/2_6_RichFaces_POC/src/resources/ajax4jsf/ branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/ branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/a4j-portlet-1.1.1-SNAPSHOT.jar branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/ajax4jsf-1.1.2-SNAPSHOT.jar branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/oscache-2.3.jar branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/richfaces-3.0.2-SNAPSHOT.jar branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/confirm.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml.regular branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editProperties.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editTheme.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/dashboard/ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editContext.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPage.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageLayout.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageTheme.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editProperties.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindow.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/instances.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objectNavigation.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objectTemplate.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objects.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/portlets.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/renameObject.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/showPortletInfo.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml Modified: branches/2_6_RichFaces_POC/build.xml branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/portlet/PortletDefinitionInvoker.java branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/portlet.xml branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/web.xml Log: Page Layout Prototype using Ajax4JSF/RichFaces Drag n Drop components Modified: branches/2_6_RichFaces_POC/build.xml =================================================================== --- branches/2_6_RichFaces_POC/build.xml 2007-06-13 02:40:16 UTC (rev 7410) +++ branches/2_6_RichFaces_POC/build.xml 2007-06-13 05:09:41 UTC (rev 7411) @@ -97,6 +97,9 @@ <path refid="facelets.facelets.classpath"/> <path refid="el.el.classpath"/> <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> + <!-- ajax4jsf integration --> + <pathelement location="src/resources/ajax4jsf/lib/ajax4jsf-1.1.2-SNAPSHOT.jar"/> + <pathelement location="src/resources/ajax4jsf/lib/richfaces-3.0.2-SNAPSHOT.jar"/> </path> <!-- Configure modules --> @@ -203,13 +206,15 @@ <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/> <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/> + + <!-- ajax4jsf integration --> + <fileset dir="src/resources/ajax4jsf/lib"/> </copy> <copy todir="${build.resources}/portal-admin.sar/portal-admin.war"> <fileset dir="${build.resources}/portal-admin-war"/> <fileset dir="${source.bin}/portal-admin-war"/> </copy> - </target> <target name="output" depends="artifacts"> @@ -262,6 +267,13 @@ <require file="${jboss.home}/server/${portal.deploy.dir}"/> <copy file="${build.lib}/portal-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> </target> + + <target name="deploy-explode" depends="output"> + <require file="${jboss.home}/server/${portal.deploy.dir}"/> + <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-admin.sar" overwrite="true"> + <fileset dir="${build.resources}/portal-admin.sar"/> + </copy> + </target> <!-- | Undeploy the application Added: branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ajax/DragAndDropBean.java =================================================================== --- branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ajax/DragAndDropBean.java (rev 0) +++ branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ajax/DragAndDropBean.java 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,72 @@ +package org.jboss.portal.core.admin.ajax; + +import java.util.List; +import java.util.ArrayList; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.dnd.event.DropEvent; + +public class DragAndDropBean +{ + private String text; + private List capitals = null; + + public DragAndDropBean() + { + this.text = "Hello World"; + + this.capitals = new ArrayList(); + this.capitals.add("Washington DC"); + this.capitals.add("New Delhi"); + } + + + + public List getCapitals() + { + return capitals; + } + + + + public void setCapitals(List capitals) + { + this.capitals = capitals; + } + + + public String getText() + { + return text; + } + + public void setText(String text) + { + this.text = text; + } + + public String getRemoteUser() + { + String remoteUser = null; + + FacesContext context = FacesContext.getCurrentInstance(); + remoteUser = context.getExternalContext().getRemoteUser(); + + return remoteUser; + } + + public void processDrop(DropEvent event) + { + FacesContext context = FacesContext.getCurrentInstance(); + String remoteUser = (String)context.getExternalContext().getRequestParameterMap().get("remoteUser"); + String windowValue = (String)context.getExternalContext().getRequestParameterMap().get("windowValue"); + String portletValue = (String)context.getExternalContext().getRequestParameterMap().get("portletValue"); + String region = (String)context.getExternalContext().getRequestParameterMap().get("region"); + System.out.println("Bean.processDrop() called------------------------"); + System.out.println("RemoteUser="+remoteUser); + System.out.println("Window="+windowValue); + System.out.println("Portlet="+portletValue); + System.out.println("Region="+region); + } +} Added: branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ajax/TransactionFilter.java =================================================================== --- branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ajax/TransactionFilter.java (rev 0) +++ branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ajax/TransactionFilter.java 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,105 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.ajax; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; + +import org.jboss.portal.common.transaction.TransactionManagerProvider; +import org.jboss.portal.common.transaction.Transactions; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class TransactionFilter implements Filter +{ + private TransactionManager tm = null; + + /** + * + */ + public void init(FilterConfig cfg) throws ServletException + { + try + { + this.tm = TransactionManagerProvider.JBOSS_PROVIDER.getTransactionManager(); + } + catch(Exception e) + { + throw new ServletException(e); + } + } + + /** + * + */ + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException + { + Transaction cour = null; + try + { + cour = this.tm.getTransaction(); + if(cour == null) + { + Transactions.begin(this.tm); + cour = this.tm.getTransaction(); + } + + chain.doFilter(request, response); + + } + catch(Exception e) + { + if(cour != null) + { + Transactions.setRollbackOnly(this.tm); + } + throw new ServletException(e); + } + finally + { + if(cour != null) + { + Transactions.safeEnd(this.tm); + } + } + } + + /** + * + */ + public void destroy() + { + this.tm = null; + } +} Modified: branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-06-13 02:40:16 UTC (rev 7410) +++ branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-06-13 05:09:41 UTC (rev 7411) @@ -30,7 +30,10 @@ import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.Content; import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; +import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.admin.ui.actions.WindowComparator; +import org.jboss.portal.core.admin.ui.portlet.PortletDefinitionInvoker; import org.jboss.portal.core.impl.model.content.ContentProviderRegistryService; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.PortalLayout; @@ -41,6 +44,8 @@ import org.jboss.portal.faces.el.PropertyValue; import org.jboss.portal.portlet.PortletInvoker; +import org.ajax4jsf.dnd.event.DropEvent; + import javax.faces.model.SelectItem; import javax.faces.event.ActionEvent; import javax.faces.event.AbortProcessingException; @@ -56,6 +61,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.HashMap; +import java.util.Collection; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -463,7 +469,7 @@ } return windows; } - + public static class DynamicMap implements DynamicBean { @@ -492,4 +498,127 @@ return true; } } + + public List getPortlets() throws Exception + { + List portlets = new ArrayList(); + + PortletDefinitionInvoker portletDefinitionInvoker = (PortletDefinitionInvoker)this.portletInvoker; + InstanceContainer instanceContainer = portletDefinitionInvoker.getInstanceContainer(); + Collection definitions = instanceContainer.getDefinitions(); + for(Iterator itr=definitions.iterator();itr.hasNext();) + { + Instance instance = (Instance)itr.next(); + portlets.add(instance.getId()); + } + + return portlets; + } + + public void addWindow(DropEvent event) + { + FacesContext context = FacesContext.getCurrentInstance(); + String portletValue = (String)context.getExternalContext().getRequestParameterMap().get("portletValue"); + String region = (String)context.getExternalContext().getRequestParameterMap().get("region"); + + + String uri = portletValue; + String targetRegion = region; + + //auto-generate the name of the window...In a non-prototype scenario, there would be a modal popup + //that would ask you to input the window name + String newWindowName = this.createWindowName(); + while (page.getWindow(newWindowName) != null) + { + newWindowName = "" + this.createWindowName(); + } + + //Check for duplicate window name + if (page.getWindow(newWindowName) != null) + { + FacesContext faces = FacesContext.getCurrentInstance(); + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Duplicate window name found on this page!", null); + faces.addMessage("windowName", message); + throw new AbortProcessingException(); + } + + try + { + Window window = page.createWindow(newWindowName, selectedContentType, uri); + + // + window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, targetRegion); + window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE); + + // Get the windows belonging to the selected region sorted by order + List windows = new ArrayList(); + for (Iterator i = page.getChildren(PortalObject.WINDOW_MASK).iterator();i.hasNext();) + { + Window tmp = (Window)i.next(); + if (targetRegion.equals(tmp.getProperty(ThemeConstants.PORTAL_PROP_REGION))) + { + windows.add(tmp); + } + } + + // Sort windows + Collections.sort(windows, new WindowComparator()); + + // Add the created one + windows.add(window); + + // Update the order states + for (int i = 0;i < windows.size();i++) + { + Window tmp = (Window)windows.get(i); + tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); + } + } + catch (DuplicatePortalObjectException unexpected) + { + unexpected.printStackTrace(); + } + } + + public void removeWindow(DropEvent event) + { + FacesContext context = FacesContext.getCurrentInstance(); + String windowValue = (String)context.getExternalContext().getRequestParameterMap().get("windowValue"); + String regionName = (String)context.getExternalContext().getRequestParameterMap().get("region"); + + //Get the windows belonging to the selected region sorted by order + List windows = new ArrayList(); + for (Iterator i = page.getChildren(PortalObject.WINDOW_MASK).iterator();i.hasNext();) + { + Window window = (Window)i.next(); + if (regionName.equals(window.getProperty(ThemeConstants.PORTAL_PROP_REGION))) + { + windows.add(window); + } + } + Collections.sort(windows, new WindowComparator()); + + for (Iterator i = windows.iterator();i.hasNext();) + { + Window window = (Window)i.next(); + if (window.getName().equals(windowValue)) + { + try + { + page.destroyChild(window.getName()); + break; + } + catch (NoSuchPortalObjectException ignore) + { + ignore.printStackTrace(); + } + } + } + } + + private static int id = 0; + public String getId() + { + return "_" + id++; + } } Modified: branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java =================================================================== --- branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-06-13 02:40:16 UTC (rev 7410) +++ branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-06-13 05:09:41 UTC (rev 7411) @@ -119,6 +119,12 @@ // Get user name String userId = FacesContext.getCurrentInstance().getExternalContext().getRemoteUser(); + if(userId == null) + { + //Try to check if this an AJAX request and read the user from request parameter map + userId = (String)FacesContext.getCurrentInstance().getExternalContext(). + getRequestParameterMap().get("remoteUser"); + } // Load portal userPortal = (Portal)portalObjectContainer.getObject(dashboardId).getChild(userId); Modified: branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/portlet/PortletDefinitionInvoker.java =================================================================== --- branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/portlet/PortletDefinitionInvoker.java 2007-06-13 02:40:16 UTC (rev 7410) +++ branches/2_6_RichFaces_POC/src/main/org/jboss/portal/core/admin/ui/portlet/PortletDefinitionInvoker.java 2007-06-13 05:09:41 UTC (rev 7411) @@ -136,6 +136,11 @@ { throw new UnsupportedOperationException(); } + + public InstanceContainer getInstanceContainer() + { + return this.instanceContainer; + } private static final class PortletDefinition implements Portlet { @@ -148,6 +153,7 @@ /** . */ private final boolean remote; + public PortletDefinition(Instance instance) throws PortletInvokerException { Added: branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/a4j-portlet-1.1.1-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/a4j-portlet-1.1.1-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/ajax4jsf-1.1.2-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/ajax4jsf-1.1.2-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/oscache-2.3.jar =================================================================== (Binary files differ) Property changes on: branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/oscache-2.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/richfaces-3.0.2-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/2_6_RichFaces_POC/src/resources/ajax4jsf/lib/richfaces-3.0.2-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-06-13 02:40:16 UTC (rev 7410) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-06-13 05:09:41 UTC (rev 7411) @@ -26,11 +26,42 @@ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> - + <!-- <application> <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> - </application> + </application> + --> + + <!-- AJAX4JSF integration --> + <application> + <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> + <view-handler>org.ajax4jsf.portlet.application.PortletViewHandler</view-handler> + </application> + <render-kit> + <renderer> + <description> + override the viewroot + </description> + <component-family>javax.faces.ViewRoot</component-family> + <renderer-type>javax.faces.ViewRoot</renderer-type> + <renderer-class>org.ajax4jsf.portlet.renderkit.portlet.PortletAjaxViewRootRenderer</renderer-class> + </renderer> + </render-kit> + <managed-bean> + <managed-bean-name>ajaxContext</managed-bean-name> + <managed-bean-class>org.ajax4jsf.portlet.PortletAjaxContext</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>dnd</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.admin.ajax.DragAndDropBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + + <lifecycle> + <phase-listener>org.jboss.portal.core.admin.ui.Refresher</phase-listener> + </lifecycle> <converter> <converter-for-class>org.jboss.portal.core.model.content.ContentType</converter-for-class> @@ -271,6 +302,7 @@ </managed-bean> + <!-- <navigation-rule> <navigation-case> <from-outcome>index</from-outcome> @@ -367,10 +399,105 @@ <to-view-id>/WEB-INF/jsf/confirmDeleteInstance.xhtml</to-view-id> </navigation-case> </navigation-rule> + --> + + <!-- AJAX4JSF integration --> + <navigation-rule> + <navigation-case> + <from-outcome>index</from-outcome> + <to-view-id>/jsf/objects.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>advancedMode</from-outcome> + <to-view-id>/jsf/objects.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>wizardMode</from-outcome> + <to-view-id>/jsf/wizard/selectPortlet.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>objects</from-outcome> + <to-view-id>/jsf/objects.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>editPortalSecurity</from-outcome> + <to-view-id>/jsf/editPortalSecurity.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>editPortalTheme</from-outcome> + <to-view-id>/jsf/editPortalTheme.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>editPageLayout</from-outcome> + <to-view-id>/jsf/editPageLayout.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>editPageSecurity</from-outcome> + <to-view-id>/jsf/editPageSecurity.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>editProperties</from-outcome> + <to-view-id>/jsf/editProperties.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>editPageTheme</from-outcome> + <to-view-id>/jsf/editPageTheme.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>editWindowSecurity</from-outcome> + <to-view-id>/jsf/editWindowSecurity.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>renameObject</from-outcome> + <to-view-id>/jsf/renameObject.xhtml</to-view-id> + </navigation-case> + + <navigation-case> + <from-outcome>editWindowTheme</from-outcome> + <to-view-id>/jsf/editWindowTheme.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>instances</from-outcome> + <to-view-id>/jsf/instances.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>portlets</from-outcome> + <to-view-id>/jsf/portlets.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>selectPortlet</from-outcome> + <to-view-id>/jsf/wizard/selectPortlet.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>selectPortal</from-outcome> + <to-view-id>/jsf/wizard/selectPortal.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>selectPage</from-outcome> + <to-view-id>/jsf/wizard/selectPage.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>selectRegion</from-outcome> + <to-view-id>/jsf/wizard/selectRegion.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>newWindowWizardConfirm</from-outcome> + <to-view-id>/jsf/wizard/newWindowWizardConfirm.xhtml</to-view-id> + </navigation-case> - <lifecycle> - <phase-listener>org.jboss.portal.core.admin.ui.Refresher</phase-listener> - </lifecycle> + <navigation-case> + <from-outcome>dashboard</from-outcome> + <to-view-id>/jsf/dashboard/dashboard.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>confirm</from-outcome> + <to-view-id>/jsf/common/confirm.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>confirmDeleteInstance</from-outcome> + <to-view-id>/jsf/confirmDeleteInstance.xhtml</to-view-id> + </navigation-case> + </navigation-rule> <component> <component-type>org.jboss.portal.Scroller</component-type> @@ -389,5 +516,4 @@ <renderer-class>org.jboss.portal.faces.component.scroller.ScrollerRenderer</renderer-class> </renderer> </render-kit> - </faces-config> Modified: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-06-13 02:40:16 UTC (rev 7410) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-06-13 05:09:41 UTC (rev 7411) @@ -35,6 +35,8 @@ <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> </portlet> + + <!-- <portlet> <portlet-name>DashboardConfigPortlet</portlet-name> <transaction> @@ -44,6 +46,7 @@ <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> </portlet> + --> <!-- Service injected in the portlet context. --> <service> Modified: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml 2007-06-13 02:40:16 UTC (rev 7410) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml 2007-06-13 05:09:41 UTC (rev 7411) @@ -39,10 +39,12 @@ </security-constraint> </instance> </deployment> + <!-- <deployment> <instance> <instance-id>DashboardConfigPortletInstance</instance-id> <portlet-ref>DashboardConfigPortlet</portlet-ref> </instance> </deployment> + --> </deployments> \ No newline at end of file Modified: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-06-13 02:40:16 UTC (rev 7410) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-06-13 05:09:41 UTC (rev 7411) @@ -27,6 +27,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1... http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"> + <!-- <portlet> <description>Administration Portlet</description> <portlet-name>AdminPortlet</portlet-name> @@ -65,4 +66,26 @@ <keywords>management,admin</keywords> </portlet-info> </portlet> + --> + + <!-- Ajax4JSF integration --> + <portlet> + <description>Administration Portlet</description> + <portlet-name>AdminPortlet</portlet-name> + <display-name>Administration Portlet</display-name> + <portlet-class>org.ajax4jsf.portlet.AjaxFacesPortlet</portlet-class> + <init-param> + <name>default-view</name> + <value>/jsf/objects.xhtml</value> + </init-param> + <expiration-cache>-1</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <portlet-info> + <title>Management Portlet</title> + <keywords>management,admin</keywords> + </portlet-info> + </portlet> </portlet-app> Modified: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/web.xml 2007-06-13 02:40:16 UTC (rev 7410) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/WEB-INF/web.xml 2007-06-13 05:09:41 UTC (rev 7411) @@ -73,17 +73,56 @@ <param-name>javax.faces.STATE_SAVING_METHOD</param-name> <param-value>server</param-value> </context-param> - + + <!-- AJAX4JSF integration --> + <context-param> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>org.ajax4jsf.portlet.application.FaceletPortletViewHandler</param-value> + </context-param> + <filter> + <display-name>AJAXTransactionFilter</display-name> + <filter-name>ajaxTransactionFilter</filter-name> + <filter-class>org.jboss.portal.core.admin.ajax.TransactionFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajaxTransactionFilter</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + <listener> + <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> + </listener> + + <!-- The JSF meta bridge bootstrap --> + <!-- + <listener> + <display-name> Faces Meta Bridge Bootstrap</display-name> + <listener-class>org.jboss.portal.faces.portlet.JSFMetaBridgeBootstrap</listener-class> + </listener> + --> + <!-- The JSF servlet --> <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <load-on-startup>1</load-on-startup> - </servlet> - - <!-- The JSF meta bridge bootstrap --> - <listener> - <display-name> Faces Meta Bridge Bootstrap</display-name> - <listener-class>org.jboss.portal.faces.portlet.JSFMetaBridgeBootstrap</listener-class> - </listener> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> </web-app> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/confirm.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/confirm.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/confirm.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,30 @@ +<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:jbp="http://www.jboss.org/portal" + xmlns:c="http://java.sun.com/jstl/core" + class="admin-ui"> + + <ui:composition template="../objectTemplate.xhtml"> + + <ui:define name="content"> + + + <p class="portlet-msg-alert">WARNING ! You are about to delete this element from the portal !</p> + + <p class="portlet-class">Are you sure ?</p> + + <h:form> + <h:commandButton value="Yes" action="objects" actionListener="#{portalobjectmgr.destroyObject}" styleClass="portlet-form-button"> + <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}" /> + </h:commandButton> + <h:commandButton value="No" action="objects" actionListener="objects" styleClass="portlet-form-button"/> + </h:form> + + </ui:define> + + </ui:composition> + +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,74 @@ +<a4j:portlet + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:jbp="http://www.jboss.org/portal" + xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:rich="http://richfaces.ajax4jsf.org/rich" +> + +<div> + +<rich:dragIndicator id="indicator"></rich:dragIndicator> + + +<div style="float:left"> + <rich:panel> + <rich:dragIndicator id="addIndicator"/> + <f:facet name="header">Drag and Drop any of these portlets to the respective layout regions</f:facet> + <c:forEach items="#{pageManager.portlets}" var="portlet"> + <rich:panel> + <a4j:outputPanel> + <rich:dragSupport dragType="portlet" dragIndicator="addIndicator"> + <rich:dndParam type="drag" name="label" value="#{portlet}"/> + <a4j:actionparam value="#{dnd.remoteUser}" name="remoteUser"/> + <a4j:actionparam value="#{portlet}" name="portletValue"/> + </rich:dragSupport> + <h:outputText value="#{portlet}"/> + </a4j:outputPanel> + </rich:panel> + </c:forEach> + </rich:panel> +</div> + +<div style="float:left; padding:0 2em 0 2em"> + <h:form id="regions"> + <rich:dragIndicator id="removeIndicator"/> + <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> + <rich:panel id="region#{regionName}"> + <f:facet name="header" id="#{pageManager.id}">#{regionName} Region</f:facet> + <c:forEach items="#{pageManager.windowItemsMap[regionName]}" var="window"> + <rich:panel id="#{pageManager.id}"> + <a4j:outputPanel id="#{pageManager.id}"> + <rich:dragSupport dragType="window" reRender="region#{regionName}" dragIndicator="removeIndicator" id="#{pageManager.id}"> + <rich:dndParam type="drag" name="label" value="#{window.value}" id="#{pageManager.id}"/> + <a4j:actionparam value="#{dnd.remoteUser}" name="remoteUser" id="#{pageManager.id}"/> + <a4j:actionparam value="#{window.value}" name="windowValue" id="#{pageManager.id}"/> + <a4j:actionparam value="#{regionName}" name="region" id="#{pageManager.id}"/> + </rich:dragSupport> + <h:outputText value="#{window.label}" id="#{pageManager.id}"/> + </a4j:outputPanel> + </rich:panel> + </c:forEach> + <rich:dropSupport acceptedTypes="portlet" dropListener="#{pageManager.addWindow}" reRender="region#{regionName}" id="#{pageManager.id}"> + <a4j:actionparam value="#{regionName}" name="region"/> + </rich:dropSupport> + </rich:panel> + <br/><br/> + </c:forEach> + </h:form> +</div> + +<div style="float:left; padding:0 2em 0 2em"> + <rich:panel> + <f:facet name="header">Drop here for removal</f:facet> + <rich:dropSupport acceptedTypes="window" dropListener="#{pageManager.removeWindow}"/> + </rich:panel> +</div> + + +</div> + +</a4j:portlet> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml.regular =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml.regular (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml.regular 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,154 @@ +<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:jbp="http://www.jboss.org/portal" + xmlns:c="http://java.sun.com/jstl/core"> + +<div style="float:left; padding:0 2em 0 2em"> + <h:form id="layoutForm"> + <table> + <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> + <tbody> + <tr> + <td colspan="2" class="portlet-form-field-label"><hr/> #{regionName} Region </td> + </tr> + <tr> + <td> + <div> + <h:commandButton + value="Up" id="u_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button"/> + </div> + <div> + <h:commandButton + value="Down" id="d_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button"/> + </div> + <div style="margin-top: 1em"> + <h:commandButton + value="Delete" id="l_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button"/> + </div> + </td> + <td> + <h:selectManyListbox + value="#{pageManager.assignedWindows[regionName]}" + size="7" styleClass="windowList portlet-form-field"> + <f:selectItems + value="#{pageManager.windowItemsMap[regionName]}"/> + </h:selectManyListbox> + </td> + </tr> + </tbody> + </c:forEach> + <tbody> + <tr> + <td colspan="2" class="portlet-form-field-label" + style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned + windows + </td> + </tr> + <tr> + <td> + <div style="margin-top: 1em"> + <h:commandButton value="Delete" + id="l_unknown" actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button"/> + </div> + </td> + <td> + <h:selectManyListbox + value="#{pageManager.assignedWindows['unknown']}" + size="7" styleClass="windowList portlet-form-field"> + <f:selectItems + value="#{pageManager.windowItemsMap['unknown']}"/> + </h:selectManyListbox> + </td> + </tr> + </tbody> + </table> + </h:form> +</div> +<div style="float:left"> + <table class="form"> + <tr> + <td colspan="2"><hr/>You can choose among several types of content to assign on the page: + </td> + </tr> + <tr> + <td class="label"> + <span class="portlet-form-field-label">Content type:</span> + </td> + <td class="widget"> + <h:form id="abc"> + <h:selectOneMenu + id="instanceId" + value="#{pageManager.selectedContentType}" + styleClass="portlet-form-field contentType"> + <f:selectItems value="#{pageManager.contentTypeItems}"/> + </h:selectOneMenu> + <h:commandButton value="Change" styleClass="portlet-form-button"/> + <h:message for="instanceId" errorClass="portlet-msg-error"/> + </h:form> + </td> + </tr> + <tr> + <td colspan="2"><hr/>You can enter a window name used during content selection (optional): + </td> + </tr> + <tr> + <td class="label"> + <span class="portlet-form-field-label">Window Name:</span> + </td> + <td class="widget"> + <h:form id="windowForm"> + <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/> + <h:message for="windowName" errorClass="portlet-msg-error"/> + </h:form> + </td> + </tr> + <tr> + <td colspan="2"><hr/>The page region will contain the selected content: + </td> + </tr> + <tr> + <td class="label"> + <span class="portlet-form-field-label">Target Region:</span> + </td> + <td class="widget"> + <h:form id="regionForm"> + <h:selectOneMenu id="targetRegion" value="#{pageManager.targetRegion}" styleClass="portlet-form-input-field"> + <f:selectItems value="#{pageManager.regionItems}"/> + </h:selectOneMenu> + <h:message for="targetRegion" errorClass="portlet-msg-error"/> + </h:form> + </td> + </tr> + <tr> + <td colspan="2"><hr/>Select content that will be added to the page: + </td> + </tr> + <tr> + <td colspan="2"> + <div style="margin:3em;"> + <jbp:portlet + portletId="#{pageManager.selectedEditorPortletId}" + portletInvoker="#{pageManager.portletInvoker}" + actionListener="#{pageManager.assignWindow}" + supportedModes="select_content" + supportedWindowStates="normal" + initialMode="select_content" + initialWindowState="normal" + onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value).setParameter('targetRegion', document.getElementById('regionForm:targetRegion').value);"/> + </div> + </td> + </tr> + </table> +</div> + +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,98 @@ +<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:c="http://java.sun.com/jstl/core"> + + <h:form> + <table width="100%"> + <thead class="portlet-section-header" style="text-align:left;"> + <tr> + <th>Key</th> + <th>Name</th> + <th>ReadOnly</th> + <c:if test="#{prefs.mutable}"> + <th>Value</th> + </c:if> + </tr> + </thead> + <tbody> + <c:forEach items="#{prefs.entries}" var="pref" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <c:choose> + <c:when test="#{prefs.mutable and pref.readOnly == false}"> + <h:commandLink + rendered="#{pref.readOnly == false}" + action="#{pref.select}">#{pref.name}</h:commandLink> + </c:when> + <c:otherwise>#{pref.name}</c:otherwise> + </c:choose> + </td> + <td> + <h:outputText value="#{pref.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="true" value="#{pref.readOnly}"/> + </td> + <c:if test="#{prefs.mutable}"> + <td> + <h:outputText value="#{pref.value}"/> + </td> + </c:if> + </tr> + </c:forEach> + </tbody> + </table> + </h:form> + + <c:if test="#{prefs.selectedEntry != null}"> + <h:form style="padding: 1em 0 1em 0"> + <fieldset style="border: 1px solid;"> + <legend>Edit existing values</legend> + <table> + <tbody> + <c:forEach items="#{prefs.selectedEntry.indices}" var="index" varStatus="status"> + <tr> + <td> + <h:outputLabel for="row_#{status.index}"> + <h:outputText value="Value #{status.index}: " styleClass="portlet-form-field-label"/> + </h:outputLabel> + </td> + <td> + <h:inputText value="#{prefs.selectedEntry[index]}" styleClass="portlet-form-input-field"/> + </td> + <td> + <h:commandButton + id="row_#{status.index}" + actionListener="#{prefs.selectedEntry.deleteLine}" + value="Delete" + styleClass="portlet-form-button"/> + </td> + </tr> + </c:forEach> + <tr> + <td colspan="3"> + <h:commandButton value="Update" styleClass="portlet-form-button"/> + </td> + </tr> + </tbody> + </table> + </fieldset> + </h:form> + + <h:form> + <fieldset style="border: 1px solid;"> + <legend>Append a value</legend> + <h:outputLabel for="new_value"> + <h:outputText value="New value: " styleClass="portlet-form-field-label"/> + </h:outputLabel> + <h:inputText id="new_value" value="#{prefs.selectedEntry.line}" styleClass="portlet-form-input-field"/> + <h:commandButton action="#{prefs.selectedEntry.appendLine}" value="Append" styleClass="portlet-form-button"/> + </fieldset> + </h:form> + + </c:if> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editProperties.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editProperties.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,93 @@ +<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:c="http://java.sun.com/jstl/core"> + + <h:form> + <table width="100%"> + <thead class="portlet-section-header" style="text-align:left;"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Value</th> + <th>Inherited</th> + <th>Delete</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{properties.entries}" var="prop" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:outputText title="#{prop.name}" value="#{prop.displayName}"/> + </td> + <td> + <h:outputText>#{prop.description}</h:outputText> + </td> + <td> + <c:choose> + <c:when test="#{prop.type=='java.lang.Boolean'}"> + <h:selectBooleanCheckbox styleClass="portlet-form-button" value="#{prop.value}" readonly="#{prop.readOnly}"/> + </c:when> + <c:otherwise> + <h:inputText styleClass="portlet-form-input-field" value="#{prop.value}" readonly="#{prop.readOnly}"/> + </c:otherwise> + </c:choose> + </td> + <td>#{prop.inherited ? 'Yes' : 'No'}</td> + <td> + <h:commandLink action="#{propertyAction.removeProperty}"> + <h:outputText value="Delete"/> + <f:param name="name" value="#{prop.name}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + <h:commandButton value="Update" styleClass="portlet-form-button"/> + </h:form> + + <!-- Separation --> + <hr/> + + <h3>Add a new property</h3> + + <p>You can either create a predefined property or create one with the name of your choice</p> + + <h:form> + <table> + <tbody> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select a predefined property: </h:outputLabel> + </td> + <td> + <h:selectOneMenu id="predefinedProperty" styleClass="portlet-form-field" value="#{propertyAction.selectedProperty}"> + <f:selectItems value="#{properties.propertyItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="property" styleClass="portlet-form-field-label">Or enter a property name: </h:outputLabel> + </td> + <td> + <h:inputText id="property" styleClass="portlet-form-input-field" value="#{propertyAction.otherPropertyName}" /> + </td> + </tr> + </tbody> + </table> + + <h:commandButton value="Add property" styleClass="portlet-form-button" action="#{propertyAction.updateProperty}"/> + </h:form> + + <!-- Separation --> + <hr/> + + <h:form> + <h:commandButton value="Cancel" styleClass="portlet-form-button" action="objects" immediate="true"/> + </h:form> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,42 @@ +<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:c="http://java.sun.com/jstl/core"> + + <h:form> + <table> + <thead class="portlet-section-header"> + <tr> + <th>Roles</th> + <th>Permissions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{auth.roles}" var="role" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:outputLabel for="cars_#{status.index}"> + Role #{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}: + </h:outputLabel> + </td> + <td> + <h:selectManyCheckbox + id="cars_#{status.index}" + value="#{auth.forRole[role]}" + layout="lineDirection"> + <f:selectItems value="#{auth.availableActions}"/> + </h:selectManyCheckbox> + </td> + </tr> + </c:forEach> + </tbody> + </table> + <div> + <h:commandButton value="Update" action="#{auth.submit}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/> + </div> + </h:form> + +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editTheme.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editTheme.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,49 @@ +<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"> + + <h:panelGroup styleClass="portlet-section-body" id="themepg"> + <h:form id="themeform"> + <table> + <tbody> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="layout">Layout:</h:outputLabel> + </td> + <td> + <h:selectOneMenu id="layout" styleClass="portlet-form-field" value="#{themePropertyAction.layoutName}"> + <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="theme">Theme:</h:outputLabel> + </td> + <td> + <h:selectOneMenu id="theme" styleClass="portlet-form-field" value="#{themePropertyAction.themeName}"> + <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="renderSet">RenderSet:</h:outputLabel> + </td> + <td> + <h:selectOneMenu id="renderSet" styleClass="portlet-form-field" value="#{themePropertyAction.renderSetName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + + <br /> + <ui:insert name="form_submit"/> + + </h:form> +</h:panelGroup> +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,48 @@ +<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"> + + <h:panelGroup styleClass="portlet-section-body" id="themepg"> + <h:form id="themeform"> + <fieldset style="border: 1px solid;"> + <legend>Theme properties</legend> + <table> + <tbody> + <tr> + <td class="portlet-form-field-label"><label class="portlet-form-field-label">Window Renderer:</label> + </td> + <td> + <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.windowRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td class="portlet-form-field-label"><label class="portlet-form-field-label">Decoration Renderer:</label> + </td> + <td> + <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.decorationRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td class="portlet-form-field-label"><label class="portlet-form-field-label">Portlet Renderer:</label> + </td> + <td> + <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.portletRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + </fieldset> + <div style="text-align:center;padding: 1em 0 1em 0"> + <ui:insert name="form_submit"/> + </div> + </h:form> +</h:panelGroup> +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,39 @@ +<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:c="http://java.sun.com/jstl/core"> + + <table> + <tr> + <td class="portlet-form-field-label">Portlet name:</td> + <td><h:form><h:commandLink + action="#{portletmgr.selectPortlet}"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="manager"/> + #{portlet.name.value} + </h:commandLink></h:form></td> + </tr> + <tr> + <td class="portlet-form-field-label">Portlet description:</td> + <td>#{portlet.description.value}</td> + </tr> + <tr> + <td class="portlet-form-field-label">Portlet title:</td> + <td>#{portlet.title.value}</td> + </tr> + <tr> + <td class="portlet-form-field-label">Portlet keywords:</td> + <td>#{portlet.keywords.value}</td> + </tr> + <c:if test="#{not empty portlet.locales}"> + <tr> + <td class="portlet-form-field-label">Portlet locales:</td> + <td> + <c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach> + </td> + </tr> + </c:if> + </table> +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,22 @@ +<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:jbp="http://www.jboss.org/portal" + xmlns:c="http://java.sun.com/jstl/core" + class="admin-ui"> + + <p class="portlet-msg-alert">WARNING ! You are about to delete the following portlet instance:</p> + + <h:outputText value="#{instancemgr.selectedInstance.id}"/> + + <p class="portlet-class">Are you sure ?</p> + + <h:form> + <h:commandButton value="Yes" action="instances" actionListener="#{instancemgr.deleteInstance}" styleClass="portlet-form-button"> + <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/> + </h:commandButton> + <h:commandButton value="No" action="instances" actionListener="objects" styleClass="portlet-form-button"/> + </h:form> +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,145 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:c="http://java.sun.com/jstl/core"> + + +<div align="center"> + <h:message id="error" for="error" errorClass="portlet-msg-error"/> +</div> + +<table width="100%"> +<tr> + <th colspan="2" class="portlet-section-header" align="center">Personal Dashboard Editor</th> +</tr> +<tr> + <td class="portlet-section-body" align="center"> + <table width="100%"> + <tr> + <td width="250"> + <table class="bottombuttonbar"> + <tr> + <td align="left" valign="top"><b>Create a New Page:</b><br/>Page name:&#160; + <h:form style="padding:0;margin:0"> + <h:inputText id="pageName" value="#{addDashboardPageAction.pageName}" + styleClass="portlet-form-input-field"/> + <h:commandButton value="Save" + action="#{addDashboardPageAction.execute}" + styleClass="portlet-form-button"/> + </h:form> + </td> + </tr> + </table> + </td> + <td align="left" valign="top"> + Use this page to manage the content and appearance of your dashboard pages. <br/> + You can control the page titles, column layouts, page themes, + and add, + order, or remove portlets. + </td> + </tr> + </table> + </td> +</tr> +<tr> + <th colspan="2" class="portlet-section-header" align="center">Currently editing page #{dashboard.selectedPage.name}</th> +</tr> +<tr> + <td class="portlet-section-body" align="center"> + <h:form style="padding:0;margin:0"> + Select: <h:selectOneMenu + id="pageNameSelector" + value="#{dashboard.selectedPageName}" + styleClass="portlet-form-field"> + <f:selectItems value="#{dashboard.pageItems}"/> + </h:selectOneMenu> + <h:commandButton value="Go" styleClass="portlet-form-button"/> + </h:form> + <br/> + </td> +</tr> +<tr> + <td> + <table width="100%"> + <tr> + <td valign="top" width="250"> + <table class="bottombuttonbar"> + <tr> + <td valign="top"> + <b>Theme and Layout</b> + <br/> + Apply a theme to your dashboard, or select the number of columns for the layout. + <hr/> + </td> + </tr> + <tr> + <td> + <h:form> + Choose a layout:<br/> + <h:selectOneMenu + id="layoutSelector" + value="#{dashboard.selectedPageLayout}" + styleClass="portlet-form-field"> + <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> + </h:selectOneMenu> + <h:commandButton value="Select" styleClass="portlet-form-button" action="#{dashboard.updateLayout}"/> + </h:form> + </td> + </tr> + <tr> + <td height="20"></td> + </tr> + <tr> + <td> + <h:form> + Choose a theme:<br/> + <h:selectOneMenu + id="themeSelector" + value="#{dashboard.selectedPageTheme}" + styleClass="portlet-form-field"> + <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> + </h:selectOneMenu> + <h:commandButton value="Select" styleClass="portlet-form-button" action="#{dashboard.updateTheme}"/> + </h:form> + </td> + </tr> + <tr> + <td height="20"></td> + </tr> + </table> + </td> + <td> + <table> + <tr> + <td> + <div class="admin-ui"> + <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml"> + <ui:param name="pageManager" value="#{dashboard.pageManager}"/> + </ui:include> + </div> + </td> + </tr> + </table> + </td> + </tr> + </table> + </td> +</tr> +</table> +<hr/> +<c:if test="#{dashboard.selectePageIsDefault == false}"> + <table width="100%"> + <tr> + <td align="left"> + <h:form style="padding:0;margin:0"> + <h:commandButton value="Delete this Page" styleClass="portlet-form-button" action="#{dashboard.destroyPage}"/> + <br/> + <font color="red">You cannot undo this action!</font> + </h:form> + </td> + </tr> + </table> +</c:if> +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editContext.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editContext.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editContext.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,32 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + + <!-- Sub page addition --> + <div style="padding:1em 0 0 0"> + <h:form id="portal_form"> + <span class="portlet-font">Create a portal:</span> + <span style="padding:1em 0 1em 0"> + <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/> + <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/> + <h:message for="name" errorClass="portlet-msg-error"/> + </span> + </h:form> + </div> + + <!-- Separation --> + <hr/> + + <!-- Navigation --> + <ui:include src="objectNavigation.xhtml"/> + + </ui:define> + + </ui:composition> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPage.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPage.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPage.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,86 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + + <h:form> + <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == 2}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Page layout"/> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Properties"/> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + </h:commandLink> | <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == 1) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Rename"/> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + </h:commandLink> + </h:form> + + + + <!-- Sub page addition --> + <div style="padding:1em 0 0 0"> + <table> + <tr> + <h:form> + <td> + <span class="portlet-font">Create a page:</span> + </td> + <td> + <h:inputText id="pageName" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> + </td> + <td> + <h:commandButton action="#{addPageAction.execute}" value="Add" styleClass="portlet-form-button"/> + </td> + <td> + <h:message for="pageName" errorClass="portlet-msg-error"/> + </td> + </h:form> + </tr> + <!-- Default page --> + <tr> + <h:form> + <td> + <span class="portlet-font">Default page:</span> + </td> + <td> + <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}"> + <f:selectItems value="#{portalobjectmgr.portalPageItems}" /> + </h:selectOneMenu> + </td> + <td colspan="2"> + <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/> + </td> + </h:form> + </tr> + </table> + </div> + + + + + <!-- Separation --> + <hr/> + + <!-- Navigation --> + <ui:include src="objectNavigation.xhtml"/> + + </ui:define> + + </ui:composition> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageLayout.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageLayout.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageLayout.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,27 @@ +<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:ct="http://www.julien.com" + xmlns:jbp="http://www.jboss.org/portal" + xmlns:c="http://java.sun.com/jstl/core"> + +<ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + + <h3>You are editing the page layout</h3> + + <ui:include src="common/editPageLayout.xhtml"> + <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/> + </ui:include> + + </ui:define> + +</ui:composition> + +</div> + + + Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,14 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html"> + <ui:composition template="objectTemplate.xhtml"> + <ui:define name="content"> + <h3>Please set the page permissions</h3> + <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{portalobjectmgr.auth}"/> + </ui:decorate> + </ui:define> + </ui:composition> +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageTheme.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageTheme.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,20 @@ +<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"> + <ui:composition template="objectTemplate.xhtml"> + <ui:define name="content"> + <h3>Page theme properties:</h3> + <ui:decorate template="common/editTheme.xhtml"> + <ui:define name="form_submit"> + <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> + <f:param name="id" value="#{node.id}"/> + </h:commandButton> + </ui:define> + </ui:decorate> + </ui:define> + </ui:composition> +</div> + Property changes on: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPageTheme.xhtml ___________________________________________________________________ Name: svn:executable + * Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +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"> + <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> + <ui:define name="content"> + <h3>Please set the portal permissions</h3> + <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{portalobjectmgr.auth}"/> + </ui:decorate> + </ui:define> + </ui:composition> +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,27 @@ +<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"> + +<ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + <h3>Portal theme properties:</h3> + <p>The settings defined here will be applied to the whole portal including all the pages and windows unless they have been assigned with different settings</p> + <br/> + <ui:decorate template="common/editTheme.xhtml"> + <ui:define name="form_submit"> + <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> + <f:param name="id" value="#{node.id}"/> + </h:commandButton> + </ui:define> + </ui:decorate> + + </ui:define> + +</ui:composition> + +</div> + Property changes on: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml ___________________________________________________________________ Name: svn:executable + * Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editProperties.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editProperties.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editProperties.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,36 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + + <ui:include src="common/editProperties.xhtml"> + <ui:param name="properties" value="#{portalobjectmgr.selectedProperties}"/> + </ui:include> + + <hr/> + <h3>Configure error handling at portal level</h3> + <ul> + <li>Access denied:</li> + <li>Error:</li> + <li>Internal error:</li> + <li>Not found:</li> + <li>Unavailable:</li> + </ul> + <hr/> + <h3>Configure error handling at window level</h3> + <ul> + <li>Access denied:</li> + <li>Error:</li> + <li>Internal error:</li> + <li>Not found:</li> + <li>Unavailable:</li> + </ul> + </ui:define> + + </ui:composition> +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindow.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindow.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindow.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,29 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:ct="http://www.julien.com" + xmlns:jbp="http://www.jboss.org/portal" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + + <!-- --> + <div> + <jbp:portlet + actionListener="#{portalobjectmgr.processEvent}" + portletId="#{portalobjectmgr.selectedContentEditorInstance}" + portletInvoker="#{portalobjectmgr.portletDefinitionInvoker}" + renderParameters="#{portalobjectmgr.renderParameters}" + supportedModes="edit_content" + supportedWindowStates="normal" + initialMode="edit_content" + initialWindowState="normal"/> + </div> + + </ui:define> + + </ui:composition> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,18 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> + +<ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + + <h3>Please set the permissions for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> + + <ui:include src="common/editSecurity.xhtml"/> + + </ui:define> + +</ui:composition> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,20 @@ +<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"> + <ui:composition template="objectTemplate.xhtml"> + <ui:define name="content"> + <h3>Window theme properties:</h3> + <ui:decorate template="common/editWindowTheme.xhtml"> + <ui:define name="form_submit"> + <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> + <f:param name="id" value="#{node.id}"/> + </h:commandButton> + </ui:define> + </ui:decorate> + </ui:define> + </ui:composition> +</div> + Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/instances.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/instances.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/instances.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,106 @@ +<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:jbp="http://www.jboss.com/portal" + xmlns:c="http://java.sun.com/jstl/core"> + +<ui:composition template="instancesTemplate.xhtml"> + + <ui:define name="content"> + + <h:form> + + <table id="instancesTable2" width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Id</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{instancemgr.selectedInstances}" var="instance" varStatus="status"> + <tr + class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> + <td> + <h:commandLink action="#{instancemgr.selectInstance}"> + <h:outputText value="#{instance.id}"/> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="info"/> + </h:commandLink> + </td> + <td><h:commandLink action="#{instancemgr.selectInstance}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="security"/> + </h:commandLink> | <h:panelGroup rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink action="#{instancemgr.selectInstance}"> + <h:outputText value="Preferences"/> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="preferences"/> + </h:commandLink> | </h:panelGroup><h:commandLink action="confirmDeleteInstance" actionListener="#{instancemgr.selectInstance}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{instance.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + <ul class="pagination"> + <c:forEach begin="0" end="#{instancemgr.instanceCount - 1}" step="#{instancemgr.paginationSize}" + var="index"> + <li class="#{index == instancemgr.selectedFrom ? 'selected' : ''}"> + <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index}"/><h:outputText + value="#{index}"/></h:commandLink> + </li> + </c:forEach> + </ul> + + </h:form> + + <c:if test="#{instancemgr.selectedPlugin != null}"> + + <hr/> + + <c:if test="#{instancemgr.selectedPlugin == 'info'}"> + <c:choose> + <c:when test="#{instancemgr.selectedInstance.portlet != null}"> + <h3>Portlet details + </h3> + <ui:include src="common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> + <ui:param name="portletmgr" value="#{portletmgr}"/> + </ui:include> + </c:when> + <c:otherwise> + <h3>Portlet details</h3> + The associated portlet is not available + </c:otherwise> + </c:choose> + </c:if> + + <c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> + <h3>Editing preferences of #{instancemgr.selectedInstance.id}: </h3> + <ui:include src="common/editPreferences.xhtml"> + <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> + </ui:include> + <h:form style="text-align:center;padding: 1em 0 1em 0"> + <h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> + </h:form> + </c:if> + + <c:if test="#{instancemgr.selectedPlugin == 'security'}"> + <h3>Editing security of #{instancemgr.selectedInstance.id}: </h3> + + <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{instancemgr.auth}"/> + </ui:decorate> + </c:if> + + </c:if> + + </ui:define> +</ui:composition> +</div> Property changes on: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/instances.xhtml ___________________________________________________________________ Name: svn:executable + * Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,26 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + class="admin-ui"> + + <!-- Common nav --> + <h:form> + <ul class="topnav"> + <li> + <h:commandLink value="Portal Objects" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> + </li> + <li id="currentTab">Portlet Instances</li> + <li> + <h:commandLink value="Portlet Definitions" action="portlets"/> + </li> + </ul> + </h:form> + + <!-- Status message --> + <h:message id="status" for="status"/> + + <!-- Content --> + <ui:insert name="content">Content</ui:insert> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objectNavigation.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objectNavigation.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,136 @@ +<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:pfc="http://www.jboss.com/portal/facelet/common" + xmlns:c="http://java.sun.com/jstl/core"> + +<h:form> + +<table width="100%"> + +<c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> + <thead class="portlet-section-header"> + <tr> + <th>Portal</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Properties"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPortalTheme" + actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink><h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Rename"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink></h:panelGroup> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> +</c:if> + +<c:if test="#{not empty portalobjectmgr.selectedObject.pages}"> + <thead class="portlet-section-header"> + <tr> + <th>Page</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.selectedObject.pages}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Page layout"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPageSecurity" + actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Properties"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Rename"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> +</c:if> + +<c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> + <thead class="portlet-section-header"> + <tr> + <th>Window</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.selectedObject.windows}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Properties"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Rename"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> +</c:if> + +</table> + +</h:form> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objectTemplate.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objectTemplate.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,56 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" + class="admin-ui"> + + <!-- Common nav --> + <h:form> + <ul class="topnav"> + <li id="currentTab">Portal Objects</li> + <li> + <h:commandLink value="Portlet Instances" action="instances"/> + </li> + <li> + <h:commandLink value="Portlet Definitions" action="portlets"/> + </li> + </ul> + </h:form> + + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node"> + <li> + &gt; + </li> + <c:choose> + <c:when test="#{node.id == portalobjectmgr.selectedObject.id}"> + <li class="selected"> + <c:if test="#{node.name == ''}">root</c:if> + <c:if test="#{node.name != ''}">#{node.name}</c:if> + </li> + </c:when> + <c:otherwise> + <li> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{node.id}"/> + <c:if test="#{node.name == ''}">root</c:if> + <c:if test="#{node.name != ''}">#{node.name}</c:if> + </h:commandLink> + </li> + </c:otherwise> + </c:choose> + </c:forEach> + </ul> + </h:form> + + <!-- Status message --> + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <!-- Content --> + <ui:insert name="content">Content</ui:insert> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objects.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objects.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/objects.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,33 @@ +<a4j:portlet + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:rich="http://richfaces.ajax4jsf.org/rich" +> + +<div> + <c:choose> + <c:when test="#{portalobjectmgr.selectedObject.type == 0}"> + <ui:include src="editContext.xhtml"/> + </c:when> + <c:when test="#{portalobjectmgr.selectedObject.type == 1}"> + <ui:include src="editPage.xhtml"/> + </c:when> + <c:when test="#{portalobjectmgr.selectedObject.type == 2}"> + <ui:include src="editPage.xhtml"/> + </c:when> + <c:when test="#{portalobjectmgr.selectedObject.type == 3}"> + <ui:include src="editWindow.xhtml"/> + </c:when> + <c:otherwise>FIXME</c:otherwise> + </c:choose> + + <h:form> + <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">Switch to wizard mode</h:commandLink></p> + </h:form> +</div> + +</a4j:portlet> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/portlets.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/portlets.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/portlets.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,94 @@ +<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:jbp="http://www.jboss.com/portal" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:pfc="http://www.jboss.com/portal/facelet/common"> + + <ui:composition template="portletsTemplate.xhtml"> + + <ui:define name="content"> + + <h:form> + <h:outputLabel for="menu"> + <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/> + </h:outputLabel> + <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}"> + <f:selectItems value="#{portletmgr.portletInvokerItems}"/> + </h:selectOneMenu> + <h:commandButton value="Change" styleClass="portlet-form-button"/> + </h:form> + + <h:form> + <table width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Id</th> + <th>Name</th> + <th>Remote</th> + <th>Remotable</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portletmgr.selectedPortlets}" var="portlet" varStatus="status"> + <tr + class="#{portlet.context.id == portletmgr.selectedPortlet.context.id ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> + <td> + <h:commandLink + action="#{portletmgr.selectPortlet}"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="manager"/> + #{portlet.context.id} + </h:commandLink> + </td> + <td>#{portlet.name.value}</td> + <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td> + <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td> + <td> + <h:commandLink action="#{portletmgr.selectPortlet}"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="manager"/> + Info + </h:commandLink> | <h:commandLink action="#{portletmgr.selectPortlet}"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="preferences"/> + Preferences + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + <ul class="pagination"> + <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}" + var="index"> + <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}"> + <h:commandLink action="#{portletmgr.selectFrom}"><f:param name="from" + value="#{index}"/><h:outputText + value="#{index}"/></h:commandLink> + </li> + </c:forEach> + </ul> + </h:form> + + <c:if test="#{portletmgr.selectedPortlet != null}"> + <c:if test="#{portletmgr.selectedPlugin == 'manager'}"> + <hr/> + <h3>Portlet details</h3> + <ui:include src="showPortletInfo.xhtml"/> + </c:if> + <c:if test="#{portletmgr.selectedPlugin == 'preferences'}"> + <hr/> + <h3>Portlet preferences</h3> + <ui:include src="common/editPreferences.xhtml"> + <ui:param name="prefs" value="#{portletmgr.selectedPreferences}"/> + </ui:include> + </c:if> + </c:if> + + </ui:define> + </ui:composition> +</div> Property changes on: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/portlets.xhtml ___________________________________________________________________ Name: svn:executable + * Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,26 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + class="admin-ui"> + + <!-- Common nav --> + <h:form> + <ul class="topnav"> + <li> + <h:commandLink value="Portal Objects" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> + </li> + <li> + <h:commandLink value="Portlet Instances" action="instances"/> + </li> + <li id="currentTab">Portlet Definitions</li> + </ul> + </h:form> + + <!-- Status message --> + <h:message id="status" for="status"/> + + <!-- Content --> + <ui:insert name="content">Content</ui:insert> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/renameObject.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/renameObject.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,18 @@ +<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:c="http://java.sun.com/jstl/core"> + <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> + <ui:define name="content"> + <h3>Renaming:</h3> + <h:form id="renameForm"> + <h:inputText id="newName" value="#{renameAction.newName}"/> + <h:message for="newName"/> + <br /> + <h:commandButton value="Update" action="#{renameAction.execute}" styleClass="portlet-form-button"/> + </h:form> + </ui:define> + </ui:composition> +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/showPortletInfo.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/showPortletInfo.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/showPortletInfo.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,27 @@ +<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:c="http://java.sun.com/jstl/core"> + <br/> + + <!-- Portlet details --> + + <c:if test="#{portletmgr.selectedPortlet != null}"> + <ui:include src="common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{portletmgr.selectedPortlet}"/> + </ui:include> + </c:if> + + <!-- Instance creation --> + + <hr/> + <h:form id="add_instance_form"> + <h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field" required="true"/> + <h:commandButton action="#{createInstanceAction.execute}" value="Create instance" styleClass="portlet-form-button"> + </h:commandButton> + <h:message for="instanceId" errorClass="portlet-msg-error"/> + </h:form> + +</div> Property changes on: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/showPortletInfo.xhtml ___________________________________________________________________ Name: svn:executable + * Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,173 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" + class="admin-ui"> + + <div class="portlet-section-header">Adding a new Portlet</div> + + <c:choose> + <c:when test="#{newWindowWizard.currentStep == 0}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 1</p> + <p class="stepText">Select Portlet</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[0]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="0"/> + <div class="wizardStepBox"> + <p class="stepNumber">Step 1</p> + <p class="stepText">Select Portlet</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 1</p> + <p class="stepText">Select Portlet</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> + </c:choose> + + <c:choose> + <c:when test="#{newWindowWizard.currentStep == 1}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 2</p> + <p class="stepText">Select Portal</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[1]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="1"/> + <div class="wizardStepBox"> + <p class="stepNumber">Step 2</p> + <p class="stepText">Select Portal</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 2</p> + <p class="stepText">Select Portal</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> + </c:choose> + + <c:choose> + <c:when test="#{newWindowWizard.currentStep == 2}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 3</p> + <p class="stepText">Select Page</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[2]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="2"/> + <div class="wizardStepBox"> + <p class="stepNumber">Step 3</p> + <p class="stepText">Select Page</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 3</p> + <p class="stepText">Select Page</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> + </c:choose> + + <c:choose> + <c:when test="#{newWindowWizard.currentStep == 3}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 4</p> + <p class="stepText">Select Region</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[3]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="3"/> + <div class="wizardStepBox"> + <p class="stepNumber">Step 4</p> + <p class="stepText">Select Region</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 4</p> + <p class="stepText">Select Region</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> + </c:choose> + + <c:choose> + <c:when test="#{newWindowWizard.currentStep == 4}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 5</p> + <p class="stepText">Confirm</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[4]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="4"/> + <div class="wizardStepBox"> + <p class="stepNumber">Step 5</p> + <p class="stepText">Confirm</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 5</p> + <p class="stepText">Confirm</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> + </c:choose> + + <!-- Status message --> + <h:message id="status" for="status"/> + + + <!-- Content --> + <div class="wizardContent"> + <ui:insert name="content">Content</ui:insert> + </div> + + <div class="wizardButtonBox"> + <h:form> + <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="Previous" + action="#{newWindowWizard.previous}" styleClass="portlet-form-button"/> + <h:commandButton rendered="#{newWindowWizard.currentStep lt 4 and newWindowWizard.enabled[newWindowWizard.currentStep + 1]}" + value="Next" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/> + </h:form> + </div> + + <h:form> + <p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p> + </h:form> + +</div> Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,26 @@ +<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:c="http://java.sun.com/jstl/core"> + + <ui:composition template="newWindowTpl.xhtml"> + <ui:define name="content"> + + <table> + <tr><td><b>Portlet:</b></td><td>#{newWindowWizard.selectedPortlet.name.defaultString}</td></tr> + <tr><td><b>Portal:</b></td><td>#{newWindowWizard.selectedPortal.name}</td></tr> + <tr><td><b>Page:</b></td><td>#{newWindowWizard.selectedPage.name}</td></tr> + <tr><td><b>Region:</b></td><td>#{newWindowWizard.selectedRegionId}</td></tr> + </table> + + <h:form> + <h:commandButton value="Confirm" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/> + </h:form> + + </ui:define> + </ui:composition> + +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,48 @@ +<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:c="http://java.sun.com/jstl/core"> + + <ui:composition template="newWindowTpl.xhtml"> + <ui:define name="content"> + + <table width="100%"> + <tbody class="portlet-section-header"> + <tr> + <th>Page</th> + <th></th> + </tr> + </tbody> + <tbody> + <h:form> + <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != 1}"> + <h:outputText value="Up"/> + <f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/> + </h:commandLink> + <c:forEach items="#{newWindowWizard.pages}" var="object" varStatus="status"> + <tr + class="#{object.id == newWindowWizard.selectedPageId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink id="cl_#{status.index}" action="#{newWindowWizard.selectPage}"> + <h:outputText id="ot_#{status.index}" value="#{object.name}"/> + <f:param id="f_#{status.index}" name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <c:if test="#{not empty object.pages}"> + <h:commandLink id="cl2_#{status.index}" action="#{newWindowWizard.selectParentPage}"> + <h:outputText id="ot2_#{status.index}" value="Sub-Pages"/> + <f:param id="f2_#{status.index}" name="id" value="#{object.id}"/> + </h:commandLink> + </c:if> + </td> + </tr> + </c:forEach> + </h:form> + </tbody> + </table> + </ui:define> + </ui:composition> +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,36 @@ +<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:c="http://java.sun.com/jstl/core"> + + <ui:composition template="newWindowTpl.xhtml"> + <ui:define name="content"> + <table width="100%"> + + <tbody class="portlet-section-header"> + <tr> + <th>Portal</th> + </tr> + </tbody> + <tbody> + <h:form> + <c:forEach items="#{newWindowWizard.portals}" var="object" varStatus="status"> + <tr + class="#{object.id == newWindowWizard.selectedPortalId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{newWindowWizard.selectPortal}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </h:form> + </tbody> + + </table> + </ui:define> + </ui:composition> +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,55 @@ +<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:c="http://java.sun.com/jstl/core"> + <ui:composition template="newWindowTpl.xhtml"> + <ui:define name="content"> + <h:form> + <h:outputLabel for="menu"> + <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/> + </h:outputLabel> + <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}"> + <f:selectItems value="#{portletmgr.portletInvokerItems}"/> + </h:selectOneMenu> + <h:commandButton value="Change" styleClass="portlet-form-button"/> + </h:form> + + <h:form> + <table width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portletmgr.selectedPortlets}" var="portlet" varStatus="status"> + <tr + class="#{portlet.context.id == newWindowWizard.selectedPortletId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> + <td title="#{portlet.description.value}"> + <h:commandLink action="#{newWindowWizard.selectPortlet}"> + <h:outputText>#{!empty portlet.name.value ? portlet.name.value : "Unnamed"}</h:outputText> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="portletInvokerId" value="#{portletmgr.selectedPortletInvokerId}"/> + </h:commandLink></td> + </tr> + </c:forEach> + </tbody> + </table> + <ul class="pagination"> + <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}" + var="index"> + <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}"> + <h:commandLink action="#{portletmgr.selectFrom}"> + <f:param name="from" value="#{index}"/> + <h:outputText value="#{index}"/> + </h:commandLink> + </li> + </c:forEach> + </ul> + </h:form> + + </ui:define> + </ui:composition> +</div> \ No newline at end of file Added: branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml =================================================================== --- branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml (rev 0) +++ branches/2_6_RichFaces_POC/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml 2007-06-13 05:09:41 UTC (rev 7411) @@ -0,0 +1,37 @@ +<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:c="http://java.sun.com/jstl/core"> + + <ui:composition template="newWindowTpl.xhtml"> + <ui:define name="content"> + + <table width="100%"> + + <tbody class="portlet-section-header"> + <tr> + <th>Portal</th> + </tr> + </tbody> + <tbody> + <h:form> + <c:forEach items="#{newWindowWizard.regions}" var="object" varStatus="status"> + <tr + class="#{object == newWindowWizard.selectedRegionId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{newWindowWizard.selectRegion}"> + <h:outputText value="#{object}"/> + <f:param name="name" value="#{object}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </h:form> + </tbody> + </table> + + </ui:define> + </ui:composition> +</div> \ No newline at end of file