portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r918293 - in /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout: greenearth/header.vm inherit/header.vm jetspeed/header.vm oldstyle/header.vm purpleplanet/header.vm turbo/header.vm
Date Wed, 03 Mar 2010 01:25:46 GMT
Author: ate
Date: Wed Mar  3 01:25:45 2010
New Revision: 918293

URL: http://svn.apache.org/viewvc?rev=918293&view=rev
Log:
Fix for JS2-1114: [velocity] Null reference [template 'decorations/layout/jetspeed/header.vm',
line 49, column 17] :${layoutFragment.id} cannot be resolved
See: http://issues.apache.org/jira/browse/JS2-1114


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/inherit/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/oldstyle/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=918293&r1=918292&r2=918293&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
Wed Mar  3 01:25:45 2010
@@ -82,7 +82,7 @@
 #PageActionBar()
 #end
 <!-- end of header -->
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+<div id="layout-${rootFragment.id}" class="#PageBaseCSSClass()" >
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm?rev=918293&r1=918292&r2=918293&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm
Wed Mar  3 01:25:45 2010
@@ -76,7 +76,7 @@
 </head>
 <body class="#PageBaseCSSClass()">
 <!--  BEGIN: layout/html/jetspeed/decorator.vm -->
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+<div id="layout-${rootFragment.id}" class="#PageBaseCSSClass()" >
 #if (!$jetspeed.isAjaxCustomizationEnabled())
     <!-- Content Table -->
     <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">

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=918293&r1=918292&r2=918293&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
Wed Mar  3 01:25:45 2010
@@ -82,7 +82,7 @@
 #PageActionBar()
 #end
 <!-- end of header -->
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+<div id="layout-${rootFragment.id}" class="#PageBaseCSSClass()" >
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/header.vm?rev=918293&r1=918292&r2=918293&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/header.vm
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/header.vm
Wed Mar  3 01:25:45 2010
@@ -46,7 +46,7 @@
 #PageActionBar()
 <!-- end of header -->
 </div>   
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+<div id="layout-${rootFragment.id}" class="#PageBaseCSSClass()" >
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">

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=918293&r1=918292&r2=918293&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
Wed Mar  3 01:25:45 2010
@@ -82,7 +82,7 @@
 #PageActionBar()
 #end
 <!-- end of header -->
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+<div id="layout-${rootFragment.id}" class="#PageBaseCSSClass()" >
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">

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=918293&r1=918292&r2=918293&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
Wed Mar  3 01:25:45 2010
@@ -82,7 +82,7 @@
 #PageActionBar()
 #end
 <!-- end of header -->
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+<div id="layout-${rootFragment.id}" class="#PageBaseCSSClass()" >
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">



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