taylor 2004/09/06 20:58:21
Modified: portal/src/webapp/WEB-INF/templates/layout/html/columns
layout.vm
Added: portal/src/webapp/WEB-INF/templates/layout/html/columns
layout-help.vm
Log:
support for page help mode added with a very minimal help screen for pages
next step is to put in velocity support for resource strings
added icons for page modes (edit, help, view)
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.13 +24 -7
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Index: layout.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- layout.vm 24 Aug 2004 14:33:32 -0000 1.12
+++ layout.vm 7 Sep 2004 03:58:21 -0000 1.13
@@ -22,6 +22,8 @@
#set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
+#set($actions = $jetspeed.PageDecoratorActions)
+
#if($myFragment.getDecorator())
#set($decorator = $myFragment.getDecorator())
@@ -43,14 +45,29 @@
#if($jetspeed.portletMode.toString() == "edit")
#set($editing = true)
#set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)
- #set($viewUrl = $renderResponse.createRenderURL())
- $!viewUrl.setPortletMode($portletModeView)
- <a href="$viewUrl">Done</a>
-#else
- #set($editUrl = $renderResponse.createRenderURL())
- $!editUrl.setPortletMode($portletModeEdit)
- <a href="$editUrl">Customize</a>
#end
+
+<table width="100%" cellspacing="0" cellpadding="0" >
+ <tr>
+ <td class="PContent" style="font-size:1pt;" nowrap="true"> </td>
+
+ <td align="left" valign="middle" class="PContent" >
+ </td>
+ <td align="right" valign="middle" class="PContent" >
+ <table border="0" cellpadding="0" cellspacing="0" >
+ <tr>
+ #foreach ($action in $actions)
+ <td align="right" valign="middle" class="PContent" >
+ <a href="${action.Action}" title="${action.Name}" ><img src="${action.Link}"
alt="${action.Alt}" border="0"></a>
+ <td/>
+ #end
+ </tr>
+ </table>
+ </td>
+
+ <td class="PContent" style="font-size:1pt;" nowrap="true"> </td>
+ </tr>
+</table>
<div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)"
class="portal-layout">
<table width="100%" cellspacing="0" cellpadding="0" >
1.1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm
Index: layout-help.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($myPage = $jetspeed.page)
#set($myFragment = $jetspeed.currentFragment)
#set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
#set($actions = $jetspeed.PageDecoratorActions)
#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) && ($myFragment == $myPage.getRootFragment()))
#parse($jetspeed.getDecoration($decoTop, "layout").appRelativePath)
#end
#set($layoutType =$portletConfig.getInitParameter("layoutType"))
#if($jetspeed.portletMode.toString() == "edit")
#set($editing = true)
#set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)
#end
<!-- Begin portlet/html/jetspeed/decorator.vm -->
<div id="portlet-help" class="portlet-Jetspeed" >
<table border="0" cellpadding="0" cellspacing="0" width="100%">
##
## Portlet Title Bar
##
#set ($cspan = 2)
<tr>
<td class="PContent" style="font-size:1pt;" nowrap="true"> </td>
<td align="left" valign="middle" class="PContent" >
</td>
<td align="right" valign="middle" class="PContent" >
<table border="0" cellpadding="0" cellspacing="0" >
<tr>
#foreach ($action in $actions)
<td align="right" valign="middle" class="PContent" >
<a href="${action.Action}" title="${action.Name}" ><img src="${action.Link}"
alt="${action.Alt}" border="0"></a>
<td/>
#end
</tr>
</table>
</td>
<td class="PContent" style="font-size:1pt;" nowrap="true"> </td>
</tr>
<tr>
<tr>
<td class="PContent" colspan="4">
<br/>
<h2>Help for Jetspeed Multicolumn Page Portlet</h2>
<p>TODO: Make all strings here resources</p>
</td>
</tr>
</table>
</div>
#if (($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
#parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath)
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
