[portal-commits] JBoss Portal SVN: r9861 - in modules/portlet/trunk/test/src/test/resources/simple-portal-war: images and 2 other directories.

Author: wesleyhales Date: 2008-02-08 00:23:36 -0500 (Fri, 08 Feb 2008) New Revision: 9861 Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/layout1.tag modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/active-button2-bg.gif modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp Log: attempt at layout config Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/layout1.tag =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/layout1.tag (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/layout1.tag 2008-02-08 05:23:36 UTC (rev 9861) @@ -0,0 +1,18 @@ +<%@ 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="third-width float-left"> + <jsp:invoke fragment="leftcol"/> + </div> + <div class="two-third-width float-left"> + <jsp:invoke fragment="rightcol"/> + </div> + + + + + Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-02-08 05:01:55 UTC (rev 9860) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-02-08 05:23:36 UTC (rev 9861) @@ -14,13 +14,13 @@ <div class="title two-third-width float-left"><h2><portal:portlettitle/></h2></div> <div class="controls third-width float-right"> <span class="mode-button"> - <a href="<portal:portleturl windowState='maximized'/>"><img src="/simple/images/icon-maximize.gif" alt=""/></a> + <a href="<portal:portleturl windowState='maximized'/>"><img src="${pageContext.request.contextPath}/images/icon-maximize.gif" alt=""/></a> </span> <span class="mode-button"> - <a href="<portal:portleturl windowState='normal'/>"><img src="images/icon-normal.gif" alt=""/></a> + <a href="<portal:portleturl windowState='normal'/>"><img src="${pageContext.request.contextPath}/images/icon-normal.gif" alt=""/></a> </span> <span class="mode-button"> - <a href="<portal:portleturl windowState='minimized'/>"><img src="images/icon-minimize.gif" alt=""/></a> + <a href="<portal:portleturl windowState='minimized'/>"><img src="${pageContext.request.contextPath}/images/icon-minimize.gif" alt=""/></a> </span> <span class="mode-button"> <a title="Edit" href="<portal:portleturl mode='edit'/>">Edit</a> Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/active-button2-bg.gif =================================================================== (Binary files differ) Property changes on: modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/active-button2-bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-08 05:01:55 UTC (rev 9860) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-08 05:23:36 UTC (rev 9861) @@ -22,31 +22,20 @@ </div> <br class="clear"/> </div> - <div class="nav full-width"> - <ul> - <li> - <a href="" class="selected">option1</a> - </li> - <li> - <a href="">option2</a> - </li> - <li> - <a href="">option3</a> - </li> - </ul> - <br class="clear"/> - </div> + <%@ include file="nav/main.jsp" %> + <div id="content"> - <portal:page> - <div class="third-width float-left"> + <portal:page> + <jbp:layout1> + <jsp:attribute name="leftcol"> <jbp:portlet name="RemoteControl" applicationName="remotecontrol-portlet" /> - </div> - <div class="two-third-width float-left"> + </jsp:attribute> + <jsp:attribute name="rightcol"> <jbp:portlet name="GoogleMap" applicationName="google-map-portlet" /> <jbp:portlet name="GoogleWeather" applicationName="google-weather-portlet" /> - </div> - - </portal:page> + </jsp:attribute> + </jbp:layout1> + </portal:page> </div> <br class="clear"/> </div> Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp 2008-02-08 05:23:36 UTC (rev 9861) @@ -0,0 +1,24 @@ +<%@ page contentType="text/html" %> +<%@ page language="java" %> +<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %> +<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> +<%@ page isELIgnored="false" %> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + + <div class="nav full-width"> + <ul> + <li> + <a href="${pageContext.request.contextPath}/layouts/default.jsp?page=home" class="selected">Home</a> + </li> + <li> + <a href="${pageContext.request.contextPath}/layouts/default.jsp?page=wikipedia}">Wikipedia</a> + </li> + <li> + <a href="">option3</a> + </li> + </ul> + <br class="clear"/> + </div>