taylor 2004/05/07 18:20:31
Modified: portal/src/webapp/WEB-INF/conf/pipelines
jetspeed-pipeline.xml
portal/src/webapp/WEB-INF/decorations/portlet/html/metal
decorator.vm
portal/src/webapp/WEB-INF portlet.xml
portal/src/webapp/WEB-INF/decorations/portlet/html/minty-blue
decorator.vm
Added: portal/src/webapp/WEB-INF/decorations/portlet/html/metal/images
restore.gif minimize.gif maximize.gif
portal/src/webapp/WEB-INF/templates/layout/html/maximized
layout.properties layout.vm
Log:
maximize state initial implementation
this implementation keeps maximized state on a per page basis
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.1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/metal/images/restore.gif
<<Binary file>>
1.1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/metal/images/minimize.gif
<<Binary file>>
1.1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/metal/images/maximize.gif
<<Binary file>>
1.1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/maximized/layout.properties
Index: layout.properties
===================================================================
# Copyright 2004 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
id=maximized
template.type=velocity
template.extension=.vm
1.1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
Index: layout.vm
===================================================================
#*
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*#
#set($table = $jetspeed.columns)
#set($myPage = $jetspeed.page)
#set($myFragment = $jetspeed.currentFragment)
#set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
#if($myFragment.getDecorator())
#set($decorator = $myFragment.getDecorator())
#end
#if ($decorator)
#set($decoTop = "${decorator}/decorator-top.vm")
#set($decoBottom = "${decorator}/decorator-bottom.vm")
#end
<!-- Decorator $decorator ${decoTop} - ${decoBottom}-->
#if ($decoTop)
#parse($jetspeed.getDecoration($decoTop, "layout").appRelativePath)
#end
<table width="100%" cellspacing="0" cellpadding="0">
<tr>
<td valign="top">
## get the decorated Portlet content
$jetspeed.decorateAndInclude($myFragment)
</td>
</tr>
</table>
#if (($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
#parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath)
#end
1.5 +3 -3
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/pipelines/jetspeed-pipeline.xml
Index: jetspeed-pipeline.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/pipelines/jetspeed-pipeline.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jetspeed-pipeline.xml 7 May 2004 13:45:40 -0000 1.4
+++ jetspeed-pipeline.xml 8 May 2004 01:20:31 -0000 1.5
@@ -23,13 +23,13 @@
<className>org.apache.jetspeed.capability.impl.CapabilityValveImpl</className>
</valveDescriptor>
<valveDescriptor>
- <className>org.apache.jetspeed.container.ContainerValve</className>
- </valveDescriptor>
- <valveDescriptor>
<className>org.apache.jetspeed.security.impl.SecurityValveImpl</className>
</valveDescriptor>
<valveDescriptor>
<className>org.apache.jetspeed.profiler.impl.ProfilerValveImpl</className>
+ </valveDescriptor>
+ <valveDescriptor>
+ <className>org.apache.jetspeed.container.ContainerValve</className>
</valveDescriptor>
<valveDescriptor>
<className>org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl</className>
1.4 +9 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- decorator.vm 7 May 2004 02:44:42 -0000 1.3
+++ decorator.vm 8 May 2004 01:20:31 -0000 1.4
@@ -20,6 +20,7 @@
#set($myPE = $jetspeed.currentPortletEntity)
+#set($actions = $jetspeed.DecoratorActions)
<!-- Begin portlet/html/jetspeed/decorator.vm -->
@@ -36,6 +37,11 @@
<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>
@@ -51,6 +57,8 @@
<td class="PContent" >
$jetspeed.include($myF)
</td>
+
+ <td align="right" valign="middle" class="PContent" />
<td class="PContentRight" ><div class="PContentRight" > </div></td>
@@ -64,6 +72,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>
1.8 +1 -122 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/portlet.xml
Index: portlet.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/portlet.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- portlet.xml 3 Apr 2004 01:12:31 -0000 1.7
+++ portlet.xml 8 May 2004 01:20:31 -0000 1.8
@@ -1,122 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<portlet-app id="jetspeed" version="1.0">
-
- <portlet id="TwoColumns">
- <portlet-name>TwoColumns</portlet-name>
- <display-name>Two Columns Layout</display-name>
- <init-param>
- <name>ViewPage</name>
- <value>/WEB-INF/layout/columns.jsp</value>
- </init-param>
- <init-param>
- <name>columns</name>
- <value>2</value>
- </init-param>
- <init-param>
- <name>sizes</name>
- <value>50%,50%</value>
- </init-param>
- <portlet-class>org.apache.jetspeed.layout.MultiColumnPortlet</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>TwoColumns</title>
- <short-title>TwoColumns</short-title>
- </portlet-info>
- </portlet>
-
- <portlet id="VelocityTwoColumns">
- <portlet-name>VelocityTwoColumns</portlet-name>
- <display-name>Two Columns Layout Using Velocity</display-name>
- <init-param>
- <name>ViewPage</name>
- <value>columns</value>
- </init-param>
- <init-param>
- <name>columns</name>
- <value>2</value>
- </init-param>
- <init-param>
- <name>sizes</name>
- <value>50%,50%</value>
- </init-param>
- <portlet-class>org.apache.jetspeed.layout.MultiColumnPortlet</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>VelocityTwoColumns</title>
- <short-title>TwoColumns</short-title>
- </portlet-info>
- </portlet>
-
- <portlet id="PortletApplicationBrowser">
- <init-param>
- <description>This parameter sets the template used in view
mode.</description>
- <name>ViewPage</name>
- <value>/pages/pam/pam-browser.jsp</value>
- </init-param>
- <portlet-name>PortletApplicationBrowser</portlet-name>
- <display-name>Portlet Application Browser</display-name>
- <description>The PAM (Portlet Application Manager) Portlet Application Browser
displays a list of portlet applications deployed to this portal. From here you can
add, edit, and delete portlet applications.</description>
-
<portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationBrowser</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>EDIT</portlet-mode>
- <portlet-mode>VIEW</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
- </supports>
- <portlet-info>
- <title>Portlet Application Browser</title>
- <short-title>Apps</short-title>
- <keywords>applications,apps,PAM</keywords>
- </portlet-info>
- </portlet>
-
- <portlet id="PortletApplicationDetail">
- <init-param>
- <description>This parameter sets the template used in view mode.</description>
- <name>ViewPage</name>
- <value>/pages/pam/pam-detail.jsp</value>
- </init-param>
- <portlet-name>PortletApplicationDetail</portlet-name>
- <display-name>Portlet Application Detail</display-name>
- <description>The PAM (Portlet Application Manager) Portlet Application Detail
displays a specific portlet application deployed to this portal. From here you can
add, edit, and delete this portlet application.</description>
-
<portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationDetail</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>EDIT</portlet-mode>
- <portlet-mode>VIEW</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
- </supports>
- <portlet-info>
- <title>Portlet Application Detail</title>
- <short-title>PAD</short-title>
- <keywords>applications,apps,PAM,PAD</keywords>
- </portlet-info>
- </portlet>
-
-</portlet-app>
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<portlet-app id="jetspeed" version="1.0">
<portlet id="TwoColumns">
<portlet-name>TwoColumns</portlet-name>
<display-name>Two Columns Layout</display-name>
<init-param>
<name>ViewPage</name>
<value>/WEB-INF/layout/columns.jsp</value>
</init-param>
<init-param>
<name>columns</name>
<value>2</value>
</init-param>
<init-param>
<name>sizes</name>
<value>50%,50%</value>
</init-param>
<portlet-class>org.apache.jetspeed.layout.MultiColumnPortlet</portlet-class>
<expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
</supports>
<portlet-info>
<title>TwoColumns</title>
<short-title>TwoColumns</short-title>
</portlet-info>
</portlet>
<portlet id="VelocityTwoColumns">
<portlet-name>VelocityTwoColumns</portlet-name>
<display-name>Two Columns Layout Using Velocity</display-name>
<init-param>
<name>ViewPage</name>
<value>columns</value>
</init-param>
<init-param>
<name>MaxPage</name>
<value>maximized</value>
</init-param>
<init-param>
<name>columns</name>
<value>2</value>
</init-param>
<init-param>
<name>sizes</name>
<value>50%,50%</value>
</init-param>
<portlet-class>org.apache.jetspeed.layout.MultiColumnPortlet</portlet-class>
<expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
</supports>
<portlet-info>
<title>VelocityTwoColumns</title>
<short-title>TwoColumns</short-title>
</portlet-info>
</portlet>
<portlet id="PortletApplicationBrowser">
<init-param>
<description>This parameter sets the template used in view mode.</description>
<name>ViewPage</name>
<value>/pages/pam/pam-browser.jsp</value>
</init-param>
<portlet-name>PortletApplicationBrowser</portlet-name>
<display-name>Portlet Application Browser</display-name>
<description>The PAM (Portlet Application Manager) Portlet Application Browser
displays a list of portlet applications deployed to this portal. From here you can
add, edit, and delete portlet applications.</description>
<portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationBrowser</portlet-class>
<expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>EDIT</portlet-mode>
<portlet-mode>VIEW</portlet-mode>
<portlet-mode>HELP</portlet-mode>
</supports>
<portlet-info>
<title>Portlet Application Browser</title>
<short-title>Apps</short-title>
<keywords>applications,apps,PAM</keywords>
</portlet-info>
</portlet>
<portlet id="PortletApplicationDetail">
<init-param>
<description>This parameter sets the template used in view mode.</description>
<name>ViewPage</name>
<value>/pages/pam/pam-detail.jsp</value>
</init-param>
<portlet-name>PortletApplicationDetail</portlet-name>
<display-name>Portlet Application Detail</display-name>
<description>The PAM (Portlet Application Manager) Portlet Application Detail
displays a specific portlet application deployed to this portal. From here you can
add, edit, and delete this portlet application.</description>
<portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationDetail</portlet-class>
<expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>EDIT</portlet-mode>
<portlet-mode>VIEW</portlet-mode>
<portlet-mode>HELP</portlet-mode>
</supports>
<portlet-info>
<title>Portlet Application Detail</title>
<short-title>PAD</short-title>
<keywords>applications,apps,PAM,PAD</keywords>
</portlet-info>
</portlet>
</portlet-app>
\ No newline at end of file
1.4 +13 -0
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- decorator.vm 4 May 2004 22:06:43 -0000 1.3
+++ decorator.vm 8 May 2004 01:20:31 -0000 1.4
@@ -20,6 +20,8 @@
#set($myPE = $jetspeed.currentPortletEntity)
+#set($actions = $jetspeed.DecoratorActions)
+
<!-- Begin portlet/html/jetspeed/decorator.vm -->
@@ -36,6 +38,12 @@
<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>
@@ -47,6 +55,8 @@
<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>
@@ -62,6 +72,8 @@
$jetspeed.include($myF)
</td>
+ <td align="right" valign="middle" class="PContent" />
+
<td class="PContentRight" ><div class="PContentRight" > </div></td>
</tr>
@@ -74,6 +86,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]
