[portal-commits] JBoss Portal SVN: r9854 - in modules/portlet/trunk/test/src/test/resources/simple-portal-war: css and 1 other directories.

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/master.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/WEB-INF/tags/portal/portlet.tag =================================================================== --- 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="scriptless" %> -<%@ attribute name="name" required="true" %> -<%@ attribute name="applicationName" required="true" %> +<%@ attribute name="name" rtexprvalue="true" required="true" %> +<%@ attribute name="applicationName" rtexprvalue="true" required="true" %> <%@ attribute name="content" fragment="true" required="false" %> <%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> @@ -11,12 +11,20 @@ <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"> + <div class="title two-third-width float-left"><h2><portal:portlettitle/></h2></div> + <div class="controls third-width float-right"> + <span class="mode-button"> <a href="<portal:portleturl windowState='maximized'/>"><img src="/simple/images/icon-maximize.gif" alt=""/></a> + </span> + <span class="mode-button"> <a href="<portal:portleturl windowState='normal'/>"><img src="images/icon-normal.gif" alt=""/></a> + </span> + <span class="mode-button"> <a href="<portal:portleturl windowState='minimized'/>"><img src="images/icon-minimize.gif" alt=""/></a> + </span> + <span class="mode-button"> <a title="Edit" href="<portal:portleturl mode='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/css/master.css =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-08 02:40:24 UTC (rev 9853) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.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.title{ +div#container div#content div.portlet div.header div.header-layer div.title 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.controls{ 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.controls 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/layouts/default.jsp =================================================================== --- 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="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" /> + <div class="left-col third-width float-left"> + <jbp:portlet name="RemoteControl" applicationName="remotecontrol-portlet" /> + </div> + <div class="right-col two-third-width float-left"> + <jbp:portlet name="GoogleMap" applicationName="google-map-portlet" /> + <jbp:portlet name="GoogleWeather" applicationName="google-weather-portlet" /> + </div> + </portal:page> </div> <br class="clear"/>