svnno****@sourc*****
svnno****@sourc*****
2007年 11月 1日 (木) 07:45:02 JST
Revision: 678
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=678
Author: shinsuke
Date: 2007-11-01 07:45:01 +0900 (Thu, 01 Nov 2007)
Log Message:
-----------
sync up with the latest j2.
Modified Paths:
--------------
pal-portal/trunk/build.properties
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties 2007-10-31 21:15:09 UTC (rev 677)
+++ pal-portal/trunk/build.properties 2007-10-31 22:45:01 UTC (rev 678)
@@ -67,7 +67,7 @@
# Jetspeed SVN revision
#jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/
jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/
-jetspeed2.revision=584942
+jetspeed2.revision=590470
# Dependencies for Jetspeed
jetspeed.version=2.1.2_pal-${portal.version}
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm 2007-10-31 21:15:09 UTC (rev 677)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm 2007-10-31 22:45:01 UTC (rev 678)
@@ -1,8 +1,8 @@
Index: src/webapp/WEB-INF/jetspeed_macros.vm
===================================================================
---- src/webapp/WEB-INF/jetspeed_macros.vm (リビジョン 558601)
+--- src/webapp/WEB-INF/jetspeed_macros.vm (リビジョン 590470)
+++ src/webapp/WEB-INF/jetspeed_macros.vm (作業コピー)
-@@ -138,7 +138,7 @@
+@@ -132,7 +132,7 @@
<div id="portal-page-actions" >
#if($_actions.size() >0)
#foreach ($_action in $_actions)
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-10-31 21:15:09 UTC (rev 677)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-10-31 22:45:01 UTC (rev 678)
@@ -1,8 +1,8 @@
Index: src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
===================================================================
---- src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (リビジョン 574906)
+--- src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (リビジョン 590470)
+++ src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (作業コピー)
-@@ -55,237 +55,14 @@
+@@ -55,245 +55,14 @@
<div id="$renderResponse.namespace" class="${layoutClass} ${layoutClass}-${layoutType}">
#if($editing)
@@ -34,7 +34,11 @@
- #end
-
- #getIntProperty($maxLayoutNesting $rootDecorator "max.layout.nesting" 2)
-- #if($request.getAttribute("fragmentNestingLevel") < $maxLayoutNesting)
+- #set ($fnl = $request.getAttribute("fragmentNestingLevel"))
+- #if (! $fnl)
+- #set ($fnl = 0)
+- #end
+- #if($fnl < $maxLayoutNesting)
- #set($allowAddLayout=true)
- #else
- #set($allowAddLayout=false)
@@ -119,14 +123,18 @@
- ####### Take all fragments and apply style
- #if($allowChangePortletDecorator)
- <div>
-- <input type="hidden" name="fragment" value="$f.id">
+- <input type="hidden" name="fragment" value="">
- <input type="hidden" name="move" value="">
- <input type="hidden" name="remove" value="">
- <label for="decorators">$messages.getString("portal.page.editing.portlet.decorator")</label>
- <select id="decorators" name="decorators">
- <option value=''>
- #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-- <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+- #set ($fd = "")
+- #if (!$f.Decorator)
+- #set ($fd = $f.Decorator)
+- #end
+- <option value='$pd' #if ($pd == $fd) SELECTED #end>$pd
- #end
- </select>
- <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
@@ -247,7 +255,7 @@
#end
#set ($dcnt = 0)
-@@ -312,6 +89,10 @@
+@@ -320,6 +89,10 @@
## editing block
#if($editing)
@@ -258,3 +266,8 @@
<div class="portlet-edit-bar">
#set ($dcnt = $dcnt + 1)
<form name="$form$dcnt" action="$formAction" method='post'>
+@@ -399,3 +172,4 @@
+ </form>
+ #parse($myFragment.decoration.footer)
+ #end
++