8:34 p.m.
Author: wesleyhales
Date: 2008-02-08 21:34:45 -0500 (Fri, 08 Feb 2008)
New Revision: 9880
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp
Modified:
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/css/master.css
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp
Log:
home page changes and cleanup, new page layout
Modified:
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 2008-02-09
00:11:22 UTC (rev 9879)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/layout1.tag 2008-02-09
02:34:45 UTC (rev 9880)
@@ -4,15 +4,14 @@
<%@ 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>
- <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/css/master.css
===================================================================
---
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-09
00:11:22 UTC (rev 9879)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-09
02:34:45 UTC (rev 9880)
@@ -103,6 +103,13 @@
padding: 0;
}
+h2.title {
+ font-size: 1.9em;
+ color: #fff;
+ margin: 0;
+ padding: 0;
+}
+
h3 {
font-size: 1.0em;
color: #fff;
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-09
00:11:22 UTC (rev 9879)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-09
02:34:45 UTC (rev 9880)
@@ -5,12 +5,12 @@
<%@ 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">
+ 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="/simple/css/master.css"
type="text/css"/>
+<title>Portlet Container 2.0</title>
+<link rel="stylesheet"
href="${pageContext.request.contextPath}/css/master.css"
type="text/css"/>
</head>
<body>
@@ -24,18 +24,79 @@
<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>
+ <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>
</div>
<br class="clear"/>
Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp
(from rev 9874,
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp)
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp 2008-02-09
02:34:45 UTC (rev 9880)
@@ -0,0 +1,47 @@
+<%@ 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
00:11:22 UTC (rev 9879)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp 2008-02-09
02:34:45 UTC (rev 9880)
@@ -5,20 +5,17 @@
<%@ 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">
+ 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>
+ <div class="nav full-width">
+ <ul>
+ <li>
+ <a href="${pageContext.request.contextPath}/layouts/default.jsp"
class="selected">Home</a>
+ </li>
+ <li>
+ <a
href="${pageContext.request.contextPath}/layouts/demo.jsp">Demo
Portlets</a>
+ </li>
+ </ul>
+ <br class="clear"/>
+ </div>