svn commit: r1610092 - /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm

Author: taylor
Date: Sun Jul 13 00:31:06 2014
New Revision: 1610092

URL: http://svn.apache.org/r1610092
Log:
JS2-1297: enabling dynamic psml (DPSML), fragment psml (FPSML) and template psml (TPSML) in portal pipeline. Contribution from David Dyer

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=1610092&r1=1610091&r2=1610092&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm Sun Jul 13 00:31:06 2014
@@ -307,17 +307,20 @@ limitations under the License.
 	<div id="column_${myFragment.getId()}_${columnIndex}" 
 	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
 	     style="float:${columnFloat}; width:${columnWidth};">
-	     
-	  #foreach($f in $column)
-      ## Set up coordinates for this fragment
-      #if($f.isLocked() == false)
-      #set($coords = $columnLayout.getCoordinate($f))	  
-      #set($col = $coords.x)
-      #set($lastRow = $columnLayout.getLastRowNumber($col))
-      #set($row = $coords.y)
+		  #foreach($f in $column)
+		  ## Set up coordinates for this fragment
+			#set($coords = $columnLayout.getCoordinate($f))	  
+			#set($col = $coords.x)
+			#set($lastRow = $columnLayout.getLastRowNumber($col))
+			#set($row = $coords.y)
 			
-      ## get the decorated Portlet content
-		  <div id='$f.id' name='$f.name' column='${col}' row='${row}' class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+			<div id='$f.id' name='$f.name' column='${col}' row='${row}' class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+				
+		  #if($f.isLocked() == false)
+		  
+				
+		  ## get the decorated Portlet content
+		  
 		    ## editing block
 		    #if($editing)
 		      <div class="portlet-edit-bar">
@@ -374,7 +377,10 @@ limitations under the License.
             </form>			 
 		      </div>
 		    #end		   
-		    ## Now get the real content
+		   
+		  
+		  #end
+		   ## Now get the real content
 	 	 	  $jetspeed.setCurrentFragment($f)	   
 		    #if($f.type == "portlet")
 			    #parse($f.decoration.template)
@@ -382,8 +388,9 @@ limitations under the License.
 			    $f.renderedContent			
 		    #end
 		  </div>
-		  #end
 		#end
+		
+		
 	</div>
 	#set ($columnIndex = $columnIndex + 1)  
 #end