incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r178043 - /incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/graffito-macros.vm
Date Mon, 23 May 2005 22:00:56 GMT
Author: clombart
Date: Mon May 23 15:00:55 2005
New Revision: 178043

URL: http://svn.apache.org/viewcvs?rev=178043&view=rev
Log:
Update velocity macros

Modified:
    incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/graffito-macros.vm

Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/graffito-macros.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/graffito-macros.vm?rev=178043&r1=178042&r2=178043&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/graffito-macros.vm
(original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/velocity/graffito-macros.vm
Mon May 23 15:00:55 2005
@@ -131,9 +131,9 @@
 
 
 
-#macro (tab $tab $MESSAGES $urlAction)
+#macro (tab $tab $renderRequest $MESSAGES $urlAction)
 
-	#set ($tabPages = $tab.getPages())
+	#set ($tabPages = $tab.getPages($renderRequest))
 
     
 	<div>
@@ -144,7 +144,7 @@
 					<td  style="font-size: 1pt;" nowrap="true">&nbsp;</td>
 					<td  style="font-size: 1pt;" nowrap="true">&nbsp;</td>
 					#foreach($tabPage in $tabPages)
-						#if($tab.isSelected($tabPage))	
+						#if($tab.isSelected($renderRequest, $tabPage))	
 							<td class="LTabLeft" style="font-size: 1pt;" nowrap="true">&nbsp;</td>
 							<td class="LTab" align="center" valign="middle">$MESSAGES.getString($tabPage.getLabel())</td>
 							<td class="LTabRight" style="font-size: 1pt;" nowrap="true">&nbsp;</td>
@@ -159,7 +159,7 @@
 		</table>	
 	</div>
 	<div class="portlet-section-alternate" /></div>
-	#parse($tab.getSelectedPage().getView())
+	#parse($tab.getSelectedPage($renderRequest).getTemplate())
 #end
 
 
@@ -175,13 +175,14 @@
 #end
 
 
-#macro (cmsPathLink $server $cmsObjects $renderResponse $MESSAGES)	
+#macro (cmsPathLink $server $cmsObjects $forwardToPage $renderResponse $MESSAGES)	
 	
-    <a href="$renderResponse.createRenderURL()?uri=$server.getScope()"> [$MESSAGES.getString("div.server")]
$server.getAlias()</a>		
+    <a href="$renderResponse.createActionURL()?uri=$server.getScope()&portletForward_$forwardToPage">
[$MESSAGES.getString("div.server")] $server.getAlias()</a>		
 	#foreach($cmsObject in $cmsObjects)
   	   #set($name = $cmsObject.getName())
   	   #if($name)
-  		  >><a href="$renderResponse.createRenderURL()?uri=$cmsObject.getUri()">$cmsObject.getName()</a>
+  		  >> <a href="$renderResponse.createActionURL()?uri=$cmsObject.getUri()&portletForward_$forwardToPage">$cmsObject.getName()</a>
+		  
 	   #end
    #end
 #end
@@ -191,7 +192,7 @@
 	#if ($graffitoTools.requireGraffitoViewer($document))			
 		<a href="$graffitoTools.getViewerServlet()?uri=$document.getUri()">$document.getTitle()</a>
	
 	#else
-		<a href="$renderResponse.createRenderURL()?uri=$document.getUri()">$document.getTitle()</a>
+		<a href="$renderResponse.createActionURL()?uri=$document.getUri()&portletForward_documentHtmlTextViewer">$document.getTitle()</a>
 
 	#end		
 	<font class="portlet-font-dim"> by $document.getOwner()</font>



Mime
View raw message