Author: wesleyhales
Date: 2008-02-08 22:13:21 -0500 (Fri, 08 Feb 2008)
New Revision: 9881
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/footer.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp
Log:
nav changes and cleanup
Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo.jsp
(from rev 9880,
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp)
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo.jsp
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo.jsp 2008-02-09
03:13:21 UTC (rev 9881)
@@ -0,0 +1,25 @@
+<%@ 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" %>
+
+ <%@ include file="/layouts/header.jsp" %>
+
+ <div id="content">
+ <portal:page>
+ <portal:pageparam namespaceURI="urn:jboss:portal:simple:google"
localName="zipcode" value="80201"/>
+ <jbp:layout1>
+ <jsp:attribute name="leftcol">
+ <jbp:portlet name="RemoteControl"
applicationName="remotecontrol-portlet"/>
+ <jbp:portlet name="Foo" applicationName="bar"/>
+ <jbp:portlet name="ErrorPortlet"
applicationName="samples-basic"/>
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+ <jbp:portlet name="GoogleMap"
applicationName="google-map-portlet"/>
+ <jbp:portlet name="GoogleWeather"
applicationName="google-weather-portlet"/>
+ </jsp:attribute>
+ </jbp:layout1>
+ </portal:page>
+
+ <%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp
(from rev 9880,
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp)
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp 2008-02-09
03:13:21 UTC (rev 9881)
@@ -0,0 +1,86 @@
+<%@ 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" %>
+
+ <%@ include file="/layouts/header.jsp" %>
+
+ <div id="content">
+ <portal:page>
+ <div class="home-content full-width">
+ <div class="third-width float-right">
+ <jbp:portlet name="GoogleMap"
applicationName="google-map-portlet" />
+ </div>
+ <h2 class="title">Demo Page Title</h2>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et
+ dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip
+ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu
+ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt
in culpa qui officia deserunt
+ mollit anim id est laborum.
+ <br/>
+ </div>
+
+ </portal:page>
+
+ <%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp 2008-02-09
02:34:45 UTC (rev 9880)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp 2008-02-09
03:13:21 UTC (rev 9881)
@@ -3,6 +3,8 @@
<%@ page isELIgnored="false" %>
<html>
<body>
-<jsp:forward page="layouts/default.jsp" />
+<jsp:forward page="demo/main.jsp" >
+ <jsp:param name="nav" value="home" />
+</jsp:forward>
</body>
</html>
Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/footer.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/footer.jsp
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/footer.jsp 2008-02-09
03:13:21 UTC (rev 9881)
@@ -0,0 +1,6 @@
+</div>
+ <br class="clear"/>
+</div>
+
+</body>
+</html>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp 2008-02-09
03:13:21 UTC (rev 9881)
@@ -0,0 +1,18 @@
+<?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">
+<html
xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
lang="en">
+<head>
+<title>Portlet Container 2.0</title>
+<link rel="stylesheet"
href="${pageContext.request.contextPath}/css/master.css"
type="text/css"/>
+</head>
+<body>
+
+<div id="container" class="full-width">
+ <div class="header full-width">
+ <div class="float-left three-quarter-width logo"></div>
+ <div class="float-right quarter-width pc20"><img
src="/simple/images/pc20.gif" alt="Portlet Container
2.0"/></div>
+ <br class="clear"/>
+ </div>
+ <%@ include file="nav/main.jsp" %>
\ No newline at end of file
Modified:
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 2008-02-09
02:34:45 UTC (rev 9880)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp 2008-02-09
03:13:21 UTC (rev 9881)
@@ -3,6 +3,7 @@
<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
<%@ page isELIgnored="false" %>
+<%@ taglib prefix="fn"
uri="http://java.sun.com/jsp/jstl/functions" %>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -11,10 +12,11 @@
<div class="nav full-width">
<ul>
<li>
- <a href="${pageContext.request.contextPath}/layouts/default.jsp"
class="selected">Home</a>
+
+ <a href="${pageContext.request.contextPath}/demo/home.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'home.jsp' ? 'selected' : ''}">Home</a>
</li>
<li>
- <a
href="${pageContext.request.contextPath}/layouts/demo.jsp">Demo
Portlets</a>
+ <a href="${pageContext.request.contextPath}/demo/demo.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'demo.jsp' ? 'selected' : ''}">Demo Portlets</a>
</li>
</ul>
<br class="clear"/>