portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r574146 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3: components/portal/src/java/org/apache/jetspeed/capabilities/impl/ etc/sql/ etc/sql/min/ src/webapp/WEB-INF/assembly/ src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/ src/w...
Date Mon, 10 Sep 2007 06:15:06 GMT
Author: woonsan
Date: Sun Sep  9 23:15:04 2007
New Revision: 574146

URL: http://svn.apache.org/viewvc?rev=574146&view=rev
Log:
[JS2-779] Supporting Pocket PC
After discussion with David Sean Taylor, I decided to do the followings for the 2.1.3 release:
 - To create a valve named 'capabilityCustomizerValve', which would change the preferred mediaType of the capabilityMap and the requestContext just after the capabilityValve finished.
  This valve should decide the mediaType based on the given client-to-mediaType mappings as a
constructor argument. For example, "ie4ppc (client name) to html-basic (media type name)".
  Also add some seed data for Pocket IE (mediaType and client).
  This improvement does not change any database schema, and tries to minimize the impacts on the 2.1.3 release.

We need to review more for better solution and consider reworking it for the 2.2 release.
Probably, We can remove the capabilityCustomizerValve in the 2.2 release.
(So, I will not commit to the /trunk.)

Added:
    portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/default-page.psml
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/folder.metadata
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/default-page.psml
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/folder.metadata
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout-help.vm
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.properties
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.vm
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.properties
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.vm
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/login/html-basic/
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/login/html-basic/login.jsp
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/css/
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/css/styles.css
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator-macros.vm
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator.properties
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/footer.vm
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/header.vm
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/images/
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/images/jetspeed-logo.gif   (with props)
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/images/nw_maj_rond.gif   (with props)
Modified:
    portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/j2-seed.xml
    portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/min/j2-seed.xml
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/pipelines.xml

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java Sun Sep  9 23:15:04 2007
@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+package org.apache.jetspeed.capabilities.impl;
+
+import java.util.Map;
+import java.util.Iterator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jetspeed.capabilities.Capabilities;
+import org.apache.jetspeed.capabilities.CapabilityMap;
+import org.apache.jetspeed.capabilities.MediaType;
+import org.apache.jetspeed.capabilities.Client;
+import org.apache.jetspeed.pipeline.PipelineException;
+import org.apache.jetspeed.pipeline.valve.AbstractValve;
+import org.apache.jetspeed.pipeline.valve.ValveContext;
+import org.apache.jetspeed.request.RequestContext;
+
+/**
+ * Invokes the capability customizer in the request pipeline
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: CapabilityCustomizerValveImpl.java 517719 2007-03-13 15:05:48Z ate $
+ */
+public class CapabilityCustomizerValveImpl extends AbstractValve
+{
+
+    private static final Log log = LogFactory.getLog(CapabilityCustomizerValveImpl.class);
+
+    private Capabilities capabilities;
+    private Map clientToMediaTypeMap;
+
+    public CapabilityCustomizerValveImpl( Capabilities capabilities, Map clientToMediaTypeMap )
+    {
+        this.capabilities = capabilities;
+        this.clientToMediaTypeMap = clientToMediaTypeMap;
+    }
+
+    /**
+     * Initialize the valve before using in a pipeline.
+     */
+    public void initialize() throws PipelineException
+    {
+
+    }
+
+    public void invoke( RequestContext request, ValveContext context ) throws PipelineException
+    {
+        CapabilityMap cm = request.getCapabilityMap();
+
+        if (cm != null && this.clientToMediaTypeMap != null)
+        {
+            Client client = cm.getClient();
+            String mediaTypeName = (String) this.clientToMediaTypeMap.get(client.getName());
+            
+            if (mediaTypeName != null)
+            {
+                MediaType mediaType = this.capabilities.getMediaType(mediaTypeName);
+                cm.setPreferredMediaType(mediaType);
+                request.setMediaType(mediaTypeName);
+            }
+        }
+
+        // Pass control to the next Valve in the Pipeline
+        context.invokeNext(request);
+    }
+
+    public String toString()
+    {
+        return "CapabilityCustomizerValveImpl";
+    }
+}

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/j2-seed.xml?rev=574146&r1=574145&r2=574146&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/j2-seed.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/j2-seed.xml Sun Sep  9 23:15:04 2007
@@ -66,6 +66,13 @@
 			<capabilities></capabilities>
 			<mimeTypes>text/xml</mimeTypes>
 		</MediaType>
+		<MediaType name="html-basic">
+			<charcterSet value="UTF-8"/>
+			<title value="HTML-BASIC"/>
+			<description value="Simple HTML for Handheld PC browsers such as Pocket IE"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</MediaType>
 	</MediaTypes>
 	<Capabilities>
 		<Capability>HTML_3_2</Capability>
@@ -255,6 +262,14 @@
 			<manufacturer value="Opera"/>
 			<capabilities>HTML_3_2,HTML_4_0,HTML_TABLE,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_IFRAME,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTTP_COOKIE,HTML_PLUGIN</capabilities>
 			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie4ppc" evalOrder="4" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 4.*Windows CE.*"/>
+			<version value="4.01"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_TABLE,HTML_FORM,HTML_IMAGE,HTML_CSS1,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
 		</Client>
 	</Clients>
 	<Roles>

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/min/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/min/j2-seed.xml?rev=574146&r1=574145&r2=574146&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/min/j2-seed.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/sql/min/j2-seed.xml Sun Sep  9 23:15:04 2007
@@ -66,6 +66,13 @@
 			<capabilities></capabilities>
 			<mimeTypes>text/xml</mimeTypes>
 		</MediaType>
+		<MediaType name="html-basic">
+			<charcterSet value="UTF-8"/>
+			<title value="HTML-BASIC"/>
+			<description value="Simple HTML for Handheld PC browsers such as Pocket IE"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</MediaType>
 	</MediaTypes>
 	<Capabilities>
 		<Capability>HTML_3_2</Capability>
@@ -255,6 +262,14 @@
 			<manufacturer value="Opera"/>
 			<capabilities>HTML_3_2,HTML_4_0,HTML_TABLE,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_IFRAME,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTTP_COOKIE,HTML_PLUGIN</capabilities>
 			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie4ppc" evalOrder="4" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 4.*Windows CE.*"/>
+			<version value="4.01"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_TABLE,HTML_FORM,HTML_IMAGE,HTML_CSS1,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
 		</Client>
 	</Clients>
 	<Roles>

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/pipelines.xml?rev=574146&r1=574145&r2=574146&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/pipelines.xml Sun Sep  9 23:15:04 2007
@@ -35,6 +35,31 @@
    </constructor-arg>
   </bean> 
   
+  <!-- 
+      To customize capabilityMap and requestContext on capabilities,
+      add this valve after each capabilityValve entry in the pipeline configs 
+      below
+   -->  
+  <bean id="capabilityCustomizerValve"
+        class="org.apache.jetspeed.capabilities.impl.CapabilityCustomizerValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.capabilities.Capabilities" />
+   </constructor-arg>
+   <!-- client name to media type mapping
+   If a client has same preferred mime type (e.g. text/html) but 
+   it should be treated with other media type,
+   put additional mapping(s) below.
+   -->
+   <constructor-arg>
+       <map>
+           <!-- If a client is IE4 of Pocket PC, then the media type will be html-basic. -->
+           <entry key="ie4ppc" value="html-basic" />
+       </map>
+   </constructor-arg>
+  </bean> 
+  
   <bean id="portalURLValve"
         class="org.apache.jetspeed.container.url.impl.PortalURLValveImpl"
         init-method="initialize"

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/default-page.psml?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/default-page.psml (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/default-page.psml Sun Sep  9 23:15:04 2007
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<page id="_user-admin-_mediatype-html-basic-default-page"
+    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">
+  <defaults
+     skin="blue"
+     layout-decorator="tigris"
+     portlet-decorator="tigris"
+  />
+  <title>Welcome to Jetspeed 2</title>
+  <metadata name="title" xml:lang="ja">Jetspeed 2 へようこそ</metadata>
+  <metadata name="title" xml:lang="zh">欢迎来到Jetspeed 2</metadata>
+  <metadata name="title" xml:lang="zh-TW">歡迎來到Jetspeed 2</metadata>
+  <metadata name="title" xml:lang="ko">Jetspeed 2 에 오신 것을 환영합니다</metadata>
+
+  <fragment id="admin-html-basic-dp-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="admin-html-basic-dp-11" type="portlet" name="j2-admin::LoginPortlet">
+      <property layout="OneColumn" name="row" value="0" />
+    </fragment>                                
+    <fragment id="admin-html-basic-dp-12" type="portlet" name="j2-admin::LocaleSelector">
+      <property layout="OneColumn" name="row" value="1" />
+    </fragment>                                
+    <fragment id="admin-html-basic-dp-13" type="portlet" name="demo::BookmarkPortlet">
+      <property layout="OneColumn" name="row" value="2" />
+    </fragment>
+  </fragment>
+
+  <security-constraints>
+    <security-constraints-ref>public-view</security-constraints-ref>
+  </security-constraints>
+</page>

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/folder.metadata?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/folder.metadata (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/admin/_mediatype/html-basic/folder.metadata Sun Sep  9 23:15:04 2007
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<folder
+    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/folder-metadata.xsd">
+  <title>Root Folder</title>  
+  <metadata name="title" xml:lang="fr">Répertoire racine</metadata>
+  <metadata name="title" xml:lang="ja">ルートフォルダ</metadata>
+  <metadata name="title" xml:lang="es">Carpeta raiz</metadata>
+  <metadata name="title" xml:lang="zh">根文件夹</metadata>
+  <metadata name="title" xml:lang="zh-TW">根文件夾</metadata>
+  <metadata name="title" xml:lang="ko">루트 폴더</metadata>
+
+  <document-order>Jetspeed2.link</document-order>
+  <document-order>Jetspeed2Wiki.link</document-order>
+  <document-order>apache_portals.link</document-order>
+  <document-order>apache.link</document-order>
+
+  <menu name="page-navigations">
+    <separator>
+      <text>Top Pages</text>
+      <metadata name="text" xml:lang="fr">Page haut</metadata>
+      <metadata name="text" xml:lang="ja">トップページ</metadata>
+      <metadata name="text" xml:lang="es">Páginas más populares</metadata>
+      <metadata name="text" xml:lang="zh">顶层页</metadata>
+      <metadata name="text" xml:lang="zh-TW">頂層頁</metadata>
+      <metadata name="text" xml:lang="ko">최상위 페이지</metadata>
+    </separator>
+    <options>/Administrative</options>
+  </menu>
+
+  <!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
+  <menu name="site-navigations" regexp="true" options="/*/,/*.psml" depth="-1"/>
+  <menu name="additional-links" regexp="true" options="/*.link"/>
+
+  <security-constraints>
+    <security-constraints-ref>manager</security-constraints-ref>
+  </security-constraints>
+</folder>

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/default-page.psml?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/default-page.psml (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/default-page.psml Sun Sep  9 23:15:04 2007
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<page id="_user-guest-_mediatype-html-basic-default-page"
+    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">
+  <defaults
+     skin="blue"
+     layout-decorator="tigris"
+     portlet-decorator="tigris"
+  />
+  <title>Welcome to Jetspeed 2</title>
+  <metadata name="title" xml:lang="ja">Jetspeed 2 へようこそ</metadata>
+  <metadata name="title" xml:lang="zh">欢迎来到Jetspeed 2</metadata>
+  <metadata name="title" xml:lang="zh-TW">歡迎來到Jetspeed 2</metadata>
+  <metadata name="title" xml:lang="ko">Jetspeed 2 에 오신 것을 환영합니다</metadata>
+
+  <fragment id="dp-html-basic-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="dp-html-basic-11" type="portlet" name="j2-admin::LoginPortlet">
+      <property layout="OneColumn" name="row" value="0" />
+    </fragment>                                
+    <fragment id="dp-html-basic-12" type="portlet" name="j2-admin::LocaleSelector">
+      <property layout="OneColumn" name="row" value="1" />
+    </fragment>                                
+    <fragment id="dp-html-basic-13" type="portlet" name="demo::BookmarkPortlet">
+      <property layout="OneColumn" name="row" value="2" />
+    </fragment>
+  </fragment>
+
+  <security-constraints>
+    <security-constraints-ref>public-view</security-constraints-ref>
+  </security-constraints>
+</page>

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/folder.metadata?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/folder.metadata (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/pages/_user/guest/_mediatype/html-basic/folder.metadata Sun Sep  9 23:15:04 2007
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<folder
+    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/folder-metadata.xsd">
+  <title>Root Folder</title>  
+  <metadata name="title" xml:lang="fr">Répertoire racine</metadata>
+  <metadata name="title" xml:lang="ja">ルートフォルダ</metadata>
+  <metadata name="title" xml:lang="es">Carpeta raiz</metadata>
+  <metadata name="title" xml:lang="zh">根文件夹</metadata>
+  <metadata name="title" xml:lang="zh-TW">根文件夾</metadata>
+  <metadata name="title" xml:lang="ko">루트 폴더</metadata>
+
+  <document-order>Jetspeed2.link</document-order>
+  <document-order>Jetspeed2Wiki.link</document-order>
+  <document-order>apache_portals.link</document-order>
+  <document-order>apache.link</document-order>
+
+  <menu name="page-navigations">
+    <separator>
+      <text>Top Pages</text>
+      <metadata name="text" xml:lang="fr">Page haut</metadata>
+      <metadata name="text" xml:lang="ja">トップページ</metadata>
+      <metadata name="text" xml:lang="es">Páginas más populares</metadata>
+      <metadata name="text" xml:lang="zh">顶层页</metadata>
+      <metadata name="text" xml:lang="zh-TW">頂層頁</metadata>
+      <metadata name="text" xml:lang="ko">최상위 페이지</metadata>
+    </separator>
+    <options>/Administrative</options>
+  </menu>
+
+  <!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
+  <menu name="site-navigations" regexp="true" options="/*/,/*.psml" depth="-1"/>
+  <menu name="additional-links" regexp="true" options="/*.link"/>
+
+  <security-constraints>
+    <security-constraints-ref>public-view</security-constraints-ref>
+  </security-constraints>
+</folder>

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout-help.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout-help.vm?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout-help.vm (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout-help.vm Sun Sep  9 23:15:04 2007
@@ -0,0 +1,71 @@
+#*
+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 ($messages = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+<!-- Header: $theme.pageLayoutDecoration.header) Footer: $theme.pageLayoutDecoration.footer -->
+
+#parse($theme.pageLayoutDecoration.header)
+
+<!-- Begin templates/layout/html/columns/layout-help.vm -->
+
+#set($myFragment = $jetspeed.currentFragment)
+#set($actions = $myFragment.decoration.actions)
+#foreach ($action in $actions)
+<a href="${action.Action}" title="${action.Name}"><img src="#GetPageResource(${action.Link})" alt="${action.Alt}" class="noborder"/></a>
+#end
+
+<div id="portlet-help" class="portlet-Jetspeed" >
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td class="PContent">
+    <h2>$messages.getString("portal.help.title")</h2>
+    <h3>$messages.getString("portal.page.help.title")</h3>
+    <p><img src="#GetPageResource('decorations/images/view.gif')" alt="view" border="0" /> $messages.getString("portal.page.help.view")</p>
+    <p><img src="#GetPageResource('decorations/images/help.gif')" alt="help" border="0" /> $messages.getString("portal.page.help.help")</p>
+    <p><img src="#GetPageResource('decorations/images/edit.gif')" alt="edit" border="0" /> $messages.getString("portal.page.help.edit")</p>
+    <p><img src="#GetPageResource('decorations/layout/images/select.gif')" alt="select" border="0" />
+       $messages.getString("portal.portlet.help.title")</p>
+    <h3>$messages.getString("portal.help.title")</h3>
+    <p><img src="#GetPageResource('decorations/images/minimized.gif')" alt="minimize" border="0" />
+       $messages.getString("portal.portlet.help.minimize")</p>
+    <p><img src="#GetPageResource('decorations/images/maximized.gif')" alt="maximize" border="0" />
+       $messages.getString("portal.portlet.help.maximize")</p>
+    <p><img src="#GetPageResource('decorations/images/restore.gif')" alt="restore" border="0" />
+       $messages.getString("portal.portlet.help.restore")</p>
+    <p><img src="#GetPageResource('decorations/images/edit.gif')" alt="edit" border="0" />
+       $messages.getString("portal.portlet.help.edit")</p>
+    <p><img src="#GetPageResource('decorations/images/print.gif')" alt="print" border="0" />
+       $messages.getString("portal.portlet.help.print")</p>
+    <h4>$messages.getString("portal.portlet.help.edit.title")</h4>
+    <p><img src="#GetPageResource('decorations/images/close.gif')" alt="close" border="0" />
+       $messages.getString("portal.portlet.help.close")</p>
+    <p><img src="#GetPageResource('decorations/layout/images/movePortletUp.gif')" alt="move up" border="0" />
+       $messages.getString("portal.portlet.help.movePortletUp")</p>
+    <p><img src="#GetPageResource('decorations/layout/images/movePortletDown.gif')" alt="move down" border="0" />
+       $messages.getString("portal.portlet.help.movePortletDown")</p>
+    <p><img src="#GetPageResource('decorations/layout/images/movePortletLeft.gif')" alt="move left" border="0" />
+       $messages.getString("portal.portlet.help.movePortletLeft")</p>
+    <p><img src="#GetPageResource('decorations/layout/images/movePortletRight.gif')" alt="move right" border="0" />
+       $messages.getString("portal.portlet.help.movePortletRight")</p>
+    </td>
+  </tr>
+</table>
+</div>
+
+<!-- End templates/layout/html/columns/layout-help.vm -->

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.properties?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.properties (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.properties Sun Sep  9 23:15:04 2007
@@ -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=columns
+template.type=velocity
+template.extension=.vm
\ No newline at end of file

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.vm?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.vm (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/columns/layout.vm Sun Sep  9 23:15:04 2007
@@ -0,0 +1,68 @@
+## 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($sizes = $jetspeed.columnSizes)
+#set($myPage = $jetspeed.page)
+#set($myFragment = $jetspeed.currentFragment)
+#set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
+#set($actions = $myFragment.decoration.actions)
+#set($editing = false)
+#if($jetspeed.portletMode.toString() == "edit")
+#set($editing = true)
+#set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)
+#end
+#parse($myFragment.decoration.header)
+#set($layoutType =$portletConfig.getInitParameter("layoutType"))
+#set($columnLayout = $renderRequest.getAttribute("columnLayout"))
+#if($actions.size()>0)
+<div class="PContent">
+#foreach ($action in $actions)
+<a href="${action.Action}" title="${action.Name}"><img src="#GetPageResource(${action.Link})" alt="${action.Alt}" class="noborder"/></a>
+#end
+#if($editing == true)    		  	  
+#set ($chooser = "${jetspeed.basePath}/Administrative/choosers/portlet-selector.psml")
+#set ($imgsrc="${jetspeed.pageBasePath}/content/images/select.gif")
+##TODO <a href="javascript:openWindow('$response.encodeURL($chooser)')"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" title="Select" class="noborder"/></a>
+#end
+</div>
+#end
+##
+##TODO <form id='portletform' action="$renderResponse.createActionURL()" method="post">
+##TODO <div>
+##TODO <input type='hidden' name='portlets'/>
+##TODO <input type='hidden' name='page' value='$myPage'/>
+##TODO </div>
+##TODO </form>
+##
+<div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)" class="portal-layout">
+#set ($sizeIndex = 0)
+#foreach($column in $columnLayout.columns)
+#set ($sizeIndex = $sizeIndex + 1)     
+#foreach($f in $column)       
+## TODO: Edit layout
+## get the decorated Portlet content
+#if($f.type == "portlet")
+	$jetspeed.setCurrentFragment($f)	   
+#parse($f.decoration.template)
+#else		
+$jetspeed.setCurrentFragment($f)
+$f.renderedContent			
+#end## if($f.type == "portlet")
+#end## foreach($f in $column)
+#end ## foreach($column in $columnLayout.columns)
+</div>
+##
+#if(($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
+#parse($myFragment.decoration.footer)
+#end

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.properties?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.properties (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.properties Sun Sep  9 23:15:04 2007
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+id=maximized
+
+#: BEGIN comment for JSP
+template.type=velocity
+template.extension=.vm
+#: END comment for JSP
+
+#: BEGIN uncomment for JSP
+#template.type=JSP
+#template.extension=.jsp
+#: END uncomment for JSP
+

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.vm?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.vm (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/layout/html-basic/maximized/layout.vm Sun Sep  9 23:15:04 2007
@@ -0,0 +1,34 @@
+#*
+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($myPage = $jetspeed.page)
+#set($f = $request.getAttribute("org.apache.jetspeed.maximized.Fragment"))
+#set($rootFragment = $myPage.rootFragment)
+#set($messages = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+#if ($rootFragment.decoration.header)
+   #parse($rootFragment.decoration.header)
+#end
+
+  ## get the decorated Portlet content
+  <div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)" class="portal-layout-maxed">
+    $jetspeed.setCurrentFragment($f)    
+    #parse($f.decoration.template)
+  </div>
+  
+##if ($rootFragment.decoration.footer)
+##parse($rootFragment.decoration.footer)
+##end

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/login/html-basic/login.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/login/html-basic/login.jsp?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/login/html-basic/login.jsp (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/templates/login/html-basic/login.jsp Sun Sep  9 23:15:04 2007
@@ -0,0 +1,31 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page language="java" import="org.apache.jetspeed.login.LoginConstants" session="true" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.login.resources.LoginViewResources" />
+
+<html>
+<body onLoad='document.forms["login"].submit();'>
+<form id='login' method='POST' action='<%= response.encodeURL("j_security_check") %>'>
+<input type='hidden' name='j_username' value='<%= session.getAttribute(LoginConstants.USERNAME) %>'/>
+<input type='hidden' name='j_password' value='<%= session.getAttribute(LoginConstants.PASSWORD) %>'/>
+<noscript>
+<input type='submit' value="<fmt:message key="login.button"/>"/>
+</noscript>
+</form>
+</body>
+</html>

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/css/styles.css?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/css/styles.css (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/css/styles.css Sun Sep  9 23:15:04 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;
+}
+

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator-macros.vm?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator-macros.vm (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator-macros.vm Sun Sep  9 23:15:04 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

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator.properties?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator.properties (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/decorator.properties Sun Sep  9 23:15:04 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=tigris
+template.type=velocity
+template.extension=.vm
+template.macros=-macros
+decorates=layout
+base.css.class=layout-tigris

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/footer.vm?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/footer.vm (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/footer.vm Sun Sep  9 23:15:04 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>

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/header.vm?rev=574146&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/header.vm (added)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/header.vm Sun Sep  9 23:15:04 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 

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/images/jetspeed-logo.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/images/jetspeed-logo.gif?rev=574146&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/images/jetspeed-logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/images/nw_maj_rond.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/images/nw_maj_rond.gif?rev=574146&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/tigris/html-basic/images/nw_maj_rond.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



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


Mime
View raw message