portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r640292 - /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/wml/columns/layout.vm
Date Mon, 24 Mar 2008 02:30:16 GMT
Author: ate
Date: Sun Mar 23 19:30:15 2008
New Revision: 640292

URL: http://svn.apache.org/viewvc?rev=640292&view=rev
Log:
Synchronizing JS2-769 changes for 2.1.3 with 2.2 trunk

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/wml/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/wml/columns/layout.vm?rev=640292&r1=640291&r2=640292&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/wml/columns/layout.vm
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/wml/columns/layout.vm
Sun Mar 23 19:30:15 2008
@@ -1,19 +1,3 @@
-#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You 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($theme = $request.getAttribute("org.apache.jetspeed.theme"))
 #set($sizes = $jetspeed.columnSizes)
 #set($myPage = $jetspeed.page)
@@ -22,63 +6,49 @@
 #set($actions = $myFragment.decoration.actions)
 #set($messages = $portletConfig.getResourceBundle($renderRequest.Locale))
 #set($rootDecorator = $myPage.getRootFragment().decoration)
-
 #if($myFragment.getDecorator())
-  #set($decorator = $myFragment.getDecorator())
+#set($decorator = $myFragment.getDecorator())
 #end
-
 #if($myFragment == $myPage.getRootFragment())
-  #set($isRoot=true)
+#set($isRoot=true)
 #end
-   
 #if ($isRoot)
-  #parse($myFragment.decoration.header)
-   #set($layoutClass = "portal-nested-layout")
+#parse($myFragment.decoration.header)
+#set($layoutClass = "portal-nested-layout")
 #else
-  #defineLayoutObjects()
-   #set($layoutClass = "portal-layout")
+#defineLayoutObjects()
+#set($layoutClass = "portal-layout")
 #end
-
 #set($layoutType =$portletConfig.getInitParameter("layoutType"))
 #set($columnLayout = $renderRequest.getAttribute("columnLayout"))
 #set($decorationFactory = $renderRequest.getAttribute("decorationFactory"))
 #set($rc = $renderRequest.getAttribute("org.apache.jetspeed.request.RequestContext"))
 #set($psrc = $rc.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
 #set($profiledPage = $psrc.Page.Path)
-
-
 #set ($dcnt = 0) 
-#set ($columnIndex = 0)
-  
-#foreach($column in $columnLayout.columns)
-	  
+#set ($columnIndex = 0)  
+#foreach($column in $columnLayout.columns)	  
   #set($columnFloat = $columnLayout.getColumnFloat($columnIndex))
-	#set($columnWidth = $columnLayout.getColumnWidth($columnIndex))
-		     
+	#set($columnWidth = $columnLayout.getColumnWidth($columnIndex))		     
 	  #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)
-			
+      #set($row = $coords.y)			
       ## get the decorated Portlet content
 	  <card id="column_${myFragment.getId()}_${columnIndex}" title="PortletTitle">	  
	   
 		    ## Now get the real content
 	 	 	  $jetspeed.setCurrentFragment($f)	   
 		    #if($f.type == "portlet")
-			    #parse($f.decoration.template)
+#parse($f.decoration.template)
 		    #else		
 			    $f.renderedContent			
 		    #end
 	   </card>
 		#end
 	#set ($columnIndex = $columnIndex + 1)  
-#end
-  
-<br/>
-
+#end  
 #if ($isRoot)
-  #parse($myFragment.decoration.footer)
+#parse($myFragment.decoration.footer)
 #end
-  



---------------------------------------------------------------------
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