[portal-commits] JBoss Portal SVN: r10509 - in branches/JBoss_Portal_Branch_2_7: core-admin and 9 other directories.

Author: thomas.heute(a)jboss.com Date: 2008-04-07 04:53:27 -0400 (Mon, 07 Apr 2008) New Revision: 10509 Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/etc/sun-jsf/portletbridge-api-1.0.0-SNAPSHOT.jar branches/JBoss_Portal_Branch_2_7/core-admin/src/etc/sun-jsf/portletbridge-impl-1.0.0-SNAPSHOT.jar branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/tabContainer.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindow.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml Removed: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/ Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java Log: Make the admin portlet use the JBoss Portlet Bridge. (Will still need to move the portletbridge libs out of the sources with a non Snapshot release) Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-04-07 01:23:46 UTC (rev 10508) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-04-07 08:53:27 UTC (rev 10509) @@ -1,173 +1,200 @@ -<%@ page import="org.jboss.portal.common.i18n.LocalizedString" %> <%@ page import="org.jboss.portal.common.util.IteratorStatus" %> <%@ page import="org.jboss.portal.core.model.instance.Instance" %> -<%@ page import="org.jboss.portal.core.portlet.info.PortletIconInfo" %> -<%@ page import="org.jboss.portal.core.portlet.info.PortletInfoInfo" %> -<%@ page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet" %> +<%@ page import="org.jboss.portal.portlet.Portlet" %> +<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %> +<%@ page import="org.jboss.portal.portlet.info.MetaInfo" %> +<%@ page import="java.util.Collection" %> <%@ page language="java" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <% - Collection instances = (Collection)request.getAttribute("INSTANCES"); - Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE"); + Collection instances = (Collection)request.getAttribute("INSTANCES"); + Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE"); %> -<%@page import="org.jboss.portal.portlet.Portlet" %> -<%@page import="org.jboss.portal.portlet.PortletInvokerException" %> -<%@page import="org.jboss.portal.portlet.info.MetaInfo" %> -<%@page import="org.jboss.portal.portlet.info.PortletInfo" %> -<%@page import="java.util.Collection" %> -<%@ page import="java.util.Locale" %> +<%@page import="org.jboss.portal.portlet.info.PortletInfo"%> +<%@page import="org.jboss.portal.core.portlet.info.CorePortletInfo"%> +<%@page import="org.jboss.portal.core.portlet.info.PortletInfoInfo"%> +<%@page import="org.jboss.portal.core.portlet.info.PortletIconInfo"%> +<%@page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet"%> +<%@ page import="javax.portlet.PortletURL" %> +<%@ page import="java.net.URLEncoder" %> <portlet:defineObjects/> <script type='text/javascript' src='/portal-admin/js/domLib.js'></script> <script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script> <script type='text/javascript' src='/portal-admin/js/domTT.js'></script> <script type="text/javascript"> - //<![CDATA[ - var domTT_styleClass = 'domTTOverlib'; - var domTT_maxWidth = false; - //]]> + //<![CDATA[ + var domTT_styleClass = 'domTTOverlib'; + var domTT_maxWidth = false; + //]]> + //This function checks for a previousSibling in the DOM and it must be a form + //generated by JSF. otherwise the actionURL will be treated as a regular link + //for non-JSF environment + // + //For JSF use: + //<h:form></h:form> + //<jbp:portlet + //... + function submitForm(actionUrl){ + var jsfForm; + try{ + //ie is normal + if(document.getElementById('bilto').previousSibling.nodeName.toLowerCase() == 'form'){ + jsfForm = document.getElementById('bilto').previousSibling; + }else{ + //firefox adds that extra text node + jsfForm = document.getElementById('bilto').previousSibling.previousSibling; + } + }catch(e){ + + } + + if (jsfForm.nodeName.toLowerCase() == 'form'){ + jsfForm.action = actionUrl; + jsfForm.submit(); + }else{ + window.location = actionUrl; + } + } + </script> <table style="width:500px;"> <tr> - <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td> + <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td> </tr> <% - Locale locale = renderRequest.getLocale(); - if (selectedInstance != null) - { - String displayName = selectedInstance.getDisplayName().getString(locale, true); - if (displayName == null) - { - displayName = selectedInstance.getId(); - } + if (selectedInstance != null) + { + String displayName = selectedInstance.getDisplayName().getString(renderRequest.getLocale(), true); + if (displayName == null) + { + displayName = selectedInstance.getId(); + } %> -<% - Portlet portlet = null; - try - { - portlet = selectedInstance.getPortlet(); - } - catch (PortletInvokerException e) - { - e.printStackTrace(); - } - if (portlet != null) - { - PortletInfo info = portlet.getInfo(); - MetaInfo metaInfo = info.getMeta(); - String iconLocation = getIcon(info); -%> + <% + Portlet portlet = null; + try + { + portlet = selectedInstance.getPortlet(); + } + catch (PortletInvokerException e) + { + e.printStackTrace(); + } + if (portlet != null) + { + MetaInfo metaInfo = portlet.getInfo().getMeta(); + + PortletInfo info = portlet.getInfo(); + + String iconLocation = getIcon(info); + + %> <tr class="portlet-section-selected"> - <td> - <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/> - <span><%= displayName %></span> + <td > + <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/> + <span><%= displayName %></span> - <div> - <span class="portlet-form-field-label">Portlet name:</span><%= displayName %> - </div> - <div> - <span class="portlet-form-field-label">Portlet description:</span> - <%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %> - </div> + <div> + <span class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> + </div> + <div> + <span class="portlet-form-field-label">Portlet description:</span><%= metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %> + </div> + + </td> + </tr> + <% + } + } - </td> -</tr> -<% - } - } + %> -%> + <tr> +<td> -<tr> - <td> +<div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;"> - <div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;"> - <table style="width:100%;" cellspacing="0" cellpadding="0"> - <% - for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();) - { + <table style="width:100%;" cellspacing="0" cellpadding="0"> + <% + for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();) + { Instance instance = (Instance)i.next(); String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); - String displayName = instance.getDisplayName().getString(locale, true); - PortletInfo info = instance.getPortlet().getInfo(); - MetaInfo portletMetaInfo = info.getMeta(); + String displayName = instance.getDisplayName().getString(renderRequest.getLocale(), true); + MetaInfo portletMetaInfo = instance.getPortlet().getInfo().getMeta(); if (displayName == null) { - displayName = instance.getId(); + displayName = instance.getId(); } + + PortletInfo info = instance.getPortlet().getInfo(); String iconLocation = getIcon(info); - %> - <portlet:actionURL var="url"> - <portlet:param name="content.action.select" value="true"/> - <portlet:param name="content.uri" value="<%= instance.getId() %>"/> - </portlet:actionURL> - <div style="display:none"> - <div class="darktip" id="info-container-<%= displayName %>"> - <div class="toolbar" style="width: 250px;"> - <div class="title"><%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.TITLE), locale) %> - </div> - </div> - <div class="content"> - <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %> - </div> - <div><span class="portlet-form-field-label">Portlet description:</span> - <%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %> - </div> - </div> - </div> - </div> + %> + <portlet:actionURL var="test"> + <portlet:param name="content.action.select" value="true"/> + <portlet:param name="content.uri" value="<%= instance.getId() %>"/> + </portlet:actionURL> - <tr class="<%= rowClass %>"> - <td> - <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/> - <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a - href="<%= url %>" id="portlet-instance-link"><%= displayName %> - </a></span></td> - </tr> - <% - } - %> - </table> - </div> + <div style="display:none"> + <div class="darktip" id="info-container-<%= displayName %>"> + <div class="toolbar" style="width: 250px;"> + <div class="title"><%= portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %></div> + </div> + <div class="content"> + + <div> + <span class="portlet-form-field-label">Portlet name:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> + </div> + <div> + <span class="portlet-form-field-label">Portlet description:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %> + </div> + </div> + </div> + + </div> + + <tr class="<%= rowClass %>" > + <td > + <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/> + <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a href="javascript:void(0);" onclick="submitForm('<%= test %>');return false" id="portlet-instance-link"><%= displayName %></a></span> + </td> + </tr> + <% + } + %> + </table> +</div> </td> -</tr> + </tr> </table> <%! - private String getIcon(PortletInfo info) - { - String iconLocation = PortletContentEditorPortlet.DEFAULT_PORTLET_ICON; - PortletInfoInfo portletInfo = info.getAttachment(PortletInfoInfo.class); - - if (portletInfo != null) - { - PortletIconInfo iconInfo = portletInfo.getPortletIconInfo(); - if (iconInfo != null && iconInfo.getIconLocation(PortletIconInfo.SMALL) != null) + private String getIcon(PortletInfo info) + { + String iconLocation = null; + if (info instanceof CorePortletInfo) { - iconLocation = iconInfo.getIconLocation(PortletIconInfo.SMALL); + CorePortletInfo cInfo = (CorePortletInfo)info; + PortletInfoInfo portletInfo = cInfo.getPortletInfo(); + if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null) + { + iconLocation = portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL); + } } - } - - return iconLocation; - } - - private String getLocalizedValue(LocalizedString locString, Locale locale) - { - String value = ""; - if (locString != null) - { - value = locString.getString(locale, true); - } - - return value; - } + if (iconLocation == null) + { + iconLocation = PortletContentEditorPortlet.DEFAULT_PORTLET_ICON; + } + return iconLocation; + } %> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-04-07 01:23:46 UTC (rev 10508) +++ branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-04-07 08:53:27 UTC (rev 10509) @@ -95,12 +95,18 @@ <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="apache.myfaces.classpath"/> + <path refid="sun.jsf.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="facelets.facelets.classpath"/> <path refid="el.el.classpath"/> - <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> + <pathelement location="${source.etc}/sun-jsf/jsf-facelets-1.1.14.jar"/> + <pathelement location="${source.etc}/sun-jsf/portletbridge-api-1.0.0-SNAPSHOT.jar"/> + <pathelement location="${source.etc}/sun-jsf/portletbridge-impl-1.0.0-SNAPSHOT.jar"/> + <pathelement location="${source.etc}/sun-jsf/richfaces-api-3.1.4.SR1.jar"/> + <pathelement location="${source.etc}/sun-jsf/richfaces-impl-3.1.4.SR1.jar"/> + <pathelement location="${source.etc}/sun-jsf/richfaces-ui-3.1.4.SR1.jar"/> + </path> <!-- Configure modules --> @@ -186,14 +192,16 @@ </jar> <!-- portal-admin.war --> - <copy todir="${build.resources}/portal-admin-war/WEB-INF/lib2"> - <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/> - <fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/> - <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> - <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"/> - <fileset dir="${commons.el.lib}" includes="commons-el.jar"/> + <copy todir="${build.resources}/portal-admin-war/WEB-INF/lib"> + <fileset dir="${apache.myfaces.lib}" includes="jstl.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-facelets-1.1.14.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="portletbridge-api-1.0.0-SNAPSHOT.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="portletbridge-impl-1.0.0-SNAPSHOT.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="richfaces-api-3.1.4.SR1.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="richfaces-impl-3.1.4.SR1.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="richfaces-ui-3.1.4.SR1.jar"/> + <fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/> + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> <fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/etc/sun-jsf/portletbridge-api-1.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/etc/sun-jsf/portletbridge-api-1.0.0-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/etc/sun-jsf/portletbridge-impl-1.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/etc/sun-jsf/portletbridge-impl-1.0.0-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2008-04-07 01:23:46 UTC (rev 10508) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2008-04-07 08:53:27 UTC (rev 10509) @@ -67,6 +67,16 @@ private DisplayNameBean displayNameBean; + public Object getBean() + { + return bean; + } + + public void setBean(Object bean) + { + this.bean = bean; + } + public void addDisplayName() throws ConversionException { if (newText != null) Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2008-04-07 01:23:46 UTC (rev 10508) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2008-04-07 08:53:27 UTC (rev 10509) @@ -57,6 +57,16 @@ private DisplayNameBean displayNameBean; + public Object getBean() + { + return bean; + } + + public void setBean(Object bean) + { + this.bean = bean; + } + public void addDisplayName() throws ConversionException { if (newText != null) Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-04-07 01:23:46 UTC (rev 10508) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-04-07 08:53:27 UTC (rev 10509) @@ -28,9 +28,16 @@ <faces-config> <application> + <view-handler> + org.jboss.portletbridge.application.PortletViewHandler + </view-handler> <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> - <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> - </application> + </application> + <factory> + <faces-context-factory> + org.jboss.portletbridge.context.FacesContextFactoryImpl + </faces-context-factory> + </factory> <converter> <converter-for-class>org.jboss.portal.core.model.content.ContentType</converter-for-class> @@ -387,105 +394,105 @@ <navigation-rule> <navigation-case> <from-outcome>index</from-outcome> - <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id> + <to-view-id>/jsf/objects.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>advancedMode</from-outcome> - <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id> + <to-view-id>/jsf/objects.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>wizardMode</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectPortlet.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectPortlet.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>objects</from-outcome> - <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id> + <to-view-id>/jsf/objects.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPortalSecurity</from-outcome> - <to-view-id>/WEB-INF/jsf/editPortalSecurity.xhtml</to-view-id> + <to-view-id>/jsf/editPortalSecurity.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPortalTheme</from-outcome> - <to-view-id>/WEB-INF/jsf/editPortalTheme.xhtml</to-view-id> + <to-view-id>/jsf/editPortalTheme.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPageLayout</from-outcome> - <to-view-id>/WEB-INF/jsf/editPageLayout.xhtml</to-view-id> + <to-view-id>/jsf/editPageLayout.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPageSecurity</from-outcome> - <to-view-id>/WEB-INF/jsf/editPageSecurity.xhtml</to-view-id> + <to-view-id>/jsf/editPageSecurity.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editProperties</from-outcome> - <to-view-id>/WEB-INF/jsf/editProperties.xhtml</to-view-id> + <to-view-id>/jsf/editProperties.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPageTheme</from-outcome> - <to-view-id>/WEB-INF/jsf/editPageTheme.xhtml</to-view-id> + <to-view-id>/jsf/editPageTheme.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editWindowSecurity</from-outcome> - <to-view-id>/WEB-INF/jsf/editWindowSecurity.xhtml</to-view-id> + <to-view-id>/jsf/editWindowSecurity.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>renameObject</from-outcome> - <to-view-id>/WEB-INF/jsf/renameObject.xhtml</to-view-id> + <to-view-id>/jsf/renameObject.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editDisplayNames</from-outcome> - <to-view-id>/WEB-INF/jsf/displayNameObject.xhtml</to-view-id> + <to-view-id>/jsf/displayNameObject.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editWindowTheme</from-outcome> - <to-view-id>/WEB-INF/jsf/editWindowTheme.xhtml</to-view-id> + <to-view-id>/jsf/editWindowTheme.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>instances</from-outcome> - <to-view-id>/WEB-INF/jsf/instances.xhtml</to-view-id> + <to-view-id>/jsf/instances.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>portlets</from-outcome> - <to-view-id>/WEB-INF/jsf/portlets.xhtml</to-view-id> + <to-view-id>/jsf/portlets.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>selectPortlet</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectPortlet.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectPortlet.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>selectPortal</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectPortal.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectPortal.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>selectPage</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectPage.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectPage.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>selectRegion</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectRegion.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectRegion.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>newWindowWizardConfirm</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml</to-view-id> + <to-view-id>/jsf/wizard/newWindowWizardConfirm.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>dashboards</from-outcome> - <to-view-id>/WEB-INF/jsf/dashboards.xhtml</to-view-id> + <to-view-id>/jsf/dashboards.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>dashboard</from-outcome> - <to-view-id>/WEB-INF/jsf/dashboard/dashboard.xhtml</to-view-id> + <to-view-id>/jsf/dashboard/dashboard.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>confirm</from-outcome> - <to-view-id>/WEB-INF/jsf/common/confirm.xhtml</to-view-id> + <to-view-id>/jsf/common/confirm.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>confirmDeleteInstance</from-outcome> - <to-view-id>/WEB-INF/jsf/confirmDeleteInstance.xhtml</to-view-id> + <to-view-id>/jsf/confirmDeleteInstance.xhtml</to-view-id> </navigation-case> </navigation-rule> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2008-04-07 01:23:46 UTC (rev 10508) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2008-04-07 08:53:27 UTC (rev 10509) @@ -35,6 +35,9 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> + <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> + <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> + <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> </header-content> <portlet-info> @@ -53,6 +56,9 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> + <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> + <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> + <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> </header-content> <portlet-info> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-04-07 01:23:46 UTC (rev 10508) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-04-07 08:53:27 UTC (rev 10509) @@ -31,11 +31,15 @@ <description>Administration Portlet</description> <portlet-name>AdminPortlet</portlet-name> <display-name>Administration Portlet</display-name> - <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> <init-param> - <name>default-view</name> - <value>/WEB-INF/jsf/objects.xhtml</value> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/jsf/objects.xhtml</value> </init-param> + <init-param> + <name>javax.portlet.faces.preserveActionParams</name> + <value>true</value> + </init-param> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -49,11 +53,15 @@ <description>Dashboard Configurator Portlet</description> <portlet-name>DashboardConfigPortlet</portlet-name> <display-name>Dashboard Configurator Portlet</display-name> - <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> <init-param> - <name>default-view</name> - <value>/WEB-INF/jsf/dashboard/dashboard.xhtml</value> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/jsf/dashboard/dashboard.xhtml</value> </init-param> + <init-param> + <name>javax.portlet.faces.preserveActionParams</name> + <value>true</value> + </init-param> <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-04-07 01:23:46 UTC (rev 10508) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-04-07 08:53:27 UTC (rev 10509) @@ -28,57 +28,84 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <!-- MyFaces specific configuration --> <context-param> - <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> - <param-value>true</param-value> - </context-param> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> + </context-param> + + <context-param> + <param-name>javax.portlet.faces.renderPolicy</param-name> + <param-value>ALWAYS_DELEGATE</param-value> + </context-param> + + <context-param> + <param-name>javax.portlet.faces.preserveActionParams</param-name> + <param-value>true</param-value> + </context-param> + + <context-param> + <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> + <param-value>rfRes</param-value> + </context-param> + + <context-param> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>NONE</param-value> + </context-param> + + <context-param> + <param-name>org.richfaces.LoadScriptStrategy</param-name> + <param-value>NONE</param-value> + </context-param> + + <context-param> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>false</param-value> + </context-param> + + <!-- JSF --> + <context-param> - <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.apache.myfaces.PRETTY_HTML</param-name> - <param-value>true</param-value> - </context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> - <!-- Facelet configuration --> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>facelets.SKIP_COMMENTS</param-name> - <param-value>true</param-value> - </context-param> - <context-param> <param-name>facelets.LIBRARIES</param-name> <param-value>/WEB-INF/portal.taglib.xml</param-value> </context-param> - <!-- JSF configuration --> - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> - </context-param> + <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>FacesServlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> - <!-- The JSF servlet --> - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>org.jboss.portal.faces.loader.FacesLoaderServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - + <servlet> + <servlet-name>FacesServlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>FacesServlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + </web-app> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,56 @@ +<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:param name="portalObjectScreen" value="Delete"/> + <ui:define name="content"> + + <f:subview rendered="#{empty portalobjectmgr.selectedDeletingObject}"> + <p class="portlet-msg-error">Inconsistent state</p> + </f:subview> + + <f:subview rendered="#{not empty portalobjectmgr.selectedDeletingObject}"> + + + <div class="portlet-msg"> + <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> + <div class="portlet-msg-body"> + <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + + <p class="portlet-msg-alert"> + WARNING! You are about to delete the + <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObject.typeName} from the + <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}"> + <span class="objectName">#{portalobjectmgr.selectedObjectParent.name}</span> + </c:if> + #{portalobjectmgr.selectedObjectParent.typeName}! + </p> + + <p class="portlet-class">Are you sure you want to delete this #{portalobjectmgr.selectedObjectType}?</p> + + <h:form> + <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}" + styleClass="portlet-form-button portlet-section-buttonrow"> + <f:attribute name="objectId" value="#{portalobjectmgr.selectedDeletingObject.id}"/> + </h:commandButton> + <h:commandButton value="Cancel" action="objects" + actionListener="#{portalobjectmgr.selectParentObject}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + </h:form> + </div> + </div> + </f:subview> + + </ui:define> + + </ui:composition> + +</div> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,146 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> + +<p class="portlet-area-header">Page Error Handling</p> + +<div class="portlet-area-body"> +<!-- defines error handeling section --> +<table cellpadding="0" cellspacing="0" width="100%"> +<tr> + <th class="portlet-section-title">Configure how the system handles errors on page level.</th> +</tr> +<tr> +<td valign="top" class="portlet-section-body"> + + +<h:form> +<table class="datatable full-width"> +<thead class="portlet-section-header"> + <tr> + <th>Case</th> + <th>Inheritance</th> + <th>Action</th> + </tr> +</thead> +<tbody> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.pageControlAccessDenied.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.pageControlAccessDenied.inherit}" + value="#{properties.pageControlAccessDenied.inherited}"/>inherit action + from parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlAccessDenied.value}" + disabled="#{properties.pageControlAccessDenied.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-alternate"> + <td> + <h:outputText value="#{properties.pageControlUnavailable.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.pageControlUnavailable.inherit}" + value="#{properties.pageControlUnavailable.inherited}"/>inherit action + from parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlUnavailable.value}" + disabled="#{properties.pageControlUnavailable.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.pageControlError.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.pageControlError.inherit}" + value="#{properties.pageControlError.inherited}"/>inherit action from + parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlError.value}" + disabled="#{properties.pageControlError.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-alternate"> + <td> + <h:outputText value="#{properties.pageControlInternalError.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.pageControlInternalError.inherit}" + value="#{properties.pageControlInternalError.inherited}"/>inherit action + from parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlInternalError.value}" + disabled="#{properties.pageControlInternalError.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.pageControlNotFound.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.pageControlNotFound.inherit}" + value="#{properties.pageControlNotFound.inherited}"/>inherit action from + parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlNotFound.value}" + disabled="#{properties.pageControlNotFound.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-alternate"> + <td> + <h:outputText value="#{properties.pageControlResourceURI.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.pageControlResourceURI.inherit}" + value="#{properties.pageControlResourceURI.inherited}"/>inherit action + from parent + </td> + <td> + <h:inputText value="#{properties.pageControlResourceURI.value}" size="60" + disabled="#{properties.pageControlResourceURI.inherited}"/> + </td> +</tr> +</tbody> +</table> +<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +</h:form> + + +</td> +</tr> +</table> + +</div> +</ui:composition> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,172 @@ +<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"> +<br/> +<table width="100%"> +<tr> +<td valign="top" width="50%"> + <p class="portlet-area-header">Content Definition</p> + + <div class="portlet-area-body"> + + <table> + <tr> + <td colspan="2">Define a name for the window of content (optional): + </td> + </tr> + <tr> + <td colspan="2"> + <h:form id="windowForm"> + <label for="windowName"> + <span class="portlet-form-field-label admin-label">Window Name:</span> + <h:inputText id="windowName" value="#{pageManager.windowName}" + styleClass="portlet-form-input-field"/> + </label> + <h:message for="windowName" errorClass="portlet-msg-error"/> + </h:form> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + Select the type of content that will be added to the page: + </td> + </tr> + <tr> + <td> + <h:form id="abc"> + <label for="instanceId" class="portlet-form-field-label-container"> + <span class="portlet-form-field-label admin-label">Content Type:</span> + <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/> + <h:selectOneMenu + id="instanceId" + value="#{pageManager.selectedContentType}" + styleClass="portlet-form-field contentType" + onchange="document.getElementById('abc:windowNameCopy').value = document.getElementById('windowForm:windowName').value; + document.getElementById('abc').submit(); "> + <f:selectItems value="#{pageManager.contentTypeItems}"/> + </h:selectOneMenu> + </label> + <h:message for="instanceId" 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" valign="top"> + <h:form></h:form> + <jbp:portlet + portletId="#{pageManager.selectedEditorPortletId}" + portletInvoker="#{pageManager.portletInvoker}" + actionListener="#{pageManager.assignWindow}" + supportedModes="edit_content" + supportedWindowStates="normal" + initialMode="edit_content" + initialWindowState="normal" + renderParameters="#{pageManager.selectedRenderParameters}" + onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> + </td> + </tr> + </table> + + </div> + +</td> +<td valign="top" width="50%"> + + <p class="portlet-area-header">Page Layout</p> + + <div class="portlet-area-body"> + + <h:form id="layoutForm"> + <h:message for="layoutForm" errorClass="portlet-msg-error"/> + <input id="blah" type="hidden" name="blah" value=""/> + <table width="100%"> + <tbody> + <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> + <tr> + <td colspan="3" class="portlet-form-field-label"> + <hr/> + #{regionName} Region + </td> + </tr> + <tr> + <td valign="top"> + <h:commandButton + onclick="document.getElementById('blah').value=document.getElementById('windowForm:windowName').value" + value="Add" id="a_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button layout-button"/> + </td> + <td width="100%"> + <h:selectManyListbox + value="#{pageManager.assignedWindows[regionName]}" + size="7" styleClass="windowList portlet-form-field"> + <f:selectItems + value="#{pageManager.windowItemsMap[regionName]}"/> + </h:selectManyListbox> + </td> + <td valign="top" width="250"> + <h:commandButton + value="Up" id="u_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button layout-button"/><br/> + <h:commandButton + value="Down" id="d_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button layout-button"/> + <hr/> + <h:commandButton + value="Delete" id="l_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button layout-button"/> + </td> + </tr> + </c:forEach> + </tbody> + <c:if test="#{!(empty pageManager.assignedWindows['unknown'])}"> + <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> + </c:if> + </table> + </h:form> + + </div> + +</td> +</tr> +</table> + +</div> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,148 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> + + +<p class="portlet-area-header">Portal Error Handling</p> + +<div class="portlet-area-body"> + +<!-- defines error handeling section --> +<table class="full-width"> +<tr> + <th class="portlet-section-title">Configure how the system handles errors on portal level.</th> +</tr> +<tr> +<td valign="top" class="portlet-section-body"> + +<h:form> +<table class="datatable full-width"> +<thead class="portlet-section-header"> + <tr> + <th>Case</th> + <th>Inheritance</th> + <th>Action</th> + </tr> +</thead> +<tbody> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.portalControlAccessDenied.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.portalControlAccessDenied.inherit}" + value="#{properties.portalControlAccessDenied.inherited}"/>inherit + action from parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlAccessDenied.value}" + disabled="#{properties.portalControlAccessDenied.inherited}" + onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-alternate"> + <td> + <h:outputText value="#{properties.portalControlUnavailable.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.portalControlUnavailable.inherit}" + value="#{properties.portalControlUnavailable.inherited}"/>inherit + action from parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlUnavailable.value}" + disabled="#{properties.portalControlUnavailable.inherited}" + onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.portalControlError.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.portalControlError.inherit}" + value="#{properties.portalControlError.inherited}"/>inherit action from + parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlError.value}" + disabled="#{properties.portalControlError.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-alternate"> + <td> + <h:outputText value="#{properties.portalControlInternalError.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.portalControlInternalError.inherit}" + value="#{properties.portalControlInternalError.inherited}"/>inherit + action from parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlInternalError.value}" + disabled="#{properties.portalControlInternalError.inherited}" + onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.portalControlNotFound.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.portalControlNotFound.inherit}" + value="#{properties.portalControlNotFound.inherited}"/>inherit action + from parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlNotFound.value}" + disabled="#{properties.portalControlNotFound.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-alternate"> + <td> + <h:outputText value="#{properties.portalControlResourceURI.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}" + onclick="submit();" + valueChangeListener="#{properties.portalControlResourceURI.inherit}" + value="#{properties.portalControlResourceURI.inherited}"/>inherit + action from parent + </td> + <td> + <h:inputText value="#{properties.portalControlResourceURI.value}" size="60" + disabled="#{properties.portalControlResourceURI.inherited}"/> + </td> +</tr> +</tbody> +</table> +<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +</h:form> +</td> +</tr> +</table> + +</div> +</ui:composition> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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:c="http://java.sun.com/jstl/core"> + +<c:choose> + <c:when test="#{not empty prefs.entries}"> + <h:form> + <table class="full-width datatable"> + <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.value}"/> + </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:when> + <c:otherwise> + <p>No defined preferences for this portlet.</p> + </c:otherwise> +</c:choose> + +<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/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,150 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> + +<div class="portlet-area-header">Properties</div> +<div class="portlet-area-body"> + +<!-- divide the area body into two panes --> +<table cellpadding="0" cellspacing="0" width="100%"> +<tr> +<td class="align-top"> + + <!-- defines property creation section --> + <table class="full-width"> + <tr> + <th class="portlet-section-title">Add a property.</th> + </tr> + <tr> + <td class="dotted-blue-vert-rt"> + + <h:form> + <!-- defines layout of property form --> + <table> + <tbody> + <f:subview id="predefined-properties" rendered="#{not empty properties.propertyItems}"> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select + predefined property:</h:outputLabel> + </td> + </tr> + <tr> + <td> + <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}"> + <f:selectItems value="#{properties.propertyItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td align="center">or</td> + </tr> + </f:subview> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="property" styleClass="portlet-form-field-label">Enter property + name:</h:outputLabel> + </td> + </tr> + <tr> + <td> + <h:inputText id="property" styleClass="portlet-form-input-field" + value="#{properties.action.otherPropertyName}"/> + </td> + </tr> + </tbody> + </table> + <!-- ends layout of property form --> + <h:commandButton value="Add Property" styleClass="portlet-form-button portlet-section-buttonrow" + action="#{properties.action.updateProperty}"/></h:form> + + </td> + </tr> + </table> + <!-- ends property creation section --> + +</td> +<td valign="top" width="100%" style="padding-left:5px;"><!-- creates division of 2 pane area --> + + + <!-- defines property list section --> + <c:if test="#{properties.size != 0}"> + <table class="full-width"> + <tr> + <th class="portlet-section-title">Manage currently defined properties.</th> + </tr> + <tr> + <td class="portlet-section-body" valign="top"> + + <h:form> + <!-- defines layout of property table --> + <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width" + rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> + <h:column> + <f:facet name="header">Name</f:facet> + <h:outputText title="#{prop.type}" value="#{prop.displayName}"/> + </h:column> + <h:column> + <f:facet name="header">Description</f:facet> + <h:outputText>#{prop.description}</h:outputText> + </h:column> + <h:column> + <f:facet name="header">Inherited</f:facet> + <h:outputText>#{prop.inherited ? 'Yes' : 'No'}</h:outputText> + </h:column> + <h:column> + <f:facet name="header">Value</f:facet> + <h:selectBooleanCheckbox value="#{prop.value}" + readonly="#{prop.readOnly}" + rendered="#{prop.type == 'java.lang.Boolean'}"/> + + <h:inputText styleClass="portlet-form-input-field" value="#{prop.value}" + readonly="#{prop.readOnly}" + rendered="#{prop.type eq 'java.lang.String' and prop.name ne 'portal.windowInitialState'}"/> + + <h:selectOneMenu styleClass="portlet-form-input-field" + value="#{prop.value}" + rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (!portalobjectmgr.maximizedStateExists or prop.value eq 'MAXIMIZED')}"> + <f:selectItem itemLabel="Choose One..." itemValue=""/> + <f:selectItem itemLabel="Maximized" itemValue="MAXIMIZED"/> + <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/> + <f:selectItem itemLabel="Normal" itemValue="NORMAL"/> + </h:selectOneMenu> + + <h:selectOneMenu styleClass="portlet-form-input-field" + value="#{prop.value}" disabled="true" + rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (portalobjectmgr.maximizedStateExists and prop.value ne 'MAXIMIZED')}"> + <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/> + </h:selectOneMenu> + + + </h:column> + <h:column> + <f:facet name="header">Delete</f:facet> + <h:commandLink action="#{properties.action.removeProperty}" + rendered="#{!prop.inherited}"> + <h:outputText styleClass="actionDelete" value="Delete"/> + <f:param name="name" value="#{prop.name}"/> + </h:commandLink> + </h:column> + </h:dataTable> + + <!-- ends property list --> + <h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form> + + </td> + </tr> + </table> + </c:if> + <!-- ends property list section --> + +</td> +</tr> +</table> +<!-- ends area body --> + +</div> + +</ui:composition> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,44 @@ +<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 class="datatable full-width"> + <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> + <br /> + <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/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,46 @@ +<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:form> + <table class="full-width datatable"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Setting</th> + </tr> + </thead> + <tbody> + <tr class="portlet-section-body"> + <td>Layout</td> + <td>Name of the layout implementation used to arrange portlet windows in pages</td> + <td> + <h:selectOneMenu id="layout" value="#{theme.layoutName}"> + <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>Theme</td> + <td>Name of the look and feel to use</td> + <td> + <h:selectOneMenu id="theme" value="#{theme.themeName}"> + <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-body"> + <td>RenderSet</td> + <td>Name of the render engine to use to render pages</td> + <td> + <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + <br /> + <ui:insert name="form_submit"/> + </h:form> +</div> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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:form> + <table class="full-width datatable"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Setting</th> + </tr> + </thead> + <tbody> + <tr class="portlet-section-body"> + <td>Window Renderer</td> + <td>Name of the render engine to use to render windows</td> + <td> + <h:selectOneMenu id="windowRenderer" value="#{theme.windowRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>Decoration Renderer</td> + <td>Name of the render engine to use to render window decorations</td> + <td> + <h:selectOneMenu id="decorationRenderer" value="#{theme.decorationRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td>Portlet Renderer</td> + <td>Name of the render engine to use to render portlets</td> + <td> + <h:selectOneMenu id="portletRenderer" value="#{theme.portletRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + <ui:insert name="form_submit"/> + </h:form> +</div> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,119 @@ +<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> + <p class="portlet-area-header">Portlet Instance Information</p> + <h:panelGrid columns="3" styleClass="panelGrid-basic"> + <f:subview id="field1"> + <dl> + <dt class="portlet-form-field-label">Portlet name:</dt> + <dd><h:commandLink + action="#{portletmgr.selectPortlet}"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="manager"/> + #{portlet.name} + </h:commandLink></dd> + </dl> + </f:subview> + <f:subview id="field2"> + <dl> + <dt class="portlet-form-field-label">Portlet description:</dt> + <dd>#{portlet.description.value}</dd> + </dl> + </f:subview> + <f:subview id="field3"> + <dl> + <dt class="portlet-form-field-label">Portlet title:</dt> + <dd>#{portlet.title.value}</dd> + </dl> + </f:subview> + <f:subview id="field4"> + <dl> + <dt class="portlet-form-field-label">Portlet keywords:</dt> + <dd>#{portlet.keywords.value}</dd> + </dl> + </f:subview> + <f:subview id="field5" rendered="#{not empty portlet.locales}"> + <dl> + <dt class="portlet-form-field-label">Portlet locales:</dt> + <dd><c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach></dd> + </dl> + </f:subview> + </h:panelGrid> + <br/> + + </h:form> + <f:subview id="displaynamecontainer" rendered="#{showDisplayNameEditor}"> + <p class="portlet-area-header">Portlet Instance Display Names</p> + <div class="float-left third-width-pad5"> + <h:form id="displayNameForm"> + <h3 class="sectionTitle zero">Add Instance Display Names</h3> + + <div class="portlet-area-body"> + <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> + <h:selectOneMenu id="locales" value="#{instanceDisplayNameAction.newLocale}"> + <f:selectItems value="#{instanceDisplayNameAction.locales}"/> + </h:selectOneMenu> + <h:commandButton value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" action="#{instanceDisplayNameAction.addDisplayName}" + styleClass="portlet-form-button"/> + </div> + </h:form> + </div> + + <div class="float-left two-third-width-pad5"> + <h:form> + <h3 class="sectionTitle zero">Current Instance Display Names</h3> + + <div class="portlet-area-body"> + + <h:dataTable var="value" value="#{instanceDisplayNameAction.currentLocales}" styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="Locale"/> + </f:facet> + #{value.localeDisplayName} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Display Name"/> + </f:facet> + #{value.text} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Delete"/> + </f:facet> + + <div style="width:150px"><h:commandLink action="#{instanceDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionDelete" value="Delete"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="delete"/> + </h:commandLink></div> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Rename"/> + </f:facet> + + <div style="width:150px"><h:commandLink action="#{instanceDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionRename" value="Rename"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="rename"/> + </h:commandLink></div> + </h:column> + </h:dataTable> + + </div> + </h:form> + + </div> + + </f:subview> +</div> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/tabContainer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/tabContainer.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/tabContainer.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,11 @@ +<ui:composition + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <div class="tab-container"> + <ui:insert name="tab-container-content"/> + <br class="clear"/> + </div> + +</ui:composition> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,51 @@ +<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="instancesTemplate.xhtml"> + <ui:define name="content"> + + <h:form> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink action="instances">Portlet Instances</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> instance Delete + </li> + </ul> + </h:form> + <br/> + + <div class="portlet-msg"> + <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt=""/></div> + <div class="portlet-msg-body"> + <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3> + + <p class="portlet-msg-alert"> + WARNING! You are about to delete the + <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows + referencing it to not be able to display their content anymore. + </p> + + <p class="portlet-class">Are you sure you want to delete this portlet instance?</p> + + <h:form> + <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}" + styleClass="portlet-form-button portlet-section-buttonrow"> + <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/> + </h:commandButton> + <h:commandButton value="Cancel" action="instances" actionListener="objects" + styleClass="portlet-form-button portlet-section-buttonrow"/> + </h:form> + </div> + </div> + </ui:define> + </ui:composition> +</div> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,163 @@ +<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 class="full-width datatable"> +<tr> + <th 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> + <c:if test="#{dashboard.selectedPage.name != 'default'}"> + <tr> + <td align="left" valign="top"><b>Rename this Page:</b><br/>New page name:&#160; + <h:form id="renameForm" style="padding:0;margin:0"> + <h:message for="newName"/> + <h:inputText id="newName" value="#{renameDashboardPageAction.newName}" + styleClass="portlet-form-input-field"/> + <h:commandButton value="Rename" + action="#{renameDashboardPageAction.execute}" + styleClass="portlet-form-button"/> + </h:form> + </td> + </tr> + </c:if> + </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> + <td class="portlet-section-header" align="center">Currently editing page #{dashboard.selectedPage.name}</td> +</tr> +<tr> + <td class="portlet-section-body" align="center"> + <h:form id="page_selector_form" style="padding:0;margin:0"> + Select: <h:selectOneMenu + id="pageNameSelector" + value="#{dashboard.selectedPageName}" + styleClass="portlet-form-field" + onchange="document.getElementById('page_selector_form').submit()"> + <f:selectItems value="#{dashboard.pageItems}"/> + </h:selectOneMenu> + </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="/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/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,62 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" + template="dashboardsTemplate.xhtml"> + + + <ui:define name="content"> + + <!-- --> + <div class="property-container"> + <ui:include src="common/editProperties.xhtml"> + <ui:param name="properties" value="#{dashboardmgr.selectedProperties}"/> + </ui:include> + </div> + + <!-- --> + <br/> + <div class="property-container"> + <ui:include src="common/editPortalErrorHandling.xhtml"> + <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/> + </ui:include> + </div> + + <!-- --> + <br/> + <div class="property-container"> + <ui:include src="common/editPageErrorHandling.xhtml"> + <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/> + </ui:include> + </div> + + <!-- Separation --> + <br/> + + <div class="property-container"> + <p class="portlet-area-header">Dashboard theme properties</p> + + <div class="portlet-area-body"> + <table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <th class="portlet-section-title">Configure dashboards settings.</th> + </tr> + <tr> + <td valign="top" class="portlet-section-body"> + <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{dashboardmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + </ui:define> + </ui:decorate> + </td> + </tr> + </table> + </div> + </div> + </ui:define> + + +</ui:composition> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,35 @@ +<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> + <h:commandLink value="Portal Objects" action="objects" + actionListener="#{portalobjectmgr.selectRootObject}"/> + </li> + <li> + <h:commandLink value="Portlet Instances" action="instances"/> + </li> + <li> + <h:commandLink value="Portlet Definitions" action="portlets"/> + </li> + <li id="currentTab">Dashboards</li> + </ul> + </h:form> + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content"> + <!-- 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> + </ui:define> + </ui:decorate> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,83 @@ +<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="/jsf/objectTemplate.xhtml"> + <ui:param name="portalObjectScreen" value="Display Names"/> + + <ui:define name="content"> + <br/><br/> + <div class="float-left third-width-pad5"> + <h:form id="displayNameForm"> + <h3 class="sectionTitle zero">Add Display Names</h3> + + <div class="portlet-area-body"> + <h:inputText id="newName" value="#{addDisplayNameAction.newText}" required="true"/> + <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{addDisplayNameAction.locales}"/> + </h:selectOneMenu> + <h:commandButton value="#{addDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" action="#{addDisplayNameAction.addDisplayName}" + styleClass="portlet-form-button"/> + </div> + </h:form> + </div> + + <div class="float-left two-third-width-pad5"> + <h:form> + <h3 class="sectionTitle zero">Current Display Names</h3> + + <div class="portlet-area-body"> + + <h:dataTable var="value" value="#{addDisplayNameAction.currentLocales}" styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="Locale"/> + </f:facet> + #{value.localeDisplayName} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Display Name"/> + </f:facet> + #{value.text} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Delete"/> + </f:facet> + + <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionDelete" value="Delete"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="delete"/> + </h:commandLink></div> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Rename"/> + </f:facet> + + <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionRename" value="Rename"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="rename"/> + </h:commandLink></div> + </h:column> + </h:dataTable> + + </div> + </h:form> + + </div> + + + <br class="clear"/> + + </ui:define> + </ui:composition> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,52 @@ +<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" + xmlns:c="http://java.sun.com/jstl/core"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + <h3 class="sectionTitle tenpx-top-bottom"> + Manage &#160; + <c:choose> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">portals</c:when> + <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> portal</c:otherwise> + </c:choose> + </h3> + <h:form> + <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionProperties"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Properties + </h:commandLink> + </h:form> + + <h3 class="sectionTitle"> + Manage &#160; + <c:choose> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">sub-portals</c:when> + <c:otherwise>pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + portal</c:otherwise> + </c:choose> + </h3> + <!-- Portal addition --> + <div class="tenpx-top-bottom"> + <h:form> + <span class="portlet-font">Create a portal named: </span> + <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" + required="true"/> + <h:commandButton action="#{portalAction.addPortal}" value="Create portal" styleClass="portlet-form-button"/> + <h:message for="name" errorClass="portlet-msg-error"/> + </h:form> + </div> + + + <!-- Navigation --> + <ui:include src="objectNavigation.xhtml"/> + </ui:define> + + </ui:composition> + +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,76 @@ +<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:c="http://java.sun.com/jstl/core" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + <h3 class="sectionTitle tenpx-top-bottom">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObject.typeName}</h3> + + + + <h:form> + <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink + action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Page layout + </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" styleClass="actionSecurity" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Security + </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Properties + </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Theme + </h:commandLink><h:panelGroup + rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"> + | <h:commandLink + action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Rename + </h:commandLink></h:panelGroup> + <h:panelGroup + rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"> + | <h:commandLink + action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> + Display Names + </h:commandLink></h:panelGroup> + <h:panelGroup + rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"> + | <h:commandLink action="confirm" styleClass="actionDelete" + actionListener="#{portalobjectmgr.selectDeletingObject}"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Delete + </h:commandLink> + </h:panelGroup> + </h:form> + + <h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObject.typeName}</h3> + <!-- Sub page addition --> + <div class="tenpx-top-bottom"> + <h:form> + <span class="portlet-font">Create a page named: </span> + <h:inputText id="pageName" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" + required="true"/> + <h:commandButton action="#{addPageAction.execute}" value="Create page" styleClass="portlet-form-button"/> + <h:message for="pageName" errorClass="portlet-msg-error"/> + </h:form> + </div> + + <!-- Navigation --> + <ui:include src="objectNavigation.xhtml"/> + </ui:define> + + </ui:composition> + +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,17 @@ +<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:param name="portalObjectScreen" value="Layout"/> + <ui:define name="content"> + <ui:include src="common/editPageLayout.xhtml"> + <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/> + </ui:include> + </ui:define> + </ui:composition> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,15 @@ +<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:param name="portalObjectScreen" value="Security"/> + <ui:define name="content"> + <h3>Please set the page permissions</h3> + <ui:decorate template="/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{portalobjectmgr.auth}"/> + </ui:decorate> + </ui:define> + </ui:composition> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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"> + <ui:composition template="objectTemplate.xhtml"> + <ui:param name="portalObjectScreen" value="Theme"/> + <ui:define name="content"> + <h3>Page theme properties</h3> + <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{portalobjectmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + styleClass="portlet-form-button"/> + </ui:define> + </ui:decorate> + </ui:define> + </ui:composition> +</div> + Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml ___________________________________________________________________ Name: svn:executable + * Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,15 @@ +<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="/jsf/objectTemplate.xhtml"> + <ui:param name="portalObjectScreen" value="Security"/> + <ui:define name="content"> + <h3>Please set the portal permissions</h3> + <ui:decorate template="/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{portalobjectmgr.auth}"/> + </ui:decorate> + </ui:define> + </ui:composition> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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"> + <ui:composition template="objectTemplate.xhtml"> + <ui:param name="portalObjectScreen" value="Theme"/> + <ui:define name="content"> + <h3>Portal theme properties</h3> + + <p>These settings are inherited by all the pages and windows of this portal. You may override these settings by + selecting the appropriate value on the respective Theme settings pages.</p> + <br/> + <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{portalobjectmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + styleClass="portlet-form-button"/> + </ui:define> + </ui:decorate> + </ui:define> + </ui:composition> +</div> + Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml ___________________________________________________________________ Name: svn:executable + * Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,57 @@ +<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" + xmlns:c="http://java.sun.com/jstl/core"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:param name="portalObjectScreen" value="Properties"/> + + <ui:define name="content"> + <br/> + <div class="tenpx-top-bottom"> + <p class="portlet-area-header">Event Listener Binding</p> + + <div class="portlet-area-body tenpx-top-bottom"> + <h:form> + <h:outputLabel for="listener" styleClass="portlet-form-field-label"> + Choose the id of the PortalEventListener to bind to this #{portalobjectmgr.selectedObjectType}: + </h:outputLabel> + <h:selectOneMenu id="listener" value="#{portalobjectmgr.selectedObject.listener}"> + <f:selectItems value="#{portalobjectmgr.listenerIds}"/> + </h:selectOneMenu> + <h:commandButton value="Update" styleClass="portlet-form-button"/> + </h:form> + </div> + </div> + <ui:include src="common/editProperties.xhtml"> + <ui:param name="properties" value="#{portalobjectmgr.selectedProperties}"/> + </ui:include> + + <br/> + <c:if + test="#{portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_CONTEXT or portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_PORTAL}"> + + <!-- --> + <ui:include src="common/editPortalErrorHandling.xhtml"> + <ui:param name="properties" value="#{portalobjectmgr.controlProperties}"/> + </ui:include> + + </c:if> + + <br/> + <c:if test="#{!(portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_WINDOW)}"> + + <!-- Separation --> + <ui:include src="common/editPageErrorHandling.xhtml"> + <ui:param name="properties" value="#{portalobjectmgr.controlProperties}"/> + </ui:include> + + </c:if> + + </ui:define> + + </ui:composition> +</div> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindow.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindow.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindow.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,30 @@ +<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 class="clear"> + <h:form></h:form> + <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/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,13 @@ +<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:param name="portalObjectScreen" value="Security"/> + <ui:define name="content"> + <h3>Please set the permissions for the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + window</h3> + <ui:include src="common/editSecurity.xhtml"/> + </ui:define> + </ui:composition> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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"> + <ui:composition template="objectTemplate.xhtml"> + <ui:param name="portalObjectScreen" value="Theme"/> + <ui:define name="content"> + <h3>Window theme properties</h3> + <ui:decorate template="common/editWindowTheme.xhtml"> + <ui:param name="theme" value="#{portalobjectmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + </ui:define> + </ui:decorate> + </ui:define> + </ui:composition> +</div> + Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,153 @@ +<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"> + +<c:if test="#{empty instancemgr.selectedPlugin}"> + <h:form> + <table id="instancesTable2" class="portlet-def-table datatable"> + <thead class="portlet-section-header"> + <tr> + <th>Instance id</th> + <th>Instance name</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> + <img src="#{instance.portlet.smallIconLocation}" align="middle" style="margin:0 4px 0 0"/> + <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:outputText value="#{instance.displayName}"/> + </td> + <td><h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity"> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="security"/> + Security + </h:commandLink> | <h:panelGroup + rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink + action="#{instancemgr.selectInstance}" styleClass="actionPreferences"> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="preferences"/> + Preferences + </h:commandLink> | </h:panelGroup><h:commandLink action="confirmDeleteInstance" + styleClass="actionDelete" + actionListener="#{instancemgr.selectInstance}"> + <f:param name="id" value="#{instance.id}"/> + Delete + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + <ul class="pagination property-container"> + <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> + <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" + var="index"> + <li class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}"> + <h:commandLink action="#{instancemgr.selectFrom}"> + <f:param name="from" value="#{index * instancemgr.paginationSize}"/> + <h:outputText value="#{index * instancemgr.paginationSize}"/> + </h:commandLink> + </li> + </c:forEach> + </c:if> + </ul> + </h:form> +</c:if> + + +<c:if test="#{instancemgr.selectedPlugin == 'info'}"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet details + </li> + </ul> + </h:form> + <br/> + <c:choose> + <c:when test="#{instancemgr.selectedInstance.portlet != null}"> + <ui:include src="common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> + <ui:param name="portletmgr" value="#{portletmgr}"/> + <ui:param name="showDisplayNameEditor" value="true"/> + </ui:include> + </c:when> + <c:otherwise> + The associated portlet is not available. + </c:otherwise> + </c:choose> +</c:if> + +<c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> preferences + </li> + </ul> + </h:form> + <br/> + <div class="property-container"> + <ui:include src="common/editPreferences.xhtml"> + <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> + </ui:include> + <br /> + <h:form> + <h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> + </h:form> + </div> +</c:if> + +<c:if test="#{instancemgr.selectedPlugin == 'security'}"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> security settings + </li> + </ul> + </h:form> + <br/> + <div class="property-container"> + <ui:decorate template="/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{instancemgr.auth}"/> + </ui:decorate> + </div> +</c:if> + +</ui:define> +</ui:composition> +</div> Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml ___________________________________________________________________ Name: svn:executable + * Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,33 @@ +<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> + <li> + <h:commandLink value="Dashboards" action="dashboards"/> + </li> + </ul> + </h:form> + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content"> + <!-- 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> + </ui:define> + </ui:decorate> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,197 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:pfc="http://www.jboss.com/portal/facelet/common" + xmlns:c="http://java.sun.com/jstl/core"> + +<h:form> + +<c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="Portal"/> + </f:facet> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Actions"/> + </f:facet> + <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionSecurity"> + <f:param name="id" value="#{object.id}"/> + Security + </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{object.id}"/> + Properties + </h:commandLink> | <h:commandLink action="editPortalTheme" styleClass="actionTheme" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{object.id}"/> + Theme + </h:commandLink> + <h:panelGroup + rendered="#{(object.name != 'admin') and (object.name != 'template')}"> + | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionRename"> + <h:outputText value="Rename"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </h:panelGroup> + <h:panelGroup + rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}"> + | <h:commandLink action="confirm" styleClass="actionDelete" + actionListener="#{portalobjectmgr.selectDeletingObject}"> + <f:param name="id" value="#{object.id}"/> + Delete + </h:commandLink> + </h:panelGroup> + <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault" + action="#{portalobjectmgr.makeObjectDefault}"> + <f:param name="id" value="#{object.id}"/> + Make Default + </h:commandLink> + </h:panelGroup> + <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" + value="Default"/></h:panelGroup> + </h:column> + </h:dataTable> +</c:if> + +<c:if test="#{not empty portalobjectmgr.selectedObject.pages}"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList datatable" + columnClasses="objectNameColumn, objectActionColumn" + rowClasses="portlet-section-body,portlet-section-alternate" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="Page"/> + </f:facet> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Actions"/> + </f:facet> + <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionLayout"> + <f:param name="id" value="#{object.id}"/> + Page layout + </h:commandLink> | <h:commandLink action="editPageSecurity" styleClass="actionSecurity" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{object.id}"/> + Security + </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{object.id}"/> + Properties + </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{object.id}"/> + Theme + </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{object.id}"/> + Rename + </h:commandLink> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionRename" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{object.id}"/> + Display Names + </h:commandLink> |<h:commandLink action="confirm" styleClass="actionDelete" + actionListener="#{portalobjectmgr.selectDeletingObject}"> + <f:param name="id" value="#{object.id}"/> + Delete + </h:commandLink> + <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault" + action="#{portalobjectmgr.makeObjectDefault}"> + <f:param name="id" value="#{object.id}"/> + Make Default + </h:commandLink> + </h:panelGroup> + <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" + value="Default"/></h:panelGroup> + </h:column> + </h:dataTable> +</c:if> + +<c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> + <h3 class="sectionTitle">Manage windows within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObject.typeName}</h3> + + <ui:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> + + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="Window"/> + </f:facet> + + <h:graphicImage + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? 'This window is set to a minimized state.' : 'This window defaults to a normal state.'}" + rendered="#{!maximizedStateExists}" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" + styleClass="windowStateIcon" + alt=""/> + + <h:graphicImage + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? 'This window is set to a maximized state.' : 'This window defaults to a minimized state because one window within this page is set to maximized.'}" + rendered="#{maximizedStateExists}" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" + styleClass="windowStateIcon" + alt=""/> + + + <!-- disable edit window for content type widget until JBPORTAL-1561 is fixed --> + <h:outputText value="#{object.name}" + rendered="#{fn:startsWith(object.declaredProperties['portal.windowContentType'], 'widget/')}"/> + + <h:commandLink action="#{portalobjectmgr.selectObject}" + rendered="#{! fn:startsWith(object.declaredProperties['portal.windowContentType'], 'widget/')}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + + + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Actions"/> + </f:facet> + <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionTheme"> + <f:param name="id" value="#{object.id}"/> + Theme + </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{object.id}"/> + <f:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> + Properties + </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" + actionListener="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{object.id}"/> + Rename + </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectDeletingObject}" + styleClass="actionDelete"> + <f:param name="id" value="#{object.id}"/> + Delete + </h:commandLink> + </h:column> + </h:dataTable> +</c:if> +</h:form> + +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,69 @@ +<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:fn="http://java.sun.com/jsp/jstl/functions" + 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> + <li> + <h:commandLink value="Dashboards" action="dashboards"/> + </li> + </ul> + </h:form> + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node"> + <c:if test="#{node.type != PortalObject.TYPE_CONTEXT}"> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + </c:if> + <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : 'pathItem'}"> + <c:choose> + <c:when test="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}"> + <!-- If window is of contentType widget --> + <h:panelGroup rendered="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}"> + <span class="objectName">#{node.name}</span> #{node.typeName} + </h:panelGroup> + </c:when> + <c:otherwise> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{node.id}"/> + <c:choose> + <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> + <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> + </c:choose> + </h:commandLink> + </c:otherwise> + </c:choose> + <h:outputText value="&#160;#{portalObjectScreen}" + rendered="#{portalObjectScreen != null and node.id == portalobjectmgr.selectedObject.id}"/> + </li> + </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 --> + <div class="property-container"> + <ui:insert name="content">Content</ui:insert> + </div> + </ui:define> + </ui:decorate> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,28 @@ +<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:c="http://java.sun.com/jstl/core"> + + <c:choose> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}"> + <ui:include src="editContext.xhtml"/> + </c:when> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL}"> + <ui:include src="editPage.xhtml"/> + </c:when> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"> + <ui:include src="editPage.xhtml"/> + </c:when> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_WINDOW}"> + <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> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,161 @@ +<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" + xmlns:portlet="http://java.sun.com/portlet"> + +<ui:composition template="portletsTemplate.xhtml"> + +<ui:define name="content"> + +<c:if test="#{empty portletmgr.selectedPlugin}"> + <div class="provider-menu-container"> + <h:form> + <h:outputLabel for="menu"> + <h:outputText value="View portlets provided by the portlet provider named: " + 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="View portlets" styleClass="portlet-form-button"/> + </h:form> + </div> + <h:form> + + <table class="portlet-def-table datatable"> + <thead class="portlet-section-header"> + <tr> + <th>Portlet name</th> + <th>Description</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> + <img src="#{portlet.smallIconLocation}" align="middle" style="margin:0 4px 0 0"/> + <h:commandLink + action="#{portletmgr.selectPortlet}" + title="#{portlet.context.id}"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="manager"/> + #{portlet.name} + </h:commandLink> + </td> + <td>#{portlet.description.value}</td> + <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td> + <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td> + <td> + <h:panelGroup rendered="#{!empty portlet.info.preferences.keys}"> + <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionPreferences"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="preferences"/> + Preferences + </h:commandLink> | </h:panelGroup> + <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionCreateInstance"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="createInstance"/> + Create instance + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + <ul class="pagination property-container"> + <c:if test="#{portletmgr.portletCount > portletmgr.paginationSize}"> + <c:forEach begin="0" end="#{(portletmgr.portletCount - 1) / portletmgr.paginationSize}" step="1" + var="index"> + <li class="#{index == (portletmgr.selectedFrom / portletmgr.paginationSize)? 'selected' : ''}"> + <h:commandLink action="#{portletmgr.selectFrom}"> + <f:param name="from" value="#{index * portletmgr.paginationSize}"/> + #{index * portletmgr.paginationSize} + </h:commandLink> + </li> + </c:forEach> + </c:if> + </ul> + </h:form> +</c:if> + +<c:if test="#{portletmgr.selectedPlugin == 'manager'}"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> details + </li> + </ul> + </h:form> + <br/> + <ui:include src="common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{portletmgr.selectedPortlet}"/> + <ui:param name="showDisplayNameEditor" value="false"/> + </ui:include> +</c:if> + +<c:if test="#{portletmgr.selectedPlugin == 'preferences'}"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> preferences + </li> + </ul> + </h:form> + <br/> + <div class="property-container"> + <ui:include src="common/editPreferences.xhtml"> + <ui:param name="prefs" value="#{portletmgr.selectedPreferences}"/> + </ui:include> + </div> +</c:if> + +<c:if test="#{portletmgr.selectedPlugin == 'createInstance'}"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> instance creation + </li> + </ul> + </h:form> + <br/> + <div class="property-container"> + <h:form id="add_instance_form" styleClass="createObjectForm"> + <span class="portlet-font">Create an instance named: </span> + <h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field" + required="true"/> + <br /> + <h:commandButton action="#{createInstanceAction.execute}" value="Create instance" + styleClass="portlet-form-button"/> + <h:message for="instanceId" errorClass="portlet-msg-error"/> + </h:form> + </div> +</c:if> + +</ui:define> +</ui:composition> +</div> Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml ___________________________________________________________________ Name: svn:executable + * Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,33 @@ +<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> + <li> + <h:commandLink value="Dashboards" action="dashboards"/> + </li> + </ul> + </h:form> + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content"> + <!-- 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> + </ui:define> + </ui:decorate> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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:c="http://java.sun.com/jstl/core"> + <ui:composition template="/jsf/objectTemplate.xhtml"> + <ui:param name="portalObjectScreen" value="Rename"/> + <ui:define name="content"> + <h3>Rename #{portalobjectmgr.selectedObjectType}</h3> + <h:form id="renameForm"> + <h:message for="newName"/> + + <p>Rename the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObjectType} to: + <h:inputText id="newName" value="#{renameAction.newName}"/> + <h:commandButton value="Rename" action="#{renameAction.execute}" styleClass="portlet-form-button"/> + </p> + </h:form> + </ui:define> + </ui:composition> +</div> Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,203 @@ +<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"> + +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> + +<div class="wizard-tab-container"> +<ul class="objectpath"> + <li class="selected">Adding a new Portlet</li> +</ul> + +<div class="property-container"> +<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> +</div> + +</div> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -0,0 +1,38 @@ +<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}</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/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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" + xmlns:c="http://java.sun.com/jstl/core"> + + <ui:composition template="newWindowTpl.xhtml"> + <ui:define name="content"> + + <table class="datatable full-width"> + <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 != PortalObject.TYPE_PORTAL}"> + <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/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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 class="full-width datatable"> + + <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/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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 class="full-width datatable"> + <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>#{portlet.name}</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 property-container"> + <c:forEach begin="0" end="#{(portletmgr.portletCount - 1)/portletmgr.paginationSize}" step="1" + var="index"> + <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}"> + <h:commandLink action="#{portletmgr.selectFrom}"> + <f:param name="from" value="#{index * portletmgr.paginationSize}"/> + <h:outputText value="#{index * portletmgr.paginationSize}"/> + </h:commandLink> + </li> + </c:forEach> + </ul> + </h:form> + + </ui:define> + </ui:composition> +</div> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml 2008-04-07 08:53:27 UTC (rev 10509) @@ -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 class="full-width datatable"> + + <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 Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-04-07 01:23:46 UTC (rev 10508) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-04-07 08:53:27 UTC (rev 10509) @@ -121,8 +121,10 @@ ViewHandler vh = faces.getApplication().getViewHandler(); String viewId = faces.getViewRoot().getViewId(); String clientId = uiportlet.getClientId(faces); - StringBuffer url = new StringBuffer(vh.getActionURL(faces, viewId)); + String actionURL = vh.getActionURL(faces, viewId); + actionURL = faces.getExternalContext().encodeActionURL(actionURL); + StringBuffer url = new StringBuffer(actionURL); // url.append("&amp;").append(clientId).append("=jbp");