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 at...@apache.org on 2007/02/20 23:14:51 UTC
svn commit: r509774 - in
/portals/jetspeed-2/trunk/src/webapp/decorations/layout: blueocean/
jscookmenu/ simple/xhtml-basic/ sunflower/ thesolution/ tigris/
Author: ate
Date: Tue Feb 20 14:14:50 2007
New Revision: 509774
URL: http://svn.apache.org/viewvc?view=rev&rev=509774
Log:
JS2-462: Need to clean up Velocity logs, too many warnings and some errors even
Fixing:
ERROR velocity - VMProxyArg.setObject() : Programmer error : I am a constant! No setting! : _delimiter / ""
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm?view=diff&rev=509774&r1=509773&r2=509774
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm Tue Feb 20 14:14:50 2007
@@ -38,11 +38,12 @@
#* include links navigation component *#
#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+ #set($__delimiter = $_delimiter)
#if(!$_delimiter || $_delimiter == "")
#if($_style != $BREADCRUMBS_STYLE)
- #set($_delimiter = " ")
+ #set($__delimiter = " ")
#else
- #set($_delimiter = " >> ")
+ #set($__delimiter = " >> ")
#end
#end
#set($menuTitle = $_menu.getTitle($preferedLocale))
@@ -85,7 +86,7 @@
<a href="$linkUrl" title="$!linkTitle">${linkName}</a>
#end
#if($_orientation == $LEFT_TO_RIGHT)
- ${_delimiter}</span>
+ ${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
</div>
@@ -104,7 +105,7 @@
#set($separatorText = $element.getText($preferedLocale))
#if($_orientation == $LEFT_TO_RIGHT)
- <span title="$!separatorTitle">${separatorText}${_delimiter}</span>
+ <span title="$!separatorTitle">${separatorText}${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
<div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm?view=diff&rev=509774&r1=509773&r2=509774
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm Tue Feb 20 14:14:50 2007
@@ -59,11 +59,12 @@
#* include links navigation component *#
#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+ #set($__delimiter = $_delimiter)
#if(!$_delimiter || $_delimiter == "")
#if($_style != $BREADCRUMBS_STYLE)
- #set($_delimiter = " ")
+ #set($__delimiter = " ")
#else
- #set($_delimiter = " >> ")
+ #set($__delimiter = " >> ")
#end
#end
#set($menuTitle = $_menu.getTitle($preferedLocale))
@@ -97,7 +98,7 @@
<a href="$linkUrl" title="$!linkTitle">${linkName}</a>
#end
#if($_orientation == $LEFT_TO_RIGHT)
- ${_delimiter}</span>
+ ${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
</div>
#end
@@ -112,7 +113,7 @@
#set($separatorTitle = $element.getTitle($preferedLocale))
#set($separatorText = $element.getText($preferedLocale))
#if($_orientation == $LEFT_TO_RIGHT)
- <span title="$!separatorTitle">${separatorText}${_delimiter}</span>
+ <span title="$!separatorTitle">${separatorText}${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
<div class="PageTitle" title="$!separatorTitle">${separatorText}</div>
#end
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm?view=diff&rev=509774&r1=509773&r2=509774
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm Tue Feb 20 14:14:50 2007
@@ -31,11 +31,12 @@
#* include links navigation component *#
#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+ #set($__delimiter = $_delimiter)
#if(!$_delimiter || $_delimiter == "")
#if($_style != $BREADCRUMBS_STYLE)
-#set($_delimiter = " ")
+#set($__delimiter = " ")
#else
-#set($_delimiter = " >> ")
+#set($__delimiter = " >> ")
#end## if($_style != $BREADCRUMBS_STYLE)
#end## if(!$_delimiter || $_delimiter == "")
#set($menuTitle = $_menu.getTitle($preferedLocale))
@@ -69,7 +70,7 @@
<a href="$linkUrl" title="$!linkTitle">${linkName}</a>
#end## if($element.type == "page")
#if($_orientation == $LEFT_TO_RIGHT)
-${_delimiter}</span>
+${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
</div>
#end## if($_orientation == $LEFT_TO_RIGHT)
@@ -83,7 +84,7 @@
#elseif($element.elementType == "separator")
#set($separatorTitle = $element.getTitle($preferedLocale)) #set($separatorText = $element.getText($preferedLocale))
#if($_orientation == $LEFT_TO_RIGHT)
-<span title="$!separatorTitle">${separatorText}${_delimiter}</span>
+<span title="$!separatorTitle">${separatorText}${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
<div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
#end## if($_orientation == $LEFT_TO_RIGHT)
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm?view=diff&rev=509774&r1=509773&r2=509774
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm Tue Feb 20 14:14:50 2007
@@ -32,11 +32,12 @@
#* include links navigation component *#
#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+ #set($__delimiter = $_delimiter)
#if(!$_delimiter || $_delimiter == "")
#if($_style != $BREADCRUMBS_STYLE)
- #set($_delimiter = " ")
+ #set($__delimiter = " ")
#else
- #set($_delimiter = " >> ")
+ #set($__delimiter = " >> ")
#end
#end
#set($menuTitle = $_menu.getTitle($preferedLocale))
@@ -79,7 +80,7 @@
<a href="$linkUrl" title="$!linkTitle">${linkName}</a>
#end
#if($_orientation == $LEFT_TO_RIGHT)
- ${_delimiter}</span>
+ ${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
</div>
@@ -98,7 +99,7 @@
#set($separatorText = $element.getText($preferedLocale))
#if($_orientation == $LEFT_TO_RIGHT)
- <span title="$!separatorTitle">${separatorText}${_delimiter}</span>
+ <span title="$!separatorTitle">${separatorText}${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
<div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm?view=diff&rev=509774&r1=509773&r2=509774
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm Tue Feb 20 14:14:50 2007
@@ -32,11 +32,12 @@
#* include links navigation component *#
#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+ #set($__delimiter = $_delimiter)
#if(!$_delimiter || $_delimiter == "")
#if($_style != $BREADCRUMBS_STYLE)
- #set($_delimiter = " ")
+ #set($__delimiter = " ")
#else
- #set($_delimiter = " >> ")
+ #set($__delimiter = " >> ")
#end
#end
#set($menuTitle = $_menu.getTitle($preferedLocale))
@@ -79,7 +80,7 @@
<a href="$linkUrl" title="$!linkTitle">${linkName}</a>
#end
#if($_orientation == $LEFT_TO_RIGHT)
- ${_delimiter}</span>
+ ${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
</div>
@@ -98,7 +99,7 @@
#set($separatorText = $element.getText($preferedLocale))
#if($_orientation == $LEFT_TO_RIGHT)
- <span title="$!separatorTitle">${separatorText}${_delimiter}</span>
+ <span title="$!separatorTitle">${separatorText}${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
<div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm?view=diff&rev=509774&r1=509773&r2=509774
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm Tue Feb 20 14:14:50 2007
@@ -38,11 +38,12 @@
#* include links navigation component *#
#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+ #set($__delimiter = $_delimiter)
#if(!$_delimiter || $_delimiter == "")
#if($_style != $BREADCRUMBS_STYLE)
- #set($_delimiter = " ")
+ #set($__delimiter = " ")
#else
- #set($_delimiter = " >> ")
+ #set($__delimiter = " >> ")
#end
#end
#set($menuTitle = $_menu.getTitle($preferedLocale))
@@ -85,7 +86,7 @@
<a href="$linkUrl" title="$!linkTitle">${linkName}</a>
#end
#if($_orientation == $LEFT_TO_RIGHT)
- ${_delimiter}</span>
+ ${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
</div>
@@ -104,7 +105,7 @@
#set($separatorText = $element.getText($preferedLocale))
#if($_orientation == $LEFT_TO_RIGHT)
- <span title="$!separatorTitle">${separatorText}${_delimiter}</span>
+ <span title="$!separatorTitle">${separatorText}${__delimiter}</span>
#elseif($_orientation == $TOP_TO_BOTTOM)
<div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org