You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sm...@apache.org on 2006/11/28 10:43:21 UTC
svn commit: r479962 -
/portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm
Author: smilek
Date: Tue Nov 28 01:43:20 2006
New Revision: 479962
URL: http://svn.apache.org/viewvc?view=rev&rev=479962
Log:
eliminated some repetitive code with headerResource macros by adding macro acquireHeaderResource
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm?view=diff&rev=479962&r1=479961&r2=479962
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm Tue Nov 28 01:43:20 2006
@@ -66,34 +66,30 @@
#* Adds additional style sheets and java script from portlets *#
#macro (includeHeaderResource)
- #set($resourceHeaderFactory = $jetspeed.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory"))
- #if ( $resourceHeader )
+ #acquireHeaderResource()
$resourceHeader.getContent()
- #else
- #set($resourceHeader = $resourceHeaderFactory.getHeaderResouce($JS2RequestContext))
-$resourceHeader.getContent()
- #end
#end
#* Adds additional style sheets and java script from portlets - desktop version *#
#macro (desktopIncludeDojoHeaderContent)
- #set($resourceHeaderFactory = $JS2ComponentManager.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory"))
- #if ( $resourceHeader )
-$resourceHeader.getNamedContentForPrefix( "header.dojo" )
- #else
- #set($resourceHeader = $resourceHeaderFactory.getHeaderResouce($JS2RequestContext))
+ #acquireHeaderResource()
$resourceHeader.getNamedContentForPrefix( "header.dojo" )
- #end
#end
#* Adds additional style sheets and java script from portlets - desktop version *#
#macro (desktopIncludeHeaderContent)
- #set($resourceHeaderFactory = $JS2ComponentManager.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory"))
- #if ( $resourceHeader )
-$resourceHeader.getContent()
- #else
- #set($resourceHeader = $resourceHeaderFactory.getHeaderResouce($JS2RequestContext))
+ #acquireHeaderResource()
$resourceHeader.getContent()
+#end
+
+#macro (acquireHeaderResource)
+ #if ( ! $resourceHeader )
+ #if ( $JS2ComponentManager )
+ #set($resourceHeaderFactory = $JS2ComponentManager.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory"))
+ #else
+ #set($resourceHeaderFactory = $jetspeed.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory"))
+ #end
+ #set($resourceHeader = $resourceHeaderFactory.getHeaderResouce($JS2RequestContext))
#end
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org