You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/03/27 01:55:41 UTC

svn commit: r522665 [17/29] - in /portals/jetspeed-2/branches/J2-M2-REDUX: ./ components/ components/jetspeed-cm/ components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/ components/jetspeed-cm/src/test/resources/ components/jetspeed-cm/...

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/css/styles.css?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/css/styles.css (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/css/styles.css Mon Mar 26 16:53:34 2007
@@ -0,0 +1,166 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+body{
+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/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/css/styles.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/css/styles.css
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm Mon Mar 26 16:53:34 2007
@@ -0,0 +1,211 @@
+#*
+  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)
+## 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)
+ #set($__delimiter = $_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

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator-macros.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +1,21 @@
+# 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.
+
+id=simple
+template.type=velocity
+template.extension=.vm
+template.macros=-macros
+decorates=layout
+base.css.class=layout-simple

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/decorator.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/footer.vm?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/footer.vm (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/footer.vm Mon Mar 26 16:53:34 2007
@@ -0,0 +1,25 @@
+#*
+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.
+*#
+#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>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/footer.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/header.vm?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/header.vm (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/header.vm Mon Mar 26 16:53:34 2007
@@ -0,0 +1,43 @@
+## 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.
+#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>
+#includeHeaderResource()
+<meta http-equiv="Content-Type" content="$response.contentType"/>
+#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 

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/header.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/header.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/images/jetspeed-logo.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/images/jetspeed-logo.gif?view=auto&rev=522665
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/images/jetspeed-logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/images/nw_maj_rond.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/images/nw_maj_rond.gif?view=auto&rev=522665
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/simple/xhtml-basic/images/nw_maj_rond.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/css/styles.css?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/css/styles.css (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/css/styles.css Mon Mar 26 16:53:34 2007
@@ -0,0 +1,202 @@
+/*
+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.
+*/
+
+@import url("../../css/portal-standard.css");
+
+body {
+background-color:#444;
+font-family:Lucida Sans Unicode, Arial;
+font-size:12px;
+margin:0px 0px 0px 0px;
+color:#555;
+}
+
+/** 
+  This white-space setting is VERY important as it keeps content from "spilling"
+  outside of portlets.
+  */
+
+a:link, a:visited {
+color:#999;
+text-decoration:none;
+}
+
+a:hover {
+text-decoration:underline;
+}
+
+body.layout-sunflower
+{
+    margin: 0;
+    padding: 0;
+}
+
+
+.layout-sunflower #breadcrumbs {
+    border-top: 1px dotted #666;
+    border-bottom: 1px dotted #666;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+    padding: 3px 8px;
+    margin: 3px;
+}
+
+.layout-sunflower #breadcrumbs a {
+    text-decoration: none;
+}
+
+
+#portal-page-actions A img
+{
+   display: inline;   
+}
+
+#portal-page-actions
+{
+   display: inline;
+   position: absolute;
+   right: 5px;
+}
+
+.layout-sunflower .layout-edit-bar
+{
+  width: 100%;
+  padding-top: 5px;
+  font-size: 8pt;
+  color: blue;
+  overflow:hidden;
+  clip:auto;
+}
+
+.layout-sunflower .layout-edit-bar label, 
+.layout-sunflower .layout-edit-bar input, 
+.layout-sunflower .layout-edit-bar select 
+{
+  font-size: 8pt;
+  color: blue;
+}
+
+.layout-sunflower .layout-edit-bar input
+{
+  font-size: 8pt;
+}
+
+.layout-sunflower .layout-edit-bar-left
+{
+  display:inline;
+  float:left;
+}
+
+.layout-sunflower .layout-edit-bar-right
+{
+  display:inline;
+  float:right;
+  padding-right: 5px;
+}
+
+.layout-sunflower .portlet-edit-bar select
+{
+  font-size: 8pt;
+  color: blue;
+}
+
+.layout-sunflower .content{
+margin-left:150px;
+background-color:#fff;
+border-left:1px solid #eee;
+padding:20px;
+font-size:1.2em;margin-right:5px;
+}
+
+.layout-sunflower p {
+padding:2px 2px 2px 2px;
+}
+
+.layout-sunflower .thebox{
+width:100%;
+position:relative;
+background-color:#fff;
+}
+.layout-sunflower .logo{
+color:#111;
+position:relative;
+margin:0px 0px 0px 0px;
+padding:0px 0px 0px 0px;
+height:230px;
+font-size:2.5em;
+text-align:right;
+background:url(../images/back.jpg) no-repeat #87ADD2;
+}
+
+.layout-sunflower .logo a{
+color:#000;
+}
+
+.layout-sunflower .header{
+position:relative;
+margin:0px 0px 0px 0px;
+padding:0px 0px 0px 0px;
+text-align:right;
+list-style-type:none;
+font-size:1.4em;
+background-color:#444;
+}
+
+.layout-sunflower .header li{
+color:#888;
+display:inline;
+padding:0px 10px 0px 10px;
+}
+.layout-sunflower .header li a{
+color:#aaa;
+text-decoration:none;
+}
+.layout-sunflower .header li a:hover{
+color:#ccc;
+text-decoration:none;
+}
+
+.layout-sunflower .footer{
+position:relative;
+text-align:right;
+font-size:1em;
+color:#ccc;
+background-color:#444;width:100%;
+}
+.layout-sunflower .footer a{
+color:#eee;
+}
+.layout-sunflower .side{
+float:left;
+margin:0px 20px 50px 10px;
+font-size:1.05em;
+width:140px;
+}
+.layout-sunflower .side div a{
+color:#555;
+font-size:1.05em;
+}
+
+.layout-sunflower h2{
+font-size:1.4em;
+color:#888;
+}
+
+.layout-sunflower h4{
+font-size:1.1em;
+}

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/css/styles.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/css/styles.css
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator-macros.vm?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator-macros.vm (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator-macros.vm Mon Mar 26 16:53:34 2007
@@ -0,0 +1,259 @@
+#*
+  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)
+  #* 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)
+    <ul class="header">
+    #foreach($element in $_menu.elements.iterator())
+      #if($element.elementType == "option")
+        #set($tabTitle = $element.getTitle($preferedLocale))
+        #set($tabName = $element.getShortTitle($preferedLocale))
+        #if($_orientation == $LEFT_TO_RIGHT)
+          #if($element.isSelected($site))
+        <li>${tabName}</li>
+          #else
+            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+        <li><a href="$tabUrl">${tabName}</a></li>
+          #end
+        #end
+      #end
+    #end
+    </ul>
+#end
+
+#* include links navigation component *#
+#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+  #set($__delimiter = $_delimiter)
+  #if(!$_delimiter || $_delimiter == "")
+    #if($_style != $BREADCRUMBS_STYLE)
+      #set($__delimiter = "&nbsp;")
+    #else
+      #set($__delimiter = "&nbsp;&gt;&gt;&nbsp;")
+    #end
+  #end
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+  
+      <div class="FolderList">
+  #if($_title == $TITLE_FIRST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+		
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+		
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+    #end
+  #end
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size())
+        #if($_orientation == $LEFT_TO_RIGHT)
+			
+        <span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+			
+        <div>
+        #end
+        #if($element.type == "page")
+			
+          <a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "link")
+			
+          <a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "folder")
+			
+          <a href="$linkUrl" class="LinkFolder" title="$!linkTitle">${linkName}</a>
+        #else
+			
+          <a href="$linkUrl" title="$!linkTitle">${linkName}</a>
+        #end
+        #if($_orientation == $LEFT_TO_RIGHT)
+        ${__delimiter}</span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+			
+        </div>
+        #end
+      #else
+        #if($_orientation == $LEFT_TO_RIGHT)
+			
+        <span title="$!linkTitle">${linkName}&nbsp;</span>		
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+			
+        <div title="$!linkTitle">${linkName}</div>
+        #end
+      #end
+    #elseif($element.elementType == "separator")
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+      #if($_orientation == $LEFT_TO_RIGHT)
+		
+        <span title="$!separatorTitle">${separatorText}${__delimiter}</span>              
+      #elseif($_orientation == $TOP_TO_BOTTOM)
+		
+        <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+      #end
+    #end
+  #end
+  #if($_title == $TITLE_LAST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+		
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+		
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+    #end
+  #end
+  
+      </div>
+#end
+
+#* include nested menu links navigation component *#
+#macro (includeNestedLinksWithIconNavigation $_menu $_orientation)
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+  #if($menuName)
+              <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+  #end
+              <div>
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                <div><a href="$linkUrl" target="$linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
+      #elseif($element.type == "folder")
+                <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+    #elseif($element.elementType == "menu")
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+    #elseif($element.elementType == "separator")
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+                  <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+    #end
+  #end
+              </div>
+#end
+
+#* include top level menu links navigation component *#
+#macro (includeLinksWithIconNavigation $_menu $_orientation)
+  #set($rowStarted = false)
+  #set($elementsStarted = false)
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #if(!$rowStarted)
+#*
+        <tr>
+          <td>
+            <div class="toolgroup">
+              <div class="body">
+                <div class="FolderList">
+*#
+      #elseif(!$elementsStarted)
+#*
+              <div class="body">
+                <div class="FolderList">
+*#
+      #end
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                  <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                  <div><a href="$linkUrl" target="$!linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
+      #elseif($element.type == "folder")
+                  <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "menu")
+      #if(!$rowStarted)
+#*
+        <tr>
+          <td>
+            <div class="toolgroup">
+              <div class="body">
+                <div class="FolderList">
+*#
+      #elseif(!$elementsStarted)
+#*
+              <div class="body">
+                <div class="FolderList">
+*#
+      #end
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "separator")
+      #if(!$rowStarted)
+#*
+        <tr>
+          <td>
+            <div class="toolgroup">
+*#
+      #elseif($elementsStarted)
+#*
+                </div>
+              </div>
+*#
+      #end
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+        <h2>${separatorText}</h2>
+#*
+              <div class="label">
+                ${separatorText}
+              </div>
+*#
+      #set($rowStarted = true)
+      #set($elementsStarted = false)
+    #end
+  #end
+  #if($elementsStarted)
+#*
+                </div>
+              </div>
+*#
+  #end
+  #if($rowStarted)
+#*
+            </div>
+          </td>
+        </tr>
+*#
+  #end
+#end

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator-macros.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +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.
+
+id=sunflower
+template.type=velocity
+template.extension=.vm
+template.macros=-macros
+decorates=layout
+base.css.class=layout-sunflower
+
+##following are defaults
+#allow.change.page.theme=true
+#allow.change.layout=true
+#max.layout.nesting=2
+#allow.add.page=true
+#allow.add.portlet=true
+#allow.change.portlet.decorator=true

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/decorator.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/footer.vm?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/footer.vm (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/footer.vm Mon Mar 26 16:53:34 2007
@@ -0,0 +1,25 @@
+#*
+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.
+*#
+
+</div>
+    <div class="footer">
+      Powered by Apache Portals Jetspeed
+    </div>
+</div>
+</body>
+</html>
+

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/footer.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm Mon Mar 26 16:53:34 2007
@@ -0,0 +1,91 @@
+#*
+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.
+*#
+
+#*
+This original design comes from Open Source Web Design.
+  http://www.oswd.org/design/preview/id/2904
+ Modified by Shinsuke Sugaya <sh...@yahoo.co.jp>
+*#
+
+#* 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>
+    #includeHeaderResource()
+
+    <meta http-equiv="Content-type" content="#ContentType()" />
+    <meta http-equiv="Content-style-type" content="text/css" />   
+
+    #includeJavaScriptForHead()
+    #IncludeStylesheets()
+	
+    <title>#PageTitle()</title>
+
+    <meta name="version" content="#SiteVersionTag()">
+    <meta name="keywords" content="" />
+    <meta name="description" content="#PageDescription()" />
+  </head>
+
+<body class="#PageBaseCSSClass()">
+<div class="#PageBaseCSSClass()">
+<div class="thebox">
+    <div class="logo"><a href="#BaseHref()">Jetspeed</a></div>
+
+<!-- Top Tabs Menu -->
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
+
+    <div class="side">
+
+<!-- Left Navigations Menu Table Data -->
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+
+#if(!$navigationsStandardMenu.empty)
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+#end
+
+    </div>
+
+    <div class="content">
+    
+<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>
+
+
+<!--  END: layout/html/sunflower/decorator.vm -->

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/header.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/images/back.jpg
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/images/back.jpg?view=auto&rev=522665
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/images/back.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/images/nw_maj_rond.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/images/nw_maj_rond.gif?view=auto&rev=522665
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/sunflower/images/nw_maj_rond.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/css/styles.css?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/css/styles.css (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/css/styles.css Mon Mar 26 16:53:34 2007
@@ -0,0 +1,338 @@
+/*
+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.
+*/
+
+@import url("../../css/portal-standard.css");
+
+body {
+    height: auto;
+    background: #FFF;
+    color: #1a3804;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+}
+
+/** 
+  This white-space setting is VERY important as it keeps content from "spilling"
+  outside of portlets.
+  */
+
+a:link, a:visited {
+    color: #458023;
+    text-decoration: underline;
+}
+
+a:hover {
+    color: #265b00;
+}
+
+body.layout-thesolution
+{
+    margin: 0;
+    padding: 0;
+}
+
+
+/*
+.layout-thesolution #breadcrumbs {
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+    padding: 3px 8px;
+    margin: 3px;
+}
+
+.layout-thesolution #breadcrumbs a {
+    text-decoration: none;
+}
+*/
+
+#portal-page-actions A img
+{
+   display: inline;   
+}
+
+#portal-page-actions
+{
+   text-align:right;
+}
+
+.layout-thesolution .layout-edit-bar
+{
+  width: 100%;
+  padding-top: 5px;
+  font-size: 8pt;
+  color: blue;
+  overflow:hidden;
+  clip:auto;
+}
+
+.layout-thesolution .layout-edit-bar label, 
+.layout-thesolution .layout-edit-bar input, 
+.layout-thesolution .layout-edit-bar select 
+{
+  font-size: 8pt;
+  color: blue;
+}
+
+.layout-thesolution .layout-edit-bar input
+{
+  font-size: 8pt;
+}
+
+.layout-thesolution .layout-edit-bar-left
+{
+  display:inline;
+  float:left;
+}
+
+.layout-thesolution .layout-edit-bar-right
+{
+  display:inline;
+  float:right;
+  padding-right: 5px;
+}
+
+.layout-thesolution .portlet-edit-bar select
+{
+  font-size: 8pt;
+  color: blue;
+}
+
+
+
+/* site specific styling */
+
+
+/* the container centers the page */
+.layout-thesolution #container {
+    width: 740px;
+    height: auto;
+    margin: 0 auto 0 auto;
+}   
+
+
+/* the topbar that contains the most upper links */
+.layout-thesolution #topbar {
+    width: 740px;
+    height: 24px;
+    line-height: 24px;
+    vertical-align: middle;
+    text-align: right;
+}
+
+/* the links in the topbar are an unordered list, formatted here */
+    .layout-thesolution #topbar ul {
+        margin: 0;
+        float: right;
+    }
+    .layout-thesolution #topbar li {
+        list-style: none;
+        display: block;
+        width: auto;
+        float: left;
+    }
+    .layout-thesolution #topbar a {
+        text-decoration: none;
+        display: block;
+        padding: 0 10px 0 10px;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 10px;
+        text-transform: uppercase;
+    }
+    .layout-thesolution #topbar a:hover {
+        background: #458023;
+        color: #FFF;
+    }
+
+
+/* the header that contains the big image */
+.layout-thesolution #header {
+    width: 740px;
+    height: 180px;
+    background: #458023 url(../images/header.jpg) top left no-repeat;
+    position: relative;
+}
+
+/* the big title text in the header */
+    .layout-thesolution #header h1 {
+        font-family: "Trebuchet MS", Tahoma, Verdana, sans-serif;
+        font-size: 30px;
+        font-weight: 100;
+        letter-spacing: -1px;
+        color: #FFF;
+        position: absolute;
+        top: 60px;
+        left: 20px;
+    }
+
+/* the navigationbar in the header */
+.layout-thesolution #navbar {
+    position: absolute;
+    bottom: 8px;
+    right: 6px;
+}
+
+/* the links in the navigationbar are an unordered list */
+    .layout-thesolution #navbar ul {
+    }
+    
+    .layout-thesolution #navbar li {
+        list-style: none;
+        display: block;
+        width: auto;
+        float: left;
+    }
+    .layout-thesolution #navbar a {
+        text-decoration: none;
+        /*display: block;*/
+        padding: 4px 3px 4px 3px;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 10px;
+        /*text-transform: uppercase;*/
+    }
+    .layout-thesolution #navbar a:hover {
+        background: #458023;
+        color: #FFF;
+    }
+    .layout-thesolution #navbar span {
+        text-decoration: none;
+        /*display: block;*/
+        padding: 4px 2px 4px 2px;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 10px;
+        /*text-transform: uppercase;*/
+    }
+    
+/* the core contains all the site contents */
+.layout-thesolution #core {
+    width: 740px;
+    height: auto;
+    margin-top: 5px;
+    background: #FFF url(../images/coreback.gif) top left repeat-y;
+}
+
+/* the coreleft contains the left part of the core */
+.layout-thesolution #coreleft {
+    width: 140px;
+    height: auto;
+    background: #deebd2;
+    float: left;
+}
+
+/* the links in coreleft are another unordered list */
+    .layout-thesolution #coreleft ul {
+    }
+    .layout-thesolution #coreleft li {
+        display: block;
+        height: auto;
+        width: 136px;
+        margin: 2px;
+    }
+    .layout-thesolution #coreleft a {
+        display: block;
+        height: auto;
+        padding: 4px;
+        width: 128px;
+        color: #325d19;
+        background: url(../images/readmore_arrow.gif) 97% center no-repeat;
+        text-decoration: none;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 10px;
+        border: 0;
+    }
+
+    .layout-thesolution #coreleft a:hover {
+        background: #458023 url(../images/readmore_over.gif) 97% center no-repeat;
+        color: #FFF;
+    }
+    
+    .layout-thesolution #coreleft h3 {
+        padding: 20px 4px 0 4px;
+        font-family: "Trebuchet MS", Tahoma, Verdana, sans-serif;
+        font-size: 18px;
+        margin: 0;
+    }
+    
+    .layout-thesolution #coreleft p {
+        padding: 5px;
+        margin-top: 0px;
+        line-height: 16px;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 10px;
+    }
+    
+
+/* the corecenter contains the center part of the core */
+.layout-thesolution #corecenter {
+    width: 590px;
+    height: auto;
+    float: left;
+}
+
+    .layout-thesolution #corecenter h2 {
+        font-family: "Trebuchet MS", Tahoma, Verdana, sans-serif;
+        font-size: 20px;
+        color: #3e6717;
+        padding: 10px 0 0 10px;
+    }
+    .layout-thesolution #corecenter p {
+        line-height: 20px;
+        padding: 0 10px 10px 10px;
+        color: #888;
+    }
+    
+    .layout-thesolution #corecenter ul {
+        padding: 20px;
+        width: auto;
+    }
+    .layout-thesolution #corecenter li {
+        list-style: none;
+        line-height: 20px;
+        border-bottom: 1px solid #DDD;
+    }
+    .layout-thesolution #corecenter li a {
+        text-decoration: none;
+        color: #a6c384;
+        display: block;
+        height: auto;
+        padding: 4px;
+    }
+    .layout-thesolution #corecenter li a:hover {
+        background: #a6c384;
+        color: #000;
+    }
+
+/* the footer contains all copyright info etcetera */
+.layout-thesolution #footer {
+    clear: both;
+    width: 740px;
+    height: 30px;
+    background: #458023;
+    line-height: 30px;
+    vertical-align: middle;
+    text-align: right;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 10px;
+}
+    .layout-thesolution #footer p {
+        color: #FFF;
+        padding-right: 20px;
+    }
+    .layout-thesolution #footer a {
+        color: #FFF;
+    }
+

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/css/styles.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/css/styles.css
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator-macros.vm?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator-macros.vm (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator-macros.vm Mon Mar 26 16:53:34 2007
@@ -0,0 +1,259 @@
+#*
+  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)
+  #* 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)
+    <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/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator-macros.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator.properties?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator.properties (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator.properties Mon Mar 26 16:53:34 2007
@@ -0,0 +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.
+
+id=thesolution
+template.type=velocity
+template.extension=.vm
+template.macros=-macros
+decorates=layout
+base.css.class=layout-thesolution
+
+##following are defaults
+#allow.change.page.theme=true
+#allow.change.layout=true
+#max.layout.nesting=2
+#allow.add.page=true
+#allow.add.portlet=true
+#allow.change.portlet.decorator=true

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/decorator.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/footer.vm?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/footer.vm (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/footer.vm Mon Mar 26 16:53:34 2007
@@ -0,0 +1,28 @@
+#*
+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.
+*#
+
+            </div>
+            <div id="footer">
+                <p><!-- Copy Right Template -->
+                &copy; 1999-2006, Apache Software Foundation </p>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>
+

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/footer.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm Mon Mar 26 16:53:34 2007
@@ -0,0 +1,91 @@
+#*
+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.
+*#
+
+#*
+This original design comes from Open Web Design.
+  http://www.openwebdesign.org/viewdesign.phtml?id=2730&referer=%2Fbrowse.php
+ Modified by Shinsuke Sugaya <sh...@yahoo.co.jp>
+*#
+
+#* 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>
+    #includeHeaderResource()
+
+    <meta http-equiv="Content-type" content="#ContentType()" />
+    <meta http-equiv="Content-style-type" content="text/css" />   
+
+    #includeJavaScriptForHead()
+    #IncludeStylesheets()
+	
+    <title>#PageTitle()</title>
+
+    <meta name="version" content="#SiteVersionTag()">
+    <meta name="keywords" content="" />
+    <meta name="description" content="#PageDescription()" />
+  </head>
+
+<body class="#PageBaseCSSClass()">
+<div class="#PageBaseCSSClass()">
+
+    <div id="container">
+        <div id="topbar">
+<!-- Top Tabs Menu -->
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
+        </div>  
+        <div id="header">
+            <h1>Jetspeed 2 Enterprise Portal</h1>
+            <div id="navbar">
+<ul><li>
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
+        &nbsp;
+#end
+</li></ul>
+            </div>
+        </div>
+        <div id="core">
+            <div id="coreleft">
+<!-- Left Navigations Menu Table Data -->
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+
+#if(!$navigationsStandardMenu.empty)
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+#end
+            </div>
+            <div id="corecenter">
+
+     <!-- Page Action Bar -->
+##   <span style="position:absolute;right:5em">$jetspeed.renderPortletEntity("theClock", "j2-admin::DateTimePortlet")</span>     
+#if ($request.getUserPrincipal())
+<span style="position:absolute;right:15em"><a href="#BaseHref()login/logout">Logout</a></span>   
+#end 
+     #PageActionBar()
+<!--  END: layout/html/thesolution/decorator.vm -->

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/header.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/coreback.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/coreback.gif?view=auto&rev=522665
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/coreback.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/header.jpg
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/header.jpg?view=auto&rev=522665
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/header.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/readmore_arrow.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/readmore_arrow.gif?view=auto&rev=522665
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/readmore_arrow.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/readmore_over.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/readmore_over.gif?view=auto&rev=522665
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/thesolution/images/readmore_over.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalAccordionContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalAccordionContainer.css?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalAccordionContainer.css (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalAccordionContainer.css Mon Mar 26 16:53:34 2007
@@ -0,0 +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.
+*/

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalAccordionContainer.css
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalBreadcrumbContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalBreadcrumbContainer.css?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalBreadcrumbContainer.css (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalBreadcrumbContainer.css Mon Mar 26 16:53:34 2007
@@ -0,0 +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.
+*/

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalBreadcrumbContainer.css
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalTabContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalTabContainer.css?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalTabContainer.css (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/tigris/css/PortalTabContainer.css Mon Mar 26 16:53:34 2007
@@ -0,0 +1,180 @@
+/*
+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.
+*/
+
+.dojoTabContainer {
+	position : relative;
+}
+
+.dojoTabPaneWrapper {
+	border : 1px solid #6290d2;
+	_zoom: 1; /* force IE6 layout mode so top border doesnt disappear */
+	display: block;
+	clear: both;
+}
+
+.dojoTabLabels-top {
+	position : relative;
+	top : 0px;
+	left : 0px;
+	overflow : visible;
+	margin-bottom : -1px;
+	width : 100%;
+	z-index: 2;	/* so the bottom of the tab label will cover up the border of dojoTabPaneWrapper */
+}
+
+.dojoTabNoLayout.dojoTabLabels-top .dojoTab {
+	margin-bottom: -1px;
+	_margin-bottom: 0px; /* IE filter so top border lines up correctly */
+}
+
+.dojoTab {
+	position : relative;
+	float : left;
+	padding-left : 9px;
+	border-bottom : 1px solid #6290d2;
+	background : url(../images/desktop/tabs/tab_left.gif) no-repeat left top;
+	cursor: pointer;
+	white-space: nowrap;
+	z-index: 3;
+}
+
+.dojoTab div {
+	display : block;
+	padding : 4px 15px 4px 6px;
+	background : url(../images/desktop/tabs/tab_top_right.gif) no-repeat right top;
+	color : #333;
+	font-size : x-small;
+    font-weight: bold;
+}
+
+.dojoTab .close {
+	display : inline-block;
+	height : 12px;
+	width : 12px;
+	padding : 0 12px 0 0;
+	margin : 0 -10px 0 10px;
+	cursor : default;
+	font-size: small;
+}
+
+.dojoTab .closeImage {
+	background : url(../images/desktop/tabs/tab_close.gif) no-repeat right top;
+}
+
+.dojoTab .closeHover {
+	background-image : url(../images/desktop/tabs/tab_close_h.gif);
+}
+
+.dojoTab.current {
+	padding-bottom : 1px;
+	border-bottom : 0;
+	background-position : 0 -150px;
+}
+
+.dojoTab.current div {
+	padding-bottom : 5px;
+	margin-bottom : -1px;
+	background-position : 100% -150px;
+}
+
+/* bottom tabs */
+
+.dojoTabLabels-bottom {
+	position : relative;
+	bottom : 0px;
+	left : 0px;
+	overflow : visible;
+	margin-top : -1px;
+	width : 100%;
+	z-index: 2;
+}
+
+.dojoTabNoLayout.dojoTabLabels-bottom {
+	position : relative;
+}
+
+.dojoTabLabels-bottom .dojoTab {
+	border-top :  1px solid #6290d2;
+	border-bottom : 0;
+	background : url(../images/desktop/tabs/tab_bot_left.gif) no-repeat left bottom;
+}
+
+.dojoTabLabels-bottom .dojoTab div {
+	background : url(../images/desktop/tabs/tab_bot_right.gif) no-repeat right bottom;
+}
+
+.dojoTabLabels-bottom .dojoTab.current {
+	border-top : 0;
+	background : url(../images/desktop/tabs/tab_bot_left_curr.gif) no-repeat left bottom;
+}
+
+.dojoTabLabels-bottom .dojoTab.current div {
+	padding-top : 4px;
+	background : url(../images/desktop/tabs/tab_bot_right_curr.gif) no-repeat right bottom;
+}
+
+/* right-h tabs */
+
+.dojoTabLabels-right-h {
+	overflow : visible;
+	margin-left : -1px;
+	z-index: 2;
+}
+
+.dojoTabLabels-right-h .dojoTab {
+	padding-left : 0;
+	border-left :  1px solid #6290d2;
+	border-bottom : 0;
+	background : url(../images/desktop/tabs/tab_bot_right.gif) no-repeat right bottom;
+	float : none;
+}
+
+.dojoTabLabels-right-h .dojoTab div {
+	padding : 4px 15px 4px 15px;
+}
+
+.dojoTabLabels-right-h .dojoTab.current {
+	border-left :  0;
+	border-bottom :  1px solid #6290d2;
+}
+
+/* left-h tabs */
+
+.dojoTabLabels-left-h {
+	overflow : visible;
+	margin-right : -1px;
+	z-index: 2;
+}
+
+.dojoTabLabels-left-h .dojoTab {
+	border-right :  1px solid #6290d2;
+	border-bottom : 0;
+	float : none;
+	background : url(../images/desktop/tabs/tab_top_left.gif) no-repeat left top;
+}
+
+.dojoTabLabels-left-h .dojoTab.current {
+	border-right : 0;
+	border-bottom :  1px solid #6290d2;
+	padding-bottom : 0;
+	background : url(../images/desktop/tabs/tab_top_left.gif) no-repeat 0 -150px;
+}
+
+.dojoTabLabels-left-h .dojoTab div {
+	background : 0;
+	border-bottom :  1px solid #6290d2;
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org