February 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r6425 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-02-27 11:24:11 -0500 (Tue, 27 Feb 2007) New Revision: 6425 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml Log: Removed unused references to Tomahawk. Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 16:04:24 UTC (rev 6424) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 16:24:11 UTC (rev 6425) @@ -2,7 +2,6 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" - xmlns:t="http://myfaces.apache.org/tomahawk" xmlns:f="http://java.sun.com/jsf/core"> <ui:include src="nodeNavigation.xhtml"/>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6424 - in trunk/core-admin/src: main/org/jboss/portal/faces and 5 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-02-27 11:04:24 -0500 (Tue, 27 Feb 2007) New Revision: 6424 Added: trunk/core-admin/src/main/org/jboss/portal/faces/ trunk/core-admin/src/main/org/jboss/portal/faces/scroller/ trunk/core-admin/src/main/org/jboss/portal/faces/scroller/ScrollerRenderer.java trunk/core-admin/src/main/org/jboss/portal/faces/scroller/ScrollerTag.java trunk/core-admin/src/main/org/jboss/portal/faces/scroller/UIScroller.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss_portal.tld trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portal.taglib.xml Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowPreferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml Log: New JSF component replacing the datascroller. removed unused references to Tomahawk. Added: trunk/core-admin/src/main/org/jboss/portal/faces/scroller/ScrollerRenderer.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/faces/scroller/ScrollerRenderer.java (rev 0) +++ trunk/core-admin/src/main/org/jboss/portal/faces/scroller/ScrollerRenderer.java 2007-02-27 16:04:24 UTC (rev 6424) @@ -0,0 +1,237 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.faces.scroller; + +import java.io.IOException; +import java.util.Iterator; +import java.util.Map; + +import javax.faces.component.NamingContainer; +import javax.faces.component.UIComponent; +import javax.faces.component.UIData; +import javax.faces.component.UIForm; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import javax.faces.el.ValueBinding; +import javax.faces.render.Renderer; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class ScrollerRenderer extends Renderer +{ + + private final String PREVIOUS = "Previous"; + private final String NEXT = "Next"; + private final String FIRST = "First"; + private final String LAST = "Last"; + + + public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException + { + // Get Attributes + String styleClass = (String) getAttribute(facesContext, component, "styleClass"); + String datatableId = (String) getAttribute(facesContext, component, "for"); + + // Get Form Component + UIComponent formComponent = component; + while (!(formComponent instanceof UIForm)) + { + formComponent = formComponent.getParent(); + } + String formComponentId = formComponent.getClientId(facesContext); + + // Get Writer + ResponseWriter writer = facesContext.getResponseWriter(); + + // Get UIData + String id = getId(datatableId, component.getClientId(facesContext)); + UIData data = (UIData) findComponent(facesContext.getViewRoot(), facesContext, id); + + int first = data.getFirst(); + int rowCount = data.getRowCount(); + int pageSize = data.getRows(); + if (pageSize <= 0) pageSize = rowCount; + + int pages = rowCount / pageSize; + if (rowCount % pageSize != 0 ) pages++; + + int currentPage = first / pageSize; + if (first >= rowCount - pageSize) currentPage = pages-1; + + int startPage = 0; + int endPage = pages; + + if (currentPage > 0) + { + writeLink(writer, component, formComponentId, component.getClientId(facesContext), PREVIOUS, styleClass); + } + if (first < rowCount - pageSize) + { + writeLink(writer, component, formComponentId, component.getClientId(facesContext), NEXT, styleClass); + } + + writeHiddenField(writer, component, component.getClientId(facesContext)); + } + + public void decode(FacesContext facesContext, UIComponent component) + { + String id = component.getClientId(facesContext); + Map parameters = facesContext.getExternalContext().getRequestParameterMap(); + String response = (String) parameters.get(id); + + String datatableId = (String) getAttribute(facesContext, component, "for"); + + // Get UIData + String dataId = getId(datatableId, component.getClientId(facesContext)); + UIData data = (UIData) findComponent(facesContext.getViewRoot(), facesContext, dataId); + + int first = data.getFirst(); + int rowCount = data.getRowCount(); + int pageSize = data.getRows(); + if (pageSize <= 0) pageSize = rowCount; + + if (response.equals(PREVIOUS)) + { + first -= pageSize; + } + else if (response.equals(NEXT)) + { + first += pageSize; + } + + if (first < 0) + { + first = 0; + } + data.setFirst(first); + } + + + private Object getAttribute(FacesContext facesContext, UIComponent component, String name) + { + ValueBinding vb = component.getValueBinding(name); + if (vb != null) + { + return vb.getValue(facesContext); + } + else + { + return component.getAttributes().get(name); + } + } + + public String getId(String id, String base) + { + String separator = "" + NamingContainer.SEPARATOR_CHAR; + String[] idSplitted = id.split(separator); + String[] baseSplitted = base.split(separator); + StringBuffer buffer = new StringBuffer(); + for (int i=0; i<(baseSplitted.length - idSplitted.length); i++) + { + buffer.append(baseSplitted[i]); + buffer.append(separator); + } + buffer.append(id); + return buffer.toString(); + } + + private UIComponent findComponent(UIComponent component, FacesContext facesContext, String id) + { + String componentId = component.getClientId(facesContext); + if (componentId.equals(id)) + { + return component; + } + Iterator it = component.getChildren().iterator(); + while (it.hasNext()) + { + UIComponent comp = (UIComponent)it.next(); + UIComponent found = findComponent(comp, facesContext, id); + if (found != null) + { + return found; + } + + } + return null; + } + + private void writeHiddenField(ResponseWriter writer, UIComponent component, String id) throws IOException + { + writer.startElement("input", component); + writer.writeAttribute("type", "hidden", null); + writer.writeAttribute("name", id, null); + writer.endElement("input"); + } + + private void writeLink(ResponseWriter writer, UIComponent component, String formComponentId, String id, String value, String styleClass) throws IOException + { + writer.writeText(" ", null); + writer.startElement("input", component); + writer.writeAttribute("value", value, null); + writer.writeAttribute("type", "submit", null); + writer.writeAttribute("onclick", onclickCode(formComponentId, id, value), null); + if (styleClass != null) + { + writer.writeAttribute("class", styleClass, "styleClass"); + } + writer.endElement("input"); + + /* + writer.writeText(" ", null); + writer.startElement("a", component); + writer.writeAttribute("href", "#", null); + writer.writeAttribute("onclick", onclickCode(formComponentId, id, value), null); + if (styleClass != null) + { + writer.writeAttribute("class", styleClass, "styleClass"); + } + writer.writeText(value, null); + writer.endElement("a"); + */ + } + + private String onclickCode(String formComponentId, String id, String value) + { + StringBuffer buffer = new StringBuffer(); + buffer.append("document.forms["); + buffer.append("'"); + buffer.append(formComponentId); + buffer.append("']"); + buffer.append(".elements['"); + buffer.append(id); + buffer.append("'].value='"); + buffer.append(value); + buffer.append("';"); + buffer.append(" document.forms["); + buffer.append("'"); + buffer.append(formComponentId); + buffer.append("'"); + buffer.append("].submit()"); + buffer.append("; return false;"); + return buffer.toString(); + } + +} Added: trunk/core-admin/src/main/org/jboss/portal/faces/scroller/ScrollerTag.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/faces/scroller/ScrollerTag.java (rev 0) +++ trunk/core-admin/src/main/org/jboss/portal/faces/scroller/ScrollerTag.java 2007-02-27 16:04:24 UTC (rev 6424) @@ -0,0 +1,95 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.faces.scroller; + +import javax.faces.application.Application; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.webapp.UIComponentTag; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class ScrollerTag extends UIComponentTag +{ + + private String _for; + private String styleClass; + + public String getComponentType() + { + return "com.jboss.portal.Scroller"; + } + + public String getRendererType() + { + return "default"; + } + + public void setFor(String _for) + { + this._for = _for; + } + + public void setStyleClass(String styleClass) + { + this.styleClass = styleClass; + } + + public void setProperties(UIComponent component) + { + super.setProperties(component); + setString(component, "for", _for); + setString(component, "styleClass", styleClass); + } + + private void setString(UIComponent component, String attributeName, String attributeValue) + { + if (attributeValue == null) return; + if (isValueReference(attributeValue)) + { + setValueBinding(component, attributeName, attributeValue); + } + else + { + component.getAttributes().put(attributeName, attributeValue); + } + } + + private void setValueBinding(UIComponent component, String attributeName, String attributeValue) + { + FacesContext facesContext = FacesContext.getCurrentInstance(); + Application app = facesContext.getApplication(); + ValueBinding vb = app.createValueBinding(attributeValue); + component.setValueBinding(attributeName, vb); + } + + public void release() + { + super.release(); + _for = null; + styleClass = null; + } +} Added: trunk/core-admin/src/main/org/jboss/portal/faces/scroller/UIScroller.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/faces/scroller/UIScroller.java (rev 0) +++ trunk/core-admin/src/main/org/jboss/portal/faces/scroller/UIScroller.java 2007-02-27 16:04:24 UTC (rev 6424) @@ -0,0 +1,37 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.faces.scroller; + +import javax.faces.component.UIInput; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class UIScroller extends UIInput +{ + public UIScroller() + { + setRendererType("default"); + } +} Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-02-27 16:04:24 UTC (rev 6424) @@ -263,4 +263,17 @@ <phase-listener>org.jboss.portal.core.portlet.management.Refresher</phase-listener> </lifecycle> + <component> + <component-type>com.jboss.portal.Scroller</component-type> + <component-class>org.jboss.portal.faces.scroller.UIScroller</component-class> + </component> + + <render-kit> + <renderer> + <component-family>javax.faces.Input</component-family> + <renderer-type>default</renderer-type> + <renderer-class>org.jboss.portal.faces.scroller.ScrollerRenderer</renderer-class> + </renderer> + </render-kit> + </faces-config> Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss_portal.tld =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss_portal.tld (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss_portal.tld 2007-02-27 16:04:24 UTC (rev 6424) @@ -0,0 +1,26 @@ +<!DOCTYPE taglib + PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" + "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> +<taglib> +<tlib-version>0.01</tlib-version> +<jsp-version>1.2</jsp-version> +<short-name>scroller</short-name> +<uri>http://www.jboss.com/portal</uri> +<description>This tag library contains the scroller tag.</description> + +<tag> + <name>scroller</name> + <tag-class>org.jboss.portal.faces.scroller.ScrollerTag</tag-class> + + <attribute> + <name>for</name> + <required>true</required> + </attribute> + + <attribute> + <name>styleClass</name> + </attribute> + +</tag> + +</taglib> \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,9 +1,7 @@ <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:t="http://myfaces.apache.org/tomahawk"> + xmlns:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,8 +1,7 @@ <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:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageTheme.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageTheme.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,8 +1,7 @@ <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:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,8 +1,7 @@ <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:t="http://myfaces.apache.org/tomahawk"> + xmlns:f="http://java.sun.com/jsf/core"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,8 +1,7 @@ <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:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalTheme.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalTheme.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,8 +1,7 @@ <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:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowPreferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowPreferences.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowPreferences.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,9 +1,7 @@ <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:t="http://myfaces.apache.org/tomahawk"> + xmlns:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowSecurity.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowSecurity.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,8 +1,7 @@ <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:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,8 +1,7 @@ <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:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -3,7 +3,7 @@ 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:t="http://myfaces.apache.org/tomahawk"> + xmlns:jbp="http://www.jboss.com/portal"> <ui:composition template="/WEB-INF/jsp/management/instancesTemplate.xhtml"> @@ -17,27 +17,14 @@ <h:panelGroup id="panel1"> <h:form id="instance_list"> - <t:dataTable + <h:dataTable id="instancesTable" var="instance" value="#{instancemgr.instances}" - rows="10" - sortColumn="#{instancemgr.sortColumn}" - sortAscending="#{instancemgr.sortAscending}" - rowClasses="portlet-section-body,portlet-section-alternate"> + rows="15"> <h:column> <f:facet name="header"> - <t:commandSortHeader columnName="id"> - <f:facet name="ascending"> - <t:graphicImage value="/images/management/up.png" - rendered="true" border="0"/> - </f:facet> - <f:facet name="descending"> - <t:graphicImage value="/images/management/down.png" - rendered="true" border="0"/> - </f:facet> <h:outputText value="Id"/> - </t:commandSortHeader> </f:facet> <h:commandLink action="#{instancemgr.selectInstance}"> <h:outputText value="#{instance[0].id}"/> @@ -46,17 +33,7 @@ </h:column> <h:column> <f:facet name="header"> - <t:commandSortHeader columnName="portlet"> - <f:facet name="ascending"> - <t:graphicImage value="/images/management/up.png" - rendered="true" border="0"/> - </f:facet> - <f:facet name="descending"> - <t:graphicImage value="/images/management/down.png" - rendered="true" border="0"/> - </f:facet> <h:outputText value="Portlet"/> - </t:commandSortHeader> </f:facet> <h:commandLink rendered="#{instance[1] != null}" action="#{portletmgr.selectPortlet}"> <f:param name="id" value="#{instance[1].context.id}"/> @@ -74,31 +51,10 @@ <f:param name="id" value="#{instance[0].id}"/> </h:commandLink> </h:column> - </t:dataTable> - <t:dataScroller id="scrollInstances" - for="instancesTable" fastStep="10" - pageCountVar="instancesPageCount" pageIndexVar="instancesPageIndex" - paginator="true" paginatorMaxPages="9" - paginatorActiveColumnStyle="font-weight:bold;"> - <f:facet name="first"> - <t:graphicImage url="/images/management/first.png" border="1"/> - </f:facet> - <f:facet name="last"> - <t:graphicImage url="/images/management/last.png" border="1"/> - </f:facet> - <f:facet name="previous"> - <t:graphicImage url="/images/management/left.png" border="1"/> - </f:facet> - <f:facet name="next"> - <t:graphicImage url="/images/management/right.png" border="1"/> - </f:facet> - <f:facet name="fastforward"> - <t:graphicImage url="/images/management/fast-forward.png" border="1"/> - </f:facet> - <f:facet name="fastrewind"> - <t:graphicImage url="/images/management/fast-rewind.png" border="1"/> - </f:facet> - </t:dataScroller> + </h:dataTable> + + <jbp:scroller for="instancesTable" styleClass="portlet-form-button"/> + </h:form> </h:panelGroup> <h:panelGroup id="splitter"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,9 +1,7 @@ <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:t="http://myfaces.apache.org/tomahawk"> + xmlns:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -3,7 +3,6 @@ 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:t="http://myfaces.apache.org/tomahawk" xmlns:ct="http://www.julien.com"> <br/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -2,8 +2,7 @@ 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:t="http://myfaces.apache.org/tomahawk"> + xmlns:f="http://java.sun.com/jsf/core"> <br/> <h:panelGrid rendered="#{portletmgr.selectedPortlet != null}"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -2,13 +2,12 @@ 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:t="http://myfaces.apache.org/tomahawk"> + xmlns:f="http://java.sun.com/jsf/core"> <h:panelGroup id="panel2" rendered="#{preferences != null}"> <h:form> - <t:dataTable + <h:dataTable id="data__" var="row" value="#{preferences.model}" @@ -53,14 +52,14 @@ </h:commandLink> <h:outputText value="#{row.value}"/> </h:column> - </t:dataTable> + </h:dataTable> </h:form> </h:panelGroup> <h:panelGroup id="panel3" rendered="#{preferences.selectedPreference != null}"> <h:form> - <t:dataTable + <h:dataTable id="string_values" var="row" value="#{preferences.selectedPreference.valueIndices}"> @@ -68,7 +67,7 @@ <h:inputText value="#{preferences.selectedPreference.value[row]}"/> <h:commandButton action="#{action.deleteLine}" value="Delete"/> </h:column> - </t:dataTable> + </h:dataTable> <h:commandButton action="#{action.updateCell}" value="Update"/> </h:form> <h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -2,8 +2,7 @@ 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:t="http://myfaces.apache.org/tomahawk"> + xmlns:f="http://java.sun.com/jsf/core"> <br/> <h:outputText style="font-weight:bold;" value="Name: "/> <h:outputText value="#{portalobjectmgr.selectedObject.name}"/> @@ -34,7 +33,7 @@ <h:panelGroup id="prop_a"> <h:form id="properties_form"> - <t:dataTable + <h:dataTable id="data" var="p" value="#{portalobjectmgr.selectedProperties}" @@ -76,7 +75,7 @@ </f:facet> <h:outputText value="#{p[1]}"/> </h:column> - </t:dataTable> + </h:dataTable> <br/> <h:messages style="color: red"/> <h:outputText style="font-weight:bold;" value="Property Name: "/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -2,14 +2,13 @@ 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:t="http://myfaces.apache.org/tomahawk"> + xmlns:f="http://java.sun.com/jsf/core"> <br/> <h:panelGroup id="securitypg"> <h:form id="myform"> - <t:dataTable + <h:dataTable id="dataconstraints" var="role" value="#{auth.roles}"> @@ -29,7 +28,7 @@ <f:selectItems value="#{auth.availableActions}"></f:selectItems> </h:selectManyListbox> </h:column> - </t:dataTable> + </h:dataTable> <h:commandButton value="Update"/> </h:form> </h:panelGroup> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -2,8 +2,7 @@ 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:t="http://myfaces.apache.org/tomahawk"> + xmlns:f="http://java.sun.com/jsf/core"> <br/> <h:outputText style="font-weight:bold;" value="Name: "/> <h:outputText value="#{portalobjectmgr.selectedObject.name}"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,8 +1,7 @@ <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:h="http://java.sun.com/jsf/html"> <ui:include src="nodeNavigation.xhtml"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,9 +1,7 @@ <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:t="http://myfaces.apache.org/tomahawk"> + xmlns:h="http://java.sun.com/jsf/html"> <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -3,7 +3,7 @@ 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:t="http://myfaces.apache.org/tomahawk"> + xmlns:jbp="http://www.jboss.com/portal"> <ui:composition template="/WEB-INF/jsp/management/definitionsTemplate.xhtml"> @@ -28,29 +28,14 @@ <h:panelGroup id="panel1"> <h:form> - <t:dataTable + <h:dataTable id="portletsTable" var="portlet" value="#{portletmgr.portlets}" - rows="10" - sortColumn="#{portletmgr.sortColumn}" - sortAscending="#{portletmgr.sortAscending}" - rowClasses="portlet-section-body,portlet-section-alternate"> + rows="10"> <h:column> <f:facet name="header"> - <t:commandSortHeader columnName="id"> - <f:facet name="ascending"> - <t:graphicImage - value="/images/management/up.png" - rendered="true"/> - </f:facet> - <f:facet name="descending"> - <t:graphicImage - value="/images/management/down.png" - rendered="true"/> - </f:facet> - <h:outputText value="Id"/> - </t:commandSortHeader> + <h:outputText value="Id"/> </f:facet> <h:commandLink action="#{portletmgr.selectPortlet}"> @@ -62,19 +47,7 @@ </h:column> <h:column> <f:facet name="header"> - <t:commandSortHeader columnName="name"> - <f:facet name="ascending"> - <t:graphicImage - value="/images/management/up.png" - rendered="true"/> - </f:facet> - <f:facet name="descending"> - <t:graphicImage - value="/images/management/down.png" - rendered="true"/> - </f:facet> - <h:outputText value="Name"/> - </t:commandSortHeader> + <h:outputText value="Name"/> </f:facet> <h:outputText value="#{portlet.name}"/> </h:column> @@ -92,47 +65,14 @@ </h:column> <h:column> <f:facet name="header"> - <t:commandSortHeader columnName="description"> - <f:facet name="ascending"> - <t:graphicImage - value="/images/management/up.png" - rendered="true"/> - </f:facet> - <f:facet name="descending"> - <t:graphicImage - value="/images/management/down.png" - rendered="true"/> - </f:facet> - <h:outputText value="Description"/> - </t:commandSortHeader> + <h:outputText value="Description"/> </f:facet> <h:outputText value="#{portlet.description}"/> </h:column> - </t:dataTable> - <t:dataScroller id="scrollPortlets" - for="portletsTable" fastStep="10" - pageCountVar="portletsPageCount" pageIndexVar="portletsPageIndex" - paginator="true" paginatorMaxPages="9" - paginatorActiveColumnStyle="font-weight:bold;"> - <f:facet name="first"> - <t:graphicImage styleClass="scroller" url="/images/management/first.png"/> - </f:facet> - <f:facet name="last"> - <t:graphicImage styleClass="scroller" url="/images/management/last.png"/> - </f:facet> - <f:facet name="previous"> - <t:graphicImage styleClass="scroller" url="/images/management/left.png"/> - </f:facet> - <f:facet name="next"> - <t:graphicImage styleClass="scroller" url="/images/management/right.png"/> - </f:facet> - <f:facet name="fastforward"> - <t:graphicImage styleClass="scroller" url="/images/management/fast-forward.png"/> - </f:facet> - <f:facet name="fastrewind"> - <t:graphicImage styleClass="scroller" url="/images/management/fast-rewind.png"/> - </f:facet> - </t:dataScroller> + </h:dataTable> + + <jbp:scroller for="portletsTable" styleClass="portlet-form-button"/> + </h:form> </h:panelGroup> <h:panelGroup id="splitter"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,8 +1,6 @@ <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:ui="http://java.sun.com/jsf/facelets"> <ui:include src="/WEB-INF/jsp/management/nodeNavigation.xhtml"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-27 16:04:24 UTC (rev 6424) @@ -1,10 +1,9 @@ <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:t="http://myfaces.apache.org/tomahawk"> + xmlns:h="http://java.sun.com/jsf/html"> + <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> <ui:define name="content"> Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portal.taglib.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portal.taglib.xml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portal.taglib.xml 2007-02-27 16:04:24 UTC (rev 6424) @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd"> +<facelet-taglib> + <namespace>http://www.jboss.com/portal</namespace> + <tag> + <tag-name>scroller</tag-name> + <component> + <component-type>com.jboss.portal.Scroller</component-type> + <renderer-type>default</renderer-type> + </component> + </tag> +</facelet-taglib> \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2007-02-27 11:21:36 UTC (rev 6423) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2007-02-27 16:04:24 UTC (rev 6424) @@ -57,7 +57,7 @@ </context-param> <context-param> <param-name>facelets.LIBRARIES</param-name> - <param-value>/WEB-INF/tomahawk.taglib.xml</param-value> + <param-value>/WEB-INF/portal.taglib.xml</param-value> </context-param> <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6423 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-02-27 06:21:36 -0500 (Tue, 27 Feb 2007) New Revision: 6423 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml Log: Full path is required Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-27 11:02:21 UTC (rev 6422) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-27 11:21:36 UTC (rev 6423) @@ -4,6 +4,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <ui:include src="nodeNavigation.xhtml"/> + <ui:include src="/WEB-INF/jsp/management/nodeNavigation.xhtml"/> </div>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6422 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF: jsp/management and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-27 06:02:21 -0500 (Tue, 27 Feb 2007) New Revision: 6422 Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml Log: move back the window editing stuff of a page to a separate page called editPageLayout Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-02-27 10:48:09 UTC (rev 6421) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-02-27 11:02:21 UTC (rev 6422) @@ -222,6 +222,10 @@ <to-view-id>/WEB-INF/jsp/management/editPortalTheme.xhtml</to-view-id> </navigation-case> <navigation-case> + <from-outcome>editPageLayout</from-outcome> + <to-view-id>/WEB-INF/jsp/management/editPageLayout.xhtml</to-view-id> + </navigation-case> + <navigation-case> <from-outcome>editPagePreferences</from-outcome> <to-view-id>/WEB-INF/jsp/management/editPagePreferences.xhtml</to-view-id> </navigation-case> Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-27 11:02:21 UTC (rev 6422) @@ -0,0 +1,96 @@ +<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:t="http://myfaces.apache.org/tomahawk" + xmlns:ct="http://www.julien.com"> + +<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> + + <ui:define name="content"> + + <h3>You are editing the layout of the page #{portalobjectmgr.selectedObject.name}</h3> + +  + + <hr /> + + <h:form id="page_form_2"> + <t:dataTable + id="data" + var="row" + value="#{portalobjectmgr.rows}" + border="1"> + <t:columns value="#{portalobjectmgr.cols}" var="col"> + <f:facet name="header"> + <h:outputText value="#{col}"/> + </f:facet> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveUp}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/up.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveDown}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/down.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveLeft}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/left.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveRight}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/right.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{row[col].id}"/> + <h:outputText value="#{row[col].name}"/> + </h:commandLink> + </t:columns> + </t:dataTable> + + </h:form> + +  + + <hr /> + + <h:form id="page_form_3"> + <h:message for="windowName" style="color: red"/> + <br /> + <br /> + <h:selectOneMenu + value="#{portalobjectmgr.selectedContentType}"> + <f:selectItems value="#{registry.availableTypes}"/> + </h:selectOneMenu> + <h:commandButton + value="Change content type" styleClass="portlet-form-button"/> + <ct:content + contentType="#{portalobjectmgr.selectedContentType}" + contentURI="#{portalobjectmgr.selectedContentURI}"/> + + <br/> + + <h:panelGroup> + <h:outputLabel for="windowName"> + <h:outputText value="New Window Name: " style="font-weight:bold;"/> + </h:outputLabel> + <h:inputText id="windowName" value="#{addWindowAction.windowName}" + validator="#{addWindowAction.validateWindowName}" + required="true"/> + <h:selectOneMenu value="#{addWindowAction.regionName}"> + <f:selectItems value="#{portalobjectmgr.regionItems}"></f:selectItems> + </h:selectOneMenu> + <h:commandButton value="Add window" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> + </h:panelGroup> + + </h:form> + + </ui:define> + +</ui:composition> + +</div> + + + Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-27 10:48:09 UTC (rev 6421) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-27 11:02:21 UTC (rev 6422) @@ -44,8 +44,8 @@ </h:column> <h:column> <f:facet name="header"><h:outputText value="Actions"/></f:facet> - <h:commandLink action="windows" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Edit"/> + <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Layout"/> <f:param name="id" value="#{page.id}"/> </h:commandLink> | <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 10:48:09 UTC (rev 6421) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 11:02:21 UTC (rev 6422) @@ -3,8 +3,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:t="http://myfaces.apache.org/tomahawk" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ct="http://www.julien.com"> + xmlns:f="http://java.sun.com/jsf/core"> <ui:include src="nodeNavigation.xhtml"/> @@ -20,80 +19,6 @@ <h:message for="name" style="color: red"/> </h:form> -  - - <hr /> - - <h:form id="page_form_2"> - <t:dataTable - id="data" - var="row" - value="#{portalobjectmgr.rows}" - border="1"> - <t:columns value="#{portalobjectmgr.cols}" var="col"> - <f:facet name="header"> - <h:outputText value="#{col}"/> - </f:facet> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveUp}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/up.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveDown}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/down.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveLeft}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/left.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveRight}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/right.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{row[col].id}"/> - <h:outputText value="#{row[col].name}"/> - </h:commandLink> - </t:columns> - </t:dataTable> - - </h:form> - -  - - <hr /> - - <h:form id="page_form_3"> - <h:message for="windowName" style="color: red"/> - <br /> - <br /> - <h:selectOneMenu - value="#{portalobjectmgr.selectedContentType}"> - <f:selectItems value="#{registry.availableTypes}"/> - </h:selectOneMenu> - <h:commandButton - value="Change content type" styleClass="portlet-form-button"/> - <ct:content - contentType="#{portalobjectmgr.selectedContentType}" - contentURI="#{portalobjectmgr.selectedContentURI}"/> - - <br/> - - <h:panelGroup> - <h:outputLabel for="windowName"> - <h:outputText value="New Window Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:inputText id="windowName" value="#{addWindowAction.windowName}" - validator="#{addWindowAction.validateWindowName}" - required="true"/> - <h:selectOneMenu value="#{addWindowAction.regionName}"> - <f:selectItems value="#{portalobjectmgr.regionItems}"></f:selectItems> - </h:selectOneMenu> - <h:commandButton value="Add window" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> - </h:panelGroup> - - </h:form> - <h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink> </div>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6421 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-27 05:48:09 -0500 (Tue, 27 Feb 2007) New Revision: 6421 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml Log: move window name input text close to region list box and the submit button to group them all Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 10:34:41 UTC (rev 6420) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 10:48:09 UTC (rev 6421) @@ -66,14 +66,6 @@ <h:form id="page_form_3"> <h:message for="windowName" style="color: red"/> <br /> - <h:panelGroup> - <h:outputLabel for="windowName"> - <h:outputText value="New Window Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:inputText id="windowName" value="#{addWindowAction.windowName}" - validator="#{addWindowAction.validateWindowName}" - required="true"/> - </h:panelGroup> <br /> <h:selectOneMenu value="#{portalobjectmgr.selectedContentType}"> @@ -86,11 +78,20 @@ contentURI="#{portalobjectmgr.selectedContentURI}"/> <br/> - <h:selectOneMenu value="#{addWindowAction.regionName}"> - <f:selectItems value="#{portalobjectmgr.regionItems}"></f:selectItems> - </h:selectOneMenu> - <h:commandButton value="Add window" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> + <h:panelGroup> + <h:outputLabel for="windowName"> + <h:outputText value="New Window Name: " style="font-weight:bold;"/> + </h:outputLabel> + <h:inputText id="windowName" value="#{addWindowAction.windowName}" + validator="#{addWindowAction.validateWindowName}" + required="true"/> + <h:selectOneMenu value="#{addWindowAction.regionName}"> + <f:selectItems value="#{portalobjectmgr.regionItems}"></f:selectItems> + </h:selectOneMenu> + <h:commandButton value="Add window" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> + </h:panelGroup> + </h:form> <h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6420 - in trunk/core-admin/src: main/org/jboss/portal/core/portlet/management/actions and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-27 05:34:41 -0500 (Tue, 27 Feb 2007) New Revision: 6420 Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml Log: use a combo box to select the region to add a window to instead of lot of submit buttons Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 10:10:26 UTC (rev 6419) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 10:34:41 UTC (rev 6420) @@ -889,6 +889,20 @@ return regions; } + public List getRegionItems() throws Exception + { + List list = getCols(); + for (int i = 0;i < list.size();i++) + { + String regionName = (String)list.get(i); + SelectItem regionItem = new SelectItem(); + regionItem.setValue(regionName); + regionItem.setLabel(regionName); + list.set(i, regionItem); + } + return list; + } + /** Return an array of <Region,Window>Map on the selected object which must be a page. */ public Map[] getRows() throws Exception { Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java 2007-02-27 10:10:26 UTC (rev 6419) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java 2007-02-27 10:34:41 UTC (rev 6420) @@ -31,7 +31,6 @@ import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; import javax.faces.validator.ValidatorException; /** @@ -47,6 +46,9 @@ /** . */ private String windowName; + /** . */ + private String regionName; + public PortalObjectManagerBean getPortalObjectManager() { return pomgr; @@ -67,6 +69,16 @@ this.windowName = windowName; } + public String getRegionName() + { + return regionName; + } + + public void setRegionName(String regionName) + { + this.regionName = regionName; + } + /** * Checks for duplicate window names on the page. Blank window names are not allowed and are controlled by the * required attribute in the presentation page. @@ -101,9 +113,6 @@ { try { - FacesContext ctx = FacesContext.getCurrentInstance(); - ValueBinding vb = ctx.getApplication().createValueBinding("#{col}"); - String region = (String)vb.getValue(ctx); Page page = (Page)pomgr.getSelectedObject(); // @@ -112,7 +121,7 @@ // Window window = page.createWindow(windowName, contentType, contentURI); - window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, region); + window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, regionName); window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE); } catch (Exception e) Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 10:10:26 UTC (rev 6419) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 10:34:41 UTC (rev 6420) @@ -84,17 +84,12 @@ <ct:content contentType="#{portalobjectmgr.selectedContentType}" contentURI="#{portalobjectmgr.selectedContentURI}"/> + <br/> - <t:dataTable - id="data" - var="row" - value="#{portalobjectmgr.rows}"> - <t:columns value="#{portalobjectmgr.cols}" var="col"> - <f:facet name="footer"> - <h:commandButton value="Add #{col}" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> - </f:facet> - </t:columns> - </t:dataTable> + <h:selectOneMenu value="#{addWindowAction.regionName}"> + <f:selectItems value="#{portalobjectmgr.regionItems}"></f:selectItems> + </h:selectOneMenu> + <h:commandButton value="Add window" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> </h:form>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6419 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsp/management and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-27 05:10:26 -0500 (Tue, 27 Feb 2007) New Revision: 6419 Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowPreferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml Log: added path navigation in order to navigate efficiently in the hierarchy Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 10:10:26 UTC (rev 6419) @@ -329,6 +329,19 @@ return portalObjectContainer.getObject(id); } + public List getSelectedObjectPath() + { + PortalObject o = getSelectedObject(); + ArrayList path = new ArrayList(); + while (o != null) + { + path.add(new PortalObjectBean(o)); + o = o.getParent(); + } + Collections.reverse(path); + return path; + } + public PortalObject getSelectedObject() { PortalObject result; @@ -380,17 +393,14 @@ { return "portals"; } - else if (po.getParent().getType() == PortalObject.TYPE_PAGE) + else if (po.getType() == PortalObject.TYPE_PAGE) { - if (po.getType() == PortalObject.TYPE_PAGE) - { - return "pages"; - } - else if (po.getType() == PortalObject.TYPE_WINDOW) - { - return "windows"; - } + return "pages"; } + else if (po.getType() == PortalObject.TYPE_WINDOW) + { + return "windows"; + } return ""; } @@ -448,16 +458,25 @@ // Do nothing } - /** Proceed to an object selection. */ public void selectObject(ActionEvent ae) { + selectObject(); + } + + /** Proceed to an object selection. */ + public String selectObject() + { + // Clear state + selectedId = new PortalObjectId().toString(PortalObjectId.LEGACY_BASE64_FORMAT); + selectedPlugin = null; + selectedContentType = ContentType.PORTLET; + selectedContentURI = null; + + // + String next = "portals"; + try { - // Clear state - selectedId = null; - selectedPlugin = null; - selectedContentType = ContentType.PORTLET; - selectedContentURI = null; // Get id Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); @@ -474,6 +493,21 @@ { selectedId = id; selectedPlugin = "manager"; + switch(object.getType()) + { + case PortalObject.TYPE_CONTEXT: + next = "portals"; + break; + case PortalObject.TYPE_PORTAL: + next = "portals"; + break; + case PortalObject.TYPE_PAGE: + next = "pages"; + break; + case PortalObject.TYPE_WINDOW: + next = "windows"; + break; + } } } } @@ -481,6 +515,9 @@ { e.printStackTrace(); } + + // + return next; } /** Proceed to object destroy. */ Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -9,12 +9,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="pages"> - <h:outputText value="Go back to pages" /> - </h:commandLink> - </h:form> - <h3>You are editing the page: <h:outputText value="#{portalobjectmgr.selectedObject.name}" /></h3> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -8,12 +8,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="pages"> - <h:outputText value="Go back to pages"/> - </h:commandLink> - </h:form> - <h3>Please set the permissions for the page: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageTheme.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageTheme.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -8,12 +8,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="pages" actionListener="#{portalobjectmgr.selectParentObject}"> - <h:outputText value="Go back to pages"/> - </h:commandLink> - </h:form> - <h3>Please set the display options for the page: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> <br/> <ui:include src="/WEB-INF/jsp/management/common/editTheme.xhtml"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -9,12 +9,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="portals" actionListener="#{portalobjectmgr.selectParentObject}"> - <h:outputText value="Go back to portals" /> - </h:commandLink> - </h:form> - <h3>You are editing the portal: <h:outputText value="#{portalobjectmgr.selectedObject.name}" /></h3> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -8,12 +8,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="portals"> - <h:outputText value="Go back to portals"/> - </h:commandLink> - </h:form> - <h3>Please set the permissions for the portal: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalTheme.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalTheme.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -8,13 +8,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="portals"> - <h:outputText value="Go back to portals"/> - </h:commandLink> - </h:form> - - <h3>Please set the display options for the portal: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> <p>The settings defined here will be applied to the whole portal including all the pages and windows unless they have been assigned with different settings</p> <br/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowPreferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowPreferences.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowPreferences.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -9,13 +9,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="windows" actionListener="#{portalobjectmgr.selectParentObject}"> - <h:outputText value="Go back to windows"/> - </h:commandLink> - </h:form> - - <h3>You are editing the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}" /></h3> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowSecurity.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowSecurity.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -8,12 +8,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="windows" actionListener="#{portalobjectmgr.selectParentObject}"> - <h:outputText value="Go back to windows"/> - </h:commandLink> - </h:form> - <h3>Please set the permissions for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -8,12 +8,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="windows" actionListener="#{portalobjectmgr.selectParentObject}"> - <h:outputText value="Go back to windows"/> - </h:commandLink> - </h:form> - <h3>Please set the display options for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> <br/> <ui:include src="/WEB-INF/jsp/management/common/editTheme.xhtml"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -8,7 +8,7 @@ <h:dataTable value="#{portalobjectmgr.portalNodes}" var="portal" style="border-spacing: 20px 7px" rendered="#{not empty portalobjectmgr.portalNodes}"> <h:column> <f:facet name="header"><h:outputText value="Portal"/></f:facet> - <h:commandLink action="pages" actionListener="#{portalobjectmgr.selectObject}"> + <h:commandLink action="#{portalobjectmgr.selectObject}"> <h:outputText value="#{portal.name}"/> <f:param name="id" value="#{portal.id}"/> </h:commandLink> @@ -37,7 +37,7 @@ <h:dataTable value="#{portalobjectmgr.pageNodes}" var="page" style="border-spacing: 20px 7px" rendered="#{not empty portalobjectmgr.pageNodes}"> <h:column> <f:facet name="header"><h:outputText value="Page"/></f:facet> - <h:commandLink action="pages" actionListener="#{portalobjectmgr.selectObject}"> + <h:commandLink action="#{portalobjectmgr.selectObject}"> <h:outputText value="#{page.name}"/> <f:param name="id" value="#{page.id}"/> </h:commandLink> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -1,7 +1,8 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <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:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core">  + <h:form> + <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node"> + > + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{node.id}"/> + <c:if test="#{node.name == ''}">root</c:if> + <c:if test="#{node.name != ''}">#{node.name}</c:if> + </h:commandLink> + </c:forEach> + </h:form> + <br/> <ui:insert name="content">Content</ui:insert> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -1,18 +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="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:t="http://myfaces.apache.org/tomahawk" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ct="http://www.julien.com"> - - <h:form> - <h:commandLink action="#{portalobjectmgr.goBack}"> - <h:outputText value="Go back"/> - </h:commandLink> - </h:form> - <ui:include src="nodeNavigation.xhtml"/> +  + + <hr /> + <h:form id="portal_form"> <h:inputText id="name" value="#{addPageAction.pageName}" validator="#{addPageAction.validatePageName}" @@ -20,5 +19,85 @@ <h:commandButton action="#{addPageAction.execute}" value="Add portal page" styleClass="portlet-form-button"/> <h:message for="name" style="color: red"/> </h:form> - + +  + + <hr /> + + <h:form id="page_form_2"> + <t:dataTable + id="data" + var="row" + value="#{portalobjectmgr.rows}" + border="1"> + <t:columns value="#{portalobjectmgr.cols}" var="col"> + <f:facet name="header"> + <h:outputText value="#{col}"/> + </f:facet> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveUp}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/up.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveDown}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/down.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveLeft}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/left.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveRight}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/right.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{row[col].id}"/> + <h:outputText value="#{row[col].name}"/> + </h:commandLink> + </t:columns> + </t:dataTable> + + </h:form> + +  + + <hr /> + + <h:form id="page_form_3"> + <h:message for="windowName" style="color: red"/> + <br /> + <h:panelGroup> + <h:outputLabel for="windowName"> + <h:outputText value="New Window Name: " style="font-weight:bold;"/> + </h:outputLabel> + <h:inputText id="windowName" value="#{addWindowAction.windowName}" + validator="#{addWindowAction.validateWindowName}" + required="true"/> + </h:panelGroup> + <br /> + <h:selectOneMenu + value="#{portalobjectmgr.selectedContentType}"> + <f:selectItems value="#{registry.availableTypes}"/> + </h:selectOneMenu> + <h:commandButton + value="Change content type" styleClass="portlet-form-button"/> + <ct:content + contentType="#{portalobjectmgr.selectedContentType}" + contentURI="#{portalobjectmgr.selectedContentURI}"/> + <br/> + <t:dataTable + id="data" + var="row" + value="#{portalobjectmgr.rows}"> + <t:columns value="#{portalobjectmgr.cols}" var="col"> + <f:facet name="footer"> + <h:commandButton value="Add #{col}" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> + </f:facet> + </t:columns> + </t:dataTable> + + </h:form> + + <h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink> + </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -59,87 +59,6 @@ </h:form> </h:panelGroup> - -<h:panelGroup - id="c" - rendered="#{portalobjectmgr.selectedObject.type==2}"> - - <h2>Add a new window</h2> - - <h:form id="page_form_2"> - <t:dataTable - id="data" - var="row" - value="#{portalobjectmgr.rows}" - border="1"> - <t:columns value="#{portalobjectmgr.cols}" var="col"> - <f:facet name="header"> - <h:outputText value="#{col}"/> - </f:facet> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveUp}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/up.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveDown}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/down.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveLeft}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/left.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveRight}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/right.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{row[col].id}"/> - <h:outputText value="#{row[col].name}"/> - </h:commandLink> - </t:columns> - </t:dataTable> - - </h:form> - <h:form id="page_form_3"> - <h:message for="windowName" style="color: red"/> - <br /> - <h:panelGroup> - <h:outputLabel for="windowName"> - <h:outputText value="New Window Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:inputText id="windowName" value="#{addWindowAction.windowName}" - validator="#{addWindowAction.validateWindowName}" - required="true"/> - </h:panelGroup> - <br /> - <h:selectOneMenu - value="#{portalobjectmgr.selectedContentType}"> - <f:selectItems value="#{registry.availableTypes}"/> - </h:selectOneMenu> - <h:commandButton - value="Change content type" class="portlet-form-button"/> - <ct:content - contentType="#{portalobjectmgr.selectedContentType}" - contentURI="#{portalobjectmgr.selectedContentURI}"/> - <br/> - <t:dataTable - id="data" - var="row" - value="#{portalobjectmgr.rows}"> - <t:columns value="#{portalobjectmgr.cols}" var="col"> - <f:facet name="footer"> - <h:commandButton value="Add #{col}" action="#{addWindowAction.execute}" class="portlet-form-button"/> - </f:facet> - </t:columns> - </t:dataTable> - - </h:form> - - <h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink> - - -</h:panelGroup> -  <h:panelGroup id="d" Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-27 08:40:26 UTC (rev 6418) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-27 10:10:26 UTC (rev 6419) @@ -9,12 +9,6 @@ <ui:define name="content"> - <h:form> - <h:commandLink action="#{portalobjectmgr.goBack}"> - <h:outputText value="Go back to pages"/> - </h:commandLink> - </h:form> - <h3>You are editing the windows of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> <h:message id="status" for="status"/>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6418 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-27 03:40:26 -0500 (Tue, 27 Feb 2007) New Revision: 6418 Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml Log: use an unified children navigation but keep nodes splitted by type Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-27 08:40:26 UTC (rev 6418) @@ -0,0 +1,94 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + + <h:form> + <h:dataTable value="#{portalobjectmgr.portalNodes}" var="portal" style="border-spacing: 20px 7px" rendered="#{not empty portalobjectmgr.portalNodes}"> + <h:column> + <f:facet name="header"><h:outputText value="Portal"/></f:facet> + <h:commandLink action="pages" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{portal.name}"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> + </h:column> + <h:column> + <f:facet name="header"><h:outputText value="Actions"/></f:facet> + <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Edit"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> | + <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> | + <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> | + <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> + </h:column> + </h:dataTable> + + <h:dataTable value="#{portalobjectmgr.pageNodes}" var="page" style="border-spacing: 20px 7px" rendered="#{not empty portalobjectmgr.pageNodes}"> + <h:column> + <f:facet name="header"><h:outputText value="Page"/></f:facet> + <h:commandLink action="pages" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{page.name}"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> + </h:column> + <h:column> + <f:facet name="header"><h:outputText value="Actions"/></f:facet> + <h:commandLink action="windows" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Edit"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> | + <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> | + <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> | + <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> + </h:column> + </h:dataTable> + + <h:dataTable value="#{portalobjectmgr.windowNodes}" var="window" style="border-spacing: 20px 7px" rendered="#{not empty portalobjectmgr.windowNodes}"> + <h:column> + <f:facet name="header"><h:outputText value="Window"/></f:facet> + <h:outputText value="#{window.name}"/> + </h:column> + <h:column> + <f:facet name="header"><h:outputText value="Actions"/></f:facet> + <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Edit"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> | + <h:commandLink action="editWindowSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> | + <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> | + <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> + </h:column> + </h:dataTable> + + </h:form> + +</div>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6417 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsp/management and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-27 03:38:52 -0500 (Tue, 27 Feb 2007) New Revision: 6417 Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/tabTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml Log: use an unified children navigation but keep nodes splitted by type Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 08:01:44 UTC (rev 6416) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 08:38:52 UTC (rev 6417) @@ -331,7 +331,7 @@ public PortalObject getSelectedObject() { - PortalObject result = null; + PortalObject result; if (selectedId != null) { result = getObjectFromId(selectedId); @@ -519,10 +519,9 @@ } } - public List getPortalNodes() + private List getNodes(int mask) { - PortalObject root = portalObjectContainer.getRootObject(); - Collection test = root.getChildren(PortalObject.PORTAL_MASK); + Collection test = getSelectedObject().getChildren(mask); // TODO: don't recreate the objects each time ! // TODO: Use a datamodel ArrayList result = new ArrayList(); @@ -535,34 +534,19 @@ return result; } + public List getPortalNodes() + { + return getNodes(PortalObject.PORTAL_MASK); + } + public List getPageNodes() { - Collection test = getSelectedObject().getChildren(PortalObject.PAGE_MASK); - // TODO: don't recreate the objects each time ! - // TODO: Use a datamodel - ArrayList result = new ArrayList(); - Iterator it = test.iterator(); - while (it.hasNext()) - { - PortalObject po = (PortalObject)it.next(); - result.add(new PortalObjectBean(po)); - } - return result; + return getNodes(PortalObject.PAGE_MASK); } public List getWindowNodes() { - Collection test = getSelectedObject().getChildren(PortalObject.WINDOW_MASK); - // TODO: don't recreate the objects each time ! - // TODO: Use a datamodel - ArrayList result = new ArrayList(); - Iterator it = test.iterator(); - while (it.hasNext()) - { - PortalObject po = (PortalObject)it.next(); - result.add(new PortalObjectBean(po)); - } - return result; + return getNodes(PortalObject.WINDOW_MASK); } public SelectItem[] getInstanceItems() Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 08:01:44 UTC (rev 6416) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 08:38:52 UTC (rev 6417) @@ -1,51 +1,23 @@ <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> + <h:form> <h:commandLink action="#{portalobjectmgr.goBack}"> - <h:outputText value="Go back"/> + <h:outputText value="Go back"/> </h:commandLink> - </h:form> - - <h:form> - <h:dataTable value="#{portalobjectmgr.pageNodes}" var="page" style="border-spacing: 20px 7px"> - <h:column> - <f:facet name="header"><h:outputText value="Portal Page"/></f:facet> - <h:commandLink action="pages" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{page.name}"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> - </h:column> - <h:column> - <f:facet name="header"><h:outputText value="Actions"/></f:facet> - <h:commandLink action="windows" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Edit"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> | - <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> | - <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> | - <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> - </h:column> - </h:dataTable> - </h:form> + </h:form> + <ui:include src="nodeNavigation.xhtml"/> + <h:form id="portal_form"> <h:inputText id="name" value="#{addPageAction.pageName}" validator="#{addPageAction.validatePageName}" required="true"/> - <h:commandButton action="#{addPageAction.execute}" value="Add portal page" class="portlet-form-button"/> + <h:commandButton action="#{addPageAction.execute}" value="Add portal page" styleClass="portlet-form-button"/> <h:message for="name" style="color: red"/> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-27 08:01:44 UTC (rev 6416) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-27 08:38:52 UTC (rev 6417) @@ -1,45 +1,16 @@ <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> - - <h:dataTable value="#{portalobjectmgr.portalNodes}" var="portal" style="border-spacing: 20px 7px"> - <h:column> - <f:facet name="header"><h:outputText value="Portal Name"/></f:facet> - <h:commandLink action="pages" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{portal.name}"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> - </h:column> - <h:column> - <f:facet name="header"><h:outputText value="Actions"/></f:facet> - <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Edit"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> | - <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> | - <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> | - <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> - </h:column> - </h:dataTable> - </h:form> + <ui:include src="nodeNavigation.xhtml"/> <h:form id="portal_form"> <h:inputText id="name" value="#{portalAction.portalName}" validator="#{portalAction.validatePortalName}" required="true"/> - <h:commandButton action="#{portalAction.addPortal}" value="Add portal" class="portlet-form-button"/> + <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/> <h:message for="name" style="color: red"/> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/tabTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/tabTemplate.xhtml 2007-02-27 08:01:44 UTC (rev 6416) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/tabTemplate.xhtml 2007-02-27 08:38:52 UTC (rev 6417) @@ -1,4 +1,3 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <div xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-27 08:01:44 UTC (rev 6416) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-27 08:38:52 UTC (rev 6417) @@ -1,36 +1,9 @@ <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:include src="nodeNavigation.xhtml"/> - <h:form> - <h:dataTable value="#{portalobjectmgr.windowNodes}" var="window" style="border-spacing: 20px 7px"> - <h:column> - <f:facet name="header"><h:outputText value="Window"/></f:facet> - <h:outputText value="#{window.name}"/> - </h:column> - <h:column> - <f:facet name="header"><h:outputText value="Actions"/></f:facet> - <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Edit"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> | - <h:commandLink action="editWindowSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> | - <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> | - <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> - </h:column> - </h:dataTable> - </h:form> - - </div>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6416 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-27 03:01:44 -0500 (Tue, 27 Feb 2007) New Revision: 6416 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml Log: Simplify actions links available per portal objects Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-26 23:54:28 UTC (rev 6415) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 08:01:44 UTC (rev 6416) @@ -22,29 +22,21 @@ <h:column> <f:facet name="header"><h:outputText value="Actions"/></f:facet> <h:commandLink action="windows" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/window.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit windows"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> - <br/> - <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit page security access"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> - </h:column> - <h:column> + <h:outputText value="Edit"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> | + <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/theme.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit page theme"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> - <br/> - <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> - <h:graphicImage value="/images/management/delete.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Destroy page"/> - <f:param name="id" value="#{page.id}"/> - </h:commandLink> + <h:outputText value="Theme"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> | + <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{page.id}"/> + </h:commandLink> </h:column> </h:dataTable> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-26 23:54:28 UTC (rev 6415) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-27 08:01:44 UTC (rev 6416) @@ -9,36 +9,28 @@ <h:column> <f:facet name="header"><h:outputText value="Portal Name"/></f:facet> <h:commandLink action="pages" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{portal.name}"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> + <h:outputText value="#{portal.name}"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> </h:column> <h:column> <f:facet name="header"><h:outputText value="Actions"/></f:facet> <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/manage.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit portal parameters"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> - <br/> + <h:outputText value="Edit"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> | <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit portal security access"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> - </h:column> - <h:column> + <h:outputText value="Security"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/theme.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit portal theme"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> - <br/> - <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> - <h:graphicImage value="/images/management/delete.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Destroy portal"/> - <f:param name="id" value="#{portal.id}"/> - </h:commandLink> + <h:outputText value="Theme"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> | + <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{portal.id}"/> + </h:commandLink> </h:column> </h:dataTable> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-26 23:54:28 UTC (rev 6415) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-27 08:01:44 UTC (rev 6416) @@ -13,29 +13,21 @@ <h:column> <f:facet name="header"><h:outputText value="Actions"/></f:facet> <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/manage.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit window parameters"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> - <br/> + <h:outputText value="Edit"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> | <h:commandLink action="editWindowSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit window security access"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> - </h:column> - <h:column> + <h:outputText value="Security"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:graphicImage value="/images/management/theme.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Edit window theme"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> - <br/> - <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> - <h:graphicImage value="/images/management/delete.png" style="vertical-align:middle;border-width:0"/> - <h:outputText value="Destroy window"/> - <f:param name="id" value="#{window.id}"/> - </h:commandLink> + <h:outputText value="Theme"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> | + <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{window.id}"/> + </h:commandLink> </h:column> </h:dataTable> </h:form>

17 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits February 2007