taylor 2004/05/06 19:39:52
Modified: portal/src/webapp/WEB-INF/decorations/portlet/html/jetspeed
decorator.vm
Log:
start of new feature (JS2-25): decorator actions
added min, max, restore buttons
implemented min, restore behavior
max is not yet implemented
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.5 +13 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- decorator.vm 6 May 2004 20:12:40 -0000 1.4
+++ decorator.vm 7 May 2004 02:39:52 -0000 1.5
@@ -20,6 +20,7 @@
#set($myPE = $jetspeed.currentPortletEntity)
+#set($actions = $jetspeed.DecoratorActions)
<!-- Begin portlet/html/jetspeed/decorator.vm -->
@@ -36,17 +37,24 @@
<td align="left" valign="middle" class="PTitle" >
${myPE.portletDefinition.name}
</td>
+ <td align="right" valign="middle" class="PTitle" >
+ #foreach ($action in $actions)
+ <a href="${action.Action}" title="${action.Name}" ><img src="${action.Link}"
alt="${action.Alt}" border="0"></a>
+ #end
+ </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>
<td align="left" valign="middle" class="PContent" >
state = $jetspeed.windowState mode = $jetspeed.portletMode
</td>
+
+ <td align="right" valign="middle" class="PContent" />
<td class="PContentRight" style="font-size:1pt;" nowrap="true"> </td>
</tr>
@@ -54,13 +62,15 @@
##
## 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>
@@ -74,6 +84,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="PBottomRight" style="font-size:1pt;" nowrap="true"> </td>
</tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
