portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725977 [4/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascript...
Date Fri, 12 Dec 2008 12:07:04 GMT
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ko.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ko.properties (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ko.properties Fri Dec 12 04:06:29 2008
@@ -1,40 +1,40 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-desktop.action.menu=\uc708\ub3c4\uc6b0 \uba54\ub274
-desktop.action.tile=\ud0c0\uc77c \ubd99\uc774\uae30
-desktop.action.untile=\ud0c0\uc77c \ub5bc\uae30
-desktop.action.heightexpand=\ub192\uc774 \ud655\ub300
-desktop.action.heightnormal=\ub192\uc774 \ubcf5\uc6d0
-desktop.action.restore=\ubcf5\uc6d0
-desktop.action.removeportlet=\ud3ec\ud2c0\ub9bf \uc0ad\uc81c
-
-# if empty string, portlet title bar will not change during ajax calls for portlet render
-desktop.action.loadportletrender=\uc5ec\ub294 \uc911 ...
-
-# if empty string, portlet title bar will not change during ajax calls for portlet action submits
-desktop.action.loadportletaction=\ubcc0\uacbd \uc911 ...
-
-# if empty string, portlet title bar will not change during ajax calls for get-portlet-action, change-portlet-action, move-portlet
-desktop.action.loadportletupdate=
-
-desktop.action.addportlet=\ud3ec\ud2c0\ub9bf \ucd94\uac00
-desktop.action.editpage=\ud398\uc774\uc9c0 \ud3b8\uc9d1
-
-# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during ajax calls
-desktop.action.loadpage=
-
-# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during loading of customizer
-desktop.action.loadpageeditor=\ud398\uc774\uc9c0 \ud3b8\uc9d1\uae30 \uc5ec\ub294 \uc911 ...
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+desktop.action.menu=\uc708\ub3c4\uc6b0 \uba54\ub274
+desktop.action.tile=\ud0c0\uc77c \ubd99\uc774\uae30
+desktop.action.untile=\ud0c0\uc77c \ub5bc\uae30
+desktop.action.heightexpand=\ub192\uc774 \ud655\ub300
+desktop.action.heightnormal=\ub192\uc774 \ubcf5\uc6d0
+desktop.action.restore=\ubcf5\uc6d0
+desktop.action.removeportlet=\ud3ec\ud2c0\ub9bf \uc0ad\uc81c
+
+# if empty string, portlet title bar will not change during ajax calls for portlet render
+desktop.action.loadportletrender=\uc5ec\ub294 \uc911 ...
+
+# if empty string, portlet title bar will not change during ajax calls for portlet action submits
+desktop.action.loadportletaction=\ubcc0\uacbd \uc911 ...
+
+# if empty string, portlet title bar will not change during ajax calls for get-portlet-action, change-portlet-action, move-portlet
+desktop.action.loadportletupdate=
+
+desktop.action.addportlet=\ud3ec\ud2c0\ub9bf \ucd94\uac00
+desktop.action.editpage=\ud398\uc774\uc9c0 \ud3b8\uc9d1
+
+# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during ajax calls
+desktop.action.loadpage=
+
+# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during loading of customizer
+desktop.action.loadpageeditor=\ud398\uc774\uc9c0 \ud3b8\uc9d1\uae30 \uc5ec\ub294 \uc911 ...

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ua.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ua.properties (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ua.properties Fri Dec 12 04:06:29 2008
@@ -3,22 +3,22 @@
 # this work for additional information regarding copyright ownership.
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-desktop.action.menu=\u041c\u0435\u043d\u044e \u0432\u0456\u043a\u043d\u0430
-desktop.action.tile=\u0420\u043e\u0437\u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043c\u043e\u0437\u0430\u0457\u043a\u043e\u044e
-desktop.action.untile=\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438 \u0440\u043e\u0437\u043c\u0456\u0449\u0435\u043d\u043d\u044f \u043c\u043e\u0437\u0430\u0457\u043a\u043e\u044e
-desktop.action.heightexpand=\u0412\u0438\u0441\u043e\u0442\u0430 - \u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438
-desktop.action.heightnormal=\u0412\u0438\u0441\u043e\u0442\u0430 - \u041d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u0430
-desktop.action.restore=\u0412\u0456\u0434\u043d\u043e\u0432\u0438\u0442\u0438
-desktop.action.removeportlet=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0440\u0442\u043b\u0435\u0442
-desktop.action.addportlet=\u0414\u043e\u0434\u0430\u0442\u0438 \u043f\u043e\u0440\u0442\u043b\u0435\u0442
-desktop.action.editpage=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0443
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+desktop.action.menu=\u041c\u0435\u043d\u044e \u0432\u0456\u043a\u043d\u0430
+desktop.action.tile=\u0420\u043e\u0437\u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043c\u043e\u0437\u0430\u0457\u043a\u043e\u044e
+desktop.action.untile=\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438 \u0440\u043e\u0437\u043c\u0456\u0449\u0435\u043d\u043d\u044f \u043c\u043e\u0437\u0430\u0457\u043a\u043e\u044e
+desktop.action.heightexpand=\u0412\u0438\u0441\u043e\u0442\u0430 - \u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438
+desktop.action.heightnormal=\u0412\u0438\u0441\u043e\u0442\u0430 - \u041d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u0430
+desktop.action.restore=\u0412\u0456\u0434\u043d\u043e\u0432\u0438\u0442\u0438
+desktop.action.removeportlet=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0440\u0442\u043b\u0435\u0442
+desktop.action.addportlet=\u0414\u043e\u0434\u0430\u0442\u0438 \u043f\u043e\u0440\u0442\u043b\u0435\u0442
+desktop.action.editpage=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0443

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/resources/Messages_ua.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/templates/PortalBreadcrumbContainer.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/blueocean/templates/PortalBreadcrumbLinkSeparator.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/initLayoutDecorators.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator-macros.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator-macros.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator-macros.vm Fri Dec 12 04:06:29 2008
@@ -1,115 +1,115 @@
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-#* include potentially nested links navigation component *#
-#macro (includeNestedLinksWithIconNavigation $_nodeSet $_nodePrefix)
-  <div>
-  #foreach($node in $_nodeSet.iterator()) 
-    #if($node.type == ".psml")
-      <div><a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkPage" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a></div>
-    #elseif($node.type == ".link")
-      <div><a href="$node.url" target="$node.target" class="Link" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a></div>
-    #elseif($node.type == "folder")
-      <div><a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkFolder" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a></div>
-    #elseif($node.type == ".ds")
-      <div class="pagetitle" title="$node.getTitle($preferedLocale)">${node.getShortTitle($preferedLocale)}</div>
-      #set($__nodePrefix = "${_nodePrefix}${node.url}")
-      #set($__nodeSet = $site.getDocumentSetNodes($__nodePrefix))
-      #includeNestedLinksWithIconNavigation($__nodeSet $__nodePrefix)
-    #else
-      <div><a href="$node.url" title="$node.getTitle()">$node.getShortTitle()</a></div>
-    #end
-  #end
-  </div>
-#end
-#macro (includeLinksWithIconNavigation $_nodeSet)
-  #includeNestedLinksWithIconNavigation($_nodeSet "")
-#end
-
-#* include folders navigation component *#
-#macro (includeFoldersNavigation $_nodeSet)
-  <div class="FolderList">
-  #foreach($childFolder in $_nodeSet.iterator())
-    <span><a href="$jetspeed.getAbsoluteUrl($childFolder.url)" class="FolderLink" title="$childFolder.getTitle($preferedLocale)">$childFolder.getShortTitle($preferedLocale)</a></span>        
-  #end
-  </div>
-#end
-
-#* include tabs navigation component *#
-#macro (includeTabsNavigation $_nodeSet)
-  <table border="0" cellpadding="0" cellspacing="0">
-    <tr>
-      #foreach($childPage in $_nodeSet.iterator())
-        #set($tabTitle = $childPage.getTitle($preferedLocale))
-        #set($tabName = $childPage.getShortTitle($preferedLocale))
-        #if($jetspeed.page.id == $childPage.id)
-          <td class="LTabLeft" nowrap="true">&nbsp;</td>
-          <td class="LTab" align="center" valign="middle" nowrap="true" title="$tabTitle">${tabName}</td>
-          <td class="LTabRight"  nowrap="true">&nbsp;</td>
-        #else
-          <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
-          <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$tabTitle"><a href="$jetspeed.getAbsoluteUrl($childPage.url)">${tabName}</a></td>
-          <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
-        #end
-      #end
-    </tr>
-  </table>
-#end
-
-#* include tabs navigation component *#
-#macro (includeFolderTabsNavigation $_nodeSet $_orientation)
-  <table border="0" cellpadding="0" cellspacing="0">
-    <tr>
-    #foreach($childFolder in $_nodeSet.iterator())
-      #set($tabTitle = $childFolder.getTitle($preferedLocale))
-      #set($tabName = $childFolder.getShortTitle($preferedLocale))
-
-      #if($_orientation == $LEFT_TO_RIGHT)
-        #if($site.folder.id == $childFolder.id)
-          <td class="LTabLeft" nowrap="true">&nbsp;</td>
-          <td class="LTab" align="center" valign="middle" nowrap="true" title="$tabTitle">${tabName}</td>
-          <td class="LTabRight"  nowrap="true">&nbsp;</td>
-        #else
-          <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
-          <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$tabTitle"><a href="$jetspeed.getAbsoluteUrl($childFolder.url)">${tabName}</a></td>
-          <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
-        #end
-      #end
-    #end           
-            
-    </tr>
-  </table>
-#end
-
-#macro (includePagesNavigation $_nodeSet $_orientation)
-  <div class="FolderList">
-  #foreach($childPage in $_nodeSet.iterator())
-    #if($_orientation == $LEFT_TO_RIGHT)
-      <span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-      <div>
-    #end
-
-    <a href="$jetspeed.getAbsoluteUrl($childPage.url)" class="FolderLink" title="$childPage.getTitle($preferedLocale)">$childPage.getShortTitle($preferedLocale)</a>        
-
-    #if($_orientation == $LEFT_TO_RIGHT)
-      </span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-      </div>
-    #end
-  #end
-  </div>
-#end
+#*
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*#
+#* include potentially nested links navigation component *#
+#macro (includeNestedLinksWithIconNavigation $_nodeSet $_nodePrefix)
+  <div>
+  #foreach($node in $_nodeSet.iterator()) 
+    #if($node.type == ".psml")
+      <div><a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkPage" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a></div>
+    #elseif($node.type == ".link")
+      <div><a href="$node.url" target="$node.target" class="Link" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a></div>
+    #elseif($node.type == "folder")
+      <div><a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkFolder" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a></div>
+    #elseif($node.type == ".ds")
+      <div class="pagetitle" title="$node.getTitle($preferedLocale)">${node.getShortTitle($preferedLocale)}</div>
+      #set($__nodePrefix = "${_nodePrefix}${node.url}")
+      #set($__nodeSet = $site.getDocumentSetNodes($__nodePrefix))
+      #includeNestedLinksWithIconNavigation($__nodeSet $__nodePrefix)
+    #else
+      <div><a href="$node.url" title="$node.getTitle()">$node.getShortTitle()</a></div>
+    #end
+  #end
+  </div>
+#end
+#macro (includeLinksWithIconNavigation $_nodeSet)
+  #includeNestedLinksWithIconNavigation($_nodeSet "")
+#end
+
+#* include folders navigation component *#
+#macro (includeFoldersNavigation $_nodeSet)
+  <div class="FolderList">
+  #foreach($childFolder in $_nodeSet.iterator())
+    <span><a href="$jetspeed.getAbsoluteUrl($childFolder.url)" class="FolderLink" title="$childFolder.getTitle($preferedLocale)">$childFolder.getShortTitle($preferedLocale)</a></span>        
+  #end
+  </div>
+#end
+
+#* include tabs navigation component *#
+#macro (includeTabsNavigation $_nodeSet)
+  <table border="0" cellpadding="0" cellspacing="0">
+    <tr>
+      #foreach($childPage in $_nodeSet.iterator())
+        #set($tabTitle = $childPage.getTitle($preferedLocale))
+        #set($tabName = $childPage.getShortTitle($preferedLocale))
+        #if($jetspeed.page.id == $childPage.id)
+          <td class="LTabLeft" nowrap="true">&nbsp;</td>
+          <td class="LTab" align="center" valign="middle" nowrap="true" title="$tabTitle">${tabName}</td>
+          <td class="LTabRight"  nowrap="true">&nbsp;</td>
+        #else
+          <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
+          <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$tabTitle"><a href="$jetspeed.getAbsoluteUrl($childPage.url)">${tabName}</a></td>
+          <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
+        #end
+      #end
+    </tr>
+  </table>
+#end
+
+#* include tabs navigation component *#
+#macro (includeFolderTabsNavigation $_nodeSet $_orientation)
+  <table border="0" cellpadding="0" cellspacing="0">
+    <tr>
+    #foreach($childFolder in $_nodeSet.iterator())
+      #set($tabTitle = $childFolder.getTitle($preferedLocale))
+      #set($tabName = $childFolder.getShortTitle($preferedLocale))
+
+      #if($_orientation == $LEFT_TO_RIGHT)
+        #if($site.folder.id == $childFolder.id)
+          <td class="LTabLeft" nowrap="true">&nbsp;</td>
+          <td class="LTab" align="center" valign="middle" nowrap="true" title="$tabTitle">${tabName}</td>
+          <td class="LTabRight"  nowrap="true">&nbsp;</td>
+        #else
+          <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
+          <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$tabTitle"><a href="$jetspeed.getAbsoluteUrl($childFolder.url)">${tabName}</a></td>
+          <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
+        #end
+      #end
+    #end           
+            
+    </tr>
+  </table>
+#end
+
+#macro (includePagesNavigation $_nodeSet $_orientation)
+  <div class="FolderList">
+  #foreach($childPage in $_nodeSet.iterator())
+    #if($_orientation == $LEFT_TO_RIGHT)
+      <span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+      <div>
+    #end
+
+    <a href="$jetspeed.getAbsoluteUrl($childPage.url)" class="FolderLink" title="$childPage.getTitle($preferedLocale)">$childPage.getShortTitle($preferedLocale)</a>        
+
+    #if($_orientation == $LEFT_TO_RIGHT)
+      </span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+      </div>
+    #end
+  #end
+  </div>
+#end

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm Fri Dec 12 04:06:29 2008
@@ -1,27 +1,27 @@
-#*
+#*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-  </td>
- </tr>
-</table> 
-</div>
-
-<p>
-<img src="#GetPageResource('images/jetspeed-powered.gif')" alt="Jetspeed 2 Powered" border="0">
-</p>
-</body>
-</html>
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+  </td>
+ </tr>
+</table> 
+</div>
+
+<p>
+<img src="#GetPageResource('images/jetspeed-powered.gif')" alt="Jetspeed 2 Powered" border="0">
+</p>
+</body>
+</html>

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

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=725977&r1=725976&r2=725977&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 Fri Dec 12 04:06:29 2008
@@ -1,100 +1,100 @@
-#*
+#*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#* Add the current layouts configuration values to the context *#
-#defineLayoutObjects()
-
-#* Loads our custom macros *#
-#parse($layoutDecoration.getResource("decorator-macros.vm"))
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-#includeHeaderResource()
-
-    <meta http-equiv="Content-type" content="#ContentType()" />
-    <title>#PageTitle()</title>
-
-#includeJavaScriptForHead()
-#IncludeStylesheets()
-
-</head>
-<body class="#PageBaseCSSClass()">
-<!--  BEGIN: layout/html/jetspeed/decorator.vm -->
-
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
-<p>
-<img src="#GetPageResource('images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" border="0">
-</p>
-
-#set($site = $request.getAttribute("org.apache.jetspeed.profiledPageContext"))
-
-<p>
-    #set($parentFolder = $site.parentFolder)
-    
-    #if($parentFolder)
-     <p style="font-style:italic">    
-        <a href="$jetspeed.getAbsoluteUrl($parentFolder.url)" title="$parentFolder.getTitle($preferedLocale)">Back to $parentFolder.getShortTitle($preferedLocale)</a> &nbsp;
-     </p>
-    #end
-    
-  #includeFoldersNavigation($site.siblingFolders)
-</p>
-  <p>
-  #includeTabsNavigation($site.siblingPages)
-## <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>  
-#if ($request.getUserPrincipal())
-<span style="position:absolute;right:5em"><a href="#BaseHref()login/logout">Logout</a></span>   
-#end 
-  #PageActionBar()
-  </p>
-</p>
-    
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr>
-#set($hasFoldersAndPages = $site.documentSetNames && !$site.documentSetNames.isEmpty())
-#set($hasAdditionaLinks = $site.rootLinks && !$site.rootLinks.isEmpty())
-#if($hasFoldersAndPages || $hasAdditionaLinks)
-  <td valign="top">
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-    #if($hasAdditionaLinks)
-    <tr>
-      <td nowrap>  
-        <br>Additional Links:
-        #includeLinksWithIconNavigation($site.rootLinks)
-      </td>
-    </tr>
-    #end
-    #foreach($docSetName in $site.documentSetNames)
-      #set($docSet = $site.getDocumentSet($docSetName))
-      #set($docSetNodes = $site.getDocumentSetNodes($docSetName))
-      <tr>
-        <td nowrap>    
-          <br><span title="$docSet.getTitle($preferedLocale)">${docSet.getShortTitle($preferedLocale)}</span>:
-          #includeNestedLinksWithIconNavigation($docSetNodes $docSet.url)
-        </td>
-      </tr>
-    #end
-    </table>
-  </td>
-#end
-  <td width="99%" nowrap valign="top">
-  
-## $jetspeed.include($jetspeed.currentFragment)
-
-<!--  END: layout/html/jetspeed/decorator.vm -->
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#* Add the current layouts configuration values to the context *#
+#defineLayoutObjects()
+
+#* Loads our custom macros *#
+#parse($layoutDecoration.getResource("decorator-macros.vm"))
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+
+#includeHeaderResource()
+
+    <meta http-equiv="Content-type" content="#ContentType()" />
+    <title>#PageTitle()</title>
+
+#includeJavaScriptForHead()
+#IncludeStylesheets()
+
+</head>
+<body class="#PageBaseCSSClass()">
+<!--  BEGIN: layout/html/jetspeed/decorator.vm -->
+
+<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+<p>
+<img src="#GetPageResource('images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" border="0">
+</p>
+
+#set($site = $request.getAttribute("org.apache.jetspeed.profiledPageContext"))
+
+<p>
+    #set($parentFolder = $site.parentFolder)
+    
+    #if($parentFolder)
+     <p style="font-style:italic">    
+        <a href="$jetspeed.getAbsoluteUrl($parentFolder.url)" title="$parentFolder.getTitle($preferedLocale)">Back to $parentFolder.getShortTitle($preferedLocale)</a> &nbsp;
+     </p>
+    #end
+    
+  #includeFoldersNavigation($site.siblingFolders)
+</p>
+  <p>
+  #includeTabsNavigation($site.siblingPages)
+## <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>  
+#if ($request.getUserPrincipal())
+<span style="position:absolute;right:5em"><a href="#BaseHref()login/logout">Logout</a></span>   
+#end 
+  #PageActionBar()
+  </p>
+</p>
+    
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<tr>
+#set($hasFoldersAndPages = $site.documentSetNames && !$site.documentSetNames.isEmpty())
+#set($hasAdditionaLinks = $site.rootLinks && !$site.rootLinks.isEmpty())
+#if($hasFoldersAndPages || $hasAdditionaLinks)
+  <td valign="top">
+    <table cellpadding="0" cellspacing="0" border="0" width="100%">
+    #if($hasAdditionaLinks)
+    <tr>
+      <td nowrap>  
+        <br>Additional Links:
+        #includeLinksWithIconNavigation($site.rootLinks)
+      </td>
+    </tr>
+    #end
+    #foreach($docSetName in $site.documentSetNames)
+      #set($docSet = $site.getDocumentSet($docSetName))
+      #set($docSetNodes = $site.getDocumentSetNodes($docSetName))
+      <tr>
+        <td nowrap>    
+          <br><span title="$docSet.getTitle($preferedLocale)">${docSet.getShortTitle($preferedLocale)}</span>:
+          #includeNestedLinksWithIconNavigation($docSetNodes $docSet.url)
+        </td>
+      </tr>
+    #end
+    </table>
+  </td>
+#end
+  <td width="99%" nowrap valign="top">
+  
+## $jetspeed.include($jetspeed.currentFragment)
+
+<!--  END: layout/html/jetspeed/decorator.vm -->

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jscookmenu/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jscookmenu/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jscookmenu/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jscookmenu/header.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jscookmenu/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jscookmenu/header.vm Fri Dec 12 04:06:29 2008
@@ -1,142 +1,142 @@
-#*
+#*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#*
-JSCookMenu (c) Copyright 2002-2005 by Heng Yuan
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*#
-
-#* Add the current layouts configuration values to the context *#
-#defineLayoutObjects()
-
-#* Loads our custom macros *#
-#parse($layoutDecoration.getResource("decorator-macros.vm"))
-
-#* Add all template constants to the current context *#
-#defineNavigationConstants()
-
-#* Access page context *#
-#set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
-
-#* select default JSCookMenu theme *#
-#set($jsCookMenuTheme = $JSCOOKMENU_JETSPEED_THEME)
-
-#* Access page menus *#
-#set($siteNavigationsStandardMenu = $site.getMenu("site-navigations"))
-#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
-#set($additionalLinksStandardMenu = $site.getMenu("additional-links"))
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-
-#includeHeaderResource()
-
-    <meta http-equiv="Content-type" content="#ContentType()" />
-    <meta http-equiv="Content-style-type" content="text/css" />
-
-#includeJavaScriptForHead()
-#IncludeStylesheets()
-
-    <title>#PageTitle()</title>
-
-    <meta name="version" content="/* $Id$" />
-    <meta name="keywords" content="" />
-    <meta name="description" content="#PageDescription()" />
-
-<!-- JSCookMenu setup -->
-    <script language="JavaScript" src="#GetPageResource("scripts/JSCookMenu.js")"></script>
-    <link rel="stylesheet" href="#GetPageResource("css/${jsCookMenuTheme}/theme.css")" type="text/css">
-    <script language="JavaScript" src="#GetPageResource("scripts/${jsCookMenuTheme}/theme.js")"></script>
-
-  </head>
-  <body marginwidth="0" marginheight="0" class="#PageBaseCSSClass()">
-
-<!--  BEGIN: layout/html/jscookmenu/decorator.vm -->
-
-    <div class="#PageBaseCSSClass()">
-
-<!-- Banner Content -->
-      <div id="banner">
-        <table border="0" cellspacing="0" cellpadding="8" width="100%">
-          <tr>
-            <td>
-              <h1><img src="#GetPageResource('images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" border="0"/></h1>
-            </td>
-            <td>
-              &nbsp;
-            </td>
-          </tr>
-        </table>
-      </div>
-
-<!-- Top Menu -->
-#if(!$siteNavigationsStandardMenu.empty)
-#includeJSCookMenuDefinition("tophorizontalmenu" $siteNavigationsStandardMenu)
-      <div id="tophorizontalmenu"></div>
-#includeJSCookMenuDraw("tophorizontalmenu" $jsCookMenuTheme $LEFT_TO_RIGHT)
-#end
-
-<!-- Breadcrumbs Back Navigation -->
-      <div id="breadcrumbs">
-#if(!$breadcrumbsStandardMenu.empty)
-#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
-## <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>
-#if ($request.getUserPrincipal())
-<span style="position:absolute;right:5em"><a href="#BaseHref()login/logout">Logout</a></span>   
-#end 
-#PageActionBar()
-#else
-        &nbsp;
-#end
-      </div>
-
-<!-- Content Table -->
-      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-        <tr>
-
-<!-- Left Menu Table Data -->
-#if(!$additionalLinksStandardMenu.empty)
-          <td valign="top" width="20%">
-#includeJSCookMenuDefinition("leftverticalmenu" $additionalLinksStandardMenu)
-         
-            <div id="leftverticalmenu"></div>
-#includeJSCookMenuDraw("leftverticalmenu" $jsCookMenuTheme $TOP_TO_BOTTOM)
-          </td>
-#end
-
-<!-- Content Table Data -->
-          <td nowrap valign="top">
-  
-<!--  END: layout/html/jscookmenu/decorator.vm -->
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#*
+JSCookMenu (c) Copyright 2002-2005 by Heng Yuan
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*#
+
+#* Add the current layouts configuration values to the context *#
+#defineLayoutObjects()
+
+#* Loads our custom macros *#
+#parse($layoutDecoration.getResource("decorator-macros.vm"))
+
+#* Add all template constants to the current context *#
+#defineNavigationConstants()
+
+#* Access page context *#
+#set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
+
+#* select default JSCookMenu theme *#
+#set($jsCookMenuTheme = $JSCOOKMENU_JETSPEED_THEME)
+
+#* Access page menus *#
+#set($siteNavigationsStandardMenu = $site.getMenu("site-navigations"))
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#set($additionalLinksStandardMenu = $site.getMenu("additional-links"))
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+
+#includeHeaderResource()
+
+    <meta http-equiv="Content-type" content="#ContentType()" />
+    <meta http-equiv="Content-style-type" content="text/css" />
+
+#includeJavaScriptForHead()
+#IncludeStylesheets()
+
+    <title>#PageTitle()</title>
+
+    <meta name="version" content="/* $Id$" />
+    <meta name="keywords" content="" />
+    <meta name="description" content="#PageDescription()" />
+
+<!-- JSCookMenu setup -->
+    <script language="JavaScript" src="#GetPageResource("scripts/JSCookMenu.js")"></script>
+    <link rel="stylesheet" href="#GetPageResource("css/${jsCookMenuTheme}/theme.css")" type="text/css">
+    <script language="JavaScript" src="#GetPageResource("scripts/${jsCookMenuTheme}/theme.js")"></script>
+
+  </head>
+  <body marginwidth="0" marginheight="0" class="#PageBaseCSSClass()">
+
+<!--  BEGIN: layout/html/jscookmenu/decorator.vm -->
+
+    <div class="#PageBaseCSSClass()">
+
+<!-- Banner Content -->
+      <div id="banner">
+        <table border="0" cellspacing="0" cellpadding="8" width="100%">
+          <tr>
+            <td>
+              <h1><img src="#GetPageResource('images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" border="0"/></h1>
+            </td>
+            <td>
+              &nbsp;
+            </td>
+          </tr>
+        </table>
+      </div>
+
+<!-- Top Menu -->
+#if(!$siteNavigationsStandardMenu.empty)
+#includeJSCookMenuDefinition("tophorizontalmenu" $siteNavigationsStandardMenu)
+      <div id="tophorizontalmenu"></div>
+#includeJSCookMenuDraw("tophorizontalmenu" $jsCookMenuTheme $LEFT_TO_RIGHT)
+#end
+
+<!-- Breadcrumbs Back Navigation -->
+      <div id="breadcrumbs">
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+## <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>
+#if ($request.getUserPrincipal())
+<span style="position:absolute;right:5em"><a href="#BaseHref()login/logout">Logout</a></span>   
+#end 
+#PageActionBar()
+#else
+        &nbsp;
+#end
+      </div>
+
+<!-- Content Table -->
+      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+        <tr>
+
+<!-- Left Menu Table Data -->
+#if(!$additionalLinksStandardMenu.empty)
+          <td valign="top" width="20%">
+#includeJSCookMenuDefinition("leftverticalmenu" $additionalLinksStandardMenu)
+         
+            <div id="leftverticalmenu"></div>
+#includeJSCookMenuDraw("leftverticalmenu" $jsCookMenuTheme $TOP_TO_BOTTOM)
+          </td>
+#end
+
+<!-- Content Table Data -->
+          <td nowrap valign="top">
+  
+<!--  END: layout/html/jscookmenu/decorator.vm -->

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jscookmenu/header.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/decorator-macros.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/decorator-macros.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/decorator-macros.vm Fri Dec 12 04:06:29 2008
@@ -1,117 +1,117 @@
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-#* define navigation constants *#
-#macro (defineNavigationConstants)
-  #set($LEFT_TO_RIGHT = "LeftToRight")
-  #set($RIGHT_TO_LEFT = "RightToLeft")
-  #set($TOP_TO_BOTTOM = "TopToBottom")
-  #set($BOTTOM_TO_TOP = "BottomToTop")
-#end
-
-#* include potentially nested links navigation component *#
-#macro (includeNestedLinksWithIconNavigation $_nodeSet $_nodePrefix $_orientation)
-  <div>
-  #foreach($node in $_nodeSet.iterator()) 
-    #if($_orientation == $TOP_TO_BOTTOM)
-      #if($node.type == ".ds")
-        <div class="pagetitle" title="$node.getTitle($preferedLocale)">${node.getShortTitle($preferedLocale)}</div>
-      #else
-        <div>
-      #end
-    #end
-
-    #if($node.type == ".psml")
-      <a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkPage" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>    
-    #elseif($node.type == ".link")
-      <a href="$node.url" target="$node.target" class="Link" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>    
-    #elseif($node.type == "folder")
-      <a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkFolder" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>    
-    #elseif($node.type == ".ds")
-      #set($__nodePrefix = "${_nodePrefix}${node.url}")
-      #set($__nodeSet = $site.getDocumentSetNodes($__nodePrefix))
-      #includeNestedLinksWithIconNavigation($__nodeSet $__nodePrefix $_orientation)
-    #else
-      <a href="$node.url" title="$node.getTitle()">$node.getShortTitle()</a>    
-    #end
-
-    #if($_orientation == $TOP_TO_BOTTOM)
-      #if($node.type != ".ds")
-        </div>
-      #end
-    #end
-  #end
-  </div>
-#end
-#macro (includeLinksWithIconNavigation $_nodeSet $_orientation)
-  #includeNestedLinksWithIconNavigation($_nodeSet "" $_orientation)
-#end
-
-#* include folders navigation component *#
-#macro (includeFoldersNavigation $_nodeSet $_orientation)
-  <div class="FolderList">
-  #foreach($childFolder in $_nodeSet.iterator())
-    #if($_orientation == $LEFT_TO_RIGHT)
-      <span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-      <div>
-    #end
-
-    <a href="$jetspeed.getAbsoluteUrl($childFolder.url)" class="FolderLink" title="$childFolder.getTitle($preferedLocale)">$childFolder.getShortTitle($preferedLocale)</a>        
-
-    #if($_orientation == $LEFT_TO_RIGHT)
-      </span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-      </div>
-    #end
-  #end
-  </div>
-#end
-
-#* include tabs navigation component *#
-#macro (includeTabsNavigation $_nodeSet $_orientation)
-  <table border="0" cellpadding="0" cellspacing="0">
-    <tr>
-    #foreach($childPage in $_nodeSet.iterator())
-      #set($tabTitle = $childPage.getTitle($preferedLocale))
-      #set($tabName = $childPage.getShortTitle($preferedLocale))
-
-      #if($_orientation == $LEFT_TO_RIGHT)
-        #if($jetspeed.page.id == $childPage.id)
-          <td class="LTabLeft" nowrap="true">&nbsp;</td>
-          <td class="LTab" align="center" valign="middle" nowrap="true" title="$tabTitle">${tabName}</td>
-          <td class="LTabRight"  nowrap="true">&nbsp;</td>
-        #else
-          <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
-          <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$tabTitle"><a href="$jetspeed.getAbsoluteUrl($childPage.url)">${tabName}</a></td>
-          <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
-        #end
-      #end
-    #end
-    </tr>
-  </table>
-#end
-
-#macro (PageActionBar)
- #set($_actions = $layoutDecoration.actions)
-  <div align="right">
-    #if($_actions.size() >0)
-    #foreach ($_action in $_actions)   
-     <a href="${_action.Action}" title="${_action.Name}" class="action pageAction" >${_action.Alt}</a>
-    #end   
-    #end
-  </div>
-#end
+#*
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*#
+#* define navigation constants *#
+#macro (defineNavigationConstants)
+  #set($LEFT_TO_RIGHT = "LeftToRight")
+  #set($RIGHT_TO_LEFT = "RightToLeft")
+  #set($TOP_TO_BOTTOM = "TopToBottom")
+  #set($BOTTOM_TO_TOP = "BottomToTop")
+#end
+
+#* include potentially nested links navigation component *#
+#macro (includeNestedLinksWithIconNavigation $_nodeSet $_nodePrefix $_orientation)
+  <div>
+  #foreach($node in $_nodeSet.iterator()) 
+    #if($_orientation == $TOP_TO_BOTTOM)
+      #if($node.type == ".ds")
+        <div class="pagetitle" title="$node.getTitle($preferedLocale)">${node.getShortTitle($preferedLocale)}</div>
+      #else
+        <div>
+      #end
+    #end
+
+    #if($node.type == ".psml")
+      <a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkPage" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>    
+    #elseif($node.type == ".link")
+      <a href="$node.url" target="$node.target" class="Link" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>    
+    #elseif($node.type == "folder")
+      <a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkFolder" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>    
+    #elseif($node.type == ".ds")
+      #set($__nodePrefix = "${_nodePrefix}${node.url}")
+      #set($__nodeSet = $site.getDocumentSetNodes($__nodePrefix))
+      #includeNestedLinksWithIconNavigation($__nodeSet $__nodePrefix $_orientation)
+    #else
+      <a href="$node.url" title="$node.getTitle()">$node.getShortTitle()</a>    
+    #end
+
+    #if($_orientation == $TOP_TO_BOTTOM)
+      #if($node.type != ".ds")
+        </div>
+      #end
+    #end
+  #end
+  </div>
+#end
+#macro (includeLinksWithIconNavigation $_nodeSet $_orientation)
+  #includeNestedLinksWithIconNavigation($_nodeSet "" $_orientation)
+#end
+
+#* include folders navigation component *#
+#macro (includeFoldersNavigation $_nodeSet $_orientation)
+  <div class="FolderList">
+  #foreach($childFolder in $_nodeSet.iterator())
+    #if($_orientation == $LEFT_TO_RIGHT)
+      <span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+      <div>
+    #end
+
+    <a href="$jetspeed.getAbsoluteUrl($childFolder.url)" class="FolderLink" title="$childFolder.getTitle($preferedLocale)">$childFolder.getShortTitle($preferedLocale)</a>        
+
+    #if($_orientation == $LEFT_TO_RIGHT)
+      </span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+      </div>
+    #end
+  #end
+  </div>
+#end
+
+#* include tabs navigation component *#
+#macro (includeTabsNavigation $_nodeSet $_orientation)
+  <table border="0" cellpadding="0" cellspacing="0">
+    <tr>
+    #foreach($childPage in $_nodeSet.iterator())
+      #set($tabTitle = $childPage.getTitle($preferedLocale))
+      #set($tabName = $childPage.getShortTitle($preferedLocale))
+
+      #if($_orientation == $LEFT_TO_RIGHT)
+        #if($jetspeed.page.id == $childPage.id)
+          <td class="LTabLeft" nowrap="true">&nbsp;</td>
+          <td class="LTab" align="center" valign="middle" nowrap="true" title="$tabTitle">${tabName}</td>
+          <td class="LTabRight"  nowrap="true">&nbsp;</td>
+        #else
+          <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
+          <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$tabTitle"><a href="$jetspeed.getAbsoluteUrl($childPage.url)">${tabName}</a></td>
+          <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
+        #end
+      #end
+    #end
+    </tr>
+  </table>
+#end
+
+#macro (PageActionBar)
+ #set($_actions = $layoutDecoration.actions)
+  <div align="right">
+    #if($_actions.size() >0)
+    #foreach ($_action in $_actions)   
+     <a href="${_action.Action}" title="${_action.Name}" class="action pageAction" >${_action.Alt}</a>
+    #end   
+    #end
+  </div>
+#end

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/footer.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/footer.vm Fri Dec 12 04:06:29 2008
@@ -1,19 +1,19 @@
-#*
+#*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
- </body>
-</html>
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+ </body>
+</html>

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/header.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/header.vm Fri Dec 12 04:06:29 2008
@@ -1,45 +1,45 @@
-#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#* Add the current layouts configuration values to the context *#
-#defineLayoutObjects()
-#* Loads our custom macros *#
-#parse($layoutDecoration.getResource("decorator-macros.vm"))
-#* Add all template constants to the current context *#
-#defineNavigationConstants()
-
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-#includeHeaderResource()
-
-    <meta http-equiv="Content-type" content="#ContentType()" />
-    <meta http-equiv="Content-style-type" content="text/css" />
-
-#includeJavaScriptForHead()
-#IncludeStylesheets()
-
-    <title>#PageTitle()</title>
-
-    <meta name="keywords" content="" />
-    <meta name="description" content="#PageDescription()" />
-  </head>
-  <body marginwidth="0" marginheight="0" class="#PageBaseCSSClass()">
-
-    #PageActionBar()
+#*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#* Add the current layouts configuration values to the context *#
+#defineLayoutObjects()
+#* Loads our custom macros *#
+#parse($layoutDecoration.getResource("decorator-macros.vm"))
+#* Add all template constants to the current context *#
+#defineNavigationConstants()
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+#includeHeaderResource()
+
+    <meta http-equiv="Content-type" content="#ContentType()" />
+    <meta http-equiv="Content-style-type" content="text/css" />
+
+#includeJavaScriptForHead()
+#IncludeStylesheets()
+
+    <title>#PageTitle()</title>
+
+    <meta name="keywords" content="" />
+    <meta name="description" content="#PageDescription()" />
+  </head>
+  <body marginwidth="0" marginheight="0" class="#PageBaseCSSClass()">
+
+    #PageActionBar()

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/header.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/xhtml-basic/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/simple/xhtml-basic/header.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/sunflower/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/sunflower/decorator-macros.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/sunflower/decorator-macros.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/sunflower/decorator-macros.vm Fri Dec 12 04:06:29 2008
@@ -1,240 +1,240 @@
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-#* define navigation constants *#
-#macro (defineNavigationConstants)
-  #set($LEFT_TO_RIGHT = "LeftToRight")
-  #set($RIGHT_TO_LEFT = "RightToLeft")
-  #set($TOP_TO_BOTTOM = "TopToBottom")
-  #set($BOTTOM_TO_TOP = "BottomToTop")
-  #set($TITLE_FIRST = "TitleFirst")
-  #set($TITLE_LAST = "TitleLast")
-  #set($BREADCRUMBS_STYLE = "BreadcrumbsStyle")
-#end
-
-#* include tabs navigation component *#
-#macro (includeTabsNavigation $_menu $_orientation)
-    <ul class="header">
-    #foreach($element in $_menu.elements.iterator())
-      #if($element.elementType == "option")
-        #set($tabTitle = $element.getTitle($preferedLocale))
-        #set($tabName = $element.getShortTitle($preferedLocale))
-        #if($_orientation == $LEFT_TO_RIGHT)
-          #if($element.isSelected($site))
-        <li>${tabName}</li>
-          #else
-            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
-        <li><a href="$tabUrl">${tabName}</a></li>
-          #end
-        #end
-      #end
-    #end
-    </ul>
-#end
-
-#* include links navigation component *#
-#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
-  #set($__delimiter = $_delimiter)
-  #if(!$_delimiter || $_delimiter == "")
-    #if($_style != $BREADCRUMBS_STYLE)
-      #set($__delimiter = "&nbsp;")
-    #else
-      #set($__delimiter = "&nbsp;&gt;&gt;&nbsp;")
-    #end
-  #end
-  #set($menuTitle = $_menu.getTitle($preferedLocale))
-  #set($menuName = $_menu.getShortTitle($preferedLocale))
-  
-      <div class="FolderList">
-  #if($_title == $TITLE_FIRST)
-    #if($_orientation == $LEFT_TO_RIGHT)
-		
-        <span title="$!menuTitle">${menuName}&nbsp;</span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-		
-        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
-    #end
-  #end
-  #foreach($element in $_menu.elements.iterator())
-    #if($element.elementType == "option")
-      #set($linkTitle = $element.getTitle($preferedLocale))
-      #set($linkName = $element.getShortTitle($preferedLocale))
-      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
-      #if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size())
-        #if($_orientation == $LEFT_TO_RIGHT)
-			
-        <span>
-        #elseif($_orientation == $TOP_TO_BOTTOM)
-			
-        <div>
-        #end
-        #if($element.type == "page")
-			
-          <a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a>
-        #elseif($element.type == "link")
-			
-          <a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a>
-        #elseif($element.type == "folder")
-			
-          <a href="$linkUrl" class="LinkFolder" title="$!linkTitle">${linkName}</a>
-        #else
-			
-          <a href="$linkUrl" title="$!linkTitle">${linkName}</a>
-        #end
-        #if($_orientation == $LEFT_TO_RIGHT)
-        ${__delimiter}</span>
-        #elseif($_orientation == $TOP_TO_BOTTOM)
-			
-        </div>
-        #end
-      #else
-        #if($_orientation == $LEFT_TO_RIGHT)
-			
-        <span title="$!linkTitle">${linkName}&nbsp;</span>		
-        #elseif($_orientation == $TOP_TO_BOTTOM)
-			
-        <div title="$!linkTitle">${linkName}</div>
-        #end
-      #end
-    #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>              
-      #elseif($_orientation == $TOP_TO_BOTTOM)
-		
-        <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
-      #end
-    #end
-  #end
-  #if($_title == $TITLE_LAST)
-    #if($_orientation == $LEFT_TO_RIGHT)
-		
-        <span title="$!menuTitle">${menuName}&nbsp;</span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-		
-        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
-    #end
-  #end
-  
-      </div>
-#end
-
-#* include nested menu links navigation component *#
-#macro (includeNestedLinksWithIconNavigation $_menu $_orientation)
-  #set($menuTitle = $_menu.getTitle($preferedLocale))
-  #set($menuName = $_menu.getShortTitle($preferedLocale))
-  #if($menuName)
-              <div class="pagetitle" title="$!menuTitle">${menuName}</div>
-  #end
-              <div>
-  #foreach($element in $_menu.elements.iterator())
-    #if($element.elementType == "option")
-      #set($linkTitle = $element.getTitle($preferedLocale))
-      #set($linkName = $element.getShortTitle($preferedLocale))
-      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
-      #if($element.type == "page")
-                <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
-      #elseif($element.type == "link")
-        #set($linkTarget = $element.target)
-                <div><a href="$linkUrl" target="$linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
-      #elseif($element.type == "folder")
-                <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
-      #end
-    #elseif($element.elementType == "menu")
-      #includeNestedLinksWithIconNavigation($element $_orientation)
-    #elseif($element.elementType == "separator")
-      #set($separatorTitle = $element.getTitle($preferedLocale))
-      #set($separatorText = $element.getText($preferedLocale))
-                  <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
-    #end
-  #end
-              </div>
-#end
-
-#* include top level menu links navigation component *#
-#macro (includeLinksWithIconNavigation $_menu $_orientation)
-  #set($rowStarted = false)
-  #set($elementsStarted = false)
-  #foreach($element in $_menu.elements.iterator())
-    #if($element.elementType == "option")
-      #if(!$rowStarted)
-##        <tr>
-##          <td>
-##            <div class="toolgroup">
-##              <div class="body">
-##                <div class="FolderList">
-      #elseif(!$elementsStarted)
-##              <div class="body">
-##                <div class="FolderList">
-      #end
-      #set($linkTitle = $element.getTitle($preferedLocale))
-      #set($linkName = $element.getShortTitle($preferedLocale))
-      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
-      #if($element.type == "page")
-                  <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
-      #elseif($element.type == "link")
-        #set($linkTarget = $element.target)
-                  <div><a href="$linkUrl" target="$!linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
-      #elseif($element.type == "folder")
-                  <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
-      #end
-      #set($rowStarted = true)
-      #set($elementsStarted = true)
-    #elseif($element.elementType == "menu")
-      #if(!$rowStarted)
-##        <tr>
-##          <td>
-##            <div class="toolgroup">
-##              <div class="body">
-##                <div class="FolderList">
-      #elseif(!$elementsStarted)
-##              <div class="body">
-##                <div class="FolderList">
-      #end
-      #includeNestedLinksWithIconNavigation($element $_orientation)
-      #set($rowStarted = true)
-      #set($elementsStarted = true)
-    #elseif($element.elementType == "separator")
-      #if(!$rowStarted)
-##        <tr>
-##          <td>
-##            <div class="toolgroup">
-      #elseif($elementsStarted)
-##                </div>
-##              </div>
-      #end
-      #set($separatorTitle = $element.getTitle($preferedLocale))
-      #set($separatorText = $element.getText($preferedLocale))
-        <h2>${separatorText}</h2>
-##              <div class="label">
-##                ${separatorText}
-##              </div>
-      #set($rowStarted = true)
-      #set($elementsStarted = false)
-    #end
-  #end
-  #if($elementsStarted)
-##                </div>
-##              </div>
-  #end
-  #if($rowStarted)
-##            </div>
-##          </td>
-##        </tr>
-  #end
-#end
+#*
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*#
+#* define navigation constants *#
+#macro (defineNavigationConstants)
+  #set($LEFT_TO_RIGHT = "LeftToRight")
+  #set($RIGHT_TO_LEFT = "RightToLeft")
+  #set($TOP_TO_BOTTOM = "TopToBottom")
+  #set($BOTTOM_TO_TOP = "BottomToTop")
+  #set($TITLE_FIRST = "TitleFirst")
+  #set($TITLE_LAST = "TitleLast")
+  #set($BREADCRUMBS_STYLE = "BreadcrumbsStyle")
+#end
+
+#* include tabs navigation component *#
+#macro (includeTabsNavigation $_menu $_orientation)
+    <ul class="header">
+    #foreach($element in $_menu.elements.iterator())
+      #if($element.elementType == "option")
+        #set($tabTitle = $element.getTitle($preferedLocale))
+        #set($tabName = $element.getShortTitle($preferedLocale))
+        #if($_orientation == $LEFT_TO_RIGHT)
+          #if($element.isSelected($site))
+        <li>${tabName}</li>
+          #else
+            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+        <li><a href="$tabUrl">${tabName}</a></li>
+          #end
+        #end
+      #end
+    #end
+    </ul>
+#end
+
+#* include links navigation component *#
+#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+  #set($__delimiter = $_delimiter)
+  #if(!$_delimiter || $_delimiter == "")
+    #if($_style != $BREADCRUMBS_STYLE)
+      #set($__delimiter = "&nbsp;")
+    #else
+      #set($__delimiter = "&nbsp;&gt;&gt;&nbsp;")
+    #end
+  #end
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+  
+      <div class="FolderList">
+  #if($_title == $TITLE_FIRST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+		
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+		
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+    #end
+  #end
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size())
+        #if($_orientation == $LEFT_TO_RIGHT)
+			
+        <span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+			
+        <div>
+        #end
+        #if($element.type == "page")
+			
+          <a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "link")
+			
+          <a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "folder")
+			
+          <a href="$linkUrl" class="LinkFolder" title="$!linkTitle">${linkName}</a>
+        #else
+			
+          <a href="$linkUrl" title="$!linkTitle">${linkName}</a>
+        #end
+        #if($_orientation == $LEFT_TO_RIGHT)
+        ${__delimiter}</span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+			
+        </div>
+        #end
+      #else
+        #if($_orientation == $LEFT_TO_RIGHT)
+			
+        <span title="$!linkTitle">${linkName}&nbsp;</span>		
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+			
+        <div title="$!linkTitle">${linkName}</div>
+        #end
+      #end
+    #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>              
+      #elseif($_orientation == $TOP_TO_BOTTOM)
+		
+        <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+      #end
+    #end
+  #end
+  #if($_title == $TITLE_LAST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+		
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+		
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+    #end
+  #end
+  
+      </div>
+#end
+
+#* include nested menu links navigation component *#
+#macro (includeNestedLinksWithIconNavigation $_menu $_orientation)
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+  #if($menuName)
+              <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+  #end
+              <div>
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                <div><a href="$linkUrl" target="$linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
+      #elseif($element.type == "folder")
+                <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+    #elseif($element.elementType == "menu")
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+    #elseif($element.elementType == "separator")
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+                  <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+    #end
+  #end
+              </div>
+#end
+
+#* include top level menu links navigation component *#
+#macro (includeLinksWithIconNavigation $_menu $_orientation)
+  #set($rowStarted = false)
+  #set($elementsStarted = false)
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #if(!$rowStarted)
+##        <tr>
+##          <td>
+##            <div class="toolgroup">
+##              <div class="body">
+##                <div class="FolderList">
+      #elseif(!$elementsStarted)
+##              <div class="body">
+##                <div class="FolderList">
+      #end
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                  <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                  <div><a href="$linkUrl" target="$!linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
+      #elseif($element.type == "folder")
+                  <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "menu")
+      #if(!$rowStarted)
+##        <tr>
+##          <td>
+##            <div class="toolgroup">
+##              <div class="body">
+##                <div class="FolderList">
+      #elseif(!$elementsStarted)
+##              <div class="body">
+##                <div class="FolderList">
+      #end
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "separator")
+      #if(!$rowStarted)
+##        <tr>
+##          <td>
+##            <div class="toolgroup">
+      #elseif($elementsStarted)
+##                </div>
+##              </div>
+      #end
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+        <h2>${separatorText}</h2>
+##              <div class="label">
+##                ${separatorText}
+##              </div>
+      #set($rowStarted = true)
+      #set($elementsStarted = false)
+    #end
+  #end
+  #if($elementsStarted)
+##                </div>
+##              </div>
+  #end
+  #if($rowStarted)
+##            </div>
+##          </td>
+##        </tr>
+  #end
+#end

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/sunflower/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/sunflower/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/sunflower/header.vm
------------------------------------------------------------------------------
    svn:eol-style = native



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