[pal-cvs 2433] [165] mobile support

svnno****@sourc***** svnno****@sourc*****
2007年 5月 29日 (火) 10:34:13 JST


Revision: 165
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=165
Author:   shinsuke
Date:     2007-05-29 10:34:13 +0900 (Tue, 29 May 2007)

Log Message:
-----------
mobile support

Modified Paths:
--------------
    pal-portal/trunk/build.properties

Added Paths:
-----------
    pal-portal/trunk/portal/files/etc/
    pal-portal/trunk/portal/files/etc/sql/
    pal-portal/trunk/portal/files/etc/sql/min/
    pal-portal/trunk/portal/files/etc/sql/min/j2-seed.xml
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout-help.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout-help.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout-help.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout-help.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout-help.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout-help.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.properties
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-html/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-html/login.jsp
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-wap2/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-wap2/login.jsp
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-hdml/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-hdml/login.jsp
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-wap2/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-wap2/login.jsp
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-html/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-html/login.jsp
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-wap2/
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-wap2/login.jsp
    pal-portal/trunk/portal/patches/components/capability/
    pal-portal/trunk/portal/patches/components/capability/src/
    pal-portal/trunk/portal/patches/components/capability/src/java/
    pal-portal/trunk/portal/patches/components/capability/src/java/org/
    pal-portal/trunk/portal/patches/components/capability/src/java/org/apache/
    pal-portal/trunk/portal/patches/components/capability/src/java/org/apache/jetspeed/
    pal-portal/trunk/portal/patches/components/capability/src/java/org/apache/jetspeed/capabilities/
    pal-portal/trunk/portal/patches/components/capability/src/java/org/apache/jetspeed/capabilities/impl/
    pal-portal/trunk/portal/patches/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-html/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-html/default-page.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-html/folder.metadata
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-html/forgot.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-html/register.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-wap2/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-wap2/default-page.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-wap2/folder.metadata
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-wap2/forgot.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-wap2/register.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/html/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/html/aboutus/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/html/default-page.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/html/downloads/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/html/products/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-hdml/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-hdml/default-page.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-hdml/folder.metadata
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-hdml/forgot.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-hdml/register.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-wap2/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-wap2/default-page.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-wap2/folder.metadata
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-wap2/forgot.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-wap2/register.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-html/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-html/default-page.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-html/folder.metadata
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-html/forgot.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-html/register.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-wap2/
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-wap2/default-page.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-wap2/folder.metadata
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-wap2/forgot.psml
    pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-wap2/register.psml

Removed Paths:
-------------
    pal-portal/trunk/portal/resources/psml/default/_role/site/aboutus/
    pal-portal/trunk/portal/resources/psml/default/_role/site/downloads/
    pal-portal/trunk/portal/resources/psml/default/_role/site/products/


-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/build.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -159,6 +159,7 @@
 -Dportal.psml.name="${portal.psml.name}" \
 
 portal.patch.files=\
+components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java,\
 components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java,\
 components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties,\
 components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties,\
@@ -187,7 +188,6 @@
 jetspeed-api/src/java/org/apache/jetspeed/security/spi/SecurityAccess.java,\
 jetspeed-api/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java,\
 commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties,\
-etc/sql/min/j2-seed.xml,\
 etc/schema/prefs-schema.xml,\
 
 

Added: pal-portal/trunk/portal/files/etc/sql/min/j2-seed.xml
===================================================================
--- pal-portal/trunk/portal/files/etc/sql/min/j2-seed.xml	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/etc/sql/min/j2-seed.xml	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,628 @@
+<?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.
+-->
+<Snapshot name="standard-jetspeed2.xml"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<softwareVersion value="1"/>
+	<softwareSubVersion value="0"/>
+	<default_rule value="j2"/>
+	<encryption value=""/>
+	<MimeTypes>
+		<MimeType>application/xhtml+xml</MimeType>
+		<MimeType>text/html</MimeType>
+		<MimeType>text/vnd.wap.wml</MimeType>
+		<MimeType>text/vxml</MimeType>
+		<MimeType>text/xhtml</MimeType>
+		<MimeType>text/xml</MimeType>
+		<MimeType>text/x-hdml</MimeType>
+	</MimeTypes>
+	<MediaTypes>
+		<MediaType name="html">
+			<charcterSet value="UTF-8"/>
+			<title value="HTML"/>
+			<description value="Rich HTML for HTML 4.0 compliants browsers"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</MediaType>
+		<MediaType name="vxml">
+			<charcterSet value="UTF-8"/>
+			<title value="VoiceXML"/>
+			<description value="Format suitable for use with an audio VoiceXML server"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</MediaType>
+		<MediaType name="wml">
+			<charcterSet value="UTF-8"/>
+			<title value="WML"/>
+			<description value="Format for mobile phones and PDAs compatible with WML 1.1"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</MediaType>
+		<MediaType name="docomo-html">
+			<charcterSet value="Shift_JIS"/>
+			<title value="DOCOMO1"/>
+			<description value="HTML for i-mode"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</MediaType>
+		<MediaType name="docomo-wap2">
+			<charcterSet value="UTF-8"/>
+			<title value="DOCOMO2"/>
+			<description value="XHTML for i-mode"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</MediaType>
+		<MediaType name="kddi-hdml">
+			<charcterSet value="Shift_JIS"/>
+			<title value="KDDI-HDML"/>
+			<description value="HDML for ezweb"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/x-hdml</mimeTypes>
+		</MediaType>
+		<MediaType name="kddi-wap2">
+			<charcterSet value="Shift_JIS"/>
+			<title value="KDDI-WAP2"/>
+			<description value="WAP 2.0 for ezweb"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</MediaType>
+		<MediaType name="softbank-html">
+			<charcterSet value="Shift_JIS"/>
+			<title value="SOFTBANK-HTML"/>
+			<description value="HTML for Softbank phone"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</MediaType>
+		<MediaType name="softbank-wap2">
+			<charcterSet value="UTF-8"/>
+			<title value="SOFTBANK-WAP2"/>
+			<description value="XHTML for Softbank phone"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</MediaType>
+		<MediaType name="xhtml-basic">
+			<charcterSet value="UTF-8"/>
+			<title value="XHTML"/>
+			<description value="XHTML Basic"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</MediaType>
+		<MediaType name="xml">
+			<charcterSet value=""/>
+			<title value="XML"/>
+			<description value="XML 1.0"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/xml</mimeTypes>
+		</MediaType>
+	</MediaTypes>
+	<Capabilities>
+		<Capability>HTML_3_2</Capability>
+		<Capability>HTML_4_0</Capability>
+		<Capability>HTML_ACTIVEX</Capability>
+		<Capability>HTML_CSS1</Capability>
+		<Capability>HTML_CSS2</Capability>
+		<Capability>HTML_CSSP</Capability>
+		<Capability>HTML_DOM</Capability>
+		<Capability>HTML_DOM_1</Capability>
+		<Capability>HTML_DOM_2</Capability>
+		<Capability>HTML_DOM_IE</Capability>
+		<Capability>HTML_DOM_NS4</Capability>
+		<Capability>HTML_FORM</Capability>
+		<Capability>HTML_FRAME</Capability>
+		<Capability>HTML_IFRAME</Capability>
+		<Capability>HTML_IMAGE</Capability>
+		<Capability>HTML_JAVA</Capability>
+		<Capability>HTML_JAVA1_0</Capability>
+		<Capability>HTML_JAVA1_1</Capability>
+		<Capability>HTML_JAVA1_2</Capability>
+		<Capability>HTML_JAVASCRIPT</Capability>
+		<Capability>HTML_JAVASCRIPT_1_0</Capability>
+		<Capability>HTML_JAVASCRIPT_1_1</Capability>
+		<Capability>HTML_JAVASCRIPT_1_2</Capability>
+		<Capability>HTML_JAVA_JRE</Capability>
+		<Capability>HTML_JSCRIPT</Capability>
+		<Capability>HTML_JSCRIPT1_0</Capability>
+		<Capability>HTML_JSCRIPT1_1</Capability>
+		<Capability>HTML_JSCRIPT1_2</Capability>
+		<Capability>HTML_LAYER</Capability>
+		<Capability>HTML_NESTED_TABLE</Capability>
+		<Capability>HTML_PLUGIN</Capability>
+		<Capability>HTML_TABLE</Capability>
+		<Capability>HTML_XML</Capability>
+		<Capability>HTML_XSL</Capability>
+		<Capability>HTTP_1_1</Capability>
+		<Capability>HTTP_COOKIE</Capability>
+		<Capability>WML_1_0</Capability>
+		<Capability>WML_1_1</Capability>
+		<Capability>WML_TABLE</Capability>
+		<Capability>XML_XINCLUDE</Capability>
+		<Capability>XML_XPATH</Capability>
+		<Capability>XML_XSLT</Capability>
+	</Capabilities>
+	<Clients>
+		<Client name="ie5mac" evalOrder="1" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 5.*Mac.*"/>
+			<version value="5.*"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_PLUGIN,HTML_CSS1,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="safari" evalOrder="2" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mac.*Safari.*"/>
+			<version value="5.*"/>
+			<model value="None"/>
+			<manufacturer value="Apple"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie6" evalOrder="3" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 6.*"/>
+			<version value="6.0"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie5" evalOrder="4" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 5.*"/>
+			<version value="5.5"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml</mimeTypes>
+		</Client>
+		<Client name="ns4" evalOrder="5" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mozilla/4.*"/>
+			<version value="4.75"/>
+			<model value="None"/>
+			<manufacturer value="Netscape"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_CSS1,HTML_LAYER,HTML_PLUGIN,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="mozilla" evalOrder="6" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mozilla/5.*"/>
+			<version value="1.x"/>
+			<model value="Mozilla"/>
+			<manufacturer value="Mozilla"/>
+			<capabilities>HTML_3_2,HTML_4_0,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IFRAME,HTML_IMAGE,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTML_PLUGIN,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xhtml,text/xml</mimeTypes>
+		</Client>
+		<Client name="lynx" evalOrder="7" preferredMimeTypeID="text/html">
+			<userAgentPattern value="Lynx.*"/>
+			<version value=""/>
+			<model value="None"/>
+			<manufacturer value="GNU"/>
+			<capabilities>HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="docomo-html" evalOrder="8" preferredMimeTypeID="text/html">
+			<userAgentPattern value="DoCoMo/1.0.*"/>
+			<version value="1.0"/>
+			<model value="Generic"/>
+			<manufacturer value="WAP"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="docomo-wap2" evalOrder="9" preferredMimeTypeID="application/xhtml+xml">
+			<userAgentPattern value="DoCoMo/2.0.*"/>
+			<version value="2.0"/>
+			<model value="Generic"/>
+			<manufacturer value="WAP"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</Client>
+		<Client name="kddi-hdml" evalOrder="10" preferredMimeTypeID="text/x-hdml">
+			<userAgentPattern value="UP.Browser.*"/>
+			<version value="1.0"/>
+			<model value="Generic"/>
+			<manufacturer value="WAP"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/x-hdml</mimeTypes>
+		</Client>
+		<Client name="kddi-wap2" evalOrder="11" preferredMimeTypeID="application/xhtml+xml">
+			<userAgentPattern value="KDDI-.*UP.Browser.*"/>
+			<version value="2.0"/>
+			<model value="Generic"/>
+			<manufacturer value="WAP"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</Client>
+		<Client name="softbank-html" evalOrder="12" preferredMimeTypeID="text/html">
+			<userAgentPattern value="J-PHONE.*"/>
+			<version value="1.0"/>
+			<model value="Generic"/>
+			<manufacturer value="WAP"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="softbank-wap2" evalOrder="13" preferredMimeTypeID="application/xhtml+xml">
+			<userAgentPattern value="MOT-C980.*|MOT-V980.*|Vodafone.*|SoftBank.*"/>
+			<version value="2.0"/>
+			<model value="Generic"/>
+			<manufacturer value="WAP"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</Client>
+		<Client name="vxml_generic" evalOrder="14" preferredMimeTypeID="text/vxml">
+			<userAgentPattern value=".*VoiceXML.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Generic"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</Client>
+		<Client name="nuance" evalOrder="16" preferredMimeTypeID="text/vxml">
+			<userAgentPattern value="Nuance.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Nuance"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</Client>
+		<Client name="agentxml" evalOrder="17" preferredMimeTypeID="text/xml">
+			<userAgentPattern value="agentxml/1.0.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Unknown"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/xml</mimeTypes>
+		</Client>
+		<Client name="opera7" evalOrder="18" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Opera/7.*"/>
+			<version value="7.x"/>
+			<model value="Opera7"/>
+			<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>
+	</Clients>
+	<Roles>
+		<Role>admin</Role>
+		<Role>guest</Role>
+		<Role>user</Role>
+		<Role>site</Role>
+		<Role>siteadmin</Role>
+<!--
+		<Role>dev</Role>
+		<Role>devmgr</Role>
+-->
+	</Roles>
+	<Groups>
+	</Groups>
+	<Users>
+		<User name="admin">
+			<credentials password="##ADMIN_PASSWORD##" enabled="TRUE" requiresUpdate="TRUE"/>
+			<roles>user,admin</roles>
+			<groups></groups>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="System"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="Administrator"/>
+				</preference>
+			</userinfo>
+			<Rules/>
+		</User>
+		<User name="guest">
+			<Null/>
+			<roles>guest,site</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="site"/>
+			</Rules>
+		</User>
+<!--
+		<User name="devmgr">
+			<credentials password="devmgr" enabled="TRUE"/>
+			<roles>user,dev,devmgr</roles>
+			<groups></groups>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Dev"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="Manager"/>
+				</preference>
+			</userinfo>
+			<Rules>
+			  <Rule locator="page" rule="user-role-fallback"/>
+			</Rules>
+		</User>		
+-->
+        <User name="site">
+            <credentials password="##SITE_PASSWORD##" enabled="TRUE" requiresUpdate="FALSE"/>
+            <roles>site,siteadmin</roles>
+            <groups></groups>
+            <preferences/>
+            <userinfo/>
+            <Rules>
+                <Rule locator="page" rule="site"/>
+            </Rules>
+        </User>
+	</Users>
+	<Permissions>
+        <Permission type="folder" resource="/" actions="view">
+            <roles>user,guest</roles>
+            <groups></groups>
+            <users></users>
+        </Permission>
+        <Permission type="folder" resource="/*" actions="view">
+            <roles>user</roles>
+            <groups></groups>
+            <users></users>
+        </Permission>
+        <Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view, edit">
+            <roles>admin</roles>
+            <groups></groups>
+            <users></users>
+        </Permission>
+
+		<Permission type="portal" resource="j2-admin::*" actions="view, edit">
+			<roles>admin</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="jetspeed-layouts::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+	</Permissions>
+	<ProfilingRules>
+		<ProfilingRule id="group-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 group-based fallback"/>
+			<Criteria>
+				<Criterion name="group">
+					<type value="group"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="ip-address" standardRule="true">
+			<description value="Resolves pages based on the clients remote IP address."/>
+			<Criteria>
+				<Criterion name="ip">
+					<type value="ip"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="j1" standardRule="true">
+			<description value="The default profiling rule following the Jetspeed-1 hard-coded profiler fallback algorithm."/>
+			<Criteria>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="user">
+					<type value="group.role.user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="mediatype">
+					<type value="mediatype"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="language">
+					<type value="language"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="country">
+					<type value="country"/>
+					<fallBackOrder value="4"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="j2" standardRule="true">
+			<description value="The default profiling rule for users and mediatype minus language and country."/>
+			<Criteria>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="user">
+					<type value="group.role.user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="mediatype">
+					<type value="mediatype"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="language">
+					<type value="language"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="country">
+					<type value="country"/>
+					<fallBackOrder value="4"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="path" standardRule="true">
+			<description value="use a path to locate."/>
+			<Criteria>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="/"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="role-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="role-group" standardRule="false">
+			<description value="A role based fallback algorithm that searches all groups and roles for a user"/>
+			<Criteria>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="group">
+					<type value="group"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="security" standardRule="true">
+			<description value="The security profiling rule needed for credential change requirements."/>
+			<Criteria>
+				<Criterion name="page">
+					<type value="hard.coded"/>
+					<value value="/my-account.psml"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="user-role-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="user-rolecombo-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="rolecombo"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+        <ProfilingRule id="site" standardRule="false">
+            <description value="A role based fallback algorithm for editing site"/>
+            <Criteria>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="mediatype">
+					<type value="mediatype"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="language">
+					<type value="language"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="country">
+					<type value="country"/>
+					<fallBackOrder value="4"/>
+					<fallBackType value="1"/>
+				</Criterion>
+            </Criteria>
+        </ProfilingRule>
+	</ProfilingRules>
+</Snapshot>


Property changes on: pal-portal/trunk/portal/files/etc/sql/min/j2-seed.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout-help.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout-help.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout-help.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,67 @@
+#*
+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 -->
+
+<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="decorations/images/view.gif" alt="view" border="0" /> $messages.getString("portal.page.help.view")</p>
+    <p><img src="decorations/images/help.gif" alt="help" border="0" /> $messages.getString("portal.page.help.help")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" /> $messages.getString("portal.page.help.edit")</p>
+    <p><img src="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="decorations/images/minimized.gif" alt="minimize" border="0" />
+       $messages.getString("portal.portlet.help.minimize")</p>
+    <p><img src="decorations/images/maximized.gif" alt="maximize" border="0" />
+       $messages.getString("portal.portlet.help.maximize")</p>
+    <p><img src="decorations/images/restore.gif" alt="restore" border="0" />
+       $messages.getString("portal.portlet.help.restore")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" />
+       $messages.getString("portal.portlet.help.edit")</p>
+    <p><img src="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="decorations/images/close.gif" alt="close" border="0" />
+       $messages.getString("portal.portlet.help.close")</p>
+    <p><img src="decorations/layout/images/movePortletUp.gif" alt="move up" border="0" />
+       $messages.getString("portal.portlet.help.movePortletUp")</p>
+    <p><img src="decorations/layout/images/movePortletDown.gif" alt="move down" border="0" />
+       $messages.getString("portal.portlet.help.movePortletDown")</p>
+    <p><img src="decorations/layout/images/movePortletLeft.gif" alt="move left" border="0" />
+       $messages.getString("portal.portlet.help.movePortletLeft")</p>
+    <p><img src="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 -->
+
+#parse($theme.pageLayoutDecoration.footer)

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -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


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,547 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+#*
+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)
+#set($namespace="${renderResponse.namespace}")
+#getBoolProperty($allowAddPortlet $rootDecorator "allow.add.portlet" true)
+
+#if($myFragment.getDecorator())
+  #set($decorator = $myFragment.getDecorator())
+#end
+
+#if($myFragment == $myPage.getRootFragment())
+  #set($isRoot=true)
+#end
+
+#if($request.getAttribute("editing") == true)
+  #set($editing = true)    
+  #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)  
+#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)
+
+<!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
+#if ($isRoot)
+  #parse($myFragment.decoration.header)
+   #set($layoutClass = "portal-nested-layout")
+#else
+  #defineLayoutObjects()
+   #set($layoutClass = "portal-layout")
+#end
+
+<div id="$renderResponse.namespace" class="${layoutClass} ${layoutClass}-${layoutType}">
+
+#if($editing)
+    #if($isRoot)
+      #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
+      #getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
+      #getBoolProperty($allowChangePageName $rootDecorator "allow.change.page.name" true)
+      #getBoolProperty($allowNavigatePage $rootDecorator "allow.navigate.page" true)
+      #getBoolProperty($allowDeletePage $rootDecorator "allow.delete.page" true)
+      #getBoolProperty($allowChangeFolderTheme $rootDecorator "allow.change.folder.theme" true)
+      #getBoolProperty($allowAddFolder $rootDecorator "allow.add.folder" true)
+      #getBoolProperty($allowChangeFolderName $rootDecorator "allow.change.folder.name" true)
+      #getBoolProperty($allowNavigateFolder $rootDecorator "allow.navigate.folder" true)
+      #getBoolProperty($allowDeleteFolder $rootDecorator "allow.delete.folder" true)
+    #else
+      #set($allowChangePageTheme=false)
+      #set($allowAddPage=false)
+      #set($allowChangePageName=false)
+      #set($allowNavigatePage=false)
+      #set($allowDeletePage=false)
+      #set($allowChangeFolderTheme=false)
+      #set($allowAddFolder=false)
+      #set($allowChangeFolderName=false)
+      #set($allowNavigateFolder=false)
+      #set($allowDeleteFolder=false)
+    #end
+
+    #getIntProperty($maxLayoutNesting $rootDecorator "max.layout.nesting" 2)
+    #if($request.getAttribute("fragmentNestingLevel") < $maxLayoutNesting)
+      #set($allowAddLayout=true)
+    #else
+      #set($allowAddLayout=false)
+    #end
+     
+    #getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
+
+      #set($form="f${renderResponse.namespace}")
+      #set($formAction = "$renderResponse.createActionURL()")
+      #set($submit = ".submit()")
+
+
+#* Preferences *#
+  <div id="${namespace}PreferenceWindow" style="z-index:10000;border-left:1px solid #999999;border-top:1px solid #999999;border-bottom:4px solid #999999;border-right:4px solid #999999;width:650px;height:450px;position:absolute;top:30px;left:30px;background-color:#efefde;">
+    <div style="z-index:10010;position:absolute;top:5px;left:10px;width:150px;height:380px;">
+      <span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.window.title")</span>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:10px;width:150px;height:380px;background-color:#ffffff;">
+<script language="JavaScript"><!--
+function ${namespace}UpdatePreference(id) {
+  if(id=="${namespace}PageProperties"){
+    document.getElementById("${namespace}PageProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.pageproperties.title")";
+  }else{
+    document.getElementById("${namespace}PageProperties").style.display="none";
+  }
+  if(id=="${namespace}AddPage"){
+    document.getElementById("${namespace}AddPage").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addpage.title")";
+  }else{
+    document.getElementById("${namespace}AddPage").style.display="none";
+  }
+  if(id=="${namespace}FolderProperties"){
+    document.getElementById("${namespace}FolderProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.folderproperties.title")";
+  }else{
+    document.getElementById("${namespace}FolderProperties").style.display="none";
+  }
+  if(id=="${namespace}AddFolder"){
+    document.getElementById("${namespace}AddFolder").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addfolder.title")";
+  }else{
+    document.getElementById("${namespace}AddFolder").style.display="none";
+  }
+  if(id=="${namespace}ChangeLayout"){
+    document.getElementById("${namespace}ChangeLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changelayout.title")";
+  }else{
+    document.getElementById("${namespace}ChangeLayout").style.display="none";
+  }
+  if(id=="${namespace}AddLayout"){
+    document.getElementById("${namespace}AddLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addlayout.title")";
+  }else{
+    document.getElementById("${namespace}AddLayout").style.display="none";
+  }
+  if(id=="${namespace}ChangeTheme"){
+    document.getElementById("${namespace}ChangeTheme").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changetheme.title")";
+  }else{
+    document.getElementById("${namespace}ChangeTheme").style.display="none";
+  }
+}
+function ${namespace}HidePreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="none";
+    document.getElementById("${namespace}PreferenceState").value="hide";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="inline";
+}
+function ${namespace}ShowPreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="block";
+    document.getElementById("${namespace}PreferenceState").value="show";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="none";
+}
+// --></script>
+#* Menu *#
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}PageProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.pageproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddPage');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addpage.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}FolderProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.folderproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddFolder');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addfolder.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changelayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addlayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeTheme');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changetheme.title")</span></a>
+      </div>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:170px;width:470px;height:380px;background-color:#ffffff;">
+      <div style="z-index:10020;width:450px;height:20px;vertical-align:middle;border-bottom:1px solid #999999;margin:5px;padding-left:5px;">
+        <span id="${namespace}PreferenceTitle" style="font-family:sans-serif;font-size:11pt;">Title</span>
+      </div>
+
+      <form name="$form" action="$formAction" method='post'>
+        <input id="${namespace}PreferenceName" type="hidden" name="preferenceName" value="${preferenceName}"/>
+        <input id="${namespace}PreferenceState" type="hidden" name="preferenceState" value="${preferenceState}"/>
+
+#* Page Properties *#
+#if($allowChangePageName||$allowNavigatePage||$allowDeletePage)
+      <div id="${namespace}PageProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangePageName)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsPageShortTitle'/>
+            </div>
+<!-- TODO:Locale -->
+            <div>
+              <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigatePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.position")</legend>
+          <div>
+            <label>$messages.getString("portal.page.editing.pagenavigation")</label>
+            <input id="move-page-left" type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" />
+            <input id="move-page-right" type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeletePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.delete")</legend>
+          <div>
+            <label for="deletepage">$messages.getString("portal.page.editing.deleteThisPage")</label>
+            <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" onclick="if(window.confirm('$messages.getString("portal.page.editing.confirmDeleteThisPage")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Page *#
+#if($allowAddPage)
+      <div id="${namespace}AddPage" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsNewPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsNewPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsNewPageShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Folder Properties *#
+#if($allowChangeFolderName||$allowNavigateFolder||$allowDeleteFolder)
+      <div id="${namespace}FolderProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangeFolderName)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigateFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.position")</legend>
+          <div>
+            <label>$messages.getString("portal.folder.editing.foldernavigation")</label>
+            <input id="move-folder-left" type="submit" name="jsMoveFolderLeft" value="$messages.getString("portal.folder.editing.moveFolderLeft")" />
+            <input id="move-folder-right" type="submit" name="jsMoveFolderRight" value="$messages.getString("portal.folder.editing.moveFolderRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeleteFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.delete")</legend>
+          <div>
+            <label for="deletefolder">$messages.getString("portal.folder.editing.deleteThisFolder")</label>
+            <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")" onclick="if(window.confirm('$messages.getString("portal.folder.editing.confirmDeleteThisFolder")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Folder *#
+#if($allowAddFolder)
+      <div id="${namespace}AddFolder" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsNewFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsNewFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsNewFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Change Layout *#
+#if($allowChangeLayout)
+      <div id="${namespace}ChangeLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Add Layout *#
+#if($allowAddLayout)
+      <div id="${namespace}AddLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Change Theme *#
+#if ($allowChangePageTheme||$allowChangePortletDecorator)
+      <div id="${namespace}ChangeTheme" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if ($allowChangePageTheme)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.theme")</legend>
+          <select id='theme' name='theme' onChange="$form$submit">
+            #foreach($td in $decorationFactory.getPageDecorations($rc))
+            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
+            #end
+          </select>   
+        </fieldset>
+<br/>
+#end
+#getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true)
+####### Take all fragments and apply style	  
+#if($allowChangePortletDecorator)          
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.portlet.decorator")</legend>
+          <input type="hidden" name="fragment" value="$f.id">
+          <input type="hidden" name="move" value="">
+          <input type="hidden" name="remove" value="">
+          <select id="decorators" name="decorators">
+            <option value=''>
+        	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+        	    #end
+          </select>
+          <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+        </fieldset>
+#end	   
+      </div>
+#end
+
+<script language="JavaScript"><!--
+var prefName=document.getElementById("${namespace}PreferenceName").value;
+if(prefName==""){
+  prefName="${namespace}PageProperties";
+}
+${namespace}UpdatePreference(prefName);
+var prefState=document.getElementById("${namespace}PreferenceState").value;
+if(prefState=="show"){
+  ${namespace}ShowPreferenceWindow();
+}else{
+  ${namespace}HidePreferenceWindow();
+}
+// --></script>
+
+      </form>
+
+    </div>
+    <div style="z-index:10010;position:absolute;top:415px;left:10px;width:630px;height:30px;text-align:right;">
+      <input type="button" onclick="${namespace}HidePreferenceWindow();" value="$messages.getString("portal.preference.window.close")" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+#set($_actions = $layoutDecoration.actions)
+    #if($_actions.size() >0)
+    #foreach ($_action in $_actions)
+      <input type="button" onclick="location.href='${_action.Action}'" value="${_action.Name}" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+    #end
+    #end
+ </div>
+
+    </div>
+  </div>
+
+## end edit mode
+#end
+
+#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}" 
+	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
+	     style="float:${columnFloat}; width:${columnWidth};">
+	     
+	  #foreach($f in $column)  	     
+      ## Set up coordinates for this fragment
+      #set($coords = $columnLayout.getCoordinate($f))	  
+      #set($col = $coords.x)
+      #set($lastRow = $columnLayout.getLastRowNumber($col))
+      #set($row = $coords.y)
+			
+      ## get the decorated Portlet content
+		  <div class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+		  
+		    ## editing block
+		    #if($editing)
+		      <div class="portlet-edit-bar">
+            #set ($dcnt = $dcnt + 1)   
+            <form name="$form$dcnt" action="$formAction" method='post'>
+              <input type="hidden" name="fragment" value="$f.id">
+              <input type="hidden" name="move" value="">
+              <input type="hidden" name="remove" value="">
+              #if($f.type == "portlet")
+                #set($fragmentType="Portlet")
+                #if($allowChangePortletDecorator)
+                  <select id='decorator' name='decorator' onChange="$form$dcnt$submit">
+                    <option value=''>
+                    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+                    #end
+                  </select>
+                #end
+              #else
+                #set($fragmentType="Layout")
+              #end              
+			        ## Move portlet left
+			        #if($lastColumn > 0 && $col > 0)            
+                <a href="#" onClick="${form}${dcnt}.move.value='3';$form$dcnt$submit;return false;" class="move-portlet-left">
+                  <img src="#GetPageResource('images/movePortletLeft.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Left")"/>
+                </a>
+			        #end
+			        ## Move portlet up	
+			        #if($row > 0)			   
+                <a href="#" onClick="${form}${dcnt}.move.value='1';$form$dcnt$submit;return false;" class="move-portlet-up">
+                  <img src="#GetPageResource('images/movePortletUp.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Up")"/>
+                </a>
+			        #end			 
+			        ## Remove portlet from page
+              <a href="#" onClick="${form}${dcnt}.remove.value='y';$form$dcnt$submit;return false;" class="remove-portlet-from-apge">
+                <img src="#GetPageResource('images/close.gif')" border="0" title="$messages.getString("portal.page.editing.remove${fragmentType}")"/>
+              </a>			 
+			        ## Move portlet down
+              #if($row < $lastRow)						
+                <a href="#" onClick="${form}${dcnt}.move.value='2';$form$dcnt$submit;return false;" class="move-portlet-down">
+                  <img src="#GetPageResource('images/movePortletDown.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Down")"/>
+                </a>
+			        #end			 
+			        ## Move portlet right
+              #if($lastColumn > 0 && $col < $lastColumn)
+                <a href="#" onClick="${form}${dcnt}.move.value='4';$form$dcnt$submit;return false;" class="move-portlet-right">
+                  <img src="#GetPageResource('images/movePortletRight.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Right")"/>
+                </a>
+			        #end
+            </form>			 
+		      </div>
+		    #end
+		   
+		    ## Now get the real content
+	 	 	  $jetspeed.setCurrentFragment($f)	   
+		    #if($f.type == "portlet")
+			    #parse($f.decoration.template)
+		    #else		
+			    $f.renderedContent			
+		    #end
+		  </div>
+		#end
+	</div>
+	#set ($columnIndex = $columnIndex + 1)  
+#end
+  
+</div>  
+  
+<br style="clear:both;"/>
+
+#if ($isRoot)
+  <form name='portletform' action="" method="post">
+    <input type='hidden' name='portlets'/>
+    <input type='hidden' name='page' value='$myPage'/>
+  </form>
+  #parse($myFragment.decoration.footer)
+#end
+  

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,19 @@
+# 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
+template.type=velocity
+template.extension=.vm
+


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -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: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout-help.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout-help.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout-help.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,67 @@
+#*
+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 -->
+
+<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="decorations/images/view.gif" alt="view" border="0" /> $messages.getString("portal.page.help.view")</p>
+    <p><img src="decorations/images/help.gif" alt="help" border="0" /> $messages.getString("portal.page.help.help")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" /> $messages.getString("portal.page.help.edit")</p>
+    <p><img src="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="decorations/images/minimized.gif" alt="minimize" border="0" />
+       $messages.getString("portal.portlet.help.minimize")</p>
+    <p><img src="decorations/images/maximized.gif" alt="maximize" border="0" />
+       $messages.getString("portal.portlet.help.maximize")</p>
+    <p><img src="decorations/images/restore.gif" alt="restore" border="0" />
+       $messages.getString("portal.portlet.help.restore")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" />
+       $messages.getString("portal.portlet.help.edit")</p>
+    <p><img src="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="decorations/images/close.gif" alt="close" border="0" />
+       $messages.getString("portal.portlet.help.close")</p>
+    <p><img src="decorations/layout/images/movePortletUp.gif" alt="move up" border="0" />
+       $messages.getString("portal.portlet.help.movePortletUp")</p>
+    <p><img src="decorations/layout/images/movePortletDown.gif" alt="move down" border="0" />
+       $messages.getString("portal.portlet.help.movePortletDown")</p>
+    <p><img src="decorations/layout/images/movePortletLeft.gif" alt="move left" border="0" />
+       $messages.getString("portal.portlet.help.movePortletLeft")</p>
+    <p><img src="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 -->
+
+#parse($theme.pageLayoutDecoration.footer)

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -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


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,547 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+#*
+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)
+#set($namespace="${renderResponse.namespace}")
+#getBoolProperty($allowAddPortlet $rootDecorator "allow.add.portlet" true)
+
+#if($myFragment.getDecorator())
+  #set($decorator = $myFragment.getDecorator())
+#end
+
+#if($myFragment == $myPage.getRootFragment())
+  #set($isRoot=true)
+#end
+
+#if($request.getAttribute("editing") == true)
+  #set($editing = true)    
+  #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)  
+#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)
+
+<!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
+#if ($isRoot)
+  #parse($myFragment.decoration.header)
+   #set($layoutClass = "portal-nested-layout")
+#else
+  #defineLayoutObjects()
+   #set($layoutClass = "portal-layout")
+#end
+
+<div id="$renderResponse.namespace" class="${layoutClass} ${layoutClass}-${layoutType}">
+
+#if($editing)
+    #if($isRoot)
+      #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
+      #getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
+      #getBoolProperty($allowChangePageName $rootDecorator "allow.change.page.name" true)
+      #getBoolProperty($allowNavigatePage $rootDecorator "allow.navigate.page" true)
+      #getBoolProperty($allowDeletePage $rootDecorator "allow.delete.page" true)
+      #getBoolProperty($allowChangeFolderTheme $rootDecorator "allow.change.folder.theme" true)
+      #getBoolProperty($allowAddFolder $rootDecorator "allow.add.folder" true)
+      #getBoolProperty($allowChangeFolderName $rootDecorator "allow.change.folder.name" true)
+      #getBoolProperty($allowNavigateFolder $rootDecorator "allow.navigate.folder" true)
+      #getBoolProperty($allowDeleteFolder $rootDecorator "allow.delete.folder" true)
+    #else
+      #set($allowChangePageTheme=false)
+      #set($allowAddPage=false)
+      #set($allowChangePageName=false)
+      #set($allowNavigatePage=false)
+      #set($allowDeletePage=false)
+      #set($allowChangeFolderTheme=false)
+      #set($allowAddFolder=false)
+      #set($allowChangeFolderName=false)
+      #set($allowNavigateFolder=false)
+      #set($allowDeleteFolder=false)
+    #end
+
+    #getIntProperty($maxLayoutNesting $rootDecorator "max.layout.nesting" 2)
+    #if($request.getAttribute("fragmentNestingLevel") < $maxLayoutNesting)
+      #set($allowAddLayout=true)
+    #else
+      #set($allowAddLayout=false)
+    #end
+     
+    #getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
+
+      #set($form="f${renderResponse.namespace}")
+      #set($formAction = "$renderResponse.createActionURL()")
+      #set($submit = ".submit()")
+
+
+#* Preferences *#
+  <div id="${namespace}PreferenceWindow" style="z-index:10000;border-left:1px solid #999999;border-top:1px solid #999999;border-bottom:4px solid #999999;border-right:4px solid #999999;width:650px;height:450px;position:absolute;top:30px;left:30px;background-color:#efefde;">
+    <div style="z-index:10010;position:absolute;top:5px;left:10px;width:150px;height:380px;">
+      <span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.window.title")</span>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:10px;width:150px;height:380px;background-color:#ffffff;">
+<script language="JavaScript"><!--
+function ${namespace}UpdatePreference(id) {
+  if(id=="${namespace}PageProperties"){
+    document.getElementById("${namespace}PageProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.pageproperties.title")";
+  }else{
+    document.getElementById("${namespace}PageProperties").style.display="none";
+  }
+  if(id=="${namespace}AddPage"){
+    document.getElementById("${namespace}AddPage").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addpage.title")";
+  }else{
+    document.getElementById("${namespace}AddPage").style.display="none";
+  }
+  if(id=="${namespace}FolderProperties"){
+    document.getElementById("${namespace}FolderProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.folderproperties.title")";
+  }else{
+    document.getElementById("${namespace}FolderProperties").style.display="none";
+  }
+  if(id=="${namespace}AddFolder"){
+    document.getElementById("${namespace}AddFolder").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addfolder.title")";
+  }else{
+    document.getElementById("${namespace}AddFolder").style.display="none";
+  }
+  if(id=="${namespace}ChangeLayout"){
+    document.getElementById("${namespace}ChangeLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changelayout.title")";
+  }else{
+    document.getElementById("${namespace}ChangeLayout").style.display="none";
+  }
+  if(id=="${namespace}AddLayout"){
+    document.getElementById("${namespace}AddLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addlayout.title")";
+  }else{
+    document.getElementById("${namespace}AddLayout").style.display="none";
+  }
+  if(id=="${namespace}ChangeTheme"){
+    document.getElementById("${namespace}ChangeTheme").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changetheme.title")";
+  }else{
+    document.getElementById("${namespace}ChangeTheme").style.display="none";
+  }
+}
+function ${namespace}HidePreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="none";
+    document.getElementById("${namespace}PreferenceState").value="hide";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="inline";
+}
+function ${namespace}ShowPreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="block";
+    document.getElementById("${namespace}PreferenceState").value="show";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="none";
+}
+// --></script>
+#* Menu *#
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}PageProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.pageproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddPage');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addpage.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}FolderProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.folderproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddFolder');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addfolder.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changelayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addlayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeTheme');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changetheme.title")</span></a>
+      </div>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:170px;width:470px;height:380px;background-color:#ffffff;">
+      <div style="z-index:10020;width:450px;height:20px;vertical-align:middle;border-bottom:1px solid #999999;margin:5px;padding-left:5px;">
+        <span id="${namespace}PreferenceTitle" style="font-family:sans-serif;font-size:11pt;">Title</span>
+      </div>
+
+      <form name="$form" action="$formAction" method='post'>
+        <input id="${namespace}PreferenceName" type="hidden" name="preferenceName" value="${preferenceName}"/>
+        <input id="${namespace}PreferenceState" type="hidden" name="preferenceState" value="${preferenceState}"/>
+
+#* Page Properties *#
+#if($allowChangePageName||$allowNavigatePage||$allowDeletePage)
+      <div id="${namespace}PageProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangePageName)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsPageShortTitle'/>
+            </div>
+<!-- TODO:Locale -->
+            <div>
+              <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigatePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.position")</legend>
+          <div>
+            <label>$messages.getString("portal.page.editing.pagenavigation")</label>
+            <input id="move-page-left" type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" />
+            <input id="move-page-right" type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeletePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.delete")</legend>
+          <div>
+            <label for="deletepage">$messages.getString("portal.page.editing.deleteThisPage")</label>
+            <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" onclick="if(window.confirm('$messages.getString("portal.page.editing.confirmDeleteThisPage")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Page *#
+#if($allowAddPage)
+      <div id="${namespace}AddPage" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsNewPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsNewPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsNewPageShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Folder Properties *#
+#if($allowChangeFolderName||$allowNavigateFolder||$allowDeleteFolder)
+      <div id="${namespace}FolderProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangeFolderName)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigateFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.position")</legend>
+          <div>
+            <label>$messages.getString("portal.folder.editing.foldernavigation")</label>
+            <input id="move-folder-left" type="submit" name="jsMoveFolderLeft" value="$messages.getString("portal.folder.editing.moveFolderLeft")" />
+            <input id="move-folder-right" type="submit" name="jsMoveFolderRight" value="$messages.getString("portal.folder.editing.moveFolderRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeleteFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.delete")</legend>
+          <div>
+            <label for="deletefolder">$messages.getString("portal.folder.editing.deleteThisFolder")</label>
+            <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")" onclick="if(window.confirm('$messages.getString("portal.folder.editing.confirmDeleteThisFolder")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Folder *#
+#if($allowAddFolder)
+      <div id="${namespace}AddFolder" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsNewFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsNewFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsNewFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Change Layout *#
+#if($allowChangeLayout)
+      <div id="${namespace}ChangeLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Add Layout *#
+#if($allowAddLayout)
+      <div id="${namespace}AddLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Change Theme *#
+#if ($allowChangePageTheme||$allowChangePortletDecorator)
+      <div id="${namespace}ChangeTheme" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if ($allowChangePageTheme)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.theme")</legend>
+          <select id='theme' name='theme' onChange="$form$submit">
+            #foreach($td in $decorationFactory.getPageDecorations($rc))
+            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
+            #end
+          </select>   
+        </fieldset>
+<br/>
+#end
+#getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true)
+####### Take all fragments and apply style	  
+#if($allowChangePortletDecorator)          
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.portlet.decorator")</legend>
+          <input type="hidden" name="fragment" value="$f.id">
+          <input type="hidden" name="move" value="">
+          <input type="hidden" name="remove" value="">
+          <select id="decorators" name="decorators">
+            <option value=''>
+        	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+        	    #end
+          </select>
+          <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+        </fieldset>
+#end	   
+      </div>
+#end
+
+<script language="JavaScript"><!--
+var prefName=document.getElementById("${namespace}PreferenceName").value;
+if(prefName==""){
+  prefName="${namespace}PageProperties";
+}
+${namespace}UpdatePreference(prefName);
+var prefState=document.getElementById("${namespace}PreferenceState").value;
+if(prefState=="show"){
+  ${namespace}ShowPreferenceWindow();
+}else{
+  ${namespace}HidePreferenceWindow();
+}
+// --></script>
+
+      </form>
+
+    </div>
+    <div style="z-index:10010;position:absolute;top:415px;left:10px;width:630px;height:30px;text-align:right;">
+      <input type="button" onclick="${namespace}HidePreferenceWindow();" value="$messages.getString("portal.preference.window.close")" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+#set($_actions = $layoutDecoration.actions)
+    #if($_actions.size() >0)
+    #foreach ($_action in $_actions)
+      <input type="button" onclick="location.href='${_action.Action}'" value="${_action.Name}" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+    #end
+    #end
+ </div>
+
+    </div>
+  </div>
+
+## end edit mode
+#end
+
+#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}" 
+	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
+	     style="float:${columnFloat}; width:${columnWidth};">
+	     
+	  #foreach($f in $column)  	     
+      ## Set up coordinates for this fragment
+      #set($coords = $columnLayout.getCoordinate($f))	  
+      #set($col = $coords.x)
+      #set($lastRow = $columnLayout.getLastRowNumber($col))
+      #set($row = $coords.y)
+			
+      ## get the decorated Portlet content
+		  <div class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+		  
+		    ## editing block
+		    #if($editing)
+		      <div class="portlet-edit-bar">
+            #set ($dcnt = $dcnt + 1)   
+            <form name="$form$dcnt" action="$formAction" method='post'>
+              <input type="hidden" name="fragment" value="$f.id">
+              <input type="hidden" name="move" value="">
+              <input type="hidden" name="remove" value="">
+              #if($f.type == "portlet")
+                #set($fragmentType="Portlet")
+                #if($allowChangePortletDecorator)
+                  <select id='decorator' name='decorator' onChange="$form$dcnt$submit">
+                    <option value=''>
+                    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+                    #end
+                  </select>
+                #end
+              #else
+                #set($fragmentType="Layout")
+              #end              
+			        ## Move portlet left
+			        #if($lastColumn > 0 && $col > 0)            
+                <a href="#" onClick="${form}${dcnt}.move.value='3';$form$dcnt$submit;return false;" class="move-portlet-left">
+                  <img src="#GetPageResource('images/movePortletLeft.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Left")"/>
+                </a>
+			        #end
+			        ## Move portlet up	
+			        #if($row > 0)			   
+                <a href="#" onClick="${form}${dcnt}.move.value='1';$form$dcnt$submit;return false;" class="move-portlet-up">
+                  <img src="#GetPageResource('images/movePortletUp.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Up")"/>
+                </a>
+			        #end			 
+			        ## Remove portlet from page
+              <a href="#" onClick="${form}${dcnt}.remove.value='y';$form$dcnt$submit;return false;" class="remove-portlet-from-apge">
+                <img src="#GetPageResource('images/close.gif')" border="0" title="$messages.getString("portal.page.editing.remove${fragmentType}")"/>
+              </a>			 
+			        ## Move portlet down
+              #if($row < $lastRow)						
+                <a href="#" onClick="${form}${dcnt}.move.value='2';$form$dcnt$submit;return false;" class="move-portlet-down">
+                  <img src="#GetPageResource('images/movePortletDown.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Down")"/>
+                </a>
+			        #end			 
+			        ## Move portlet right
+              #if($lastColumn > 0 && $col < $lastColumn)
+                <a href="#" onClick="${form}${dcnt}.move.value='4';$form$dcnt$submit;return false;" class="move-portlet-right">
+                  <img src="#GetPageResource('images/movePortletRight.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Right")"/>
+                </a>
+			        #end
+            </form>			 
+		      </div>
+		    #end
+		   
+		    ## Now get the real content
+	 	 	  $jetspeed.setCurrentFragment($f)	   
+		    #if($f.type == "portlet")
+			    #parse($f.decoration.template)
+		    #else		
+			    $f.renderedContent			
+		    #end
+		  </div>
+		#end
+	</div>
+	#set ($columnIndex = $columnIndex + 1)  
+#end
+  
+</div>  
+  
+<br style="clear:both;"/>
+
+#if ($isRoot)
+  <form name='portletform' action="" method="post">
+    <input type='hidden' name='portlets'/>
+    <input type='hidden' name='page' value='$myPage'/>
+  </form>
+  #parse($myFragment.decoration.footer)
+#end
+  

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,19 @@
+# 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
+template.type=velocity
+template.extension=.vm
+


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -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: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout-help.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout-help.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout-help.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,67 @@
+#*
+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 -->
+
+<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="decorations/images/view.gif" alt="view" border="0" /> $messages.getString("portal.page.help.view")</p>
+    <p><img src="decorations/images/help.gif" alt="help" border="0" /> $messages.getString("portal.page.help.help")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" /> $messages.getString("portal.page.help.edit")</p>
+    <p><img src="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="decorations/images/minimized.gif" alt="minimize" border="0" />
+       $messages.getString("portal.portlet.help.minimize")</p>
+    <p><img src="decorations/images/maximized.gif" alt="maximize" border="0" />
+       $messages.getString("portal.portlet.help.maximize")</p>
+    <p><img src="decorations/images/restore.gif" alt="restore" border="0" />
+       $messages.getString("portal.portlet.help.restore")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" />
+       $messages.getString("portal.portlet.help.edit")</p>
+    <p><img src="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="decorations/images/close.gif" alt="close" border="0" />
+       $messages.getString("portal.portlet.help.close")</p>
+    <p><img src="decorations/layout/images/movePortletUp.gif" alt="move up" border="0" />
+       $messages.getString("portal.portlet.help.movePortletUp")</p>
+    <p><img src="decorations/layout/images/movePortletDown.gif" alt="move down" border="0" />
+       $messages.getString("portal.portlet.help.movePortletDown")</p>
+    <p><img src="decorations/layout/images/movePortletLeft.gif" alt="move left" border="0" />
+       $messages.getString("portal.portlet.help.movePortletLeft")</p>
+    <p><img src="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 -->
+
+#parse($theme.pageLayoutDecoration.footer)

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -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


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,547 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+#*
+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)
+#set($namespace="${renderResponse.namespace}")
+#getBoolProperty($allowAddPortlet $rootDecorator "allow.add.portlet" true)
+
+#if($myFragment.getDecorator())
+  #set($decorator = $myFragment.getDecorator())
+#end
+
+#if($myFragment == $myPage.getRootFragment())
+  #set($isRoot=true)
+#end
+
+#if($request.getAttribute("editing") == true)
+  #set($editing = true)    
+  #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)  
+#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)
+
+<!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
+#if ($isRoot)
+  #parse($myFragment.decoration.header)
+   #set($layoutClass = "portal-nested-layout")
+#else
+  #defineLayoutObjects()
+   #set($layoutClass = "portal-layout")
+#end
+
+<div id="$renderResponse.namespace" class="${layoutClass} ${layoutClass}-${layoutType}">
+
+#if($editing)
+    #if($isRoot)
+      #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
+      #getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
+      #getBoolProperty($allowChangePageName $rootDecorator "allow.change.page.name" true)
+      #getBoolProperty($allowNavigatePage $rootDecorator "allow.navigate.page" true)
+      #getBoolProperty($allowDeletePage $rootDecorator "allow.delete.page" true)
+      #getBoolProperty($allowChangeFolderTheme $rootDecorator "allow.change.folder.theme" true)
+      #getBoolProperty($allowAddFolder $rootDecorator "allow.add.folder" true)
+      #getBoolProperty($allowChangeFolderName $rootDecorator "allow.change.folder.name" true)
+      #getBoolProperty($allowNavigateFolder $rootDecorator "allow.navigate.folder" true)
+      #getBoolProperty($allowDeleteFolder $rootDecorator "allow.delete.folder" true)
+    #else
+      #set($allowChangePageTheme=false)
+      #set($allowAddPage=false)
+      #set($allowChangePageName=false)
+      #set($allowNavigatePage=false)
+      #set($allowDeletePage=false)
+      #set($allowChangeFolderTheme=false)
+      #set($allowAddFolder=false)
+      #set($allowChangeFolderName=false)
+      #set($allowNavigateFolder=false)
+      #set($allowDeleteFolder=false)
+    #end
+
+    #getIntProperty($maxLayoutNesting $rootDecorator "max.layout.nesting" 2)
+    #if($request.getAttribute("fragmentNestingLevel") < $maxLayoutNesting)
+      #set($allowAddLayout=true)
+    #else
+      #set($allowAddLayout=false)
+    #end
+     
+    #getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
+
+      #set($form="f${renderResponse.namespace}")
+      #set($formAction = "$renderResponse.createActionURL()")
+      #set($submit = ".submit()")
+
+
+#* Preferences *#
+  <div id="${namespace}PreferenceWindow" style="z-index:10000;border-left:1px solid #999999;border-top:1px solid #999999;border-bottom:4px solid #999999;border-right:4px solid #999999;width:650px;height:450px;position:absolute;top:30px;left:30px;background-color:#efefde;">
+    <div style="z-index:10010;position:absolute;top:5px;left:10px;width:150px;height:380px;">
+      <span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.window.title")</span>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:10px;width:150px;height:380px;background-color:#ffffff;">
+<script language="JavaScript"><!--
+function ${namespace}UpdatePreference(id) {
+  if(id=="${namespace}PageProperties"){
+    document.getElementById("${namespace}PageProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.pageproperties.title")";
+  }else{
+    document.getElementById("${namespace}PageProperties").style.display="none";
+  }
+  if(id=="${namespace}AddPage"){
+    document.getElementById("${namespace}AddPage").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addpage.title")";
+  }else{
+    document.getElementById("${namespace}AddPage").style.display="none";
+  }
+  if(id=="${namespace}FolderProperties"){
+    document.getElementById("${namespace}FolderProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.folderproperties.title")";
+  }else{
+    document.getElementById("${namespace}FolderProperties").style.display="none";
+  }
+  if(id=="${namespace}AddFolder"){
+    document.getElementById("${namespace}AddFolder").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addfolder.title")";
+  }else{
+    document.getElementById("${namespace}AddFolder").style.display="none";
+  }
+  if(id=="${namespace}ChangeLayout"){
+    document.getElementById("${namespace}ChangeLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changelayout.title")";
+  }else{
+    document.getElementById("${namespace}ChangeLayout").style.display="none";
+  }
+  if(id=="${namespace}AddLayout"){
+    document.getElementById("${namespace}AddLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addlayout.title")";
+  }else{
+    document.getElementById("${namespace}AddLayout").style.display="none";
+  }
+  if(id=="${namespace}ChangeTheme"){
+    document.getElementById("${namespace}ChangeTheme").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changetheme.title")";
+  }else{
+    document.getElementById("${namespace}ChangeTheme").style.display="none";
+  }
+}
+function ${namespace}HidePreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="none";
+    document.getElementById("${namespace}PreferenceState").value="hide";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="inline";
+}
+function ${namespace}ShowPreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="block";
+    document.getElementById("${namespace}PreferenceState").value="show";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="none";
+}
+// --></script>
+#* Menu *#
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}PageProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.pageproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddPage');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addpage.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}FolderProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.folderproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddFolder');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addfolder.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changelayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addlayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeTheme');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changetheme.title")</span></a>
+      </div>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:170px;width:470px;height:380px;background-color:#ffffff;">
+      <div style="z-index:10020;width:450px;height:20px;vertical-align:middle;border-bottom:1px solid #999999;margin:5px;padding-left:5px;">
+        <span id="${namespace}PreferenceTitle" style="font-family:sans-serif;font-size:11pt;">Title</span>
+      </div>
+
+      <form name="$form" action="$formAction" method='post'>
+        <input id="${namespace}PreferenceName" type="hidden" name="preferenceName" value="${preferenceName}"/>
+        <input id="${namespace}PreferenceState" type="hidden" name="preferenceState" value="${preferenceState}"/>
+
+#* Page Properties *#
+#if($allowChangePageName||$allowNavigatePage||$allowDeletePage)
+      <div id="${namespace}PageProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangePageName)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsPageShortTitle'/>
+            </div>
+<!-- TODO:Locale -->
+            <div>
+              <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigatePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.position")</legend>
+          <div>
+            <label>$messages.getString("portal.page.editing.pagenavigation")</label>
+            <input id="move-page-left" type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" />
+            <input id="move-page-right" type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeletePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.delete")</legend>
+          <div>
+            <label for="deletepage">$messages.getString("portal.page.editing.deleteThisPage")</label>
+            <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" onclick="if(window.confirm('$messages.getString("portal.page.editing.confirmDeleteThisPage")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Page *#
+#if($allowAddPage)
+      <div id="${namespace}AddPage" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsNewPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsNewPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsNewPageShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Folder Properties *#
+#if($allowChangeFolderName||$allowNavigateFolder||$allowDeleteFolder)
+      <div id="${namespace}FolderProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangeFolderName)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigateFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.position")</legend>
+          <div>
+            <label>$messages.getString("portal.folder.editing.foldernavigation")</label>
+            <input id="move-folder-left" type="submit" name="jsMoveFolderLeft" value="$messages.getString("portal.folder.editing.moveFolderLeft")" />
+            <input id="move-folder-right" type="submit" name="jsMoveFolderRight" value="$messages.getString("portal.folder.editing.moveFolderRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeleteFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.delete")</legend>
+          <div>
+            <label for="deletefolder">$messages.getString("portal.folder.editing.deleteThisFolder")</label>
+            <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")" onclick="if(window.confirm('$messages.getString("portal.folder.editing.confirmDeleteThisFolder")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Folder *#
+#if($allowAddFolder)
+      <div id="${namespace}AddFolder" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsNewFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsNewFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsNewFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Change Layout *#
+#if($allowChangeLayout)
+      <div id="${namespace}ChangeLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Add Layout *#
+#if($allowAddLayout)
+      <div id="${namespace}AddLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Change Theme *#
+#if ($allowChangePageTheme||$allowChangePortletDecorator)
+      <div id="${namespace}ChangeTheme" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if ($allowChangePageTheme)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.theme")</legend>
+          <select id='theme' name='theme' onChange="$form$submit">
+            #foreach($td in $decorationFactory.getPageDecorations($rc))
+            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
+            #end
+          </select>   
+        </fieldset>
+<br/>
+#end
+#getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true)
+####### Take all fragments and apply style	  
+#if($allowChangePortletDecorator)          
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.portlet.decorator")</legend>
+          <input type="hidden" name="fragment" value="$f.id">
+          <input type="hidden" name="move" value="">
+          <input type="hidden" name="remove" value="">
+          <select id="decorators" name="decorators">
+            <option value=''>
+        	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+        	    #end
+          </select>
+          <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+        </fieldset>
+#end	   
+      </div>
+#end
+
+<script language="JavaScript"><!--
+var prefName=document.getElementById("${namespace}PreferenceName").value;
+if(prefName==""){
+  prefName="${namespace}PageProperties";
+}
+${namespace}UpdatePreference(prefName);
+var prefState=document.getElementById("${namespace}PreferenceState").value;
+if(prefState=="show"){
+  ${namespace}ShowPreferenceWindow();
+}else{
+  ${namespace}HidePreferenceWindow();
+}
+// --></script>
+
+      </form>
+
+    </div>
+    <div style="z-index:10010;position:absolute;top:415px;left:10px;width:630px;height:30px;text-align:right;">
+      <input type="button" onclick="${namespace}HidePreferenceWindow();" value="$messages.getString("portal.preference.window.close")" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+#set($_actions = $layoutDecoration.actions)
+    #if($_actions.size() >0)
+    #foreach ($_action in $_actions)
+      <input type="button" onclick="location.href='${_action.Action}'" value="${_action.Name}" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+    #end
+    #end
+ </div>
+
+    </div>
+  </div>
+
+## end edit mode
+#end
+
+#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}" 
+	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
+	     style="float:${columnFloat}; width:${columnWidth};">
+	     
+	  #foreach($f in $column)  	     
+      ## Set up coordinates for this fragment
+      #set($coords = $columnLayout.getCoordinate($f))	  
+      #set($col = $coords.x)
+      #set($lastRow = $columnLayout.getLastRowNumber($col))
+      #set($row = $coords.y)
+			
+      ## get the decorated Portlet content
+		  <div class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+		  
+		    ## editing block
+		    #if($editing)
+		      <div class="portlet-edit-bar">
+            #set ($dcnt = $dcnt + 1)   
+            <form name="$form$dcnt" action="$formAction" method='post'>
+              <input type="hidden" name="fragment" value="$f.id">
+              <input type="hidden" name="move" value="">
+              <input type="hidden" name="remove" value="">
+              #if($f.type == "portlet")
+                #set($fragmentType="Portlet")
+                #if($allowChangePortletDecorator)
+                  <select id='decorator' name='decorator' onChange="$form$dcnt$submit">
+                    <option value=''>
+                    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+                    #end
+                  </select>
+                #end
+              #else
+                #set($fragmentType="Layout")
+              #end              
+			        ## Move portlet left
+			        #if($lastColumn > 0 && $col > 0)            
+                <a href="#" onClick="${form}${dcnt}.move.value='3';$form$dcnt$submit;return false;" class="move-portlet-left">
+                  <img src="#GetPageResource('images/movePortletLeft.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Left")"/>
+                </a>
+			        #end
+			        ## Move portlet up	
+			        #if($row > 0)			   
+                <a href="#" onClick="${form}${dcnt}.move.value='1';$form$dcnt$submit;return false;" class="move-portlet-up">
+                  <img src="#GetPageResource('images/movePortletUp.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Up")"/>
+                </a>
+			        #end			 
+			        ## Remove portlet from page
+              <a href="#" onClick="${form}${dcnt}.remove.value='y';$form$dcnt$submit;return false;" class="remove-portlet-from-apge">
+                <img src="#GetPageResource('images/close.gif')" border="0" title="$messages.getString("portal.page.editing.remove${fragmentType}")"/>
+              </a>			 
+			        ## Move portlet down
+              #if($row < $lastRow)						
+                <a href="#" onClick="${form}${dcnt}.move.value='2';$form$dcnt$submit;return false;" class="move-portlet-down">
+                  <img src="#GetPageResource('images/movePortletDown.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Down")"/>
+                </a>
+			        #end			 
+			        ## Move portlet right
+              #if($lastColumn > 0 && $col < $lastColumn)
+                <a href="#" onClick="${form}${dcnt}.move.value='4';$form$dcnt$submit;return false;" class="move-portlet-right">
+                  <img src="#GetPageResource('images/movePortletRight.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Right")"/>
+                </a>
+			        #end
+            </form>			 
+		      </div>
+		    #end
+		   
+		    ## Now get the real content
+	 	 	  $jetspeed.setCurrentFragment($f)	   
+		    #if($f.type == "portlet")
+			    #parse($f.decoration.template)
+		    #else		
+			    $f.renderedContent			
+		    #end
+		  </div>
+		#end
+	</div>
+	#set ($columnIndex = $columnIndex + 1)  
+#end
+  
+</div>  
+  
+<br style="clear:both;"/>
+
+#if ($isRoot)
+  <form name='portletform' action="" method="post">
+    <input type='hidden' name='portlets'/>
+    <input type='hidden' name='page' value='$myPage'/>
+  </form>
+  #parse($myFragment.decoration.footer)
+#end
+  

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,19 @@
+# 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
+template.type=velocity
+template.extension=.vm
+


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -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: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout-help.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout-help.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout-help.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="Shift_JIS"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
+#*
+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 -->
+
+<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="decorations/images/view.gif" alt="view" border="0" /> $messages.getString("portal.page.help.view")</p>
+    <p><img src="decorations/images/help.gif" alt="help" border="0" /> $messages.getString("portal.page.help.help")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" /> $messages.getString("portal.page.help.edit")</p>
+    <p><img src="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="decorations/images/minimized.gif" alt="minimize" border="0" />
+       $messages.getString("portal.portlet.help.minimize")</p>
+    <p><img src="decorations/images/maximized.gif" alt="maximize" border="0" />
+       $messages.getString("portal.portlet.help.maximize")</p>
+    <p><img src="decorations/images/restore.gif" alt="restore" border="0" />
+       $messages.getString("portal.portlet.help.restore")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" />
+       $messages.getString("portal.portlet.help.edit")</p>
+    <p><img src="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="decorations/images/close.gif" alt="close" border="0" />
+       $messages.getString("portal.portlet.help.close")</p>
+    <p><img src="decorations/layout/images/movePortletUp.gif" alt="move up" border="0" />
+       $messages.getString("portal.portlet.help.movePortletUp")</p>
+    <p><img src="decorations/layout/images/movePortletDown.gif" alt="move down" border="0" />
+       $messages.getString("portal.portlet.help.movePortletDown")</p>
+    <p><img src="decorations/layout/images/movePortletLeft.gif" alt="move left" border="0" />
+       $messages.getString("portal.portlet.help.movePortletLeft")</p>
+    <p><img src="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 -->
+
+#parse($theme.pageLayoutDecoration.footer)

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -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


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="Shift_JIS"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
+#*
+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)
+#set($namespace="${renderResponse.namespace}")
+#getBoolProperty($allowAddPortlet $rootDecorator "allow.add.portlet" true)
+#if($myFragment.getDecorator())#set($decorator = $myFragment.getDecorator())#end
+#if($myFragment == $myPage.getRootFragment())#set($isRoot=true)#end
+#if($request.getAttribute("editing") == true)#set($editing = true)#set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)#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)
+<!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
+#if ($isRoot)#parse($myFragment.decoration.header)#set($layoutClass = "portal-nested-layout")
+#else#defineLayoutObjects()#set($layoutClass = "portal-layout")#end
+<div id="$renderResponse.namespace" class="${layoutClass} ${layoutClass}-${layoutType}">
+#if($editing)
+#if($isRoot)
+#getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
+#getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
+#getBoolProperty($allowChangePageName $rootDecorator "allow.change.page.name" true)
+#getBoolProperty($allowNavigatePage $rootDecorator "allow.navigate.page" true)
+#getBoolProperty($allowDeletePage $rootDecorator "allow.delete.page" true)
+#getBoolProperty($allowChangeFolderTheme $rootDecorator "allow.change.folder.theme" true)
+#getBoolProperty($allowAddFolder $rootDecorator "allow.add.folder" true)
+#getBoolProperty($allowChangeFolderName $rootDecorator "allow.change.folder.name" true)
+#getBoolProperty($allowNavigateFolder $rootDecorator "allow.navigate.folder" true)
+#getBoolProperty($allowDeleteFolder $rootDecorator "allow.delete.folder" true)
+#else
+#set($allowChangePageTheme=false)
+#set($allowAddPage=false)
+#set($allowChangePageName=false)
+#set($allowNavigatePage=false)
+#set($allowDeletePage=false)
+#set($allowChangeFolderTheme=false)
+#set($allowAddFolder=false)
+#set($allowChangeFolderName=false)
+#set($allowNavigateFolder=false)
+#set($allowDeleteFolder=false)
+#end
+
+#getIntProperty($maxLayoutNesting $rootDecorator "max.layout.nesting" 2)
+#if($request.getAttribute("fragmentNestingLevel") < $maxLayoutNesting)
+#set($allowAddLayout=true)
+#else
+#set($allowAddLayout=false)
+#end
+     
+#getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
+
+#set($form="f${renderResponse.namespace}")
+#set($formAction = "$renderResponse.createActionURL()")
+#set($submit = ".submit()")
+
+#* Preferences *#
+<div id="${namespace}PreferenceWindow">
+<div>
+      <form name="$form" action="$formAction" method='post'>
+#* Page Properties *#
+#if($allowChangePageName||$allowNavigatePage||$allowDeletePage)
+      <div id="${namespace}PageProperties">
+#if($allowChangePageName)
+        <div>
+          <div>$messages.getString("portal.page.editing.pageConfiguration")</div>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsPageShortTitle'/>
+            </div>
+<!-- TODO:Locale -->
+            <div>
+              <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
+            </div>
+          </div>
+        </div>
+#end
+<br/>
+#if($allowNavigatePage)
+        <div>
+          <div>$messages.getString("portal.page.position")</div>
+          <div>
+            <label>$messages.getString("portal.page.editing.pagenavigation")</label>
+            <input id="move-page-left" type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" />
+            <input id="move-page-right" type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" />
+          </div>
+        </div>
+#end
+<br/>
+#if($allowDeletePage)
+        <div>
+          <div>$messages.getString("portal.page.delete")</div>
+          <div>
+            <label for="deletepage">$messages.getString("portal.page.editing.deleteThisPage")</label>
+            <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" onclick="if(window.confirm('$messages.getString("portal.page.editing.confirmDeleteThisPage")')){return true;}return false;"/>
+          </div>
+        </div>
+#end
+      </div>
+#end
+
+#* Add Page *#
+#if($allowAddPage)
+      <div id="${namespace}AddPage" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <div>
+          <div>$messages.getString("portal.page.editing.pageConfiguration")</div>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsNewPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsNewPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsNewPageShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
+            </div>
+          </div>
+        </div>
+      </div>
+#end
+
+#* Folder Properties *#
+#if($allowChangeFolderName||$allowNavigateFolder||$allowDeleteFolder)
+      <div id="${namespace}FolderProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangeFolderName)
+        <div>
+          <div>$messages.getString("portal.folder.editing.folderConfiguration")</div>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
+            </div>
+          </div>
+        </div>
+#end
+<br/>
+#if($allowNavigateFolder)
+        <div>
+          <div>$messages.getString("portal.folder.position")</div>
+          <div>
+            <label>$messages.getString("portal.folder.editing.foldernavigation")</label>
+            <input id="move-folder-left" type="submit" name="jsMoveFolderLeft" value="$messages.getString("portal.folder.editing.moveFolderLeft")" />
+            <input id="move-folder-right" type="submit" name="jsMoveFolderRight" value="$messages.getString("portal.folder.editing.moveFolderRight")" />
+          </div>
+        </div>
+#end
+<br/>
+#if($allowDeleteFolder)
+        <div>
+          <div>$messages.getString("portal.folder.delete")</div>
+          <div>
+            <label for="deletefolder">$messages.getString("portal.folder.editing.deleteThisFolder")</label>
+            <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")" onclick="if(window.confirm('$messages.getString("portal.folder.editing.confirmDeleteThisFolder")')){return true;}return false;"/>
+          </div>
+        </div>
+#end
+      </div>
+#end
+
+#* Add Folder *#
+#if($allowAddFolder)
+      <div id="${namespace}AddFolder" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <div>
+          <div>$messages.getString("portal.folder.editing.folderConfiguration")</div>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsNewFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsNewFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsNewFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")"/>
+            </div>
+          </div>
+        </div>
+      </div>
+#end
+
+#* Change Layout *#
+#if($allowChangeLayout)
+      <div id="${namespace}ChangeLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <div>
+          <div>$messages.getString("portal.page.editing.layout")</div>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
+        </div>
+      </div>
+#end    
+
+#* Add Layout *#
+#if($allowAddLayout)
+      <div id="${namespace}AddLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <div>
+          <div>$messages.getString("portal.page.editing.layout")</div>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
+        </div>
+      </div>
+#end    
+
+#* Change Theme *#
+#if ($allowChangePageTheme||$allowChangePortletDecorator)
+      <div id="${namespace}ChangeTheme" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if ($allowChangePageTheme)
+        <div>
+          <div>$messages.getString("portal.page.editing.theme")</div>
+          <select id='theme' name='theme' onChange="$form$submit">
+            #foreach($td in $decorationFactory.getPageDecorations($rc))
+            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
+            #end
+          </select>   
+        </div>
+<br/>
+#end
+#getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true)
+####### Take all fragments and apply style	  
+#if($allowChangePortletDecorator)          
+        <div>
+          <div>$messages.getString("portal.page.editing.portlet.decorator")</div>
+          <input type="hidden" name="fragment" value="$f.id">
+          <input type="hidden" name="move" value="">
+          <input type="hidden" name="remove" value="">
+          <select id="decorators" name="decorators">
+            <option value=''>
+        	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+        	    #end
+          </select>
+          <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+        </div>
+#end	   
+      </div>
+#end
+
+      </form>
+
+    </div>
+<div>
+#set($_actions = $layoutDecoration.actions)
+#if($_actions.size() >0)
+#foreach ($_action in $_actions)
+<input type="button" onclick="location.href='${_action.Action}'" value="${_action.Name}"/>
+#end
+#end
+</div>
+
+</div>
+
+## end edit mode
+#end
+
+#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}" class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}">
+	     
+	  #foreach($f in $column)  	     
+      ## Set up coordinates for this fragment
+      #set($coords = $columnLayout.getCoordinate($f))	  
+      #set($col = $coords.x)
+      #set($lastRow = $columnLayout.getLastRowNumber($col))
+      #set($row = $coords.y)
+			
+      ## get the decorated Portlet content
+		  <div class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+		  
+		    ## editing block
+		    #if($editing)
+		      <div class="portlet-edit-bar">
+            #set ($dcnt = $dcnt + 1)   
+            <form name="$form$dcnt" action="$formAction" method='post'>
+              <input type="hidden" name="fragment" value="$f.id">
+              <input type="hidden" name="move" value="">
+              <input type="hidden" name="remove" value="">
+              #if($f.type == "portlet")
+                #set($fragmentType="Portlet")
+                #if($allowChangePortletDecorator)
+                  <select id='decorator' name='decorator' onChange="$form$dcnt$submit">
+                    <option value=''>
+                    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+                    #end
+                  </select>
+                #end
+              #else
+                #set($fragmentType="Layout")
+              #end              
+			        ## Move portlet left
+			        #if($lastColumn > 0 && $col > 0)            
+                <a href="#" onClick="${form}${dcnt}.move.value='3';$form$dcnt$submit;return false;" class="move-portlet-left">
+                  <img src="#GetPageResource('images/movePortletLeft.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Left")"/>
+                </a>
+			        #end
+			        ## Move portlet up	
+			        #if($row > 0)			   
+                <a href="#" onClick="${form}${dcnt}.move.value='1';$form$dcnt$submit;return false;" class="move-portlet-up">
+                  <img src="#GetPageResource('images/movePortletUp.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Up")"/>
+                </a>
+			        #end			 
+			        ## Remove portlet from page
+              <a href="#" onClick="${form}${dcnt}.remove.value='y';$form$dcnt$submit;return false;" class="remove-portlet-from-apge">
+                <img src="#GetPageResource('images/close.gif')" border="0" title="$messages.getString("portal.page.editing.remove${fragmentType}")"/>
+              </a>			 
+			        ## Move portlet down
+              #if($row < $lastRow)						
+                <a href="#" onClick="${form}${dcnt}.move.value='2';$form$dcnt$submit;return false;" class="move-portlet-down">
+                  <img src="#GetPageResource('images/movePortletDown.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Down")"/>
+                </a>
+			        #end			 
+			        ## Move portlet right
+              #if($lastColumn > 0 && $col < $lastColumn)
+                <a href="#" onClick="${form}${dcnt}.move.value='4';$form$dcnt$submit;return false;" class="move-portlet-right">
+                  <img src="#GetPageResource('images/movePortletRight.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Right")"/>
+                </a>
+			        #end
+            </form>			 
+		      </div>
+		    #end
+		   
+		    ## Now get the real content
+	 	 	  $jetspeed.setCurrentFragment($f)	   
+		    #if($f.type == "portlet")
+			    #parse($f.decoration.template)
+		    #else		
+			    $f.renderedContent			
+		    #end
+		  </div>
+		#end
+	</div>
+	#set ($columnIndex = $columnIndex + 1)  
+#end
+  
+</div>  
+  
+
+#if ($isRoot)
+  <form name='portletform' action="" method="post">
+    <input type='hidden' name='portlets'/>
+    <input type='hidden' name='page' value='$myPage'/>
+  </form>
+  #parse($myFragment.decoration.footer)
+#end
+  

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,19 @@
+# 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
+template.type=velocity
+template.extension=.vm
+


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -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: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout-help.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout-help.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout-help.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,67 @@
+#*
+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 -->
+
+<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="decorations/images/view.gif" alt="view" border="0" /> $messages.getString("portal.page.help.view")</p>
+    <p><img src="decorations/images/help.gif" alt="help" border="0" /> $messages.getString("portal.page.help.help")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" /> $messages.getString("portal.page.help.edit")</p>
+    <p><img src="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="decorations/images/minimized.gif" alt="minimize" border="0" />
+       $messages.getString("portal.portlet.help.minimize")</p>
+    <p><img src="decorations/images/maximized.gif" alt="maximize" border="0" />
+       $messages.getString("portal.portlet.help.maximize")</p>
+    <p><img src="decorations/images/restore.gif" alt="restore" border="0" />
+       $messages.getString("portal.portlet.help.restore")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" />
+       $messages.getString("portal.portlet.help.edit")</p>
+    <p><img src="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="decorations/images/close.gif" alt="close" border="0" />
+       $messages.getString("portal.portlet.help.close")</p>
+    <p><img src="decorations/layout/images/movePortletUp.gif" alt="move up" border="0" />
+       $messages.getString("portal.portlet.help.movePortletUp")</p>
+    <p><img src="decorations/layout/images/movePortletDown.gif" alt="move down" border="0" />
+       $messages.getString("portal.portlet.help.movePortletDown")</p>
+    <p><img src="decorations/layout/images/movePortletLeft.gif" alt="move left" border="0" />
+       $messages.getString("portal.portlet.help.movePortletLeft")</p>
+    <p><img src="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 -->
+
+#parse($theme.pageLayoutDecoration.footer)

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -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


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,547 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+#*
+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)
+#set($namespace="${renderResponse.namespace}")
+#getBoolProperty($allowAddPortlet $rootDecorator "allow.add.portlet" true)
+
+#if($myFragment.getDecorator())
+  #set($decorator = $myFragment.getDecorator())
+#end
+
+#if($myFragment == $myPage.getRootFragment())
+  #set($isRoot=true)
+#end
+
+#if($request.getAttribute("editing") == true)
+  #set($editing = true)    
+  #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)  
+#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)
+
+<!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
+#if ($isRoot)
+  #parse($myFragment.decoration.header)
+   #set($layoutClass = "portal-nested-layout")
+#else
+  #defineLayoutObjects()
+   #set($layoutClass = "portal-layout")
+#end
+
+<div id="$renderResponse.namespace" class="${layoutClass} ${layoutClass}-${layoutType}">
+
+#if($editing)
+    #if($isRoot)
+      #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
+      #getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
+      #getBoolProperty($allowChangePageName $rootDecorator "allow.change.page.name" true)
+      #getBoolProperty($allowNavigatePage $rootDecorator "allow.navigate.page" true)
+      #getBoolProperty($allowDeletePage $rootDecorator "allow.delete.page" true)
+      #getBoolProperty($allowChangeFolderTheme $rootDecorator "allow.change.folder.theme" true)
+      #getBoolProperty($allowAddFolder $rootDecorator "allow.add.folder" true)
+      #getBoolProperty($allowChangeFolderName $rootDecorator "allow.change.folder.name" true)
+      #getBoolProperty($allowNavigateFolder $rootDecorator "allow.navigate.folder" true)
+      #getBoolProperty($allowDeleteFolder $rootDecorator "allow.delete.folder" true)
+    #else
+      #set($allowChangePageTheme=false)
+      #set($allowAddPage=false)
+      #set($allowChangePageName=false)
+      #set($allowNavigatePage=false)
+      #set($allowDeletePage=false)
+      #set($allowChangeFolderTheme=false)
+      #set($allowAddFolder=false)
+      #set($allowChangeFolderName=false)
+      #set($allowNavigateFolder=false)
+      #set($allowDeleteFolder=false)
+    #end
+
+    #getIntProperty($maxLayoutNesting $rootDecorator "max.layout.nesting" 2)
+    #if($request.getAttribute("fragmentNestingLevel") < $maxLayoutNesting)
+      #set($allowAddLayout=true)
+    #else
+      #set($allowAddLayout=false)
+    #end
+     
+    #getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
+
+      #set($form="f${renderResponse.namespace}")
+      #set($formAction = "$renderResponse.createActionURL()")
+      #set($submit = ".submit()")
+
+
+#* Preferences *#
+  <div id="${namespace}PreferenceWindow" style="z-index:10000;border-left:1px solid #999999;border-top:1px solid #999999;border-bottom:4px solid #999999;border-right:4px solid #999999;width:650px;height:450px;position:absolute;top:30px;left:30px;background-color:#efefde;">
+    <div style="z-index:10010;position:absolute;top:5px;left:10px;width:150px;height:380px;">
+      <span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.window.title")</span>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:10px;width:150px;height:380px;background-color:#ffffff;">
+<script language="JavaScript"><!--
+function ${namespace}UpdatePreference(id) {
+  if(id=="${namespace}PageProperties"){
+    document.getElementById("${namespace}PageProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.pageproperties.title")";
+  }else{
+    document.getElementById("${namespace}PageProperties").style.display="none";
+  }
+  if(id=="${namespace}AddPage"){
+    document.getElementById("${namespace}AddPage").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addpage.title")";
+  }else{
+    document.getElementById("${namespace}AddPage").style.display="none";
+  }
+  if(id=="${namespace}FolderProperties"){
+    document.getElementById("${namespace}FolderProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.folderproperties.title")";
+  }else{
+    document.getElementById("${namespace}FolderProperties").style.display="none";
+  }
+  if(id=="${namespace}AddFolder"){
+    document.getElementById("${namespace}AddFolder").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addfolder.title")";
+  }else{
+    document.getElementById("${namespace}AddFolder").style.display="none";
+  }
+  if(id=="${namespace}ChangeLayout"){
+    document.getElementById("${namespace}ChangeLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changelayout.title")";
+  }else{
+    document.getElementById("${namespace}ChangeLayout").style.display="none";
+  }
+  if(id=="${namespace}AddLayout"){
+    document.getElementById("${namespace}AddLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addlayout.title")";
+  }else{
+    document.getElementById("${namespace}AddLayout").style.display="none";
+  }
+  if(id=="${namespace}ChangeTheme"){
+    document.getElementById("${namespace}ChangeTheme").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changetheme.title")";
+  }else{
+    document.getElementById("${namespace}ChangeTheme").style.display="none";
+  }
+}
+function ${namespace}HidePreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="none";
+    document.getElementById("${namespace}PreferenceState").value="hide";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="inline";
+}
+function ${namespace}ShowPreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="block";
+    document.getElementById("${namespace}PreferenceState").value="show";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="none";
+}
+// --></script>
+#* Menu *#
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}PageProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.pageproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddPage');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addpage.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}FolderProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.folderproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddFolder');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addfolder.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changelayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addlayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeTheme');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changetheme.title")</span></a>
+      </div>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:170px;width:470px;height:380px;background-color:#ffffff;">
+      <div style="z-index:10020;width:450px;height:20px;vertical-align:middle;border-bottom:1px solid #999999;margin:5px;padding-left:5px;">
+        <span id="${namespace}PreferenceTitle" style="font-family:sans-serif;font-size:11pt;">Title</span>
+      </div>
+
+      <form name="$form" action="$formAction" method='post'>
+        <input id="${namespace}PreferenceName" type="hidden" name="preferenceName" value="${preferenceName}"/>
+        <input id="${namespace}PreferenceState" type="hidden" name="preferenceState" value="${preferenceState}"/>
+
+#* Page Properties *#
+#if($allowChangePageName||$allowNavigatePage||$allowDeletePage)
+      <div id="${namespace}PageProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangePageName)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsPageShortTitle'/>
+            </div>
+<!-- TODO:Locale -->
+            <div>
+              <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigatePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.position")</legend>
+          <div>
+            <label>$messages.getString("portal.page.editing.pagenavigation")</label>
+            <input id="move-page-left" type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" />
+            <input id="move-page-right" type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeletePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.delete")</legend>
+          <div>
+            <label for="deletepage">$messages.getString("portal.page.editing.deleteThisPage")</label>
+            <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" onclick="if(window.confirm('$messages.getString("portal.page.editing.confirmDeleteThisPage")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Page *#
+#if($allowAddPage)
+      <div id="${namespace}AddPage" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsNewPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsNewPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsNewPageShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Folder Properties *#
+#if($allowChangeFolderName||$allowNavigateFolder||$allowDeleteFolder)
+      <div id="${namespace}FolderProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangeFolderName)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigateFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.position")</legend>
+          <div>
+            <label>$messages.getString("portal.folder.editing.foldernavigation")</label>
+            <input id="move-folder-left" type="submit" name="jsMoveFolderLeft" value="$messages.getString("portal.folder.editing.moveFolderLeft")" />
+            <input id="move-folder-right" type="submit" name="jsMoveFolderRight" value="$messages.getString("portal.folder.editing.moveFolderRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeleteFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.delete")</legend>
+          <div>
+            <label for="deletefolder">$messages.getString("portal.folder.editing.deleteThisFolder")</label>
+            <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")" onclick="if(window.confirm('$messages.getString("portal.folder.editing.confirmDeleteThisFolder")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Folder *#
+#if($allowAddFolder)
+      <div id="${namespace}AddFolder" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsNewFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsNewFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsNewFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Change Layout *#
+#if($allowChangeLayout)
+      <div id="${namespace}ChangeLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Add Layout *#
+#if($allowAddLayout)
+      <div id="${namespace}AddLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Change Theme *#
+#if ($allowChangePageTheme||$allowChangePortletDecorator)
+      <div id="${namespace}ChangeTheme" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if ($allowChangePageTheme)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.theme")</legend>
+          <select id='theme' name='theme' onChange="$form$submit">
+            #foreach($td in $decorationFactory.getPageDecorations($rc))
+            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
+            #end
+          </select>   
+        </fieldset>
+<br/>
+#end
+#getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true)
+####### Take all fragments and apply style	  
+#if($allowChangePortletDecorator)          
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.portlet.decorator")</legend>
+          <input type="hidden" name="fragment" value="$f.id">
+          <input type="hidden" name="move" value="">
+          <input type="hidden" name="remove" value="">
+          <select id="decorators" name="decorators">
+            <option value=''>
+        	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+        	    #end
+          </select>
+          <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+        </fieldset>
+#end	   
+      </div>
+#end
+
+<script language="JavaScript"><!--
+var prefName=document.getElementById("${namespace}PreferenceName").value;
+if(prefName==""){
+  prefName="${namespace}PageProperties";
+}
+${namespace}UpdatePreference(prefName);
+var prefState=document.getElementById("${namespace}PreferenceState").value;
+if(prefState=="show"){
+  ${namespace}ShowPreferenceWindow();
+}else{
+  ${namespace}HidePreferenceWindow();
+}
+// --></script>
+
+      </form>
+
+    </div>
+    <div style="z-index:10010;position:absolute;top:415px;left:10px;width:630px;height:30px;text-align:right;">
+      <input type="button" onclick="${namespace}HidePreferenceWindow();" value="$messages.getString("portal.preference.window.close")" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+#set($_actions = $layoutDecoration.actions)
+    #if($_actions.size() >0)
+    #foreach ($_action in $_actions)
+      <input type="button" onclick="location.href='${_action.Action}'" value="${_action.Name}" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+    #end
+    #end
+ </div>
+
+    </div>
+  </div>
+
+## end edit mode
+#end
+
+#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}" 
+	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
+	     style="float:${columnFloat}; width:${columnWidth};">
+	     
+	  #foreach($f in $column)  	     
+      ## Set up coordinates for this fragment
+      #set($coords = $columnLayout.getCoordinate($f))	  
+      #set($col = $coords.x)
+      #set($lastRow = $columnLayout.getLastRowNumber($col))
+      #set($row = $coords.y)
+			
+      ## get the decorated Portlet content
+		  <div class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+		  
+		    ## editing block
+		    #if($editing)
+		      <div class="portlet-edit-bar">
+            #set ($dcnt = $dcnt + 1)   
+            <form name="$form$dcnt" action="$formAction" method='post'>
+              <input type="hidden" name="fragment" value="$f.id">
+              <input type="hidden" name="move" value="">
+              <input type="hidden" name="remove" value="">
+              #if($f.type == "portlet")
+                #set($fragmentType="Portlet")
+                #if($allowChangePortletDecorator)
+                  <select id='decorator' name='decorator' onChange="$form$dcnt$submit">
+                    <option value=''>
+                    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+                    #end
+                  </select>
+                #end
+              #else
+                #set($fragmentType="Layout")
+              #end              
+			        ## Move portlet left
+			        #if($lastColumn > 0 && $col > 0)            
+                <a href="#" onClick="${form}${dcnt}.move.value='3';$form$dcnt$submit;return false;" class="move-portlet-left">
+                  <img src="#GetPageResource('images/movePortletLeft.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Left")"/>
+                </a>
+			        #end
+			        ## Move portlet up	
+			        #if($row > 0)			   
+                <a href="#" onClick="${form}${dcnt}.move.value='1';$form$dcnt$submit;return false;" class="move-portlet-up">
+                  <img src="#GetPageResource('images/movePortletUp.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Up")"/>
+                </a>
+			        #end			 
+			        ## Remove portlet from page
+              <a href="#" onClick="${form}${dcnt}.remove.value='y';$form$dcnt$submit;return false;" class="remove-portlet-from-apge">
+                <img src="#GetPageResource('images/close.gif')" border="0" title="$messages.getString("portal.page.editing.remove${fragmentType}")"/>
+              </a>			 
+			        ## Move portlet down
+              #if($row < $lastRow)						
+                <a href="#" onClick="${form}${dcnt}.move.value='2';$form$dcnt$submit;return false;" class="move-portlet-down">
+                  <img src="#GetPageResource('images/movePortletDown.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Down")"/>
+                </a>
+			        #end			 
+			        ## Move portlet right
+              #if($lastColumn > 0 && $col < $lastColumn)
+                <a href="#" onClick="${form}${dcnt}.move.value='4';$form$dcnt$submit;return false;" class="move-portlet-right">
+                  <img src="#GetPageResource('images/movePortletRight.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Right")"/>
+                </a>
+			        #end
+            </form>			 
+		      </div>
+		    #end
+		   
+		    ## Now get the real content
+	 	 	  $jetspeed.setCurrentFragment($f)	   
+		    #if($f.type == "portlet")
+			    #parse($f.decoration.template)
+		    #else		
+			    $f.renderedContent			
+		    #end
+		  </div>
+		#end
+	</div>
+	#set ($columnIndex = $columnIndex + 1)  
+#end
+  
+</div>  
+  
+<br style="clear:both;"/>
+
+#if ($isRoot)
+  <form name='portletform' action="" method="post">
+    <input type='hidden' name='portlets'/>
+    <input type='hidden' name='page' value='$myPage'/>
+  </form>
+  #parse($myFragment.decoration.footer)
+#end
+  

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,19 @@
+# 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
+template.type=velocity
+template.extension=.vm
+


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -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: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout-help.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout-help.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout-help.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,67 @@
+#*
+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 -->
+
+<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="decorations/images/view.gif" alt="view" border="0" /> $messages.getString("portal.page.help.view")</p>
+    <p><img src="decorations/images/help.gif" alt="help" border="0" /> $messages.getString("portal.page.help.help")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" /> $messages.getString("portal.page.help.edit")</p>
+    <p><img src="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="decorations/images/minimized.gif" alt="minimize" border="0" />
+       $messages.getString("portal.portlet.help.minimize")</p>
+    <p><img src="decorations/images/maximized.gif" alt="maximize" border="0" />
+       $messages.getString("portal.portlet.help.maximize")</p>
+    <p><img src="decorations/images/restore.gif" alt="restore" border="0" />
+       $messages.getString("portal.portlet.help.restore")</p>
+    <p><img src="decorations/images/edit.gif" alt="edit" border="0" />
+       $messages.getString("portal.portlet.help.edit")</p>
+    <p><img src="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="decorations/images/close.gif" alt="close" border="0" />
+       $messages.getString("portal.portlet.help.close")</p>
+    <p><img src="decorations/layout/images/movePortletUp.gif" alt="move up" border="0" />
+       $messages.getString("portal.portlet.help.movePortletUp")</p>
+    <p><img src="decorations/layout/images/movePortletDown.gif" alt="move down" border="0" />
+       $messages.getString("portal.portlet.help.movePortletDown")</p>
+    <p><img src="decorations/layout/images/movePortletLeft.gif" alt="move left" border="0" />
+       $messages.getString("portal.portlet.help.movePortletLeft")</p>
+    <p><img src="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 -->
+
+#parse($theme.pageLayoutDecoration.footer)

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -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


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,547 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+#*
+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)
+#set($namespace="${renderResponse.namespace}")
+#getBoolProperty($allowAddPortlet $rootDecorator "allow.add.portlet" true)
+
+#if($myFragment.getDecorator())
+  #set($decorator = $myFragment.getDecorator())
+#end
+
+#if($myFragment == $myPage.getRootFragment())
+  #set($isRoot=true)
+#end
+
+#if($request.getAttribute("editing") == true)
+  #set($editing = true)    
+  #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)  
+#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)
+
+<!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
+#if ($isRoot)
+  #parse($myFragment.decoration.header)
+   #set($layoutClass = "portal-nested-layout")
+#else
+  #defineLayoutObjects()
+   #set($layoutClass = "portal-layout")
+#end
+
+<div id="$renderResponse.namespace" class="${layoutClass} ${layoutClass}-${layoutType}">
+
+#if($editing)
+    #if($isRoot)
+      #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
+      #getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
+      #getBoolProperty($allowChangePageName $rootDecorator "allow.change.page.name" true)
+      #getBoolProperty($allowNavigatePage $rootDecorator "allow.navigate.page" true)
+      #getBoolProperty($allowDeletePage $rootDecorator "allow.delete.page" true)
+      #getBoolProperty($allowChangeFolderTheme $rootDecorator "allow.change.folder.theme" true)
+      #getBoolProperty($allowAddFolder $rootDecorator "allow.add.folder" true)
+      #getBoolProperty($allowChangeFolderName $rootDecorator "allow.change.folder.name" true)
+      #getBoolProperty($allowNavigateFolder $rootDecorator "allow.navigate.folder" true)
+      #getBoolProperty($allowDeleteFolder $rootDecorator "allow.delete.folder" true)
+    #else
+      #set($allowChangePageTheme=false)
+      #set($allowAddPage=false)
+      #set($allowChangePageName=false)
+      #set($allowNavigatePage=false)
+      #set($allowDeletePage=false)
+      #set($allowChangeFolderTheme=false)
+      #set($allowAddFolder=false)
+      #set($allowChangeFolderName=false)
+      #set($allowNavigateFolder=false)
+      #set($allowDeleteFolder=false)
+    #end
+
+    #getIntProperty($maxLayoutNesting $rootDecorator "max.layout.nesting" 2)
+    #if($request.getAttribute("fragmentNestingLevel") < $maxLayoutNesting)
+      #set($allowAddLayout=true)
+    #else
+      #set($allowAddLayout=false)
+    #end
+     
+    #getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
+
+      #set($form="f${renderResponse.namespace}")
+      #set($formAction = "$renderResponse.createActionURL()")
+      #set($submit = ".submit()")
+
+
+#* Preferences *#
+  <div id="${namespace}PreferenceWindow" style="z-index:10000;border-left:1px solid #999999;border-top:1px solid #999999;border-bottom:4px solid #999999;border-right:4px solid #999999;width:650px;height:450px;position:absolute;top:30px;left:30px;background-color:#efefde;">
+    <div style="z-index:10010;position:absolute;top:5px;left:10px;width:150px;height:380px;">
+      <span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.window.title")</span>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:10px;width:150px;height:380px;background-color:#ffffff;">
+<script language="JavaScript"><!--
+function ${namespace}UpdatePreference(id) {
+  if(id=="${namespace}PageProperties"){
+    document.getElementById("${namespace}PageProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.pageproperties.title")";
+  }else{
+    document.getElementById("${namespace}PageProperties").style.display="none";
+  }
+  if(id=="${namespace}AddPage"){
+    document.getElementById("${namespace}AddPage").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addpage.title")";
+  }else{
+    document.getElementById("${namespace}AddPage").style.display="none";
+  }
+  if(id=="${namespace}FolderProperties"){
+    document.getElementById("${namespace}FolderProperties").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.folderproperties.title")";
+  }else{
+    document.getElementById("${namespace}FolderProperties").style.display="none";
+  }
+  if(id=="${namespace}AddFolder"){
+    document.getElementById("${namespace}AddFolder").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addfolder.title")";
+  }else{
+    document.getElementById("${namespace}AddFolder").style.display="none";
+  }
+  if(id=="${namespace}ChangeLayout"){
+    document.getElementById("${namespace}ChangeLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changelayout.title")";
+  }else{
+    document.getElementById("${namespace}ChangeLayout").style.display="none";
+  }
+  if(id=="${namespace}AddLayout"){
+    document.getElementById("${namespace}AddLayout").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addlayout.title")";
+  }else{
+    document.getElementById("${namespace}AddLayout").style.display="none";
+  }
+  if(id=="${namespace}ChangeTheme"){
+    document.getElementById("${namespace}ChangeTheme").style.display="block";
+    document.getElementById("${namespace}PreferenceName").value=id;
+    document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changetheme.title")";
+  }else{
+    document.getElementById("${namespace}ChangeTheme").style.display="none";
+  }
+}
+function ${namespace}HidePreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="none";
+    document.getElementById("${namespace}PreferenceState").value="hide";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="inline";
+}
+function ${namespace}ShowPreferenceWindow(){
+    document.getElementById("${namespace}PreferenceWindow").style.display="block";
+    document.getElementById("${namespace}PreferenceState").value="show";
+    document.getElementById("${namespace}PreferenceWindowLink").style.display="none";
+}
+// --></script>
+#* Menu *#
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}PageProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.pageproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddPage');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addpage.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}FolderProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.folderproperties.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddFolder');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addfolder.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changelayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}AddLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addlayout.title")</span></a>
+      </div>
+      <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;">
+        <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeTheme');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changetheme.title")</span></a>
+      </div>
+    </div>
+    <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:170px;width:470px;height:380px;background-color:#ffffff;">
+      <div style="z-index:10020;width:450px;height:20px;vertical-align:middle;border-bottom:1px solid #999999;margin:5px;padding-left:5px;">
+        <span id="${namespace}PreferenceTitle" style="font-family:sans-serif;font-size:11pt;">Title</span>
+      </div>
+
+      <form name="$form" action="$formAction" method='post'>
+        <input id="${namespace}PreferenceName" type="hidden" name="preferenceName" value="${preferenceName}"/>
+        <input id="${namespace}PreferenceState" type="hidden" name="preferenceState" value="${preferenceState}"/>
+
+#* Page Properties *#
+#if($allowChangePageName||$allowNavigatePage||$allowDeletePage)
+      <div id="${namespace}PageProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangePageName)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsPageShortTitle'/>
+            </div>
+<!-- TODO:Locale -->
+            <div>
+              <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigatePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.position")</legend>
+          <div>
+            <label>$messages.getString("portal.page.editing.pagenavigation")</label>
+            <input id="move-page-left" type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" />
+            <input id="move-page-right" type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeletePage)
+        <fieldset>
+          <legend>$messages.getString("portal.page.delete")</legend>
+          <div>
+            <label for="deletepage">$messages.getString("portal.page.editing.deleteThisPage")</label>
+            <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" onclick="if(window.confirm('$messages.getString("portal.page.editing.confirmDeleteThisPage")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Page *#
+#if($allowAddPage)
+      <div id="${namespace}AddPage" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+          <div class="page-content">
+            <div>
+              <label for="pagename">$messages.getString("portal.page.editing.page")</label>
+              <input id='pagename' name='jsNewPageName'/>
+            </div>
+            <div>
+              <label for="pagetitle">$messages.getString("portal.page.editing.page.title")</label>
+              <input id='pagetitle' name='jsNewPageTitle'/>
+            </div>
+            <div>
+              <label for="pageshorttitle">$messages.getString("portal.page.editing.page.shorttitle")</label>
+              <input id='pageshorttitle' name='jsNewPageShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Folder Properties *#
+#if($allowChangeFolderName||$allowNavigateFolder||$allowDeleteFolder)
+      <div id="${namespace}FolderProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if($allowChangeFolderName)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
+            </div>
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowNavigateFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.position")</legend>
+          <div>
+            <label>$messages.getString("portal.folder.editing.foldernavigation")</label>
+            <input id="move-folder-left" type="submit" name="jsMoveFolderLeft" value="$messages.getString("portal.folder.editing.moveFolderLeft")" />
+            <input id="move-folder-right" type="submit" name="jsMoveFolderRight" value="$messages.getString("portal.folder.editing.moveFolderRight")" />
+          </div>
+        </fieldset>
+#end
+<br/>
+#if($allowDeleteFolder)
+        <fieldset>
+          <legend>$messages.getString("portal.folder.delete")</legend>
+          <div>
+            <label for="deletefolder">$messages.getString("portal.folder.editing.deleteThisFolder")</label>
+            <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")" onclick="if(window.confirm('$messages.getString("portal.folder.editing.confirmDeleteThisFolder")')){return true;}return false;"/>
+          </div>
+        </fieldset>
+#end
+      </div>
+#end
+
+#* Add Folder *#
+#if($allowAddFolder)
+      <div id="${namespace}AddFolder" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+          <div class="folder-content">
+            <div>
+              <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
+              <input id='foldername' name='jsNewFolderName'/>
+            </div>
+            <div>
+              <label for="foldertitle">$messages.getString("portal.folder.editing.folder.title")</label>
+              <input id='foldertitle' name='jsNewFolderTitle'/>
+            </div>
+            <div>
+              <label for="foldershorttitle">$messages.getString("portal.folder.editing.folder.shorttitle")</label>
+              <input id='foldershorttitle' name='jsNewFolderShortTitle'/>
+            </div>
+            <div>
+              <input type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")"/>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+#end
+
+#* Change Layout *#
+#if($allowChangeLayout)
+      <div id="${namespace}ChangeLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Add Layout *#
+#if($allowAddLayout)
+      <div id="${namespace}AddLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.layout")</legend>
+          <select id='layout' name='layout'>
+            #foreach($ld in $decorationFactory.getLayouts($rc))     
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            #end
+          </select>
+          <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
+        </fieldset>
+      </div>
+#end    
+
+#* Change Theme *#
+#if ($allowChangePageTheme||$allowChangePortletDecorator)
+      <div id="${namespace}ChangeTheme" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+#if ($allowChangePageTheme)
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.theme")</legend>
+          <select id='theme' name='theme' onChange="$form$submit">
+            #foreach($td in $decorationFactory.getPageDecorations($rc))
+            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
+            #end
+          </select>   
+        </fieldset>
+<br/>
+#end
+#getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true)
+####### Take all fragments and apply style	  
+#if($allowChangePortletDecorator)          
+        <fieldset>
+          <legend>$messages.getString("portal.page.editing.portlet.decorator")</legend>
+          <input type="hidden" name="fragment" value="$f.id">
+          <input type="hidden" name="move" value="">
+          <input type="hidden" name="remove" value="">
+          <select id="decorators" name="decorators">
+            <option value=''>
+        	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+        	    #end
+          </select>
+          <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+        </fieldset>
+#end	   
+      </div>
+#end
+
+<script language="JavaScript"><!--
+var prefName=document.getElementById("${namespace}PreferenceName").value;
+if(prefName==""){
+  prefName="${namespace}PageProperties";
+}
+${namespace}UpdatePreference(prefName);
+var prefState=document.getElementById("${namespace}PreferenceState").value;
+if(prefState=="show"){
+  ${namespace}ShowPreferenceWindow();
+}else{
+  ${namespace}HidePreferenceWindow();
+}
+// --></script>
+
+      </form>
+
+    </div>
+    <div style="z-index:10010;position:absolute;top:415px;left:10px;width:630px;height:30px;text-align:right;">
+      <input type="button" onclick="${namespace}HidePreferenceWindow();" value="$messages.getString("portal.preference.window.close")" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+#set($_actions = $layoutDecoration.actions)
+    #if($_actions.size() >0)
+    #foreach ($_action in $_actions)
+      <input type="button" onclick="location.href='${_action.Action}'" value="${_action.Name}" style="font-family:sans-serif;font-size:11pt;height:25px;"/>
+    #end
+    #end
+ </div>
+
+    </div>
+  </div>
+
+## end edit mode
+#end
+
+#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}" 
+	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
+	     style="float:${columnFloat}; width:${columnWidth};">
+	     
+	  #foreach($f in $column)  	     
+      ## Set up coordinates for this fragment
+      #set($coords = $columnLayout.getCoordinate($f))	  
+      #set($col = $coords.x)
+      #set($lastRow = $columnLayout.getLastRowNumber($col))
+      #set($row = $coords.y)
+			
+      ## get the decorated Portlet content
+		  <div class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+		  
+		    ## editing block
+		    #if($editing)
+		      <div class="portlet-edit-bar">
+            #set ($dcnt = $dcnt + 1)   
+            <form name="$form$dcnt" action="$formAction" method='post'>
+              <input type="hidden" name="fragment" value="$f.id">
+              <input type="hidden" name="move" value="">
+              <input type="hidden" name="remove" value="">
+              #if($f.type == "portlet")
+                #set($fragmentType="Portlet")
+                #if($allowChangePortletDecorator)
+                  <select id='decorator' name='decorator' onChange="$form$dcnt$submit">
+                    <option value=''>
+                    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+                    #end
+                  </select>
+                #end
+              #else
+                #set($fragmentType="Layout")
+              #end              
+			        ## Move portlet left
+			        #if($lastColumn > 0 && $col > 0)            
+                <a href="#" onClick="${form}${dcnt}.move.value='3';$form$dcnt$submit;return false;" class="move-portlet-left">
+                  <img src="#GetPageResource('images/movePortletLeft.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Left")"/>
+                </a>
+			        #end
+			        ## Move portlet up	
+			        #if($row > 0)			   
+                <a href="#" onClick="${form}${dcnt}.move.value='1';$form$dcnt$submit;return false;" class="move-portlet-up">
+                  <img src="#GetPageResource('images/movePortletUp.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Up")"/>
+                </a>
+			        #end			 
+			        ## Remove portlet from page
+              <a href="#" onClick="${form}${dcnt}.remove.value='y';$form$dcnt$submit;return false;" class="remove-portlet-from-apge">
+                <img src="#GetPageResource('images/close.gif')" border="0" title="$messages.getString("portal.page.editing.remove${fragmentType}")"/>
+              </a>			 
+			        ## Move portlet down
+              #if($row < $lastRow)						
+                <a href="#" onClick="${form}${dcnt}.move.value='2';$form$dcnt$submit;return false;" class="move-portlet-down">
+                  <img src="#GetPageResource('images/movePortletDown.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Down")"/>
+                </a>
+			        #end			 
+			        ## Move portlet right
+              #if($lastColumn > 0 && $col < $lastColumn)
+                <a href="#" onClick="${form}${dcnt}.move.value='4';$form$dcnt$submit;return false;" class="move-portlet-right">
+                  <img src="#GetPageResource('images/movePortletRight.gif')" border="0" title="$messages.getString("portal.page.editing.move${fragmentType}Right")"/>
+                </a>
+			        #end
+            </form>			 
+		      </div>
+		    #end
+		   
+		    ## Now get the real content
+	 	 	  $jetspeed.setCurrentFragment($f)	   
+		    #if($f.type == "portlet")
+			    #parse($f.decoration.template)
+		    #else		
+			    $f.renderedContent			
+		    #end
+		  </div>
+		#end
+	</div>
+	#set ($columnIndex = $columnIndex + 1)  
+#end
+  
+</div>  
+  
+<br style="clear:both;"/>
+
+#if ($isRoot)
+  <form name='portletform' action="" method="post">
+    <input type='hidden' name='portlets'/>
+    <input type='hidden' name='page' value='$myPage'/>
+  </form>
+  #parse($myFragment.decoration.footer)
+#end
+  

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.properties
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.properties	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.properties	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,19 @@
+# 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
+template.type=velocity
+template.extension=.vm
+


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.vm	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.vm	2007-05-29 01:34:13 UTC (rev 165)
@@ -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: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-html/login.jsp
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-html/login.jsp	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-html/login.jsp	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,39 @@
+<%--
+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 contentType="text/html; charset=Shift_JIS" %>
+<%@ 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>
+<HEAD>
+<TITLE><fmt:message key="login.page.title"/></TITLE>
+</HEAD>
+<BODY>
+<IMG src="<%= request.getContextPath() %>/images/login_logo.gif">
+<% if(session.getAttribute(LoginConstants.ERRORCODE) != null) {%>
+<fmt:message key="login.invalid.id.or.password"/>
+<% } %>
+<FORM method="post" action="<%= response.encodeURL("j_security_check") %>">
+<fmt:message key="username.label"/><BR>
+<INPUT type="text" name="j_username" value="<%= session.getAttribute(LoginConstants.USERNAME) %>" accesskey="1"><BR>
+<fmt:message key="password.label"/><BR>
+<INPUT type="password" name="j_password" value="<%= session.getAttribute(LoginConstants.PASSWORD) %>" accesskey="2"><BR>
+<INPUT type="submit" value="<fmt:message key="login.button"/>" accesskey="3">
+</FORM>
+<A href="<%= request.getContextPath() %>/portal"><fmt:message key="login.home.link"/></A>
+</BODY>
+</HTML>


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-html/login.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-wap2/login.jsp
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-wap2/login.jsp	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-wap2/login.jsp	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,41 @@
+<?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.
+--%><!DOCTYPE html PUBLIC "-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/1.0) 1.0//EN" "i-xhtml_4ja_10.dtd">
+<%@ page contentType="application/xhtml+xml; charset=UTF-8" %>
+<%@ 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>
+<head>
+<title><fmt:message key="login.page.title"/></title>
+</head>
+<body>
+<img src="<%= request.getContextPath() %>/images/login_logo.gif"/>
+<% if(session.getAttribute(LoginConstants.ERRORCODE) != null) {%>
+<div class="errormessage"><fmt:message key="login.invalid.id.or.password"/></div>
+<% } %>
+<form id="login" method="post" action="<%= response.encodeURL("j_security_check") %>">
+<div>
+<fmt:message key="username.label"/><input type="text" name="j_username" value="<%= session.getAttribute(LoginConstants.USERNAME) %>" accesskey="1"/><br/>
+<fmt:message key="password.label"/><input type="password" name="j_password" value="<%= session.getAttribute(LoginConstants.PASSWORD) %>" accesskey="2"/><br/>
+<input type="submit" value="<fmt:message key="login.button"/>" accesskey="3"/>
+</div>
+</form>
+<div class="home">
+<a href="<%= request.getContextPath() %>/portal"><fmt:message key="login.home.link"/></a>
+</div>
+</body>
+</html>


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/docomo-wap2/login.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-hdml/login.jsp
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-hdml/login.jsp	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-hdml/login.jsp	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,26 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page contentType="text/x-hdml; charset=Shift_JIS" %>
+<%@ 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" />
+<HDML VERSION="3.0" MARKABLE="TRUE">
+<DISPLAY NAME="login" TITLE="<fmt:message key="login.page.title"/>">
+<CENTER><fmt:message key="login.page.title"/><BR><BR>
+<LINE>Your device is not supported.<WRAP>
+</DISPLAY>
+</HDML>


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-hdml/login.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-wap2/login.jsp
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-wap2/login.jsp	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-wap2/login.jsp	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="Shift_JIS"?><%--
+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.
+--%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
+<%@ page contentType="application/xhtml+xml; charset=Shift_JIS" %>
+<%@ 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>
+<head>
+<meta http-equiv="Cache-Control" content="no-cache" />
+<title><fmt:message key="login.page.title"/></title>
+</head>
+<body>
+<img src="<%= request.getContextPath() %>/images/login_logo.gif"/>
+<% if(session.getAttribute(LoginConstants.ERRORCODE) != null) {%>
+<div class="errormessage"><fmt:message key="login.invalid.id.or.password"/></div>
+<% } %>
+<form id="login" method="post" action="<%= response.encodeURL("j_security_check") %>">
+<div>
+<fmt:message key="username.label"/><input type="text" name="j_username" value="<%= session.getAttribute(LoginConstants.USERNAME) %>" accesskey="1"/><br/>
+<fmt:message key="password.label"/><input type="password" name="j_password" value="<%= session.getAttribute(LoginConstants.PASSWORD) %>" accesskey="2"/><br/>
+<input type="submit" value="<fmt:message key="login.button"/>" accesskey="3"/>
+</div>
+</form>
+<div class="home">
+<a href="<%= request.getContextPath() %>/portal"><fmt:message key="login.home.link"/></a>
+</div>
+</body>
+</html>


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/kddi-wap2/login.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-html/login.jsp
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-html/login.jsp	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-html/login.jsp	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,39 @@
+<%--
+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 contentType="text/html; charset=Shift_JIS" %>
+<%@ 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>
+<HEAD>
+<TITLE><fmt:message key="login.page.title"/></TITLE>
+</HEAD>
+<BODY>
+<IMG src="<%= request.getContextPath() %>/images/login_logo.gif">
+<% if(session.getAttribute(LoginConstants.ERRORCODE) != null) {%>
+<fmt:message key="login.invalid.id.or.password"/>
+<% } %>
+<FORM method="post" action="<%= response.encodeURL("j_security_check") %>">
+<fmt:message key="username.label"/><BR>
+<INPUT type="text" name="j_username" value="<%= session.getAttribute(LoginConstants.USERNAME) %>" accesskey="1"><BR>
+<fmt:message key="password.label"/><BR>
+<INPUT type="password" name="j_password" value="<%= session.getAttribute(LoginConstants.PASSWORD) %>" accesskey="2"><BR>
+<INPUT type="submit" value="<fmt:message key="login.button"/>" accesskey="3">
+</FORM>
+<A href="<%= request.getContextPath() %>/portal"><fmt:message key="login.home.link"/></A>
+</BODY>
+</HTML>


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-html/login.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-wap2/login.jsp
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-wap2/login.jsp	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-wap2/login.jsp	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="Shift_JIS"?><%--
+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.
+--%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
+<%@ page contentType="application/xhtml+xml; charset=Shift_JIS" %>
+<%@ 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>
+<head>
+<title><fmt:message key="login.page.title"/></title>
+</head>
+<body>
+<img src="<%= request.getContextPath() %>/images/login_logo.gif"/>
+<% if(session.getAttribute(LoginConstants.ERRORCODE) != null) {%>
+<div class="errormessage"><fmt:message key="login.invalid.id.or.password"/></div>
+<% } %>
+<form id="login" method="post" action="<%= response.encodeURL("j_security_check") %>">
+<div>
+<fmt:message key="username.label"/><input type="text" name="j_username" value="<%= session.getAttribute(LoginConstants.USERNAME) %>" accesskey="1"/><br/>
+<fmt:message key="password.label"/><input type="password" name="j_password" value="<%= session.getAttribute(LoginConstants.PASSWORD) %>" accesskey="2"/><br/>
+<input type="submit" value="<fmt:message key="login.button"/>" accesskey="3"/>
+</div>
+</form>
+<div class="home">
+<a href="<%= request.getContextPath() %>/portal"><fmt:message key="login.home.link"/></a>
+</div>
+</body>
+</html>


Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/softbank-wap2/login.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/patches/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java
===================================================================
--- pal-portal/trunk/portal/patches/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java	2007-05-29 01:18:36 UTC (rev 164)
+++ pal-portal/trunk/portal/patches/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java	2007-05-29 01:34:13 UTC (rev 165)
@@ -0,0 +1,20 @@
+Index: components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java
+===================================================================
+--- components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java	(リビジョン 542366)
++++ components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java	(作業コピー)
+@@ -240,9 +240,12 @@
+                 }
+ 
+                 //Set preferred Mimetype
+-                MediaType mtEntry =
+-                    getMediaTypeForMimeType(map.getPreferredType().getName());
+-
++                MediaType mtEntry = getMediaType(entry.getName());
++                if (mtEntry == null)
++                {
++                    mtEntry = getMediaTypeForMimeType(map.getPreferredType().getName());
++                }
++                 
+                 map.setPreferredMediaType(mtEntry);
+ 
+                 // Add map to cache


Property changes on: pal-portal/trunk/portal/patches/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-html/default-page.psml (from rev 164, pal-portal/trunk/portal/resources/psml/default/_role/site/default-page.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-html/folder.metadata (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/folder.metadata)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-html/forgot.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/forgot.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-html/register.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/register.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-wap2/default-page.psml (from rev 164, pal-portal/trunk/portal/resources/psml/default/_role/site/default-page.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-wap2/folder.metadata (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/folder.metadata)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-wap2/forgot.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/forgot.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/docomo-wap2/register.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/register.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/html/aboutus (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/aboutus)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/html/default-page.psml (from rev 164, pal-portal/trunk/portal/resources/psml/default/_role/site/default-page.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/html/downloads (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/downloads)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/html/products (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/products)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-hdml/default-page.psml (from rev 164, pal-portal/trunk/portal/resources/psml/default/_role/site/default-page.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-hdml/folder.metadata (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/folder.metadata)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-hdml/forgot.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/forgot.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-hdml/register.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/register.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-wap2/default-page.psml (from rev 164, pal-portal/trunk/portal/resources/psml/default/_role/site/default-page.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-wap2/folder.metadata (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/folder.metadata)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-wap2/forgot.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/forgot.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/kddi-wap2/register.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/register.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-html/default-page.psml (from rev 164, pal-portal/trunk/portal/resources/psml/default/_role/site/default-page.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-html/folder.metadata (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/folder.metadata)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-html/forgot.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/forgot.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-html/register.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/register.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-wap2/default-page.psml (from rev 164, pal-portal/trunk/portal/resources/psml/default/_role/site/default-page.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-wap2/folder.metadata (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/folder.metadata)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-wap2/forgot.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/forgot.psml)

Copied: pal-portal/trunk/portal/resources/psml/default/_role/site/_mediatype/softbank-wap2/register.psml (from rev 158, pal-portal/trunk/portal/resources/psml/default/_role/site/register.psml)


pal-cvs メーリングリストの案内