portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r366087 - in /portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout: html/columns/layout.vm html/maximized/layout.vm html/tcolumns/layout.vm xhtml-basic/columns/layout.vm
Date Thu, 05 Jan 2006 05:39:19 GMT
Author: taylor
Date: Wed Jan  4 21:39:12 2006
New Revision: 366087

URL: http://svn.apache.org/viewcvs?rev=366087&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/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.vm

Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=366087&r1=366086&r2=366087&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Wed Jan  4 21:39:12 2006
@@ -46,7 +46,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();">
@@ -97,7 +97,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">
@@ -111,7 +111,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" class="move-portlet-left"><img src="#GetPageResource('images/movePortletLeft.gif')"
border="0" title="Move Portlet Left"/></a>
 			 #end
 			 
@@ -120,7 +120,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" class="move-portlet-up"><img src="#GetPageResource('images/movePortletUp.gif')"
border="0" title="Move Portlet Up"/></a>
 			 #end
 			 
@@ -135,7 +135,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" class="move-portlet-down"><img src="#GetPageResource('images/movePortletDown.gif')"
border="0" title="Move Portlet Down"/></a>
 			 #end
 			 
@@ -144,7 +144,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" class="move-portlet-right"><img src="#GetPageResource('images/movePortletRight.gif')"
border="0" title="Move Portlet Right"/></a>
 			 #end
 </form>			 
@@ -152,10 +152,11 @@
 		   #end
 		   
 		   #if($f.type == "portlet")
-			 #parse($f.decoration.template)
+		     $jetspeed.setCurrentFragment($f)
+			     #parse($f.decoration.template)
 		   #else		
 	 	 	 $jetspeed.setCurrentFragment($f)
-			 $f.renderedContent			
+  			 $f.renderedContent			
 		   #end
 		   </div>
 		 #end

Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm?rev=366087&r1=366086&r2=366087&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
(original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
Wed Jan  4 21:39:12 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/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm?rev=366087&r1=366086&r2=366087&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
(original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
Wed Jan  4 21:39:12 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>
@@ -218,6 +218,7 @@
 		 #end			
            ## get the decorated Portlet content
 		  #if($f.type == "portlet")
+			 $jetspeed.setCurrentFragment($f)
 			 #parse($f.decoration.template)
 		  #else		
 	 	 	 $jetspeed.setCurrentFragment($f)

Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.vm?rev=366087&r1=366086&r2=366087&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.vm
(original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.vm
Wed Jan  4 21:39:12 2006
@@ -52,6 +52,7 @@
 ## TODO: Edit layout
 ## get the decorated Portlet content
 #if($f.type == "portlet")
+$jetspeed.setCurrentFragment($f)
 #parse($f.decoration.template)
 #else		
 $jetspeed.setCurrentFragment($f)



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message