portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r889075 [1/2] - in /portals/jetspeed-2/portal/trunk: applications/jetspeed-layouts/src/main/webapp/WEB-INF/ applications/jetspeed/src/main/webapp/ applications/jetspeed/src/main/webapp/WEB-INF/pages/ applications/jetspeed/src/main/webapp/WE...
Date Thu, 10 Dec 2009 03:39:20 GMT
Author: taylor
Date: Thu Dec 10 03:39:17 2009
New Revision: 889075

URL: http://svn.apache.org/viewvc?rev=889075&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
- introduce jetspeed.properties configuration to switch between server side and client side customization, values ( ajax | server ) 
jetui.customization.method = ajax
  (note that server side doesnt complete support templates) 
- /portal pipeline not fully supports ajax customization and the same level as /ui pipeline. /ui pipeline will be converted over to a client side rendering engine over the next week  
- enabling PSML template usage in /portal pipeline, 
- added server side support for detached portlets and decorator-rendered portlets (not yet implemented on server side) 
- rewrote Spaces navigator using styles contributed by Robbert Kauffman
- removed all hard coded includes of portlets in decorators, templates
- fixing syntax errors in layout decorators portlet.xml

note: close/delete portlet is not yet implemented in portal pipeline

Added:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/choosers/template.tpsml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.properties   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/arrow-nav-top.png   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/divider-nav-top.png   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/hover-nav-top.png   (with props)
    portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlets/layout/NameValueProperty.java   (with props)
Removed:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/environment.vm
Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/portal.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/desktop.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/portal.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/desktop.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/desktop.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/portal.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/desktop.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/portal.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/desktop.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
    portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java
    portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml Thu Dec 10 03:39:17 2009
@@ -26,6 +26,7 @@
       which provides its own layout algorithm</description>
     <portlet-name>SimpleLayout</portlet-name>
     <display-name>Simple readonly fixed Layout</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.LayoutPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -34,13 +35,12 @@
       <name>MaxPage</name>
       <value>maximized</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.LayoutPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
-    <expiration-cache>0</expiration-cache>
+    <expiration-cache>0</expiration-cache>    
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>view</portlet-mode>
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>SimpleLayoutPortlet</title>
       <short-title>SimpleLayout</short-title>
@@ -53,6 +53,7 @@
     <display-name xml:lang="ja">Velocityを利用した 1 列レイアウト</display-name>
     <display-name xml:lang="zh">基于Velocity的单列布局</display-name>
     <display-name xml:lang="zh-TW">基於Velocity的單列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
    <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -73,8 +74,6 @@
       <name>layoutType</name>
       <value>OneColumn</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -86,6 +85,7 @@
       <mime-type>text/vnd.wap.wml</mime-type>      
       <portlet-mode>view</portlet-mode>    
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>One Column</title>
       <short-title>OneColumn</short-title>
@@ -98,6 +98,7 @@
     <display-name xml:lang="ja">Velocity とテーブルを利用した 1 列レイアウト</display-name>
     <display-name xml:lang="zh">基于Velocity表格的单列布局</display-name>
     <display-name xml:lang="zh-TW">基於Velocity表格的單列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>tcolumns</value>
@@ -118,8 +119,6 @@
       <name>layoutType</name>
       <value>OneColumn</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -127,6 +126,7 @@
       <portlet-mode>edit</portlet-mode>
       <portlet-mode>help</portlet-mode>      
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>One Column with Tables</title>
       <short-title>OneColumnTable</short-title>
@@ -139,6 +139,7 @@
     <display-name xml:lang="ja">Velocity を利用した 2 列レイアウト</display-name>
     <display-name xml:lang="zh">基于Velocity的双列布局</display-name>
     <display-name xml:lang="zh-TW">基於Velocity的雙列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -163,8 +164,6 @@
       <name>editorType</name>
       <value>desktop</value>
     </init-param> -->
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -172,6 +171,7 @@
       <portlet-mode>edit</portlet-mode>
       <portlet-mode>help</portlet-mode>      
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Two Columns</title>
       <short-title>TwoColumns</short-title>
@@ -184,6 +184,7 @@
     <display-name xml:lang="ja">Velocity を利用した左側にナビゲーションコントロール用の小さな列を持つ 2 列</display-name>
     <display-name xml:lang="zh">基于Velocity,导航栏较窄的双列布局</display-name>
     <display-name xml:lang="zh-TW">基於Velocity,導航欄較窄的雙列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -204,8 +205,6 @@
       <name>layoutType</name>
       <value>TwoColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -213,6 +212,7 @@
       <portlet-mode>edit</portlet-mode>
       <portlet-mode>help</portlet-mode>      
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Two Columns (15%/85%)</title>
       <short-title>Two Columns (15%/85%)</short-title>
@@ -226,6 +226,7 @@
     <display-name xml:lang="ja">Velocity を利用した 3 列レイアウト</display-name>
     <display-name xml:lang="zh">基于Velocity的3列布局</display-name>
     <display-name xml:lang="zh-TW">基於Velocity的3列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -246,8 +247,6 @@
       <name>layoutType</name>
       <value>ThreeColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -255,6 +254,7 @@
       <portlet-mode>edit</portlet-mode>
       <portlet-mode>help</portlet-mode>      
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Three Columns</title>
       <short-title>ThreeColumns</short-title>
@@ -267,6 +267,7 @@
     <display-name xml:lang="ja">Velocity とテーブルを利用した 3 列レイアウト</display-name>
     <display-name xml:lang="zh">基于Velocity表格的3列布局</display-name>
     <display-name xml:lang="zh-TW">基於Velocity表格的3列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>tcolumns</value>
@@ -287,8 +288,6 @@
       <name>layoutType</name>
       <value>ThreeColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -296,6 +295,7 @@
       <portlet-mode>edit</portlet-mode>
       <portlet-mode>help</portlet-mode>      
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Three Columns with Tables</title>
       <short-title>ThreeColumnsTable</short-title>
@@ -308,6 +308,7 @@
     <display-name xml:lang="ja">ページアクションのない Velocity を利用した 1 列レイアウト</display-name>
     <display-name xml:lang="zh">没有页面状态、基于Velocity的单列布局</display-name>
     <display-name xml:lang="zh-TW">沒有頁面狀態、基於Velocity的單列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -328,8 +329,6 @@
       <name>layoutType</name>
       <value>OneColumn</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -339,6 +338,7 @@
       <mime-type>text/vnd.wap.wml</mime-type>      
       <portlet-mode>view</portlet-mode>    
     </supports>    
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>One Column - No Actions</title>
       <short-title>OneColumnNoActions</short-title>
@@ -351,6 +351,7 @@
     <display-name xml:lang="ja">ページアクションのない Velocity を利用した 2 列レイアウト</display-name>
     <display-name xml:lang="zh">没有页面状态、基于Velocity的双列布局</display-name>
     <display-name xml:lang="zh-TW">沒有頁面狀態、基於Velocity的雙列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -371,13 +372,12 @@
       <name>layoutType</name>
       <value>TwoColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>view</portlet-mode>
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Two Columns - No Actions</title>
       <short-title>TwoColumnsNoActions</short-title>
@@ -390,6 +390,7 @@
     <display-name xml:lang="ja">ページアクションのない Velocity を利用した 3 列レイアウト</display-name>
     <display-name xml:lang="zh">没有页面状态、基于Velocity的3列布局</display-name>
     <display-name xml:lang="zh-TW">沒有頁面狀態、基於Velocity的3列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -410,13 +411,12 @@
       <name>layoutType</name>
       <value>ThreeColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>view</portlet-mode>
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Three Columns - No Actions</title>
       <short-title>ThreeColumnsNoActions</short-title>
@@ -428,6 +428,7 @@
     <display-name xml:lang="ja">ページアクションのない Velocity を利用した 2 列レイアウト</display-name>
     <display-name xml:lang="zh">没有页面状态、基于Velocity的双列布局</display-name>
     <display-name xml:lang="zh-TW">沒有頁面狀態、基於Velocity的雙列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -448,13 +449,12 @@
       <name>layoutType</name>
       <value>TwoColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>view</portlet-mode>
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Two Columns (25%/75%) No Actions</title>
       <short-title>VelocityTwoColumns2575NoActions</short-title>
@@ -467,6 +467,7 @@
     <display-name xml:lang="ja">Velocity を利用した 25/75 の 2 列レイアウト</display-name>
     <display-name xml:lang="zh">基于Velocity的双列布局</display-name>
     <display-name xml:lang="zh-TW">基於Velocity的雙列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -487,8 +488,6 @@
       <name>layoutType</name>
       <value>TwoColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -496,6 +495,7 @@
       <portlet-mode>edit</portlet-mode>
       <portlet-mode>help</portlet-mode>      
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Two Columns (25%/75%)</title>
       <short-title>VelocityTwoColumns2575</short-title>
@@ -508,6 +508,7 @@
     <display-name xml:lang="ja">アクションのない Velocity を利用した左側にナビゲーションコントロール用の小さな列を持つ 2 列</display-name>
     <display-name xml:lang="zh">没有页面状态、基于Velocity,导航栏较窄的单列布局</display-name>
     <display-name xml:lang="zh-TW">沒有頁面狀態、基於Velocity,導航欄較窄的雙列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -528,13 +529,12 @@
       <name>layoutType</name>
       <value>TwoColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>view</portlet-mode>
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Two Columns (15%,85%) No Actions</title>
       <short-title>2 Columns 15,85 No Actions</short-title>
@@ -547,6 +547,7 @@
     <display-name xml:lang="ja">Velocity とテーブルを利用した 2 列レイアウト</display-name>
     <display-name xml:lang="zh">基于Velocity表格的双列布局</display-name>
     <display-name xml:lang="zh-TW">基於Velocity表格的雙列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>tcolumns</value>
@@ -567,8 +568,6 @@
       <name>layoutType</name>
       <value>TwoColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -576,6 +575,7 @@
       <portlet-mode>edit</portlet-mode>
       <portlet-mode>help</portlet-mode>      
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Two Columns with Tables</title>
       <short-title>Two Columns Tables</short-title>
@@ -587,6 +587,7 @@
     <display-name>Four Columns</display-name>
     <display-name xml:lang="zh">基于Velocity表格的4列布局</display-name>
     <display-name xml:lang="zh-TW">基於Velocity表格的4列佈局</display-name>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
@@ -607,8 +608,6 @@
       <name>layoutType</name>
       <value>FourColumns</value>
     </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
@@ -616,6 +615,7 @@
       <portlet-mode>edit</portlet-mode>
       <portlet-mode>help</portlet-mode>      
     </supports>
+    <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
     <portlet-info>
       <title>Four Columns</title>
       <short-title>FourColumns</short-title>

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/choosers/template.tpsml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/choosers/template.tpsml?rev=889075&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/choosers/template.tpsml (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/choosers/template.tpsml Thu Dec 10 03:39:17 2009
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page-template id="chooser-definition"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+
+  <title>TEMPLATE</title>
+  <fragment id="choosers-top" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+
+    <page-fragment id="chooser-template">
+      <property name="row" value="1"/>
+    </page-fragment>
+    
+  </fragment>  
+</page-template>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml Thu Dec 10 03:39:17 2009
@@ -5,28 +5,37 @@
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
   <title>TEMPLATE</title>
-  <fragment id="template-top" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+  <fragment id="template-top2" type="layout" name="jetspeed-layouts::VelocityThreeColumns">
+    <property name="sizes" value="15%,70%,15%"></property>
 
-    <fragment id="_jsNavigator-1001" type="portlet" name="j2-admin::JetspeedNavigator">
+    <fragment id="_jsSpaceNavigator-1001" type="portlet" name="j2-admin::SpaceNavigator" decorator='clear'>
+            <property name="y" value="300"></property>
+            <property name="x" value="20"></property>            
+            <property name="jsdesktop" value="detached=true"></property>                        
+    </fragment>
+
+    <fragment id="_jsNavigator-1001" type="portlet" name="j2-admin::PageNavigator">
   	        <property name="z" value="201.0"></property>
             <property name="row" value="0"></property>
-            <property name="width" value="267.0"></property>
+            <property name="width" value="40"></property>
             <property name="height" value="388.0"></property>
             <property name="column" value="0"></property>
             <property name="y" value="104.0"></property>
-            <property name="x" value="1.0"></property>
+            <property name="x" value="1.0"></property>            
             <property name="jsdesktop" value="staticpos=false;fitheight=false"></property>                        
     </fragment>
     <page-fragment id="page-template">
-      <property name="row" value="1"/>
+      <property name="column" value="1"/>
+      <property name="row" value="0"/>
+      <property name="width" value="60%"></property>      
     </page-fragment>
     
     <fragment id="_jsToolbox-1001" type="portlet" name="j2-admin::JetspeedToolbox">
   	        <property name="z" value="201.0"></property>
-            <property name="row" value="2"></property>
-            <property name="width" value="267.0"></property>
+            <property name="row" value="0"></property>
+            <property name="width" value="40"></property>
             <property name="height" value="388.0"></property>
-            <property name="column" value="0"></property>
+            <property name="column" value="2"></property>
             <property name="y" value="500.0"></property>
             <property name="x" value="1.0"></property>
             <property name="jsdesktop" value="staticpos=false;fitheight=false"></property>                        

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm Thu Dec 10 03:39:17 2009
@@ -92,9 +92,9 @@
     #else
       #set($allowAddLayout=false)
     #end
-     
     #getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
     #getBoolProperty($allowAddPortlet $rootDecorator "allow.add.portlet" true)
+    #if ($myFragment.isLocked() == false)             
     <fieldset>    
     <div class="layout-edit-bar-left">
         <div class="layout-title"><b>$messages.getString("portal.page.customizer.name")</b></div>
@@ -140,7 +140,7 @@
       <div class="layout-title"><b>$messages.getString("portal.page.editing.layoutConfiguration")</b></div>
       <div class="layout-content">
         #end
-        #if ($allowChangePageTheme)
+##        #if ($allowChangePageTheme)
         <div>
           <label for="theme">$messages.getString("portal.page.editing.theme")</label>
           <select id='theme' name='theme' onChange="$form$submit">
@@ -149,7 +149,7 @@
             #end
           </select>   
         </div>
-        #end
+##        #end
         #if($allowAddLayout||$allowChangeLayout)
         <div>
           <label for="layout">$messages.getString("portal.page.editing.layout")</label>
@@ -193,7 +193,8 @@
       </div>
         #end
     </div> 
-    </fieldset>   
+    </fieldset>
+    #end       
     <fieldset style="float:left;width:49%;margin:0px;padding:0px;">
     <div class="layout-edit-bar-left">
         #if($allowAddPage||$allowChangePageName||$allowDeletePage)
@@ -303,7 +304,6 @@
 	  
   #set($columnFloat = $columnLayout.getColumnFloat($columnIndex))
 	#set($columnWidth = $columnLayout.getColumnWidth($columnIndex))
-	
 	<div id="column_${myFragment.getId()}_${columnIndex}" 
 	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
 	     style="float:${columnFloat}; width:${columnWidth};">
@@ -317,7 +317,7 @@
       #set($row = $coords.y)
 			
       ## get the decorated Portlet content
-		  <div class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+		  <div id='$f.id' name='$f.name' column='${col}' row='${row}' class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
 		    ## editing block
 		    #if($editing)
 		      <div class="portlet-edit-bar">

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.properties?rev=889075&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.properties (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.properties Thu Dec 10 03:39:17 2009
@@ -0,0 +1,18 @@
+# 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=jetui
+template.type=velocity
+template.extension=.vm
+

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm?rev=889075&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm Thu Dec 10 03:39:17 2009
@@ -0,0 +1,99 @@
+#*
+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($theme = $request.getAttribute("org.apache.jetspeed.theme"))
+#set($sizes = $jetspeed.columnSizes)
+#set($myPage = $jetspeed.page)
+#set($myFragment = $jetspeed.currentFragment)
+#set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
+#set($actions = $myFragment.decoration.actions)
+#set($messages = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set($rootDecorator = $myPage.getRootFragment().decoration)
+
+#if($myFragment.getDecorator())
+  #set($decorator = $myFragment.getDecorator())
+#end
+
+#if($myFragment == $myPage.getRootFragment())
+  #set($isRoot=true)
+#end
+
+## Decorator  $decorator  ${decoTop} - ${decoBottom}
+#if ($isRoot)
+  #parse($myFragment.decoration.header)
+   #set($layoutClass = "portal-nested-layout")
+#else
+  #defineLayoutObjects()
+   #set($layoutClass = "portal-layout")
+#end
+
+#set($layoutType =$portletConfig.getInitParameter("layoutType"))
+#set($columnLayout = $renderRequest.getAttribute("columnLayout"))
+#set($decorationFactory = $renderRequest.getAttribute("decorationFactory"))
+#set($rc = $renderRequest.getAttribute("org.apache.jetspeed.request.RequestContext"))
+#set($psrc = $rc.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
+#set($profiledPage = $psrc.Page.Path)
+
+<div id="$renderResponse.namespace" class="${layoutClass} ${layoutClass}-${layoutType}">
+
+
+#set ($dcnt = 0) 
+#set ($columnIndex = 0)
+  
+#foreach($column in $columnLayout.columns)
+	  
+    #set($columnFloat = $columnLayout.getColumnFloat($columnIndex))
+    #set($columnWidth = $columnLayout.getColumnWidth($columnIndex))
+
+	<div id="column_${myFragment.getId()}_${columnIndex}"  column="${columnIndex}" name="$myFragment.name" locked='$myFragment.isLocked()'
+	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
+	     style="float:${columnFloat}; width:${columnWidth};">
+	     
+	  #foreach($f in $column)
+      ## Set up coordinates for this fragment
+      ## #if($f.isLocked() == false)
+	      #set($coords = $columnLayout.getCoordinate($f))	  
+	      #set($col = $coords.x)
+	      #set($row = $coords.y)
+  	      ## Now get the real content
+	 	  $jetspeed.setCurrentFragment($f)	   
+  	      #if($f.type == "portlet")
+	         ## get the decorated Portlet content
+		     <div id='$f.id' name='$f.name' column='${col}' row='${row}' class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+			    #parse($f.decoration.template)
+		     </div>			    
+		   #else		
+			    $f.renderedContent			
+		   #end
+		  #end
+	##	#end
+	</div>
+	#set ($columnIndex = $columnIndex + 1)  
+#end  
+</div>  
+<br style="clear:both;"/>
+#if ($isRoot)
+  #parse($myFragment.decoration.footer)
+#end
+
+#foreach($f in $columnLayout.detachedPortlets)
+  #set($x = $f.getProperty("x"))
+  #set($y = $f.getProperty("y"))
+  $jetspeed.setCurrentFragment($f)	   
+   <div id='$f.id' detached='true' locked='$f.isLocked()' name='$f.name' column='${col}' row='${row}' style='position: absolute; top: ${x}px; left: ${y}px;'>
+	    #parse($f.decoration.template)
+   </div>			    
+#end

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/portal.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/portal.css?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/portal.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/portal.css Thu Dec 10 03:39:17 2009
@@ -31,5 +31,20 @@
 font-size: 7pt;
 }
 
-
+.active > a { font-weight: bold; }
+#nav-top { z-index: 1000;  }
+#nav-top > li { float: left; margin: 0 7px 0 0; padding-bottom: 5px; list-style-type: none}
+#nav-top a { display: block; color:#3F8800; text-decoration: none; font-size: 12px;}
+#nav-top a:hover { text-decoration: underline; }
+#nav-top > li > a { padding: 0 26px 5px 5px; background: url(../../images/arrow-nav-top.png) no-repeat 100% 2px; color: #FFFFFF; font-weight: bold; }
+#nav-top ul li { padding: 0 10px 8px; list-style-type: none }
+#nav-top li:hover { background: url(../../images/hover-nav-top.png) repeat-x; }
+#nav-top li:hover ul { left: auto; }
+#nav-top ul { position: absolute; left: -999em; background-color: #FFFFFF; border: 1px solid #107EC0; }
+#nav-top #envList { width: 145px; }
+#nav-top #spaceList { width: 250px; }
+#nav-top ul .first, #nav-top ul li:first-child { padding-top: 8px; }
+#nav-top ul .add { background: url(../../images/divider-nav-top.png) repeat-x; padding-top: 7px; }
+ 
 /*  end layout decorator tigris additions  */
+ 
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/desktop.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/desktop.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/desktop.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/desktop.vm Thu Dec 10 03:39:17 2009
@@ -41,7 +41,6 @@
   <h1 class="logo">Jetspeed</h1>
   <div class="menu">
 <ul class="tabs">
-#parse ($layoutDecoration.getResource("../environment.vm"))
 </ul>  
 ##   <div class="tabs" widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer"></div>
   </div>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm Thu Dec 10 03:39:17 2009
@@ -22,4 +22,7 @@
       <img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
     </p>
   </body>
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script src="#BaseHref()/jetui/engine/portal.js"></script>
+#end  
 </html>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm Thu Dec 10 03:39:17 2009
@@ -1,101 +1,103 @@
-#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#* Add the current layouts configuration values to the context *#
-#defineLayoutObjects()
-
-#* Loads our custom macros *#
-#parse($layoutDecoration.getResource("decorator-macros.vm"))
-
-#* Add all template constants to the current context *#
-#defineNavigationConstants()
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head> 
-
-## To include head elements, portlet contents which are instantly added should be rendered before invoking includeHeaderResource.
-#set($navigatorPortletContent = $jetspeed.renderPortletWindow("_JetspeedNavigator", "j2-admin::JetspeedNavigator"))
-#set($toolboxPortletContent = $jetspeed.renderPortletWindow("_JetspeedToolbox", "j2-admin::JetspeedToolbox"))
-
-#includeHeaderResource()
-
-    <meta http-equiv="Content-type" content="#ContentType()" />
-    <title>#PageTitle()</title>
-<link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
-#includeJavaScriptForHead()
-#IncludeStylesheets()
-
-</head>
+#*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#* Add the current layouts configuration values to the context *#
+#defineLayoutObjects()
+
+#* Loads our custom macros *#
+#parse($layoutDecoration.getResource("decorator-macros.vm"))
+
+#* Add all template constants to the current context *#
+#defineNavigationConstants()
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head> 
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script type="text/javascript" src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
+<script language="javascript">
+var assetsDir = "assets/";
+var buildDir = "#BaseHref()/javascript/yui/build/" ;
+var yuiConfig = {base:"#BaseHref()/javascript/yui/build/", timeout: 10000, debug: true, useBrowserConsole: true}; // ({classNamePrefix: 'jet'})
+</script>
+<link rel="stylesheet" type="text/css" href="#BaseHref()/jetui/css/portal.css"/>
+#end
+
+#includeHeaderResource()
+
+<meta http-equiv="Content-type" content="#ContentType()" />
+<title>#PageTitle()</title>
+<link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
+#includeJavaScriptForHead()
+#IncludeStylesheets()
+
+</head>
 <body class="#PageBaseCSSClass()">
 <!--  BEGIN: layout/html/jetspeed/decorator.vm -->
 <!-- Page Action Bar -->
 #if ($request.getUserPrincipal())
-<a class="layout-greenearth-logout" href="#BaseHref()login/logout">Logout</a>
+<span class="layout-statusarea"><b>$jetspeed.getUserAttributes().get("user.name.given") $jetspeed.getUserAttributes().get("user.name.family")</b> | Profile | Tasks (5) | Notifications (2) | <a href="#BaseHref()login/logout">Log out</a></span>
 #end
+#if (!$jetspeed.isAjaxCustomizationEnabled())
 #PageActionBar()
-<!-- end of header -->
-</div>   
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+#end
+<!-- end of header -->
+<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">
-## #set($pagesStandardMenu = $site.getMenu("pages"))
## #if(!$pagesStandardMenu.empty)
-## #includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-## #end
-<ul class="tabs">
-#parse ($layoutDecoration.getResource("../environment.vm"))
-</ul>
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
+#end
 </div>
-</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)
-					<tr><td class="portlet greenearth">
-                        $navigatorPortletContent
-                    </td></tr>
-					<tr><td class="portlet greenearth">
-                        $toolboxPortletContent
-                    </td></tr>
-                    </table>
-                </div>
-            </td>
-            #end
-            
-            <!-- Content Table Data -->
-            <td nowrap="nowrap" valign="top">
-           <!-- 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>
-                
-                ## $jetspeed.include($jetspeed.currentFragment)
-                
-                <!--  END: layout/html/tigris/decorator.vm -->
+</div>
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+    <!-- Content Table -->
+    <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+        <tr>            
+            <!-- Left Navigations Menu Table Data -->
+            #set($navigationsStandardMenu = $site.getMenu("navigations"))
+            #if(!$navigationsStandardMenu.empty)
+            <td valign="top" id="leftcol" >
+                <div id="navcolumn">
+                    <table cellpadding="0" cellspacing="4" border="0" width="100%">
+                        #includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+                    </table>
+                </div>
+            </td>
+            #end
+            
+            <!-- Content Table Data -->
+            <td nowrap="nowrap" valign="top">
+           <!-- Breadcrumbs Back Navigation -->
+#end          
+      <div id="breadcrumbs">
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
+        &nbsp;
+#end
+    </div>
+                
+                ## $jetspeed.include($jetspeed.currentFragment)
+                
+                <!--  END: layout/html/tigris/decorator.vm -->
                 

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/arrow-nav-top.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/arrow-nav-top.png?rev=889075&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/arrow-nav-top.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/divider-nav-top.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/divider-nav-top.png?rev=889075&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/divider-nav-top.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/hover-nav-top.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/hover-nav-top.png?rev=889075&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/images/hover-nav-top.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/portal.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/portal.css?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/portal.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/portal.css Thu Dec 10 03:39:17 2009
@@ -31,5 +31,19 @@
 font-size: 7pt;
 }
 
+.active > a { font-weight: bold; }
+#nav-top { z-index: 1000;  }
+#nav-top > li { float: left; margin: 0 7px 0 0; padding-bottom: 5px; list-style-type: none}
+#nav-top a { display: block; color:#000000; text-decoration: none; font-size: 12px;}
+#nav-top a:hover { text-decoration: underline; }
+#nav-top > li > a { padding: 0 26px 5px 5px; background: url(../../images/arrow-nav-top.png) no-repeat 100% 2px; color: #FFFFFF; font-weight: bold; }
+#nav-top ul li { padding: 0 10px 8px; list-style-type: none }
+#nav-top li:hover { background: url(../../images/hover-nav-top.png) repeat-x; }
+#nav-top li:hover ul { left: auto; }
+#nav-top ul { position: absolute; left: -999em; background-color: #FFFFFF; border: 1px solid #107EC0; }
+#nav-top #envList { width: 145px; }
+#nav-top #spaceList { width: 250px; }
+#nav-top ul .first, #nav-top ul li:first-child { padding-top: 8px; }
+#nav-top ul .add { background: url(../../images/divider-nav-top.png) repeat-x; padding-top: 7px; }
 
 /*  end layout decorator tigris additions  */

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/desktop.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/desktop.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/desktop.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/desktop.vm Thu Dec 10 03:39:17 2009
@@ -41,7 +41,6 @@
   <h1 class="logo">Jetspeed</h1>
   <div class="menu">
 <ul class="tabs">
-#parse ($layoutDecoration.getResource("../environment.vm"))
 </ul>  
 ##   <div class="tabs" widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer"></div>
   </div>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm Thu Dec 10 03:39:17 2009
@@ -14,12 +14,16 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 *#
-
+#if (!$jetspeed.isAjaxCustomizationEnabled())
           </td>
         </tr>
       </table> 
+#end      
     <p>
       <img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
     </p>
   </body>
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script src="#BaseHref()/jetui/engine/portal.js"></script>
+#end  
 </html>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm Thu Dec 10 03:39:17 2009
@@ -27,15 +27,20 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head> 
-
-## To include head elements, portlet contents which are instantly added should be rendered before invoking includeHeaderResource.
-#set($navigatorPortletContent = $jetspeed.renderPortletWindow("_JetspeedNavigator", "j2-admin::JetspeedNavigator"))
-#set($toolboxPortletContent = $jetspeed.renderPortletWindow("_JetspeedToolbox", "j2-admin::JetspeedToolbox"))
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script type="text/javascript" src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
+<script language="javascript">
+var assetsDir = "assets/";
+var buildDir = "#BaseHref()/javascript/yui/build/" ;
+var yuiConfig = {base:"#BaseHref()/javascript/yui/build/", timeout: 10000, debug: true, useBrowserConsole: true}; // ({classNamePrefix: 'jet'})
+</script>
+<link rel="stylesheet" type="text/css" href="#BaseHref()/jetui/css/portal.css"/>
+#end
 
 #includeHeaderResource()
 
-    <meta http-equiv="Content-type" content="#ContentType()" />
-    <title>#PageTitle()</title>
+<meta http-equiv="Content-type" content="#ContentType()" />
+<title>#PageTitle()</title>
 <link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
 #includeJavaScriptForHead()
 #IncludeStylesheets()
@@ -44,24 +49,25 @@
 <body class="#PageBaseCSSClass()">
 <!--  BEGIN: layout/html/jetspeed/decorator.vm -->
 <!-- Page Action Bar -->
-#if ($request.getUserPrincipal())
-<a class="layout-jetspeed-logout" href="#BaseHref()login/logout">Logout</a>
+#if ($request.getUserPrincipal())
+<span class="layout-statusarea"><b>$jetspeed.getUserAttributes().get("user.name.given") $jetspeed.getUserAttributes().get("user.name.family")</b> | Profile | Tasks (5) | Notifications (2) | <a href="#BaseHref()login/logout">Log out</a></span>
 #end
-#PageActionBar()
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+#PageActionBar()
+#end
 <!-- end of header -->
-</div>   
 <div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">
-## #set($pagesStandardMenu = $site.getMenu("pages"))
## #if(!$pagesStandardMenu.empty)
-## #includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-## #end
-<ul class="tabs">
-#parse ($layoutDecoration.getResource("../environment.vm"))
-</ul>
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+#set($pagesStandardMenu = $site.getMenu("pages"))
#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
+#end
 </div>
 </div>
+#if (!$jetspeed.isAjaxCustomizationEnabled())
     <!-- Content Table -->
     <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
         <tr>            
@@ -71,13 +77,7 @@
             <td valign="top" id="leftcol" >
                 <div id="navcolumn">
                     <table cellpadding="0" cellspacing="4" border="0" width="100%">
-##                        #includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
-					<tr><td class="portlet jetspeed">
-                        $navigatorPortletContent
-                    </td></tr>
-					<tr><td class="portlet jetspeed">
-                        $toolboxPortletContent
-                    </td></tr>
+                        #includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
                     </table>
                 </div>
             </td>
@@ -86,6 +86,7 @@
             <!-- Content Table Data -->
             <td nowrap="nowrap" valign="top">
            <!-- Breadcrumbs Back Navigation -->
+#end          
       <div id="breadcrumbs">
 #set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
 #if(!$breadcrumbsStandardMenu.empty)
@@ -98,4 +99,4 @@
                 ## $jetspeed.include($jetspeed.currentFragment)
                 
                 <!--  END: layout/html/tigris/decorator.vm -->
-                
+                                
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/desktop.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/desktop.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/desktop.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/desktop.vm Thu Dec 10 03:39:17 2009
@@ -41,7 +41,6 @@
   <h1 class="logo">Jetspeed</h1>
   <div class="menu">
 <ul class="tabs">
-#parse ($layoutDecoration.getResource("../environment.vm"))
 </ul>  
    <div class="tabs" widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer"></div>
   </div>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/portal.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/portal.css?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/portal.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/portal.css Thu Dec 10 03:39:17 2009
@@ -31,5 +31,20 @@
 font-size: 7pt;
 }
 
+.active > a { font-weight: bold; }
+#nav-top { z-index: 1000;  }
+#nav-top > li { float: left; margin: 0 7px 0 0; padding-bottom: 5px; list-style-type: none}
+#nav-top a { display: block; color:#32004B; text-decoration: none; font-size: 12px;}
+#nav-top a:hover { text-decoration: underline; }
+#nav-top > li > a { padding: 0 26px 5px 5px; background: url(../../images/arrow-nav-top.png) no-repeat 100% 2px; color: #FFFFFF; font-weight: bold; }
+#nav-top ul li { padding: 0 10px 8px; list-style-type: none }
+#nav-top li:hover { background: url(../../images/hover-nav-top.png) repeat-x; }
+#nav-top li:hover ul { left: auto; }
+#nav-top ul { position: absolute; left: -999em; background-color: #FFFFFF; border: 1px solid #107EC0; }
+#nav-top #envList { width: 145px; }
+#nav-top #spaceList { width: 250px; }
+#nav-top ul .first, #nav-top ul li:first-child { padding-top: 8px; }
+#nav-top ul .add { background: url(../../images/divider-nav-top.png) repeat-x; padding-top: 7px; }
+
 
 /*  end layout decorator tigris additions  */

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/desktop.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/desktop.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/desktop.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/desktop.vm Thu Dec 10 03:39:17 2009
@@ -41,7 +41,6 @@
   <h1 class="logo">Jetspeed</h1>
   <div class="menu">
 <ul class="tabs">
-#parse ($layoutDecoration.getResource("../environment.vm"))
 </ul>  
 ##   <div class="tabs" widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer"></div>
   </div>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm Thu Dec 10 03:39:17 2009
@@ -22,4 +22,7 @@
       <img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
     </p>
   </body>
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script src="#BaseHref()/jetui/engine/portal.js"></script>
+#end    
 </html>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm Thu Dec 10 03:39:17 2009
@@ -1,101 +1,103 @@
-#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#* Add the current layouts configuration values to the context *#
-#defineLayoutObjects()
-
-#* Loads our custom macros *#
-#parse($layoutDecoration.getResource("decorator-macros.vm"))
-
-#* Add all template constants to the current context *#
-#defineNavigationConstants()
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head> 
-
-## To include head elements, portlet contents which are instantly added should be rendered before invoking includeHeaderResource.
-#set($navigatorPortletContent = $jetspeed.renderPortletWindow("_JetspeedNavigator", "j2-admin::JetspeedNavigator"))
-#set($toolboxPortletContent = $jetspeed.renderPortletWindow("_JetspeedToolbox", "j2-admin::JetspeedToolbox"))
-
-#includeHeaderResource()
-
-    <meta http-equiv="Content-type" content="#ContentType()" />
-    <title>#PageTitle()</title>
-<link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
-#includeJavaScriptForHead()
-#IncludeStylesheets()
-
-</head>
+#*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#* Add the current layouts configuration values to the context *#
+#defineLayoutObjects()
+
+#* Loads our custom macros *#
+#parse($layoutDecoration.getResource("decorator-macros.vm"))
+
+#* Add all template constants to the current context *#
+#defineNavigationConstants()
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head> 
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script type="text/javascript" src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
+<script language="javascript">
+var assetsDir = "assets/";
+var buildDir = "#BaseHref()/javascript/yui/build/" ;
+var yuiConfig = {base:"#BaseHref()/javascript/yui/build/", timeout: 10000, debug: true, useBrowserConsole: true}; // ({classNamePrefix: 'jet'})
+</script>
+<link rel="stylesheet" type="text/css" href="#BaseHref()/jetui/css/portal.css"/>
+#end
+
+#includeHeaderResource()
+
+<meta http-equiv="Content-type" content="#ContentType()" />
+<title>#PageTitle()</title>
+<link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
+#includeJavaScriptForHead()
+#IncludeStylesheets()
+
+</head>
 <body class="#PageBaseCSSClass()">
 <!--  BEGIN: layout/html/jetspeed/decorator.vm -->
 <!-- Page Action Bar -->
 #if ($request.getUserPrincipal())
-<a class="layout-purpleplanet-logout" href="#BaseHref()login/logout">Logout</a>
+<span class="layout-statusarea"><b>$jetspeed.getUserAttributes().get("user.name.given") $jetspeed.getUserAttributes().get("user.name.family")</b> | Profile | Tasks (5) | Notifications (2) | <a href="#BaseHref()login/logout">Log out</a></span>
 #end
+#if (!$jetspeed.isAjaxCustomizationEnabled())
 #PageActionBar()
-<!-- end of header -->
-</div>   
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+#end
+<!-- end of header -->
+<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">
-## #set($pagesStandardMenu = $site.getMenu("pages"))
## #if(!$pagesStandardMenu.empty)
-## #includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-## #end
-<ul class="tabs">
-#parse ($layoutDecoration.getResource("../environment.vm"))
-</ul>
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
+#end
 </div>
-</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)
-					<tr><td class="portlet purpleplanet">
-                        $navigatorPortletContent
-                    </td></tr>
-					<tr><td class="portlet purpleplanet">
-                        $toolboxPortletContent
-                    </td></tr>
-                    </table>
-                </div>
-            </td>
-            #end
-            
-            <!-- Content Table Data -->
-            <td nowrap="nowrap" valign="top">
-           <!-- 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>
-                
-                ## $jetspeed.include($jetspeed.currentFragment)
-                
-                <!--  END: layout/html/tigris/decorator.vm -->
+</div>
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+    <!-- Content Table -->
+    <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+        <tr>            
+            <!-- Left Navigations Menu Table Data -->
+            #set($navigationsStandardMenu = $site.getMenu("navigations"))
+            #if(!$navigationsStandardMenu.empty)
+            <td valign="top" id="leftcol" >
+                <div id="navcolumn">
+                    <table cellpadding="0" cellspacing="4" border="0" width="100%">
+                        #includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+                    </table>
+                </div>
+            </td>
+            #end
+            
+            <!-- Content Table Data -->
+            <td nowrap="nowrap" valign="top">
+           <!-- Breadcrumbs Back Navigation -->
+#end          
+      <div id="breadcrumbs">
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
+        &nbsp;
+#end
+    </div>
+                
+                ## $jetspeed.include($jetspeed.currentFragment)
                 
+                <!--  END: layout/html/tigris/decorator.vm -->
+                
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/portal.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/portal.css?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/portal.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/portal.css Thu Dec 10 03:39:17 2009
@@ -31,5 +31,19 @@
 font-size: 7pt;
 }
 
+.active > a { font-weight: bold; }
+#nav-top { z-index: 1000;  }
+#nav-top > li { float: left; margin: 0 7px 0 0; padding-bottom: 5px; list-style-type: none}
+#nav-top a { display: block; color:#107EC0; text-decoration: none; font-size: 12px;}
+#nav-top a:hover { text-decoration: underline; }
+#nav-top > li > a { padding: 0 26px 5px 5px; background: url(../../images/arrow-nav-top.png) no-repeat 100% 2px; color: #FFFFFF; font-weight: bold; }
+#nav-top ul li { padding: 0 10px 8px; list-style-type: none }
+#nav-top li:hover { background: url(../../images/hover-nav-top.png) repeat-x; }
+#nav-top li:hover ul { left: auto; }
+#nav-top ul { position: absolute; left: -999em; background-color: #FFFFFF; border: 1px solid #107EC0; }
+#nav-top #envList { width: 145px; }
+#nav-top #spaceList { width: 250px; }
+#nav-top ul .first, #nav-top ul li:first-child { padding-top: 8px; }
+#nav-top ul .add { background: url(../../images/divider-nav-top.png) repeat-x; padding-top: 7px; }
 
 /*  end layout decorator tigris additions  */

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/desktop.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/desktop.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/desktop.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/desktop.vm Thu Dec 10 03:39:17 2009
@@ -41,7 +41,6 @@
   <h1 class="logo">Jetspeed</h1>
   <div class="menu">
 <ul class="tabs">
-#parse ($layoutDecoration.getResource("../environment.vm"))
 </ul>  
 ##   <div class="tabs" widgetId="jetspeed-menu-pages" dojoType="jetspeed:PortalTabContainer"></div>
   </div>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm Thu Dec 10 03:39:17 2009
@@ -22,4 +22,7 @@
       <img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
     </p>
   </body>
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script src="#BaseHref()/jetui/engine/portal.js"></script>
+#end  
 </html>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm Thu Dec 10 03:39:17 2009
@@ -1,101 +1,103 @@
-#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#* Add the current layouts configuration values to the context *#
-#defineLayoutObjects()
-
-#* Loads our custom macros *#
-#parse($layoutDecoration.getResource("decorator-macros.vm"))
-
-#* Add all template constants to the current context *#
-#defineNavigationConstants()
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head> 
-
-## To include head elements, portlet contents which are instantly added should be rendered before invoking includeHeaderResource.
-#set($navigatorPortletContent = $jetspeed.renderPortletWindow("_JetspeedNavigator", "j2-admin::JetspeedNavigator"))
-#set($toolboxPortletContent = $jetspeed.renderPortletWindow("_JetspeedToolbox", "j2-admin::JetspeedToolbox"))
-
-#includeHeaderResource()
-
-    <meta http-equiv="Content-type" content="#ContentType()" />
-    <title>#PageTitle()</title>
-<link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
-#includeJavaScriptForHead()
-#IncludeStylesheets()
-
-</head>
+#*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#* Add the current layouts configuration values to the context *#
+#defineLayoutObjects()
+
+#* Loads our custom macros *#
+#parse($layoutDecoration.getResource("decorator-macros.vm"))
+
+#* Add all template constants to the current context *#
+#defineNavigationConstants()
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head> 
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script type="text/javascript" src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
+<script language="javascript">
+var assetsDir = "assets/";
+var buildDir = "#BaseHref()/javascript/yui/build/" ;
+var yuiConfig = {base:"#BaseHref()/javascript/yui/build/", timeout: 10000, debug: true, useBrowserConsole: true}; // ({classNamePrefix: 'jet'})
+</script>
+<link rel="stylesheet" type="text/css" href="#BaseHref()/jetui/css/portal.css"/>
+#end
+
+#includeHeaderResource()
+
+<meta http-equiv="Content-type" content="#ContentType()" />
+<title>#PageTitle()</title>
+<link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
+#includeJavaScriptForHead()
+#IncludeStylesheets()
+
+</head>
 <body class="#PageBaseCSSClass()">
 <!--  BEGIN: layout/html/jetspeed/decorator.vm -->
 <!-- Page Action Bar -->
 #if ($request.getUserPrincipal())
-<a class="layout-turbo-logout" href="#BaseHref()login/logout">Logout</a>
+<span class="layout-statusarea"><b>$jetspeed.getUserAttributes().get("user.name.given") $jetspeed.getUserAttributes().get("user.name.family")</b> | Profile | Tasks (5) | Notifications (2) | <a href="#BaseHref()login/logout">Log out</a></span>
 #end
+#if (!$jetspeed.isAjaxCustomizationEnabled())
 #PageActionBar()
-<!-- end of header -->
-</div>   
-<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+#end
+<!-- end of header -->
+<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">
-## #set($pagesStandardMenu = $site.getMenu("pages"))
## #if(!$pagesStandardMenu.empty)
-## #includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-## #end
-<ul class="tabs">
-#parse ($layoutDecoration.getResource("../environment.vm"))
-</ul>
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
+#end
 </div>
-</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)
-					<tr><td class="portlet turbo">
-                        $navigatorPortletContent
-                    </td></tr>
-					<tr><td class="portlet turbo">
-                        $toolboxPortletContent
-                    </td></tr>
-                    </table>
-                </div>
-            </td>
-            #end
-            
-            <!-- Content Table Data -->
-            <td nowrap="nowrap" valign="top">
-           <!-- 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>
-                
-                ## $jetspeed.include($jetspeed.currentFragment)
-                
-                <!--  END: layout/html/tigris/decorator.vm -->
+</div>
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+    <!-- Content Table -->
+    <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+        <tr>            
+            <!-- Left Navigations Menu Table Data -->
+            #set($navigationsStandardMenu = $site.getMenu("navigations"))
+            #if(!$navigationsStandardMenu.empty)
+            <td valign="top" id="leftcol" >
+                <div id="navcolumn">
+                    <table cellpadding="0" cellspacing="4" border="0" width="100%">
+                        #includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+                    </table>
+                </div>
+            </td>
+            #end
+            
+            <!-- Content Table Data -->
+            <td nowrap="nowrap" valign="top">
+           <!-- Breadcrumbs Back Navigation -->
+#end          
+      <div id="breadcrumbs">
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
+        &nbsp;
+#end
+    </div>
+                
+                ## $jetspeed.include($jetspeed.currentFragment)
                 
+                <!--  END: layout/html/tigris/decorator.vm -->
+                                
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp?rev=889075&r1=889074&r2=889075&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp Thu Dec 10 03:39:17 2009
@@ -14,4 +14,4 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-<% response.sendRedirect(response.encodeRedirectURL("ui/")); %>
+<% response.sendRedirect(response.encodeRedirectURL("portal/")); %>



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