Author: ate
Date: Tue Feb 20 08:30:29 2007
New Revision: 509630
URL: http://svn.apache.org/viewvc?view=rev&rev=509630
Log:
JS2-275: remove dependency on base tag for rendering decoration resource links
by making them contextPath relative
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=509630&r1=509629&r2=509630
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm Tue Feb 20
08:30:29 2007
@@ -60,7 +60,7 @@
#macro (IncludeStylesheets)
#foreach($style in $theme.styleSheets)
- <link rel="stylesheet" type="text/css" media="screen, projection"
href="$style" />
+ <link rel="stylesheet" type="text/css" media="screen, projection"
href="$request.contextPath/$style" />
#end
#end
@@ -105,7 +105,7 @@
* Returns the fully-qualified path the specified resources using
* $decorator
*#
-#macro (GetResource $_decorator $_path)$!{_decorator.getResource($_path)}#end
+#macro (GetResource $_decorator
$_path)$request.contextPath/$!{_decorator.getResource($_path)}#end
#**
* Returns the fully-qualified path the specified resources using
@@ -122,7 +122,7 @@
<div id="portal-page-actions" >
#if($_actions.size() >0)
#foreach ($_action in $_actions)
- <a href="${_action.Action}" title="${_action.Name}" class="action
pageAction" ><img src="${_action.Link}" alt="${_action.Alt}" border="0" /></a>
+ <a href="${_action.Action}" title="${_action.Name}" class="action
pageAction" ><img src="$request.contextPath/${_action.Link}"
alt="${_action.Alt}" border="0" /></a>
#end
#end
</div>
@@ -133,7 +133,7 @@
<div class="PActionBar">
#foreach ($_action in $_actions)
- <a href="${_action.Action}" title="${_action.Name}" class="action
portlet-action" #if($_action.target)target="$_action.target"#end><img
src="${_action.link}" alt="${_action.Alt}" border="0" /></a>
+ <a href="${_action.Action}" title="${_action.Name}" class="action
portlet-action" #if($_action.target)target="$_action.target"#end><img
src="$request.contextPath/${_action.link}" alt="${_action.Alt}" border="0"
/></a>
#end
</div>
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
