Author: taylor
Date: Mon Oct 10 10:55:42 2005
New Revision: 312700
URL: http://svn.apache.org/viewcvs?rev=312700&view=rev
Log:
Revive the old table-based columns
The new DHTML stuff is buggy and doesn't implement PSML overrides of columns
widths
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties?rev=312700&view=auto
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.properties
Mon Oct 10 10:55:42 2005
@@ -0,0 +1,17 @@
+# 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=tcolumns
+template.type=velocity
+template.extension=.vm
\ No newline at end of file
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm?rev=312700&view=auto
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
Mon Oct 10 10:55:42 2005
@@ -0,0 +1,205 @@
+#*
+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($sizes = $jetspeed.columnSizes)
+
+#set($myPage = $jetspeed.page)
+
+#set($myFragment = $jetspeed.currentFragment)
+
+#set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
+
+#set($actions = $jetspeed.PageDecoratorActions)
+
+#set($editing = false)
+#if($jetspeed.portletMode.toString() == "edit")
+ #set($editing = true)
+ #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)
+#end
+
+ #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"))
+#set($columnLayout = $renderRequest.getAttribute("columnLayout"))
+
+#if ($actions.size()>0)
+<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
+ #if($editing == true)
+ #set ($chooser =
"${jetspeed.basePath}/system/customizer/portlet-selector.psml")
+ <td align="right" valign="middle" class="PContent" >
+ #set ($imgsrc="${jetspeed.pageBasePath}/content/images/select.gif")
+ <a
href="javascript:openWindow('$response.encodeURL($chooser)')"><img
src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Select"/></a>
+ </td>
+ #end
+ </tr>
+ </table>
+ </td>
+
+ <td class="PContent" style="font-size:1pt;" nowrap="true"> </td>
+ </tr>
+</table>
+#end
+
+<form name='portletform' action="$renderResponse.createActionURL()"
method="post">
+<input type='hidden' name='portlets'/>
+<input type='hidden' name='page' value='$myPage'/>
+</form>
+
+<div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)"
class="portal-layout">
+<table width="100%" cellspacing="0" cellpadding="0" >
+ <tr>
+ #set ($sizeIndex = 0)
+ #set ($layoutImageBase = "${jetspeed.pageBasePath}/content/images")
+ #foreach($column in $columnLayout.columns)
+ #if ($sizes)
+ #if ($sizeIndex < $sizes.size())
+ <td valign='top' width='$sizes.get($sizeIndex)'/>
+ #else
+ <td valign="top">
+ #end
+ #else
+ <td valign="top">
+ #end
+ #set ($sizeIndex = $sizeIndex + 1)
+ <table width="100%" class="portal-layout-column">
+ #foreach($f in $column)
+ <tr>
+ <td width="100%">
+ #set($coords = $columnLayout.getCoordinate($f))
+ #set($col = $coords.x)
+ #set($lastRow = $columnLayout.getLastRowNumber($col))
+ #set($row = $coords.y)
+ #if($editing)<div id="_$f.id">
+ <div style="position:relative; top:10px; left:0; width:100%;
height:100%;">
+ <div id="_$f.id_toolBox" >
+ <table cellpadding="0" cellspacing="0" >
+ <tr>
+ <td></td>
+ <td align="center"
onMouseover="this.style.backgroundColor='red'"
onMouseout="this.style.backgroundColor=''">
+ #if($row > 0)
+ #set($upUrl = $renderResponse.createRenderURL())
+ $!upUrl.setParameter("move","1")
+ $!upUrl.setParameter("fragmentId","$f.id")
+ #set ($imgsrc="$layoutImageBase/movePortletUp.gif")
+ <a href="$upUrl"><img
src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Up"/></a>
+ #end
+ </td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td align="right"
onMouseover="this.style.backgroundColor='red'"
onMouseout="this.style.backgroundColor=''">
+ #if($lastColumn > 0 && $col > 0)
+ #set($leftUrl = $renderResponse.createRenderURL())
+ $!leftUrl.setParameter("move","3")
+ $!leftUrl.setParameter("fragmentId","$f.id")
+ #set ($imgsrc="$layoutImageBase/movePortletLeft.gif")
+ <a href="$leftUrl"><img
src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet
Left"/></a>
+ #end
+ </td>
+ <td align="center" style="font-size:smaller;
font-weight:bold" >
+ Position
+ </td>
+ <td align="left"
onMouseover="this.style.backgroundColor='red'"
onMouseout="this.style.backgroundColor=''">
+ #if($lastColumn > 0 && $col < $lastColumn)
+ #set($rightUrl = $renderResponse.createRenderURL())
+ $!rightUrl.setParameter("move","4")
+ $!rightUrl.setParameter("fragmentId","$f.id")
+ #set ($imgsrc="$layoutImageBase/movePortletRight.gif")
+ <a href="$rightUrl"><img
src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet
Right"/></a>
+ #end
+ </td>
+ <td>
+ #set($deleter = $renderResponse.createActionURL())
+ $deleter.setParameter("deleteId","$f.id")
+ $deleter.setParameter("page","$myPage")
+ #set ($imgsrc="$layoutImageBase/close.gif")
+ <a href="$deleter"><img
src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Remove Portlet"/></a>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td align="center"
onMouseover="this.style.backgroundColor='red'"
onMouseout="this.style.backgroundColor=''">
+ #if($row < $lastRow)
+ #set($downUrl =
$renderResponse.createRenderURL())
+ $!downUrl.setParameter("move","2")
+ $!downUrl.setParameter("fragmentId","$f.id")
+ #set ($imgsrc="$layoutImageBase/movePortletDown.gif")
+ <a href="$downUrl"><img
src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet
Down"/></a>
+ #end
+ </td>
+ <td></td>
+ <td></td>
+ </tr>
+ </table>
+ </div>
+ #end
+ ## get the decorated Portlet content
+ #if($f.type == "portlet")
+ #parse($jetspeed.decorateAndInclude($f))
+ #else
+ $jetspeed.setCurrentFragment($f)
+ $f.renderedContent
+ #end
+
+ ##$jetspeed.decorateAndInclude($f)
+
+ #if($editing)
+ </div>
+ </div>
+ #end
+
+ </td>
+ </tr>
+ #end
+
+ </table>
+ </td>
+ #end
+ </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]