Author: woonsan
Date: Tue Dec 15 18:05:41 2009
New Revision: 890921
URL: http://svn.apache.org/viewvc?rev=890921&view=rev
Log:
JS2-1084: Fixing the velocity checking of emptiness on portal page path
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm?rev=890921&r1=890920&r2=890921&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
Tue Dec 15 18:05:41 2009
@@ -28,7 +28,7 @@
#set($portalContextPath = $rc.request.getContextPath())
#set($portalServletPath = $rc.request.getServletPath())
#set($portalPagePath = $rc.getPortalURL().getPath())
-#if ($portalPagePath == "")
+#if ("$!portalPagePath" == "")
#set($portalPagePath = "/")
#end
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm?rev=890921&r1=890920&r2=890921&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
Tue Dec 15 18:05:41 2009
@@ -28,7 +28,7 @@
#set($portalContextPath = $rc.request.getContextPath())
#set($portalServletPath = $rc.request.getServletPath())
#set($portalPagePath = $rc.getPortalURL().getPath())
-#if ($portalPagePath == "")
+#if ("$!portalPagePath" == "")
#set($portalPagePath = "/")
#end
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm?rev=890921&r1=890920&r2=890921&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
Tue Dec 15 18:05:41 2009
@@ -28,7 +28,7 @@
#set($portalContextPath = $rc.request.getContextPath())
#set($portalServletPath = $rc.request.getServletPath())
#set($portalPagePath = $rc.getPortalURL().getPath())
-#if ($portalPagePath == "")
+#if ("$!portalPagePath" == "")
#set($portalPagePath = "/")
#end
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm?rev=890921&r1=890920&r2=890921&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
Tue Dec 15 18:05:41 2009
@@ -28,7 +28,7 @@
#set($portalContextPath = $rc.request.getContextPath())
#set($portalServletPath = $rc.request.getServletPath())
#set($portalPagePath = $rc.getPortalURL().getPath())
-#if ($portalPagePath == "")
+#if ("$!portalPagePath" == "")
#set($portalPagePath = "/")
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
