portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject svn commit: r354567 [3/6] - in /portals/jetspeed-2/trunk/src/webapp/decorations: ./ generic/ generic/clear/ images/ layout/ layout/images/ layout/jetspeed/ layout/jetspeed/css/ layout/jetspeed/images/ layout/jscookmenu/ layout/jscookmenu/css/ layout/js...
Date Tue, 06 Dec 2005 21:27:33 GMT
Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,43 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+*#
+
+<!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" />
+    <title>$jetspeed.page.title</title> 
+#set($cssUrls = $renderRequest.getAttribute("cssUrls"))
+#foreach($cssUrl in $cssUrls)
+    <link rel="stylesheet" type="text/css" media="all" href="$cssUrl" />
+#end
+</head>
+
+<body class="layout-Metal">
+
+
+
+
+
+<!--  BEGIN: layout/html/metal/decorator.vm -->
+
+<p>
+<img src="content/images/jetspeed-logo.gif" alt="Jetspeed 2 Logo" border="0">
+</p>
+
+## $jetspeed.include($jetspeed.currentFragment)
+
+<!--  END: layout/html/metal/decorator.vm -->

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/images/jetspeed-logo.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/images/jetspeed-logo.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/images/jetspeed-logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/images/jetspeed-powered.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/images/jetspeed-powered.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/images/jetspeed-powered.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/css/styles.css?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/css/styles.css (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/css/styles.css Tue Dec  6 13:26:30 2005
@@ -0,0 +1,95 @@
+/*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.layout-MintyBlue  {
+
+}
+
+/*
+  Database Browser
+ */
+.jetdbHead
+{
+  text-decoration:underline;
+  background-color:#6868AB;
+  layer-background-color:#CCCCFF;
+  border-style:outset;
+  border-width:2px;
+  border-left-color:white;
+  border-top-color:white;
+  border-bottom-color:black;
+  border-right-color:black;
+  cursor:hand;
+  FONT-SIZE:8pt;
+  FONT-WEIGHT:bold;
+  COLOR: white;
+  ; font-family: Verdana, Arial, Helvetica, sans-serif
+}
+
+.jetdbHeadNoLink
+{
+  background-color:#6868AB;
+  layer-background-color:#6868AB;
+  border-style:solid;
+  border-width:2px;
+  border-left-color:#6868AB;
+  border-top-color:#6868AB;
+  border-bottom-color:#6868AB;
+  border-right-color:#6868AB;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+  COLOR: white;
+  ; font-family: Verdana, Arial, Helvetica, sans-serif
+}
+
+.jetdbOdd
+{
+  background-color:#CCCCCC;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+}
+.jetdbEven
+{
+  background-color:#999999;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+}
+
+.jetdbLight
+{
+  background-color:#cc99ff;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+}
+
+.jetdbButton
+{
+    background-color: #CCCCCC;
+    border-style: none;
+    color: Black;
+    display: block;
+    font-weight: normal;
+    padding: 0;
+    font-family : Arial, Helvetica, sans-serif;
+    font-size : 8pt;
+    border-top: 1px solid #FFFFFF;
+    border-left: 1px solid #FFFFFF;
+    border-right: 1px solid #0A0A0A;
+    border-bottom: 1px solid #0A0A0A;
+    width : 65px;
+}
+        
\ No newline at end of file

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/css/styles.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/footer.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/footer.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/footer.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/footer.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,21 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+*#
+
+<p>
+<img src="#GetPageResource('images/jetspeed-powered.gif')" alt="Jetspeed 2 Powered" border="0">
+</p>
+</body>
+</html>

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,39 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+*#
+#defineLayoutObjects()
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+    <meta http-equiv="Content-type" content="#ContentType()" />
+	<meta name="version" content="#SiteVersionTag()">
+    <meta name="keywords" content="" />
+    <meta name="description" content="#PageDescription()" />	
+    <title>#PageTitle()</title>
+	#IncludeStylesheets()    
+</head>
+<body class="#BaseCSSClass($layoutDecoration)">
+
+<!--  BEGIN: layout/html/minty-blue/decorator.vm -->
+
+<p>
+<img src="#GetPageResource('images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" border="0">
+</p>
+
+## $jetspeed.include($jetspeed.currentFragment)
+
+<!--  END: layout/html/minty-blue/decorator.vm -->

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/jetspeed-logo.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/jetspeed-logo.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/jetspeed-logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/jetspeed-powered.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/jetspeed-powered.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/jetspeed-powered.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tableft.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tableft.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tableft.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tableft_low.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tableft_low.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tableft_low.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabmiddle.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabmiddle.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabmiddle.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabmiddle_low.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabmiddle_low.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabmiddle_low.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabright.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabright.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabright.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabright_low.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabright_low.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/images/tabright_low.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/css/styles.css?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/css/styles.css (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/css/styles.css Tue Dec  6 13:26:30 2005
@@ -0,0 +1,327 @@
+/*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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 {
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    padding: 1em;
+    background: #fff;
+    color: #000;
+
+}
+
+a:link, a:visited {
+    color: blue;
+}
+
+a:hover {
+    color: #f30 !important;
+}
+
+body.layout-tigris
+{
+    margin: 0;
+    padding: 0;
+}
+
+.PTitle
+{
+ 
+}
+
+
+.Link
+{
+}
+
+.LinkFolder
+{
+}
+
+.LinkPage
+{
+}
+
+.layout-tigris .LTabLeftLow
+{
+    width: 5px;
+
+    background-image: url(../../tigris/images/nw_maj_rond.gif);
+    background-repeat: no-repeat;
+    background-color: #999;
+    border-bottom: 1px solid #fff;
+    border-left: 1px solid #fff;
+    padding-left: 9px;
+    padding-right: 0px;
+}
+
+.layout-tigris .LTabLow
+{
+    height:25px;;    
+
+    background-color: #999;
+    border-bottom: 1px solid #fff;
+    padding-left: 0px;
+    padding-right: 0px;
+
+}
+
+.layout-tigris .LTabLow A:link, 
+.layout-tigris .LTabLow A:visited,
+.layout-tigris .LTabLow A:hover, 
+.layout-tigris .LTabLow A:active
+{
+    text-decoration: none;
+    color: #fff;
+}
+
+.layout-tigris .LTabRightLow
+{
+    width: 0px;
+
+    background-color: #999;
+    border-bottom: 1px solid #fff;
+    border-right: 1px solid #fff;
+    padding-left: 0px;
+    padding-right: 9px;
+}
+
+.layout-tigris .LTabLeft
+{
+    width: 5px;
+
+    background-image: url(../../tigris/images/nw_maj_rond.gif);
+    background-repeat: no-repeat;
+    background-color: #ddd;
+    color: #fff;
+    border-left: 1px solid #fff;
+    padding-left: 9px;
+    padding-right: 0px;
+
+}
+
+.layout-tigris .LTab
+{
+    height:25px;    
+
+    background-color: #ddd;
+    color: #555;
+    padding-left: 0px;
+    padding-right: 0px;
+}
+ 
+.layout-tigris .LTabRight
+{
+    width:10px;
+
+    border-right: 1px solid #333;
+    background-color: #ddd;
+    color: #fff;
+    padding-left: 0px;
+    padding-right: 9px;
+}
+
+.layout-tigris .tabs {
+    margin-top: .67em;
+    margin-right: 0px;
+    margin-left: 0px;
+    padding-left: 8px;
+    border-bottom: 6px #ddd solid;
+}
+
+.layout-tigris .tabs td {
+    padding-top: 3px;
+    padding-bottom: 3px;
+    font-weight: bold;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+
+}
+
+.layout-tigris #banner h1 {
+    font-size: 1.25em;
+    margin: 0;
+}
+
+.layout-tigris #login {
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+    font-weight: bold;
+}
+
+.layout-tigris #breadcrumbs {
+    border-top: 1px solid #fff;
+    background-color: #ccc;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+    padding: 2px 8px;
+}
+
+.layout-tigris #breadcrumbs a {
+    text-decoration: none;
+}
+
+.layout-tigris #navcolumn {
+    font-size: x-small;
+}
+
+.layout-tigris #navcolumn p {
+    background-image: none;
+
+}
+
+.layout-tigris #navcolumn a:visited {
+    color: blue;
+}
+
+.layout-tigris #main {
+    border-top: 1px solid #999;
+}
+
+.layout-tigris #leftcol {
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+.layout-tigris #leftcol a {
+    text-decoration: none;
+}
+
+.layout-tigris #leftcol a:active, .layout-tigris #leftcol a:hover {
+    color: #f30 !important;
+}
+
+.layout-tigris .toolgroup {
+    background: #efefef;
+    margin-bottom: 6px;
+}
+
+.layout-tigris .toolgroup .label {
+    border-bottom: 1px solid #666;
+    border-right: 1px solid #666;
+    background: #ddd;
+    color: #555;
+    padding: 4px;
+    font-weight: bold;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+.layout-tigris .toolgroup .body {
+    border-right: 1px solid #aaa;
+    border-bottom: 1px solid #aaa;
+    padding: 4px 4px 4px 0;
+}
+
+.layout-tigris .toolgroup .body div {
+    padding-bottom: .3em;
+    padding-left: 0;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+.layout-tigris .toolgroup .body div div {
+    padding-left: .5em;
+}
+
+.layout-tigris .toolgroup .pagetitle{
+    font-weight: bold;
+    padding-left: .5em;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+.layout-tigris .toolgroup .body div p {
+    margin-top: .0;
+    padding-bottom: 0;
+    padding-left: 0;
+    margin-top: .0;
+    margin-bottom: .0;
+}
+
+/*
+  Database Browser
+ */
+.jetdbHead
+{
+  text-decoration:underline;
+  background-color:#6868AB;
+  layer-background-color:#CCCCFF;
+  border-style:outset;
+  border-width:2px;
+  border-left-color:white;
+  border-top-color:white;
+  border-bottom-color:black;
+  border-right-color:black;
+  cursor:hand;
+  FONT-SIZE:8pt;
+  FONT-WEIGHT:bold;
+  COLOR: white;
+  ; font-family: Verdana, Arial, Helvetica, sans-serif
+}
+
+.jetdbHeadNoLink
+{
+  background-color:#6868AB;
+  layer-background-color:#6868AB;
+  border-style:solid;
+  border-width:2px;
+  border-left-color:#6868AB;
+  border-top-color:#6868AB;
+  border-bottom-color:#6868AB;
+  border-right-color:#6868AB;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+  COLOR: white;
+  ; font-family: Verdana, Arial, Helvetica, sans-serif
+}
+  
+.jetdbOdd
+{
+  background-color:#CCCCCC;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+}
+.jetdbEven
+{
+  background-color:#999999;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+}
+
+.jetdbLight
+{
+  background-color:#ccccff;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+}
+
+.jetdbButton
+{
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+        
\ No newline at end of file

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/css/styles.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,91 @@
+#* define navigation constants *#
+#macro (defineNavigationConstants)
+  #* Constants for layout orientation *#    
+  #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

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator.properties?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator.properties (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator.properties Tue Dec  6 13:26:30 2005
@@ -0,0 +1,20 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed 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.
+
+id=simple
+template.type=velocity
+template.extension=.vm
+template.macros=-macros
+decorates=layout
+base.css.class=layout-tigris

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/footer.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/footer.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/footer.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/footer.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,18 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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>

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,40 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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="#ContentType()" />
+    <meta http-equiv="Content-style-type" content="text/css" />
+#includeJavaScriptForHead()
+#includeHeaderResource()
+#IncludeStylesheets()
+    <title>#PageTitle()</title>
+
+    <meta name="version" content="#SiteVersionTag()" />
+    <meta name="keywords" content="" />
+    <meta name="description" content="#PageDescription()" />
+  </head>
+  <body marginwidth="0" marginheight="0" class="#PageBaseCSSClass()">
+
+

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/images/jetspeed-logo.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/images/jetspeed-logo.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/images/jetspeed-logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/images/jetspeed-powered.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/images/jetspeed-powered.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/images/jetspeed-powered.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/images/nw_maj_rond.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/images/nw_maj_rond.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/images/nw_maj_rond.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/css/styles.css?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/css/styles.css (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/css/styles.css Tue Dec  6 13:26:30 2005
@@ -0,0 +1,165 @@
+/*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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{
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+background: #fff;
+color: #000;
+margin: 0;
+padding: 0;
+}
+
+a:link, a:visited{
+color: blue;
+}
+
+a:hover{
+color: #f30 !important;
+}
+
+.Link
+{
+}
+
+.LinkFolder
+{
+}
+
+.LinkPage
+{
+}
+
+.layout-simple #logo{
+text-align: center;
+}
+
+.layout-simple #logo img{
+border:0px;
+}
+
+.layout-simple .tabs {
+margin:3px;
+}
+
+.layout-simple #tabs .tab{
+border:1px;
+padding: 0px;
+margin:0px;
+font-size: x-small;
+vertical-align: middle;
+text-align: left;
+}
+
+.layout-simple #tabs .tab a{
+padding: 0px;
+margin:0px;
+font-size: x-small;
+vertical-align: middle;
+text-align: left;
+color: blue;
+}
+
+.layout-simple #breadcrumbs {
+margin:3px;
+voice-family: inherit;
+font-size: x-small;
+background: #efefef;
+}
+
+.layout-simple #breadcrumbs a{
+text-decoration: none;
+}
+
+.layout-simple #breadcrumbs .FolderList .pagetitle{
+border-bottom: 1px solid #666;
+border-right: 1px solid #666;
+background: #ddd;
+color: #555;
+padding: 4px;
+font-weight: bold;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple #breadcrumbs .FolderList div{
+padding-bottom: .3em;
+padding-left: 4px;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple #navcolumn{
+font-size: x-small;
+}
+
+.layout-simple #navcolumn a:visited{
+color: blue;
+}
+
+.layout-simple .toolgroup{
+margin:3px;
+background: #efefef;
+margin-bottom: 6px;
+}
+
+.layout-simple .toolgroup .label{
+padding: 4px;
+border-bottom: 1px solid #666;
+border-right: 1px solid #666;
+background: #ddd;
+color: #555;
+font-weight: bold;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple .toolgroup .body{
+border-right: 1px solid #aaa;
+border-bottom: 1px solid #aaa;
+padding: 4px 4px 4px 0;
+}
+
+.layout-simple .toolgroup .body div {
+padding-bottom: .3em;
+padding-left: 0;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple .toolgroup .body div div {
+padding-left: .5em;
+}
+
+.layout-simple .toolgroup .pagetitle{
+font-weight: bold;
+padding-left: .5em;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple .toolgroup .body div p {
+margin-top: .0;
+padding-bottom: 0;
+padding-left: 0;
+margin-top: .0;
+margin-bottom: .0;
+}
+
+.layout-simple .noborder{
+border:0px;
+}
+

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/css/styles.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,194 @@
+#* define navigation constants *#
+#macro (defineNavigationConstants)
+## Constants for layout orientation
+#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)
+#foreach($element in $_menu.elements.iterator())
+#if($element.elementType == "option")
+#set($tabTitle = $element.getTitle($preferedLocale)) #set($tabName = $element.getShortTitle($preferedLocale))
+#set($_tag="span")
+#if($_orientation == $TOP_TO_BOTTOM)
+#set($_tag="div")
+#end## if($_orientation == $TOP_TO_BOTTOM)
+#if($element.isSelected($site))
+<$_tag class="tab" title="$!tabTitle">${tabName}</$_tag>
+#else
+#set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+<$_tag class="tab" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></$_tag>
+#end## if($element.isSelected($site))
+#end## if($element.elementType == "option")
+#end## foreach($element in $_menu.elements.iterator())
+#end
+
+#* include links navigation component *#
+#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+#if(!$_delimiter || $_delimiter == "")
+#if($_style != $BREADCRUMBS_STYLE)
+#set($_delimiter = "&nbsp;")
+#else
+#set($_delimiter = "&nbsp;&gt;&gt;&nbsp;")
+#end## if($_style != $BREADCRUMBS_STYLE)
+#end## if(!$_delimiter || $_delimiter == "")
+#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## if($_orientation == $LEFT_TO_RIGHT)
+#end## if($_title == $TITLE_FIRST)
+#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($_orientation == $LEFT_TO_RIGHT)
+#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($element.type == "page")
+#if($_orientation == $LEFT_TO_RIGHT)
+${_delimiter}</span>
+#elseif($_orientation == $TOP_TO_BOTTOM)
+</div>
+#end## if($_orientation == $LEFT_TO_RIGHT)
+#else
+#if($_orientation == $LEFT_TO_RIGHT)
+<span title="$!linkTitle">${linkName}&nbsp;</span>
+#elseif($_orientation == $TOP_TO_BOTTOM)
+<div title="$!linkTitle">${linkName}</div>
+#end## if($_orientation == $LEFT_TO_RIGHT)
+#end## if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size())
+#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## if($_orientation == $LEFT_TO_RIGHT)
+#end## if($element.elementType == "option")
+#end## foreach($element in $_menu.elements.iterator())
+#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## if($_orientation == $LEFT_TO_RIGHT)
+#end## if($_title == $TITLE_LAST)
+</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## if($menuName)
+<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")
+<div><a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a></div>	
+#elseif($element.type == "folder")
+<div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+#end## if($element.type == "page")
+#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## if($element.elementType == "option")
+#end## foreach($element in $_menu.elements.iterator())
+</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)
+<div class="toolgroup">
+<div class="body">
+<div class="FolderList">
+#elseif(!$elementsStarted)
+<div class="body">
+<div class="FolderList">
+#end## if(!$rowStarted)
+#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")
+<div><a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a></div>	
+#elseif($element.type == "folder")
+<div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+#end## if($element.type == "page")
+#set($rowStarted = true)
+#set($elementsStarted = true)
+#elseif($element.elementType == "menu")
+#if(!$rowStarted)
+<div class="toolgroup">
+<div class="body">
+<div class="FolderList">
+#elseif(!$elementsStarted)
+<div class="body">
+<div class="FolderList">
+#end## if(!$rowStarted)
+#includeNestedLinksWithIconNavigation($element $_orientation)
+#set($rowStarted = true)
+#set($elementsStarted = true)
+#elseif($element.elementType == "separator")
+#if(!$rowStarted)
+<div class="toolgroup">
+#elseif($elementsStarted)
+</div>
+</div>
+</div>
+<div class="toolgroup">
+#end## if(!$rowStarted)
+#set($separatorTitle = $element.getTitle($preferedLocale))
+#set($separatorText = $element.getText($preferedLocale))
+<div class="label">${separatorText}</div>
+#set($rowStarted = true)
+#set($elementsStarted = false)
+#end## if($element.elementType == "option")
+#end## foreach($element in $_menu.elements.iterator())
+#if($elementsStarted)
+</div>
+</div>
+#end## if($elementsStarted)
+#if($rowStarted)
+</div>
+#end## if($rowStarted)
+#end

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator.properties?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator.properties (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator.properties Tue Dec  6 13:26:30 2005
@@ -0,0 +1,20 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed 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.
+
+id=simple
+template.type=velocity
+template.extension=.vm
+template.macros=-macros
+decorates=layout
+base.css.class=layout-simple

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/decorator.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/footer.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/footer.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/footer.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/footer.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,24 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+*#
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
+<div id="navcolumn">
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+</div>
+#end
+<p>Powered by Jetspeed</p>
+</div>
+</body></html>

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/header.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/header.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/header.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,42 @@
+## Copyright 2004 The Apache Software Foundation
+## 
+## Licensed 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.
+#set($defaultEnc="UTF-8")<?xml version="1.0" encoding="#if($response.characterEncoding)$response.characterEncoding#else$defaultEnc#end"?>
+#defineNavigationConstants()##
+#defineLayoutObjects()##
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="$response.contentType"/>
+#includeHeaderResource()
+#IncludeStylesheets()
+<title>#PageTitle()</title>
+</head>
+<body>
+<div class="#PageBaseCSSClass()">
+<div id="logo"><img src="#GetPageResource('images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" /></div>
+## Top Tabs Menu
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+<div id="tabs">
+#includeTabsNavigation($pagesStandardMenu $TOP_TO_BOTTOM)
+</div>
+#end
+## Breadcrumbs Back Navigation
+<div id="breadcrumbs">
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $TOP_TO_BOTTOM $TITLE_FIRST $BREADCRUMBS_STYLE "")
+#end
+</div>
+## Content Table Data 

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/images/jetspeed-logo.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/images/jetspeed-logo.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/images/jetspeed-logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/images/nw_maj_rond.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/images/nw_maj_rond.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/images/nw_maj_rond.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/css/styles.css?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/css/styles.css (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/css/styles.css Tue Dec  6 13:26:30 2005
@@ -0,0 +1,417 @@
+/*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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 {
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    padding: 1em;
+    background: #fff;
+    color: #000;
+    white-space: normal;
+
+
+}
+
+/** 
+  This white-space setting is VERY important as it keeps content from "spilling"
+  outside of portlets.
+  */
+
+td,
+th
+{
+  white-space: normal;
+}
+
+th
+{
+  font-size: 12pt;
+}
+
+a:link, a:visited {
+    color: blue;
+}
+
+a:hover {
+    color: #f30 !important;
+}
+
+body.layout-tigris
+{
+    margin: 0;
+    padding: 0;
+}
+
+
+.Link
+{
+}
+
+.LinkFolder
+{
+}
+
+.LinkPage
+{
+}
+
+.layout-tigris .LTabLeftLow
+{
+    width: 5px;
+
+    background-image: url(../images/nw_maj_rond.gif);
+    background-repeat: no-repeat;
+    background-color: #999;
+    border-bottom: 1px solid #fff;
+    border-left: 1px solid #fff;
+    padding-left: 9px;
+    padding-right: 0px;
+}
+
+.layout-tigris .LTabLow
+{
+    height:25px;    
+
+    background-color: #999;
+    border-bottom: 1px solid #fff;
+    padding-left: 0px;
+    padding-right: 0px;
+
+}
+
+.layout-tigris .LTabLow A:link, 
+.layout-tigris .LTabLow A:visited,
+.layout-tigris .LTabLow A:hover, 
+.layout-tigris .LTabLow A:active
+{
+    text-decoration: none;
+    color: #fff;
+}
+
+.layout-tigris .LTabRightLow
+{
+    width: 0px;
+
+    background-color: #999;
+    border-bottom: 1px solid #fff;
+    border-right: 1px solid #fff;
+    padding-left: 0px;
+    padding-right: 9px;
+}
+
+.layout-tigris .LTabLeft
+{
+    width: 5px;
+
+    background-image: url(../images/nw_maj_rond.gif);
+    background-repeat: no-repeat;
+    background-color: #ddd;
+    color: #fff;
+    border-left: 1px solid #fff;
+    padding-left: 9px;
+    padding-right: 0px;
+
+}
+
+.layout-tigris .LTab
+{
+    height:25px;    
+
+    background-color: #ddd;
+    color: #555;
+    padding-left: 0px;
+    padding-right: 0px;
+}
+ 
+.layout-tigris .LTabRight
+{
+    width:10px;
+
+    border-right: 1px solid #333;
+    background-color: #ddd;
+    color: #fff;
+    padding-left: 0px;
+    padding-right: 9px;
+}
+
+.layout-tigris .tabs {
+    margin-top: .67em;
+    margin-right: 0px;
+    margin-left: 0px;
+    padding-left: 8px;
+    border-bottom: 6px #ddd solid;
+}
+
+.layout-tigris .tabs td {
+    padding-top: 3px;
+    padding-bottom: 3px;
+    font-weight: bold;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+
+}
+
+.layout-tigris #banner h1 {
+    font-size: 1.25em;
+    margin: 0;
+}
+
+.layout-tigris #login {
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+    font-weight: bold;
+}
+
+.layout-tigris #breadcrumbs {
+    border-top: 1px solid #fff;
+    background-color: #ccc;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+    padding: 2px 8px;
+}
+
+.layout-tigris #breadcrumbs a {
+    text-decoration: none;
+}
+
+.layout-tigris #navcolumn {
+    font-size: x-small;
+}
+
+.layout-tigris #navcolumn p {
+    background-image: none;
+
+}
+
+.layout-tigris #navcolumn a:visited {
+    color: blue;
+}
+
+.layout-tigris #main {
+    border-top: 1px solid #999;
+}
+
+.layout-tigris #leftcol 
+{
+    width: 15%;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+.layout-tigris #leftcol a {
+    text-decoration: none;
+}
+
+.layout-tigris #leftcol a:active, .layout-tigris #leftcol a:hover {
+    color: #f30 !important;
+}
+
+.layout-tigris .toolgroup {
+    background: #efefef;
+    margin-bottom: 6px;
+}
+
+.layout-tigris .toolgroup .label {
+    border-bottom: 1px solid #666;
+    border-right: 1px solid #666;
+    background: #ddd;
+    color: #555;
+    padding: 4px;
+    font-weight: bold;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+.layout-tigris .toolgroup .body {
+    border-right: 1px solid #aaa;
+    border-bottom: 1px solid #aaa;
+    padding: 4px 4px 4px 0;
+}
+
+.layout-tigris .toolgroup .body div {
+    padding-bottom: .3em;
+    padding-left: 0;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+.layout-tigris .toolgroup .body div div {
+    padding-left: .5em;
+}
+
+.layout-tigris .toolgroup .pagetitle{
+    font-weight: bold;
+    padding-left: .5em;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+.layout-tigris .toolgroup .body div p {
+    margin-top: .0;
+    padding-bottom: 0;
+    padding-left: 0;
+    margin-top: .0;
+    margin-bottom: .0;
+}
+
+/*
+  Database Browser
+ */
+.jetdbHead
+{
+  text-decoration:underline;
+  background-color:#6868AB;
+  layer-background-color:#CCCCFF;
+  border-style:outset;
+  border-width:2px;
+  border-left-color:white;
+  border-top-color:white;
+  border-bottom-color:black;
+  border-right-color:black;
+  cursor:hand;
+  FONT-SIZE:8pt;
+  FONT-WEIGHT:bold;
+  COLOR: white;
+  font-family: Verdana, Arial, Helvetica, sans-serif
+}
+
+.jetdbHeadNoLink
+{
+  background-color:#6868AB;
+  layer-background-color:#6868AB;
+  border-style:solid;
+  border-width:2px;
+  border-left-color:#6868AB;
+  border-top-color:#6868AB;
+  border-bottom-color:#6868AB;
+  border-right-color:#6868AB;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+  COLOR: white;
+  font-family: Verdana, Arial, Helvetica, sans-serif
+}
+  
+.jetdbOdd
+{
+  background-color:#CCCCCC;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+  color:black;  
+}
+.jetdbEven
+{
+  background-color:#999999;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+  color:white;  
+}
+
+.jetdbLight
+{
+  background-color:#ccccff;
+  FONT-SIZE:7pt;
+  FONT-WEIGHT:normal;
+}
+
+.jetdbButton
+{
+    background-color: #CCCCCC;
+    border-style: none;
+    color: Black;
+    display: block;
+    font-weight: normal;
+    padding: 0;
+    font-family : Arial, Helvetica, sans-serif;
+    font-size : 8pt;
+    border-top: 1px solid #FFFFFF;
+    border-left: 1px solid #FFFFFF;
+    border-right: 1px solid #0A0A0A;
+    border-bottom: 1px solid #0A0A0A;
+    width : 65px;
+}
+
+#portal-page-actions A img
+{
+   display: inline;   
+}
+
+#portal-page-actions
+{
+   display: inline;
+   position: absolute;
+   right: 5px;
+}
+
+.FolderList
+{
+   display: inline;
+}
+
+
+
+
+.layout-tigris .portal-layout
+{
+	padding-top:6px;
+}
+
+
+
+/** TwoColumn Sepcific widths */
+.layout-tigris .portal-layout-TwoColumns .portal-layout-column
+{  
+  padding-left:1%;
+  width: 48%;
+  float: left;  
+}
+
+/** TwoColumn Sepcific widths */
+.layout-tigris .portal-layout-OneColumn .portal-layout-column
+{  
+  padding-left:1%;
+  padding-right:1%;
+  width: 97%;
+  float: left;  
+}
+
+
+/** TwoColumn Sepcific widths */
+.layout-tigris .portal-layout-ThreeColumns .portal-layout-column
+{  
+  padding-left:1%;
+  width: 31%;
+  float: left;  
+}
+
+.portal-layout-cell
+{
+  padding-bottom: 4px;
+}
+
+.portal-layout-maxed
+{
+  padding-top: 4px;
+  padding-right: 2px;
+}
+        
\ No newline at end of file

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

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,229 @@
+#* define navigation constants *#
+#macro (defineNavigationConstants)
+  #* Constants for layout orientation *#	
+  #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="true">&nbsp;</td>
+            <td class="LTab" align="center" valign="middle" nowrap="true" title="$!tabTitle">${tabName}</td>
+            <td class="LTabRight"  nowrap="true">&nbsp;</td>
+          #else
+            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+            <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
+            <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></td>
+            <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
+          #end
+        #end
+      #end
+    #end
+          </tr>
+        </table>
+#end
+
+#* include links navigation component *#
+#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_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

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator.properties?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator.properties (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator.properties Tue Dec  6 13:26:30 2005
@@ -0,0 +1,20 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed 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.
+
+id=tigris
+template.type=velocity
+template.extension=.vm
+template.macros=-macros
+decorates=layout
+base.css.class=layout-tigris

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

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/footer.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/footer.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/footer.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/footer.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,25 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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>

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,126 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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()
+
+<html>
+  <head>
+	<base href="#BaseHref()">
+    <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="#SiteVersionTag()">
+    <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-logo.gif')" 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
+
+## <!-- 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 -->
+    #if ($actions.size()>0)
+    <div id="portal-page-actions" >
+      #foreach ($action in $layoutDecoration.actions)
+        <a href="${action.Action}" title="${action.Name}" class="pageAction" ><img src="${action.Link}" alt="${action.Alt}" border="0" /></a>
+	  #end
+	  #if($editing == true)    		  	  
+	    #set ($chooser = "${jetspeed.basePath}/system/customizer/portlet-selector.psml")
+
+        <a href="javascript:openWindow('$response.encodeURL($chooser)')"><img src="$response.encodeURL('content/images/select.gif')" border="0" title="Add a Portlet"/></a>
+	  #end 
+	  
+    </div>
+    #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" >
+            <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 -->

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm?rev=354567&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm Tue Dec  6 13:26:30 2005
@@ -0,0 +1,112 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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: decorator-top.vm 239262 2005-08-22 22:23:39Z shinsuke $" />
+    <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="$response.encodeURL('content/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 -->

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/jetspeed-logo.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/jetspeed-logo.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/jetspeed-logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/jetspeed-powered.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/jetspeed-powered.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/jetspeed-powered.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/nw_maj_rond.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/nw_maj_rond.gif?rev=354567&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/nw_maj_rond.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



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