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>