Author: wesleyhales Date: 2008-06-04 21:57:14 -0400 (Wed, 04 Jun 2008) New Revision: 10926 Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1and3columns.tag modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1column.tag modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/jsr-301.jsp Modified: modules/portlet/trunk/portal/pom.xml modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp Log: Layout enhancements and ui for JSR-301 demo Modified: modules/portlet/trunk/portal/pom.xml =================================================================== --- modules/portlet/trunk/portal/pom.xml 2008-06-04 20:10:25 UTC (rev 10925) +++ modules/portlet/trunk/portal/pom.xml 2008-06-05 01:57:14 UTC (rev 10926) @@ -25,6 +25,12 @@ </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <version>2.0.0.Beta12</version> + </dependency> + + <dependency> <groupId>org.jboss.portal.portlet</groupId> <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1and3columns.tag =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1and3columns.tag (rev 0) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1and3columns.tag 2008-06-05 01:57:14 UTC (rev 10926) @@ -0,0 +1,17 @@ +<%@ tag body-content="scriptless" %> +<%@ attribute name="leftcol" fragment="true" required="false" %> +<%@ attribute name="rightcol" fragment="true" required="false" %> + +<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> + + <div class="quarter-width float-left"> + <jsp:invoke fragment="leftcol"/> + </div> + <div class="three-quarter-width float-left"> + <jsp:invoke fragment="rightcol"/> + </div> + + + + + Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1column.tag =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1column.tag (rev 0) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1column.tag 2008-06-05 01:57:14 UTC (rev 10926) @@ -0,0 +1,13 @@ +<%@ tag body-content="scriptless" %> +<%@ attribute name="leftcol" fragment="true" required="false" %> +<%@ attribute name="rightcol" fragment="true" required="false" %> + +<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> + + <div class="full-width float-left"> + <jsp:invoke fragment="leftcol"/> + </div> + + + + Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-06-04 20:10:25 UTC (rev 10925) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-06-05 01:57:14 UTC (rev 10926) @@ -2,12 +2,13 @@ <%@ attribute name="name" rtexprvalue="true" required="true" %> <%@ attribute name="applicationName" rtexprvalue="true" required="true" %> <%@ attribute name="id" rtexprvalue="true" required="false" %> +<%@ attribute name="style" rtexprvalue="true" required="false" %> <%@ attribute name="content" fragment="true" required="false" %> <%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <portal:portlet name="${name}" applicationName="${applicationName}" errorPage="/WEB-INF/jsp/error.jsp"> - <div class="portlet" id="${!empty id ? id : name}"> + <div class="portlet" id="${!empty id ? id : name}" style="${style}"> <div class="portlet-frame"> <div class="header full-width"> <div class="header-layer full-width"> Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/jsr-301.jsp =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/jsr-301.jsp (rev 0) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/jsr-301.jsp 2008-06-05 01:57:14 UTC (rev 10926) @@ -0,0 +1,18 @@ +<%@ page contentType="text/html" %> +<%@ page language="java" %> +<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %> +<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> +<%@ page isELIgnored="false" %> + +<%@ include file="/layouts/header.jsp" %> +<link rel="stylesheet" href="${pageContext.request.contextPath}/css/debugger.css" type="text/css"/> +<script type="text/javascript" src="${pageContext.request.contextPath}/js/debugger.js"></script> +<portal:page> + + <xportal:1column> + <jsp:attribute name="leftcol"> + <xportal:portlet name="riPortlet" applicationName="JSFRIPortlet" style="width:800px"/> + </jsp:attribute> + </xportal:1column> +</portal:page> +<%@ include file="/layouts/footer.jsp" %> \ No newline at end of file Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-06-04 20:10:25 UTC (rev 10925) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-06-05 01:57:14 UTC (rev 10926) @@ -32,6 +32,9 @@ <li> <a href="${pageContext.request.contextPath}/demo/demo4.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo4.jsp' ? 'selected' : ''}">Demo4</a> </li> + <li> + <a href="${pageContext.request.contextPath}/demo/jsr-301.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'jsr-301.jsp' ? 'selected' : ''}">JSR-301 Demo</a> + </li> </ul> <br class="clear"/> </div>