You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2006/01/05 06:42:33 UTC
svn commit: r366088 - in
/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html:
maximized/layout.vm tcolumns/layout.vm
Author: taylor
Date: Wed Jan 4 21:42:31 2006
New Revision: 366088
URL: http://svn.apache.org/viewcvs?rev=366088&view=rev
Log:
* storing page on db page manager broken, changed id to path
* fix maximize window state for decorators
* correctly set current portlet fragment during rendering
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm?rev=366088&r1=366087&r2=366088&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm Wed Jan 4 21:42:31 2006
@@ -24,6 +24,7 @@
## get the decorated Portlet content
<div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)" class="portal-layout-maxed">
+ $jetspeed.setCurrentFragment($f)
#parse($f.decoration.template)
</div>
Modified: 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=366088&r1=366087&r2=366088&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm Wed Jan 4 21:42:31 2006
@@ -93,7 +93,7 @@
#if($editing)
#set($themeUrl = $renderResponse.createActionURL())
- $!themeUrl.setParameter("editingPage","$myPage.id")
+ $!themeUrl.setParameter("editingPage","$myPage.path")
<form name="themeForm" action="$themeUrl" method='post'>
<label style='font-size:8pt;color:blue;padding-left: 9px;'>Theme:
<select id='theme' name='theme' style='font-size:8pt;color:blue' onChange="themeForm.submit();">
@@ -110,7 +110,7 @@
#end
-<div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)" class="portal-layout">
+<div id="portal-layout-$htmlUtil.getSafeElementId($myPage.path)" class="portal-layout">
<table width="100%" cellspacing="0" cellpadding="0" >
<tr>
#set ($sizeIndex = 0)
@@ -145,7 +145,7 @@
#set($upUrl = $renderResponse.createActionURL())
$!upUrl.setParameter("move","1")
$!upUrl.setParameter("fragmentToMove","$f.id")
- $!upUrl.setParameter("editingPage","$myPage.id")
+ $!upUrl.setParameter("editingPage","$myPage.path")
<a href="$upUrl"><img src="#GetPageResource('images/movePortletUp.gif')" border="0" title="Move Portlet Up"/></a>
#end
</td>
@@ -159,7 +159,7 @@
#set($leftUrl = $renderResponse.createActionURL())
$!leftUrl.setParameter("move","3")
$!leftUrl.setParameter("fragmentToMove","$f.id")
- $!leftUrl.setParameter("editingPage","$myPage.id")
+ $!leftUrl.setParameter("editingPage","$myPage.path")
<a href="$leftUrl"><img src="#GetPageResource('images/movePortletLeft.gif')" border="0" title="Move Portlet Left"/></a>
#end
</td>
@@ -171,7 +171,7 @@
#set($rightUrl = $renderResponse.createActionURL())
$!rightUrl.setParameter("move","4")
$!rightUrl.setParameter("fragmentToMove","$f.id")
- $!rightUrl.setParameter("editingPage","$myPage.id")
+ $!rightUrl.setParameter("editingPage","$myPage.path")
<a href="$rightUrl"><img src="#GetPageResource('images/movePortletRight.gif')" border="0" title="Move Portlet Right"/></a>
#end
</td>
@@ -185,7 +185,7 @@
#set ($dcnt = $dcnt + 1)
#set($decUrl = $renderResponse.createActionURL())
$!decUrl.setParameter("fragmentToMove","$f.id")
- $!decUrl.setParameter("editingPage","$myPage.id")
+ $!decUrl.setParameter("editingPage","$myPage.path")
#set ($temp = ".submit();")
<form name="portletForm$dcnt" action="$decUrl" method='post'>
<select id='decorator' name='decorator' style='font-size:8pt;color:blue;' onChange="portletForm$dcnt$temp">
@@ -205,7 +205,7 @@
#set($downUrl = $renderResponse.createActionURL())
$!downUrl.setParameter("move","2")
$!downUrl.setParameter("fragmentToMove","$f.id")
- $!downUrl.setParameter("editingPage","$myPage.id")
+ $!downUrl.setParameter("editingPage","$myPage.path")
<a href="$downUrl"><img src="#GetPageResource('images/movePortletDown.gif')" border="0" title="Move Portlet Down"/></a>
#end
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org