From portal-commits at lists.jboss.org Fri Feb  8 00:23:36 2008
Content-Type: multipart/mixed; boundary="===============1766564989355938495=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9861 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: images and 2
 other directories.
Date: Fri, 08 Feb 2008 00:23:36 -0500
Message-ID: <E1JNLi4-00023h-Fa@committer01.frg.pub.inap.atl.jboss.com>

--===============1766564989355938495==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-08 00:23:36 -0500 (Fri, 08 Feb 2008)
New Revision: 9861

Added:
   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/images/a=
ctive-button2-bg.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
nav/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
nav/main.jsp
Modified:
   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/layouts/=
default.jsp
Log:
attempt at layout config

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-=
INF/tags/portal/layout1.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/layout1.tag	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/layout1.tag	2008-02-08 05:23:36 UTC (rev 9861)
@@ -0,0 +1,18 @@
+<%@ tag body-content=3D"scriptless" %>
+<%@ attribute name=3D"leftcol" fragment=3D"true" required=3D"false" %>
+<%@ attribute name=3D"rightcol" fragment=3D"true" required=3D"false" %>
+
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+
+
+    <div class=3D"third-width float-left">
+       <jsp:invoke fragment=3D"leftcol"/>
+    </div>
+    <div class=3D"two-third-width float-left">
+       <jsp:invoke fragment=3D"rightcol"/>
+    </div>
+
+
+
+
+

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/tags/portal/portlet.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 05:01:55 UTC (rev 9860)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 05:23:36 UTC (rev 9861)
@@ -14,13 +14,13 @@
          <div class=3D"title two-third-width float-left"><h2><portal:portl=
ettitle/></h2></div>
          <div class=3D"controls third-width float-right">
             <span class=3D"mode-button">
-            <a href=3D"<portal:portleturl windowState=3D'maximized'/>"><im=
g src=3D"/simple/images/icon-maximize.gif" alt=3D""/></a>
+            <a href=3D"<portal:portleturl windowState=3D'maximized'/>"><im=
g src=3D"${pageContext.request.contextPath}/images/icon-maximize.gif" alt=
=3D""/></a>
             </span>
             <span class=3D"mode-button">
-            <a href=3D"<portal:portleturl windowState=3D'normal'/>"><img s=
rc=3D"images/icon-normal.gif" alt=3D""/></a>
+            <a href=3D"<portal:portleturl windowState=3D'normal'/>"><img s=
rc=3D"${pageContext.request.contextPath}/images/icon-normal.gif" alt=3D""/>=
</a>
             </span>
             <span class=3D"mode-button">
-            <a href=3D"<portal:portleturl windowState=3D'minimized'/>"><im=
g src=3D"images/icon-minimize.gif" alt=3D""/></a>
+            <a href=3D"<portal:portleturl windowState=3D'minimized'/>"><im=
g src=3D"${pageContext.request.contextPath}/images/icon-minimize.gif" alt=
=3D""/></a>
             </span>
             <span class=3D"mode-button">
             <a title=3D"Edit" href=3D"<portal:portleturl mode=3D'edit'/>">=
Edit</a>

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/active-button2-bg.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/active-button2-bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 05:01:55 UTC (rev 9860)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 05:23:36 UTC (rev 9861)
@@ -22,31 +22,20 @@
       </div>
       <br class=3D"clear"/>
    </div>
-   <div class=3D"nav full-width">
-      <ul>
-         <li>
-            <a href=3D"" class=3D"selected">option1</a>
-         </li>
-         <li>
-            <a href=3D"">option2</a>
-         </li>
-         <li>
-            <a href=3D"">option3</a>
-         </li>
-      </ul>
-      <br class=3D"clear"/>
-   </div>
+   <%@ include file=3D"nav/main.jsp" %>
+  =

    <div id=3D"content">
-    <portal:page>
-       <div class=3D"third-width float-left">
+      <portal:page>
+      <jbp:layout1>
+       <jsp:attribute name=3D"leftcol">
           <jbp:portlet name=3D"RemoteControl" applicationName=3D"remotecon=
trol-portlet" />
-       </div>
-       <div class=3D"two-third-width float-left">
+       </jsp:attribute>
+       <jsp:attribute name=3D"rightcol">
           <jbp:portlet name=3D"GoogleMap" applicationName=3D"google-map-po=
rtlet" />
           <jbp:portlet name=3D"GoogleWeather" applicationName=3D"google-we=
ather-portlet" />
-       </div>
-
-    </portal:page>
+       </jsp:attribute>
+      </jbp:layout1>
+      </portal:page>
    </div>
    <br class=3D"clear"/>
 </div>

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layo=
uts/nav/main.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-08 05:23:36 UTC (rev 9861)
@@ -0,0 +1,24 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!DOCTYPE html
+   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+   <div class=3D"nav full-width">
+      <ul>
+         <li>
+            <a href=3D"${pageContext.request.contextPath}/layouts/default.=
jsp?page=3Dhome" class=3D"selected">Home</a>
+         </li>
+         <li>
+            <a href=3D"${pageContext.request.contextPath}/layouts/default.=
jsp?page=3Dwikipedia}">Wikipedia</a>
+         </li>
+         <li>
+            <a href=3D"">option3</a>
+         </li>
+      </ul>
+      <br class=3D"clear"/>
+   </div>


--===============1766564989355938495==--