From portal-commits at lists.jboss.org Thu Feb  7 22:24:10 2008
Content-Type: multipart/mixed; boundary="===============4146270397563958010=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9854 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: css and 1
 other directories.
Date: Thu, 07 Feb 2008 22:24:10 -0500
Message-ID: <E1JNJqU-0002a6-05@committer01.frg.pub.inap.atl.jboss.com>

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

Author: wesleyhales
Date: 2008-02-07 22:24:09 -0500 (Thu, 07 Feb 2008)
New Revision: 9854

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/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
Log:
layout changes

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 02:40:24 UTC (rev 9853)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 03:24:09 UTC (rev 9854)
@@ -1,6 +1,6 @@
 <%@ tag body-content=3D"scriptless" %>
-<%@ attribute name=3D"name" required=3D"true" %>
-<%@ attribute name=3D"applicationName" required=3D"true" %>
+<%@ attribute name=3D"name" rtexprvalue=3D"true" required=3D"true" %>
+<%@ attribute name=3D"applicationName" rtexprvalue=3D"true" required=3D"tr=
ue" %>
 <%@ attribute name=3D"content" fragment=3D"true" required=3D"false" %> =

 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 =

@@ -11,12 +11,20 @@
    <div class=3D"portlet-frame">
    <div class=3D"header full-width">
       <div class=3D"header-layer full-width">
-         <div class=3D"title half-width float-left"><portal:portlettitle/>=
</div>
-         <div class=3D"controls half-width float-right">
+         <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>
+            </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>
+            </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>
+            </span>
+            <span class=3D"mode-button">
             <a title=3D"Edit" href=3D"<portal:portleturl mode=3D'edit'/>">=
Edit</a>
+            </span>
          </div>
       </div>
    </div>
@@ -26,4 +34,4 @@
 =

 </div>
 </div>
-</portal:portlet>
\ No newline at end of file
+</portal:portlet>

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=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/css/mas=
ter.css	2008-02-08 02:40:24 UTC (rev 9853)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-08 03:24:09 UTC (rev 9854)
@@ -201,6 +201,7 @@
    background-color: #e2e2e2;
    padding: 2px;
    float:left;
+   margin:10px;
 }
 =

 div#container div#content div.portlet-frame{
@@ -223,7 +224,7 @@
    height:20px;
 }
 =

-div#container div#content div.portlet div.header div.header-layer div.titl=
e{
+div#container div#content div.portlet div.header div.header-layer div.titl=
e h2{
    font: bold 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
    color: #fff;
    padding: 2px;
@@ -231,5 +232,10 @@
 =

 div#container div#content div.portlet div.header div.header-layer div.cont=
rols{
    text-align: right;
-   padding: 3px 3px 0 0;
+   padding: 3px 0 0 0;
+}
+
+div#container div#content div.portlet div.header div.header-layer div.cont=
rols span.mode-button{
+   text-align: right;
+   padding: 0 5px 0 0;
 }
\ No newline at end of file

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 02:40:24 UTC (rev 9853)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 03:24:09 UTC (rev 9854)
@@ -38,13 +38,14 @@
    </div>
    <div id=3D"content">
     <portal:page>
-       <jbp:portlet name=3D"GoogleMap" applicationName=3D"google-map-portl=
et" >
-<%--
-           <a href=3D"<portal:portleturl><portal:param name=3D'zipcode' va=
lue=3D'20855'/></portal:portleturl>">Derwood</a>
---%>
-       </jbp:portlet>
-       <jbp:portlet name=3D"GoogleWeather" applicationName=3D"google-weath=
er-portlet" />
-       <jbp:portlet name=3D"RemoteControl" applicationName=3D"remotecontro=
l-portlet" />
+       <div class=3D"left-col third-width float-left">
+          <jbp:portlet name=3D"RemoteControl" applicationName=3D"remotecon=
trol-portlet" />
+       </div>
+       <div class=3D"right-col two-third-width float-left">
+          <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>
    </div>
    <br class=3D"clear"/>


--===============4146270397563958010==--