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 [5/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/thesolution/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/thesolution/decorator-macros.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/thesolution/decorator-macros.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/thesolution/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>
-    #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))
-        <h3>${separatorText}</h3>
-##              <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>
+    #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))
+        <h3>${separatorText}</h3>
+##              <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/thesolution/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalAccordionContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalAccordionContainer.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalAccordionContainer.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalAccordionContainer.css Fri Dec 12 04:06:29 2008
@@ -1,16 +1,16 @@
-/*
+/*
 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.
-*/
+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.
+*/

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalBreadcrumbContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalBreadcrumbContainer.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalBreadcrumbContainer.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalBreadcrumbContainer.css Fri Dec 12 04:06:29 2008
@@ -1,16 +1,16 @@
-/*
+/*
 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.
-*/
+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.
+*/

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

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalTaskBar.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalTaskBar.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalTaskBar.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/PortalTaskBar.css Fri Dec 12 04:06:29 2008
@@ -1,74 +1,74 @@
-/*
+/*
 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.
-*/
-
-.dojoTaskBarItem {
-    background-image: url(../windowicons/blue-metalic-28.jpg);
-    background-repeat: no-repeat;
-	height: 28px;
-	/*width: 200px;*/
-    overflow: hidden;
-    padding-right: 8px;
-	font-size: 9pt;
-    cursor: pointer;
-}
-.portalTaskBarItemEndCap {
-    background-image: url(../windowicons/blue-metalic-endcap-28.jpg);
-    background-repeat: no-repeat;
-    height: 28px;
-	width: 4px;
-}
-.portalTaskBarItemTable {
-    display: inline;
-    padding: 0px;
-    margin: 0px 2px 6px 2px;
-    /*border-spacing: 0;*/  /* could get rid of cellspacing attribute if IE would support CSS2 better */
-}
-
-
-
-/*
-.dojoTaskBarItem {
-    background-image: url(../windoXXXXXXXXXX/blue-metalic-28.jpg);
-    background-repeat: no-repeat;
-	border: outset 2px;
-	display: inline;
-	margin-right: 5px;
-	cursor: pointer;
-	height: 28px;
-	width: 200px;
-	font-size: 8pt;
-	white-space: nowrap;
-	text-align: center;
-}
-*/
-
-.dojoTaskBarItem img {
-	vertical-align: top;
-	margin-right: 5px;
-	margin-left: 5px;
-    margin-top: 1px;
-    padding-top: 0px;
-	height: 16px;
-	width: 16px;
-}
-
-.dojoTaskBarItem a {
-	color: black;
-	text-decoration: none;
-}
-
-
+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.
+*/
+
+.dojoTaskBarItem {
+    background-image: url(../windowicons/blue-metalic-28.jpg);
+    background-repeat: no-repeat;
+	height: 28px;
+	/*width: 200px;*/
+    overflow: hidden;
+    padding-right: 8px;
+	font-size: 9pt;
+    cursor: pointer;
+}
+.portalTaskBarItemEndCap {
+    background-image: url(../windowicons/blue-metalic-endcap-28.jpg);
+    background-repeat: no-repeat;
+    height: 28px;
+	width: 4px;
+}
+.portalTaskBarItemTable {
+    display: inline;
+    padding: 0px;
+    margin: 0px 2px 6px 2px;
+    /*border-spacing: 0;*/  /* could get rid of cellspacing attribute if IE would support CSS2 better */
+}
+
+
+
+/*
+.dojoTaskBarItem {
+    background-image: url(../windoXXXXXXXXXX/blue-metalic-28.jpg);
+    background-repeat: no-repeat;
+	border: outset 2px;
+	display: inline;
+	margin-right: 5px;
+	cursor: pointer;
+	height: 28px;
+	width: 200px;
+	font-size: 8pt;
+	white-space: nowrap;
+	text-align: center;
+}
+*/
+
+.dojoTaskBarItem img {
+	vertical-align: top;
+	margin-right: 5px;
+	margin-left: 5px;
+    margin-top: 1px;
+    padding-top: 0px;
+	height: 16px;
+	width: 16px;
+}
+
+.dojoTaskBarItem a {
+	color: black;
+	text-decoration: none;
+}
+
+

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

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/portal.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/portal.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/portal.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/css/portal.css Fri Dec 12 04:06:29 2008
@@ -1,29 +1,29 @@
-/*
+/*
 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.
-*/
-
-/*  begin layout decorator tigris additions  */
-
-.layout-tigris #breadcrumbs {
-    border-top: 1px solid #fff;
-    background-color: #ccc;
-    voice-family: "\"}\"";
-    voice-family: inherit;
-    font-size: x-small;
-    padding: 2px 8px;
-}
-
-/*  end layout decorator tigris additions  */
+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.
+*/
+
+/*  begin layout decorator tigris additions  */
+
+.layout-tigris #breadcrumbs {
+    border-top: 1px solid #fff;
+    background-color: #ccc;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+    padding: 2px 8px;
+}
+
+/*  end layout decorator tigris additions  */

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/decorator-macros.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/decorator-macros.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/decorator-macros.vm Fri Dec 12 04:06:29 2008
@@ -1,277 +1,277 @@
-#*
-  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)
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-    #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))
-            <td class="LTabLeft" nowrap="nowrap">&nbsp;</td>
-            <td class="LTab" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle">${tabName}</td>
-            <td class="LTabRight"  nowrap="nowrap">&nbsp;</td>
-          #else
-            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
-            <td class="LTabLeftLow"  nowrap="nowrap">&nbsp;</td>
-            <td class="LTabLow" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></td>
-            <td class="LTabRightLow"  nowrap="nowrap">&nbsp;</td>
-          #end
-        #end
-      #end
-    #end
-          </tr>
-        </table>
-#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))
-              <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
-
-#macro (MULTIMENU $_menu)
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-#set ($found = "false")
-    #foreach($element in $_menu.elements.iterator())
-      #if($element.elementType == "option" || $element.elementType == "menu")  
-        #set($tabTitle = $element.getTitle($preferedLocale))
-        #set($tabName = $element.getShortTitle($preferedLocale))
-          #if($element.isSelected($site))
-            <td class="LTabLeft" nowrap="nowrap">&nbsp;</td>
-            <td class="LTab" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle">${tabName}</td>
-            <td class="LTabRight"  nowrap="nowrap">&nbsp;</td>
-            #set ($sitem = $element)
-            #set ($found = "true")
-          #else
-            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
-            <td class="LTabLeftLow"  nowrap="nowrap">&nbsp;</td>
-            <td class="LTabLow" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></td>
-            <td class="LTabRightLow"  nowrap="nowrap">&nbsp;</td>
-          #end
-        #else
-        #end      
-    #end
-          </tr>
-        </table>
-        #if ($found == "true")
- 	    #if($sitem.elementType == "menu")
-	      #MULTIMENU($sitem)
-	    #end
-		#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)
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr>
+    #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))
+            <td class="LTabLeft" nowrap="nowrap">&nbsp;</td>
+            <td class="LTab" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle">${tabName}</td>
+            <td class="LTabRight"  nowrap="nowrap">&nbsp;</td>
+          #else
+            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+            <td class="LTabLeftLow"  nowrap="nowrap">&nbsp;</td>
+            <td class="LTabLow" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></td>
+            <td class="LTabRightLow"  nowrap="nowrap">&nbsp;</td>
+          #end
+        #end
+      #end
+    #end
+          </tr>
+        </table>
+#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))
+              <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
+
+#macro (MULTIMENU $_menu)
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr>
+#set ($found = "false")
+    #foreach($element in $_menu.elements.iterator())
+      #if($element.elementType == "option" || $element.elementType == "menu")  
+        #set($tabTitle = $element.getTitle($preferedLocale))
+        #set($tabName = $element.getShortTitle($preferedLocale))
+          #if($element.isSelected($site))
+            <td class="LTabLeft" nowrap="nowrap">&nbsp;</td>
+            <td class="LTab" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle">${tabName}</td>
+            <td class="LTabRight"  nowrap="nowrap">&nbsp;</td>
+            #set ($sitem = $element)
+            #set ($found = "true")
+          #else
+            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+            <td class="LTabLeftLow"  nowrap="nowrap">&nbsp;</td>
+            <td class="LTabLow" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></td>
+            <td class="LTabRightLow"  nowrap="nowrap">&nbsp;</td>
+          #end
+        #else
+        #end      
+    #end
+          </tr>
+        </table>
+        #if ($found == "true")
+ 	    #if($sitem.elementType == "menu")
+	      #MULTIMENU($sitem)
+	    #end
+		#end
+#end

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

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

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

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/desktop_print.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/desktop_print.jsp?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/desktop_print.jsp (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/desktop_print.jsp Fri Dec 12 04:06:29 2008
@@ -1,64 +1,64 @@
-<%--
+<%--
 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.
---%>
-<%@ page language="java" import="org.apache.jetspeed.desktop.JetspeedDesktopContext" session="true" %>
-<%@ page import="java.util.Enumeration"%>
-<%@ page import="org.apache.jetspeed.request.RequestContext"%>
-<%@ page import="org.apache.jetspeed.Jetspeed" %>
-<%@ page import="org.apache.jetspeed.PortalReservedParameters" %>
-<%@ page import="org.apache.jetspeed.om.page.Fragment" %>
-<%@ page import="org.apache.jetspeed.decoration.Theme" %>
-<%@ page import="org.apache.jetspeed.decoration.Decoration" %>
-<% 
-    JetspeedDesktopContext desktop = (JetspeedDesktopContext)request.getAttribute(JetspeedDesktopContext.DESKTOP_CONTEXT_ATTRIBUTE);
-    RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
-
-    String layoutStyleClass = "layout-" + desktop.getLayoutDecorationName();
-%>
-<html> <!-- .jsp --> <!-- NOTE: do not use strict doctype - see dojo svn log for FloatingPane.js -->
-<head>
-<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Content-style-type" content="text/css" />
-
-<%= desktop.getHeaderResource().getNamedContentForPrefix( "header.dojo" )%>
-
-<%= desktop.getHeaderResource().getContent()%>
-
-<script language="JavaScript" type="text/javascript">
-    function notifyRetrieveAllMenusFinished()
-    {
-        dojo.debug( "window.notifyRetrieveAllMenusFinished" );
-    }
-    dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished" );
-</script>
-</head>
-
-<body class="<%= layoutStyleClass %>">
-<!-- Start Jetspeed Page -->
-<div class="<%= layoutStyleClass %>" id="jetspeedPage">
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-<tr>
-<td id="jetspeedDesktopCell">
-<!-- Start Jetspeed Desktop -->
-<div class="<%= layoutStyleClass %>" id="jetspeedDesktop"></div>
-<!-- End Jetspeed Desktop -->
-</td>
-</tr>
-</table>
-</div>
-<!-- End Jetspeed Page -->
-</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.
+--%>
+<%@ page language="java" import="org.apache.jetspeed.desktop.JetspeedDesktopContext" session="true" %>
+<%@ page import="java.util.Enumeration"%>
+<%@ page import="org.apache.jetspeed.request.RequestContext"%>
+<%@ page import="org.apache.jetspeed.Jetspeed" %>
+<%@ page import="org.apache.jetspeed.PortalReservedParameters" %>
+<%@ page import="org.apache.jetspeed.om.page.Fragment" %>
+<%@ page import="org.apache.jetspeed.decoration.Theme" %>
+<%@ page import="org.apache.jetspeed.decoration.Decoration" %>
+<% 
+    JetspeedDesktopContext desktop = (JetspeedDesktopContext)request.getAttribute(JetspeedDesktopContext.DESKTOP_CONTEXT_ATTRIBUTE);
+    RequestContext requestContext = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
+
+    String layoutStyleClass = "layout-" + desktop.getLayoutDecorationName();
+%>
+<html> <!-- .jsp --> <!-- NOTE: do not use strict doctype - see dojo svn log for FloatingPane.js -->
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
+<meta http-equiv="Content-style-type" content="text/css" />
+
+<%= desktop.getHeaderResource().getNamedContentForPrefix( "header.dojo" )%>
+
+<%= desktop.getHeaderResource().getContent()%>
+
+<script language="JavaScript" type="text/javascript">
+    function notifyRetrieveAllMenusFinished()
+    {
+        dojo.debug( "window.notifyRetrieveAllMenusFinished" );
+    }
+    dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished" );
+</script>
+</head>
+
+<body class="<%= layoutStyleClass %>">
+<!-- Start Jetspeed Page -->
+<div class="<%= layoutStyleClass %>" id="jetspeedPage">
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+<tr>
+<td id="jetspeedDesktopCell">
+<!-- Start Jetspeed Desktop -->
+<div class="<%= layoutStyleClass %>" id="jetspeedDesktop"></div>
+<!-- End Jetspeed Desktop -->
+</td>
+</tr>
+</table>
+</div>
+<!-- End Jetspeed Page -->
+</body>
+</html>

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/desktop_print.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/desktop_print.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/desktop_print.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/desktop_print.vm Fri Dec 12 04:06:29 2008
@@ -1,50 +1,50 @@
-#*
+#*
 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.
-*#
-<html> <!-- .vm --> <!-- NOTE: do not use strict doctype - see dojo svn log for FloatingPane.js -->
-<head>
-<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Content-style-type" content="text/css" />
-
-#desktopIncludeDojoHeaderContent()
-
-#desktopIncludeHeaderContent()
-
-<script language="JavaScript" type="text/javascript">
-    function notifyRetrieveAllMenusFinished()
-    {
-        dojo.debug( "window.notifyRetrieveAllMenusFinished" );
-    }
-    dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished" );
-</script>
-</head>
-
-<body class="layout-${jetspeedDesktop.getLayoutDecorationName()}">
-<!-- Start Jetspeed Page -->
-<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedPage">
-<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-<tr>
-<td id="jetspeedDesktopCell">
-<!-- Start Jetspeed Desktop -->
-<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedDesktop"></div>
-<!-- End Jetspeed Desktop -->
-</td>
-</tr>
-</table>
-</div>
-<!-- End Jetspeed Page -->
-</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.
+*#
+<html> <!-- .vm --> <!-- NOTE: do not use strict doctype - see dojo svn log for FloatingPane.js -->
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
+<meta http-equiv="Content-style-type" content="text/css" />
+
+#desktopIncludeDojoHeaderContent()
+
+#desktopIncludeHeaderContent()
+
+<script language="JavaScript" type="text/javascript">
+    function notifyRetrieveAllMenusFinished()
+    {
+        dojo.debug( "window.notifyRetrieveAllMenusFinished" );
+    }
+    dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished" );
+</script>
+</head>
+
+<body class="layout-${jetspeedDesktop.getLayoutDecorationName()}">
+<!-- Start Jetspeed Page -->
+<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedPage">
+<table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+<tr>
+<td id="jetspeedDesktopCell">
+<!-- Start Jetspeed Desktop -->
+<div class="layout-${jetspeedDesktop.getLayoutDecorationName()}" id="jetspeedDesktop"></div>
+<!-- End Jetspeed Desktop -->
+</td>
+</tr>
+</table>
+</div>
+<!-- End Jetspeed Page -->
+</body>
+</html>

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

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/footer.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/footer.vm Fri Dec 12 04:06:29 2008
@@ -1,26 +1,26 @@
-#*
+#*
 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_blue_sm.png')" 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_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
+    </p>
+  </body>
+</html>

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

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/header.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/header.vm Fri Dec 12 04:06:29 2008
@@ -1,121 +1,121 @@
-#*
-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 XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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 class="#PageBaseCSSClass()">
-<!--  BEGIN: layout/html/tigris/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_blue_med.png')" alt="Jetspeed 2 Logo" border="0"/></h1>
-            </td>
-            <td>
-              <div align="right" id="login">
-                &nbsp;
-              </div>
-            </td>
-          </tr>
-        </table>
-      </div>
-
-<!-- Top Tabs Menu -->
-#set($pagesStandardMenu = $site.getMenu("pages"))
-#if(!$pagesStandardMenu.empty)
-      <div class="tabs">
-#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-      </div>
-#end
-## #set($multiMenu = $site.getMenu("site-navigations"))
-## #MULTIMENU($multiMenu)
-## <!-- Back Navigation -->
-##       <div id="breadcrumbs">
-## #set($backStandardMenu = $site.getMenu("back"))
-## #if(!$backStandardMenu.empty)
-## #includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT $TITLE_FIRST "" "")
-## #else
-##         &nbsp;
-## #end
-##       </div>
-
-<!-- Breadcrumbs Back Navigation -->
-      <div id="breadcrumbs">
-#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
-#if(!$breadcrumbsStandardMenu.empty)
-#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
-#else
-        &nbsp;
-#end
-     <!-- Page Action Bar -->
-##    <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()
-
-   </div>
-
-<!-- Content Table -->
-      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-        <tr>
-
-<!-- Left Navigations Menu Table Data -->
-#set($navigationsStandardMenu = $site.getMenu("navigations"))
-
-#if(!$navigationsStandardMenu.empty)
-          <td valign="top" id="leftcol" >
-            <div id="navcolumn">
-              <table cellpadding="0" cellspacing="4" border="0" width="100%">
-#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
-              </table>
-            </div>
-          </td>
-#end
-
-<!-- Content Table Data -->
-          <td nowrap="nowrap" valign="top">
-  
-## $jetspeed.include($jetspeed.currentFragment)
-
-<!--  END: layout/html/tigris/decorator.vm -->
+#*
+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 XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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 class="#PageBaseCSSClass()">
+<!--  BEGIN: layout/html/tigris/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_blue_med.png')" alt="Jetspeed 2 Logo" border="0"/></h1>
+            </td>
+            <td>
+              <div align="right" id="login">
+                &nbsp;
+              </div>
+            </td>
+          </tr>
+        </table>
+      </div>
+
+<!-- Top Tabs Menu -->
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+      <div class="tabs">
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+      </div>
+#end
+## #set($multiMenu = $site.getMenu("site-navigations"))
+## #MULTIMENU($multiMenu)
+## <!-- Back Navigation -->
+##       <div id="breadcrumbs">
+## #set($backStandardMenu = $site.getMenu("back"))
+## #if(!$backStandardMenu.empty)
+## #includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT $TITLE_FIRST "" "")
+## #else
+##         &nbsp;
+## #end
+##       </div>
+
+<!-- Breadcrumbs Back Navigation -->
+      <div id="breadcrumbs">
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
+        &nbsp;
+#end
+     <!-- Page Action Bar -->
+##    <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()
+
+   </div>
+
+<!-- Content Table -->
+      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+        <tr>
+
+<!-- Left Navigations Menu Table Data -->
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+
+#if(!$navigationsStandardMenu.empty)
+          <td valign="top" id="leftcol" >
+            <div id="navcolumn">
+              <table cellpadding="0" cellspacing="4" border="0" width="100%">
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+              </table>
+            </div>
+          </td>
+#end
+
+<!-- Content Table Data -->
+          <td nowrap="nowrap" valign="top">
+  
+## $jetspeed.include($jetspeed.currentFragment)
+
+<!--  END: layout/html/tigris/decorator.vm -->

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

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/html/ja/decorator-top.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/html/ja/decorator-top.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/html/ja/decorator-top.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/html/ja/decorator-top.vm Fri Dec 12 04:06:29 2008
@@ -1,113 +1,113 @@
-#*
+#*
 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 all template constants to the current context *#
-#defineNavigationConstants()
-#* Add the current layouts configuration values to the context *#
-#defineLayoutObjects()
-
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html#if($response.characterEncoding); charset=$response.characterEncoding#end" />
-    <meta http-equiv="Content-style-type" content="text/css" />
-
-#includeJavaScriptForHead()
-#includeHeaderResource()
-    <title>$jetspeed.page.getTitle($preferedLocale)</title>
-
-    <meta name="version" content="/* $Id$" />
-    <meta name="keywords" content="" />
-    <meta name="description" content="$jetspeed.page.getTitle($preferedLocale)" />
-  </head>
-  <body marginwidth="0" marginheight="0" class="layout-tigris">
-
-#set($myF = $jetspeed.currentFragment)
-#set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
-
-<!--  BEGIN: layout/html/tigris/decorator.vm -->
-
-    <div class="layout-tigris">
-
-<!-- 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 ロゴ" border="0"/></h1>
-            </td>
-            <td>
-              <div align="right" id="login">
-                &nbsp;
-              </div>
-            </td>
-          </tr>
-        </table>
-      </div>
-
-<!-- Top Tabs Menu -->
-#set($pagesStandardMenu = $site.getMenu("pages"))
-#if(!$pagesStandardMenu.empty)
-      <div class="tabs">
-#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-      </div>
-#end
-
-## <!-- Back Navigation -->
-##       <div id="breadcrumbs">
-## #set($backStandardMenu = $site.getMenu("back"))
-## #if(!$backStandardMenu.empty)
-## #includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT $TITLE_LAST "" "")
-## #else
-##         &nbsp;
-## #end
-##       </div>
-
-<!-- Breadcrumbs Back Navigation -->
-      <div id="breadcrumbs">
-#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
-#if(!$breadcrumbsStandardMenu.empty)
-#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
-#else
-        &nbsp;
-#end
-      </div>
-
-<!-- Content Table -->
-      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-        <tr>
-
-<!-- Left Navigations Menu Table Data -->
-#set($navigationsStandardMenu = $site.getMenu("navigations"))
-#if(!$navigationsStandardMenu.empty)
-          <td valign="top" id="leftcol" width="20%">
-            <div id="navcolumn">
-              <table cellpadding="0" cellspacing="4" border="0" width="100%">
-#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
-              </table>
-            </div>
-          </td>
-#end
-
-<!-- Content Table Data -->
-          <td nowrap valign="top">
-  
-## $jetspeed.include($jetspeed.currentFragment)
-
-<!--  END: layout/html/tigris/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 all template constants to the current context *#
+#defineNavigationConstants()
+#* Add the current layouts configuration values to the context *#
+#defineLayoutObjects()
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html#if($response.characterEncoding); charset=$response.characterEncoding#end" />
+    <meta http-equiv="Content-style-type" content="text/css" />
+
+#includeJavaScriptForHead()
+#includeHeaderResource()
+    <title>$jetspeed.page.getTitle($preferedLocale)</title>
+
+    <meta name="version" content="/* $Id$" />
+    <meta name="keywords" content="" />
+    <meta name="description" content="$jetspeed.page.getTitle($preferedLocale)" />
+  </head>
+  <body marginwidth="0" marginheight="0" class="layout-tigris">
+
+#set($myF = $jetspeed.currentFragment)
+#set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
+
+<!--  BEGIN: layout/html/tigris/decorator.vm -->
+
+    <div class="layout-tigris">
+
+<!-- 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 ロゴ" border="0"/></h1>
+            </td>
+            <td>
+              <div align="right" id="login">
+                &nbsp;
+              </div>
+            </td>
+          </tr>
+        </table>
+      </div>
+
+<!-- Top Tabs Menu -->
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+      <div class="tabs">
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+      </div>
+#end
+
+## <!-- Back Navigation -->
+##       <div id="breadcrumbs">
+## #set($backStandardMenu = $site.getMenu("back"))
+## #if(!$backStandardMenu.empty)
+## #includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT $TITLE_LAST "" "")
+## #else
+##         &nbsp;
+## #end
+##       </div>
+
+<!-- Breadcrumbs Back Navigation -->
+      <div id="breadcrumbs">
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
+        &nbsp;
+#end
+      </div>
+
+<!-- Content Table -->
+      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+        <tr>
+
+<!-- Left Navigations Menu Table Data -->
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
+          <td valign="top" id="leftcol" width="20%">
+            <div id="navcolumn">
+              <table cellpadding="0" cellspacing="4" border="0" width="100%">
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+              </table>
+            </div>
+          </td>
+#end
+
+<!-- Content Table Data -->
+          <td nowrap valign="top">
+  
+## $jetspeed.include($jetspeed.currentFragment)
+
+<!--  END: layout/html/tigris/decorator.vm -->

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

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

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/tigris/resources/Messages_en.properties
------------------------------------------------------------------------------
    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