taylor 2004/05/10 13:16:55
Modified: portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/css
styles.css
portal/src/webapp/WEB-INF/decorations/portlet/html/metal
decorator.vm
portal/src/webapp/WEB-INF/decorations/portlet/html/minty-blue
decorator.vm
portal/src/webapp/WEB-INF/decorations/portlet/html/jetspeed
decorator.vm
Log:
fixed html bug with min/max/restore icons stacking on top of each other
PR:
Obtained from:
Submitted by:
Reviewed by:
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.7 +2 -2 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/css/styles.css
Index: styles.css
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/css/styles.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- styles.css 7 May 2004 02:46:04 -0000 1.6
+++ styles.css 10 May 2004 20:16:55 -0000 1.7
@@ -21,7 +21,7 @@
otherwise it won't show !
**/
width:10px;
-
+
/** Always use relative path ! **/
background: url(content/jetspeed/images/titleleft.gif);
}
@@ -32,7 +32,7 @@
Specify the height of the image used
else it will use the text height
**/
- height:21px;
+ height:10px;
color:#FFFFFF;
font-weight:bold;
background: url(content/jetspeed/images/title.gif);
1.5 +6 -0 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/metal/decorator.vm
Index: decorator.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/metal/decorator.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- decorator.vm 8 May 2004 01:20:31 -0000 1.4
+++ decorator.vm 10 May 2004 20:16:55 -0000 1.5
@@ -38,9 +38,15 @@
${myPE.portletDefinition.name}
</td>
<td align="right" valign="middle" class="PTitle" >
+ <table border="0" cellpadding="0" cellspacing="0" >
+ <tr>
#foreach ($action in $actions)
+ <td align="right" valign="middle" class="PTitle" >
<a href="${action.Action}" title="${action.Name}" ><img src="${action.Link}"
alt="${action.Alt}" border="0"></a>
+ <td/>
#end
+ </tr>
+ </table>
</td>
<td class="PTitleRight" style="font-size:1pt;" nowrap="true"> </td>
1.5 +12 -8 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/minty-blue/decorator.vm
Index: decorator.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/minty-blue/decorator.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- decorator.vm 8 May 2004 01:20:31 -0000 1.4
+++ decorator.vm 10 May 2004 20:16:55 -0000 1.5
@@ -22,7 +22,6 @@
#set($actions = $jetspeed.DecoratorActions)
-
<!-- Begin portlet/html/jetspeed/decorator.vm -->
<div class="MintyBlue" >
@@ -36,19 +35,24 @@
<td class="PTitleLeft" style="font-size:1pt;" nowrap="true"> </td>
<td align="left" valign="middle" class="PTitle" >
- ${myPE.portletDefinition.name}
+ ${myPE.portletDefinition.name}
</td>
<td align="right" valign="middle" class="PTitle" >
+ <table border="0" cellpadding="0" cellspacing="0" >
+ <tr>
#foreach ($action in $actions)
+ <td align="right" valign="middle" class="PTitle" >
<a href="${action.Action}" title="${action.Name}" ><img src="${action.Link}"
alt="${action.Alt}" border="0"></a>
+ <td/>
#end
+ </tr>
+ </table>
</td>
-
<td class="PTitleRight" style="font-size:1pt;" nowrap="true"> </td>
</tr>
-### testing, this weill be removed
+### testing, this will be removed
<tr>
<td class="PContentLeft" style="font-size:1pt;" nowrap="true"> </td>
@@ -64,16 +68,16 @@
##
## Portlet Content
##
-#if (!$jetspeed.isHidden($myF))
+#if (!$jetspeed.isHidden($myF) || $jetspeed.WindowState != "minimized")
<tr>
<td nowrap="nowrap"><div class="PContentLeft" > </div></td>
<td class="PContent" >
$jetspeed.include($myF)
</td>
-
+
<td align="right" valign="middle" class="PContent" />
-
+
<td class="PContentRight" ><div class="PContentRight" > </div></td>
</tr>
@@ -86,7 +90,7 @@
<tr>
<td class="PBottomLeft" style="font-size:1pt;" nowrap="true"> </td>
<td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
- <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
+ <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
<td class="PBottomRight" style="font-size:1pt;" nowrap="true"> </td>
</tr>
</table>
1.6 +6 -0 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/jetspeed/decorator.vm
Index: decorator.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/jetspeed/decorator.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- decorator.vm 7 May 2004 02:39:52 -0000 1.5
+++ decorator.vm 10 May 2004 20:16:55 -0000 1.6
@@ -38,9 +38,15 @@
${myPE.portletDefinition.name}
</td>
<td align="right" valign="middle" class="PTitle" >
+ <table border="0" cellpadding="0" cellspacing="0" >
+ <tr>
#foreach ($action in $actions)
+ <td align="right" valign="middle" class="PTitle" >
<a href="${action.Action}" title="${action.Name}" ><img src="${action.Link}"
alt="${action.Alt}" border="0"></a>
+ <td/>
#end
+ </tr>
+ </table>
</td>
<td class="PTitleRight" style="font-size:1pt;" nowrap="true"> </td>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org
|