Author: wesleyhales
Date: 2008-02-07 18:42:33 -0500 (Thu, 07 Feb 2008)
New Revision: 9844
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/
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/css/
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/active-button-bg.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/icon-maximize.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/icon-minimize.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/icon-normal.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/inactive-button-bg.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/logo-header.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/nav-bg.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/pc20.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/portal-bg.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/portlet-title-rt-bg.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/portlet-titlebg.gif
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
Initial layout
Added:
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
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-02-07
23:42:33 UTC (rev 9844)
@@ -0,0 +1,29 @@
+<%@ tag body-content="scriptless" %>
+<%@ attribute name="name" required="true" %>
+<%@ attribute name="applicationName" required="true" %>
+<%@ attribute name="content" fragment="true"
required="false" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+
+<portal:portlet
+ name="GoogleMap"
+ applicationName="google-map-portlet">
+<div class="portlet">
+ <div class="portlet-frame">
+ <div class="header full-width">
+ <div class="header-layer full-width">
+ <div class="title half-width
float-left"><portal:portlettitle/></div>
+ <div class="controls half-width float-right">
+ <a href="<portal:portleturl
windowState='maximized'/>"><img
src="/simple/images/icon-maximize.gif" alt=""/></a>
+ <a href="<portal:portleturl
windowState='normal'/>"><img src="images/icon-normal.gif"
alt=""/></a>
+ <a href="<portal:portleturl
windowState='minimized'/>"><img
src="images/icon-minimize.gif" alt=""/></a>
+ <a title="Edit" href="<portal:portleturl
mode='edit'/>">Edit</a>
+ </div>
+ </div>
+ </div>
+ <portal:portletmarkup/>
+
+ <jsp:doBody/>
+
+</div>
+</div>
+</portal:portlet>
\ No newline at end of file
Added: 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
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-07
23:42:33 UTC (rev 9844)
@@ -0,0 +1,235 @@
+body {
+ font: normal 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
+}
+
+.align-center {
+ text-align: center;
+}
+
+.align-left {
+ text-align: left;
+}
+
+.align-center-margin {
+ margin: 0 auto 0 auto;
+}
+
+.float-left {
+ float: left;
+}
+
+.float-right {
+ float: right;
+}
+
+.align-left {
+ text-align: left;
+}
+
+.align-right {
+ text-align: right;
+}
+
+.half-width {
+ width: 49%;
+}
+
+.quarter-width {
+ width: 24.9%;
+}
+
+.three-quarter-width {
+ width: 74.9%;
+}
+
+.full-width {
+ width: 100%;
+}
+
+.third-width {
+ width: 32.9%;
+}
+
+.two-third-width {
+ width: 65.5%;
+}
+
+.tenpx-top-bottom {
+ margin: 10px 0 10px 0;
+}
+
+.relative {
+ position: relative
+}
+
+.absolute {
+ position: absolute
+}
+
+p.white-padded {
+ color: #fff;
+ padding: 5px;
+}
+
+.clear {
+ clear: both;
+}
+
+img {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+
+body,
+div,
+form,
+ul,
+li {
+ margin: 0;
+ padding: 0;
+}
+
+ul {
+
+}
+
+/*--------------------------------Decoration*/
+
+h2 {
+ font-size: 1.9em;
+ color: #fff;
+ margin: 0;
+ padding: 0;
+}
+
+h3 {
+ font-size: 1.0em;
+ color: #fff;
+ margin: 0;
+ padding: 0;
+}
+
+a {
+ color: #e1d77e;
+}
+
+p {
+ margin: 0;
+ padding: 0;
+}
+
+
+/*-------------------------------Container Decoration*/
+
+div#container>div.header {
+ height: 40px;
+ background-color: #000;
+}
+
+div#container div.header div.logo {
+ background-image: url( /simple/images/logo-header.gif );
+ background-repeat: no-repeat;
+ background-position: top left;
+ height:40px;
+}
+
+div#container div.header div.pc20 {
+ text-align: right;
+}
+
+div#container div.header div.pc20 img {
+ margin: 5px 10px 0 0;
+}
+
+div#container div.nav {
+ background-image: url( /simple/images/nav-bg.gif );
+ background-repeat: repeat-x;
+ background-position: top left;
+ border-top: 1px solid #878787;
+ border-bottom: 1px solid #383838;
+ height:23px;
+}
+
+div#container div.nav ul {
+ height:23px;
+ margin: 0 0 0 10px;
+}
+
+div#container div.nav ul li {
+ display: inline;
+ float: left;
+ text-align: center;
+ height: 21px;
+ border: 1px solid #929292;
+}
+
+div#container div.nav ul li a,
+div#container div.nav ul li a:hover {
+ display: block;
+ padding: 4px 12px 4px 12px;
+ background-repeat: repeat-x;
+ background-position: top left;
+ text-decoration:none;
+ font: bold 11px Lucida Sans, Trebuchet, tahoma, sans-serif;
+}
+
+div#container div.nav ul li a{
+ color: #353535;
+ background-image: url( /simple/images/inactive-button-bg.gif );
+}
+
+div#container div.nav ul li a:hover,
+div#container div.nav ul li a.selected{
+ color: #000;
+ background-image: url( /simple/images/active-button-bg.gif );
+}
+
+div#container div#content {
+ background-image: url( /simple/images/portal-bg.gif );
+ background-repeat: repeat-x;
+ background-position: top left;
+ min-height: 600px;
+ padding: 10px;
+}
+
+/*-------------------------------Portlet Decoration*/
+
+div#container div#content div.portlet{
+ /*width: 800px;*/
+ border: 1px solid #969696;
+ background-color: #e2e2e2;
+ padding: 2px;
+ float:left;
+}
+
+div#container div#content div.portlet-frame{
+ background-color: #fff;
+ border: 1px solid #fff;
+ /*height: 500px;*/
+}
+
+div#container div#content div.portlet div.header {
+ background-image: url( /simple/images/portlet-titlebg.gif );
+ background-repeat: repeat-x;
+ background-position: top left;
+ height:20px;
+}
+
+div#container div#content div.portlet div.header div.header-layer {
+ background-image: url( /simple/images/portlet-title-rt-bg.gif );
+ background-repeat: no-repeat;
+ background-position: top right;
+ height:20px;
+}
+
+div#container div#content div.portlet div.header div.header-layer div.title{
+ font: bold 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
+ color: #fff;
+ padding: 2px;
+}
+
+div#container div#content div.portlet div.header div.header-layer div.controls{
+ text-align: right;
+ padding: 3px 3px 0 0;
+}
\ No newline at end of file
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/active-button-bg.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/active-button-bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/icon-maximize.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/icon-maximize.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/icon-minimize.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/icon-minimize.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/icon-normal.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/icon-normal.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/inactive-button-bg.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/inactive-button-bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/logo-header.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/logo-header.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/nav-bg.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/nav-bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/pc20.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/pc20.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/portal-bg.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/portal-bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/portlet-title-rt-bg.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/portlet-title-rt-bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/portlet-titlebg.gif
===================================================================
(Binary files differ)
Property changes on:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/portlet-titlebg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-07
23:42:16 UTC (rev 9843)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp 2008-02-07
23:42:33 UTC (rev 9844)
@@ -3,59 +3,6 @@
<%@ page isELIgnored="false" %>
<html>
<body>
-<portal:page>
- <portal:portlet name="GoogleWeather"
applicationName="google-weather-portlet">
- <div class="portlet">
- <div class="titlebar">
- <div class="title"><portal:portlettitle/></div>
- <ul class="actions">
- <li><a title="Maximize"
href="<portal:portleturl
windowState='maximized'/>">M</a></li>
- <li><a title="Normal" href="<portal:portleturl
windowState='normal'/>">n</a></li>
- <li><a title="Minimize"
href="<portal:portleturl
windowState='minimized'/>">m</a></li>
- <li><a title="Edit" href="<portal:portleturl
mode='edit'/>">Edit</a></li>
- </ul>
- </div>
- <div class="portletcontent">
- <portal:portletmarkup/>
- </div>
- </div>
- </portal:portlet>
-
-
- <portal:portlet name="GoogleMap"
applicationName="google-map-portlet">
- <div class="portlet">
- <div class="titlebar">
- <div class="title"><portal:portlettitle/></div>
- <ul class="actions">
- <li><a title="Maximize"
href="<portal:portleturl
windowState='maximized'/>">M</a></li>
- <li><a title="Normal" href="<portal:portleturl
windowState='normal'/>">n</a></li>
- <li><a title="Minimize"
href="<portal:portleturl
windowState='minimized'/>">m</a></li>
- <li><a title="Edit" href="<portal:portleturl
mode='edit'/>">Edit</a></li>
- </ul>
- </div>
- <div class="portletcontent">
- <portal:portletmarkup/>
- </div>
- </div>
- </portal:portlet>
-
- <br/>
- <portal:portlet name="RemoteControl"
applicationName="remotecontrol-portlet">
- <div class="portlet">
- <div class="titlebar">
- <div class="title"><portal:portlettitle/></div>
- <ul class="actions">
- <li><a title="Maximize"
href="<portal:portleturl
windowState='maximized'/>">M</a></li>
- <li><a title="Normal" href="<portal:portleturl
windowState='normal'/>">n</a></li>
- <li><a title="Minimize"
href="<portal:portleturl
windowState='minimized'/>">m</a></li>
- <li><a title="Edit" href="<portal:portleturl
mode='edit'/>">Edit</a></li>
- </ul>
- </div>
- <div class="portletcontent">
- <portal:portletmarkup/>
- </div>
- </div>
- </portal:portlet>
-</portal:page>
+<jsp:forward page="layouts/default.jsp" />
</body>
</html>
Added:
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
(rev 0)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-07
23:42:33 UTC (rev 9844)
@@ -0,0 +1,52 @@
+<%@ 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="/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>
+ <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>
+ <div id="content">
+ <portal:page>
+ <jbp:portlet name="GoogleMap"
applicationName="google-map-portlet" >
+ <a href="<portal:portleturl><portal:param
name='zipcode'
value='20855'/></portal:portleturl>">Derwood</a>
+ </jbp:portlet>
+ <jbp:portlet name="GoogleWeather"
applicationName="google-weather-portlet" />
+ <jbp:portlet name="RemoteControl"
applicationName="remotecontrol-portlet" />
+ </portal:page>
+ </div>
+ <br class="clear"/>
+</div>
+
+</body>
+</html>
\ No newline at end of file