6:11 p.m.
Author: chris.laprun(a)jboss.com
Date: 2008-02-08 19:11:22 -0500 (Fri, 08 Feb 2008)
New Revision: 9879
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/nav/main.jsp
Log:
- Minor fixes.
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
23:45:46 UTC (rev 9878)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-09
00:11:22 UTC (rev 9879)
@@ -5,41 +5,37 @@
<%@ 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="/simple/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="../images/pc20.gif" alt=""/>
- </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" %>
-
+
<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>
+ <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"/>
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-08
23:45:46 UTC (rev 9878)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp 2008-02-09
00:11:22 UTC (rev 9879)
@@ -5,20 +5,20 @@
<%@ 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?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>