8:20 a.m.
Author: wesleyhales
Date: 2008-02-09 09:20:51 -0500 (Sat, 09 Feb 2008)
New Revision: 9897
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo2.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp
Removed:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
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:
layout changes and new pages
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
===================================================================
---
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-09
14:09:09 UTC (rev 9896)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-09
14:20:51 UTC (rev 9897)
@@ -204,12 +204,12 @@
/*-------------------------------Portlet Decoration*/
div#container div#content div.portlet{
- /*width: 800px;*/
border: 1px solid #969696;
background-color: #e2e2e2;
padding: 2px;
float:left;
margin:10px;
+ width: 95%;
}
div#container div#content div.portlet-frame{
Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp
(from rev 9894,
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo.jsp)
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp 2008-02-09
14:20:51 UTC (rev 9897)
@@ -0,0 +1,21 @@
+<%@ 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" %>
+
+<portal:page>
+ <portal:pageparam namespaceURI="urn:jboss:portal:simple:google"
localName="zipcode" value="80201"/>
+ <jbp:layout1>
+ <jsp:attribute name="leftcol">
+
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+
+ </jsp:attribute>
+ </jbp:layout1>
+</portal:page>
+
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo2.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo2.jsp
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo2.jsp 2008-02-09
14:20:51 UTC (rev 9897)
@@ -0,0 +1,21 @@
+<%@ 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" %>
+
+<portal:page>
+ <portal:pageparam namespaceURI="urn:jboss:portal:simple:google"
localName="zipcode" value="80201"/>
+ <jbp:layout1>
+ <jsp:attribute name="leftcol">
+
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+
+ </jsp:attribute>
+ </jbp:layout1>
+</portal:page>
+
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp 2008-02-09
14:20:51 UTC (rev 9897)
@@ -0,0 +1,21 @@
+<%@ 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" %>
+
+<portal:page>
+ <portal:pageparam namespaceURI="urn:jboss:portal:simple:google"
localName="zipcode" value="80201"/>
+ <jbp:layout1>
+ <jsp:attribute name="leftcol">
+
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+
+ </jsp:attribute>
+ </jbp:layout1>
+</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
14:09:09 UTC (rev 9896)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp 2008-02-09
14:20:51 UTC (rev 9897)
@@ -3,8 +3,6 @@
<%@ page isELIgnored="false" %>
<html>
<body>
-<jsp:forward page="demo/home.jsp">
- <jsp:param name="nav" value="home"/>
-</jsp:forward>
+<jsp:forward page="demo/home.jsp"/>
</body>
</html>
Deleted: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp
===================================================================
---
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp 2008-02-09
14:09:09 UTC (rev 9896)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp 2008-02-09
14:20:51 UTC (rev 9897)
@@ -1,47 +0,0 @@
-<%@ 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">
-<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="${pageContext.request.contextPath}/images/pc20.gif"
alt=""/>
- </div>
- <br class="clear"/>
- </div>
- <%@ include file="nav/main.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>
- </div>
- <br class="clear"/>
-</div>
-
-</body>
-</html>
\ 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
14:09:09 UTC (rev 9896)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp 2008-02-09
14:20:51 UTC (rev 9897)
@@ -18,6 +18,15 @@
<li>
<a href="${pageContext.request.contextPath}/demo/demo.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'demo.jsp' ? 'selected' : ''}">Demo Portlets</a>
</li>
+ <li>
+ <a href="${pageContext.request.contextPath}/demo/demo1.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'demo1.jsp' ? 'selected' : ''}">Demo1</a>
+ </li>
+ <li>
+ <a href="${pageContext.request.contextPath}/demo/demo2.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'demo2.jsp' ? 'selected' : ''}">Demo2</a>
+ </li>
+ <li>
+ <a href="${pageContext.request.contextPath}/demo/demo3.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'demo3.jsp' ? 'selected' : ''}">Demo3</a>
+ </li>
</ul>
<br class="clear"/>
</div>