[pal-cvs 2434] [166] updated layout templates.

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


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

Log Message:
-----------
updated layout templates.

Modified Paths:
--------------
    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.vm
    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/columns/layout-help.vm
    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/layout.vm
    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.vm
    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/columns/layout.vm
    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/columns/layout-help.vm
    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/layout.vm
    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.vm
    pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.vm


-------------- next part --------------
Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout-help.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,67 +1,50 @@
-#*
+#*
 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)
+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>
+    <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>
+</DIV>
+
+<!-- End templates/layout/html/columns/layout-help.vm -->
+
+#parse($theme.pageLayoutDecoration.footer)

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/columns/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,8 +1,7 @@
-<!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.
+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
@@ -25,38 +24,19 @@
 #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    
-   
+#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 ($isRoot)#parse($myFragment.decoration.header)#set($layoutClass = "portal-nested-layout")
+#else#defineLayoutObjects()#set($layoutClass = "portal-layout")#end
+<DIV>
 #if($editing)
     #if($isRoot)
       #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
@@ -95,353 +75,210 @@
       #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'>
 
-      <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>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.pageConfiguration")</H3>
+            <DIV>
+              $messages.getString("portal.page.editing.page")
+              <INPUT name='jsPageName' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.page.editing.page.title")
+              <INPUT name='jsPageTitle' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.page.editing.page.shorttitle")
+              <INPUT name='jsPageShortTitle' type="text">
+            </DIV>
 <!-- TODO:Locale -->
-            <div>
-              <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
-            </div>
-          </div>
-        </fieldset>
+            <DIV>
+              <INPUT type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")">
+            </DIV>
+        </DIV>
 #end
-<br/>
+<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>
+        <DIV>
+          <H3>$messages.getString("portal.page.position")</H3>
+          <DIV>
+            $messages.getString("portal.page.editing.pagenavigation")
+            <INPUT type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" >
+            <INPUT type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" >
+          </DIV>
+        </DIV>
 #end
-<br/>
+<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>
+        <DIV>
+          <H3>$messages.getString("portal.page.delete")</H3>
+          <DIV>
+            $messages.getString("portal.page.editing.deleteThisPage")
+            <INPUT type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")">
+          </DIV>
+        </DIV>
 #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>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.pageConfiguration")</H3>
+          <DIV class="page-content">
+            <DIV>
+              $messages.getString("portal.page.editing.page")
+              <INPUT name='jsNewPageName' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.page.editing.page.title")
+              <INPUT name='jsNewPageTitle' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.page.editing.page.shorttitle")
+              <INPUT name='jsNewPageShortTitle' type="text">
+            </DIV>
+            <DIV>
+              <INPUT type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")">
+            </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)
-        <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>
+        <DIV>
+          <H3>$messages.getString("portal.folder.editing.folderConfiguration")</H3>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder")
+              <INPUT name='jsFolderName' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder.title")
+              <INPUT name='jsFolderTitle' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder.shorttitle")
+              <INPUT name='jsFolderShortTitle' type="text">
+            </DIV>
+            <DIV>
+              <INPUT type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
+            </DIV>
+        </DIV>
 #end
-<br/>
+<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>
+        <DIV>
+          <H3>$messages.getString("portal.folder.position")</H3>
+          <DIV>
+            $messages.getString("portal.folder.editing.foldernavigation")
+            <INPUT type="submit" name="jsMoveFolderLeft" value="$messages.getString("portal.folder.editing.moveFolderLeft")" >
+            <INPUT type="submit" name="jsMoveFolderRight" value="$messages.getString("portal.folder.editing.moveFolderRight")" >
+          </DIV>
+        </DIV>
 #end
-<br/>
+<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>
+        <DIV>
+          <H3>$messages.getString("portal.folder.delete")</H3>
+          <DIV>
+            $messages.getString("portal.folder.editing.deleteThisFolder")
+            <INPUT type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")">
+          </DIV>
+        </DIV>
 #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>
+        <DIV>
+          <H3>$messages.getString("portal.folder.editing.folderConfiguration")</H3>
+          <DIV class="folder-content">
+            <DIV>
+              $messages.getString("portal.folder.editing.folder")
+              <INPUT name='jsNewFolderName' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder.title")
+              <INPUT name='jsNewFolderTitle' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder.shorttitle")
+              <INPUT name='jsNewFolderShortTitle' type="text">
+            </DIV>
+            <DIV>
+              <INPUT type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")">
+            </DIV>
+          </DIV>
+        </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'>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.layout")</H3>
+          <SELECT name='layout'>
             #foreach($ld in $decorationFactory.getLayouts($rc))     
-            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            <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>
+          </SELECT>
+          <INPUT type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" >
+        </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'>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.layout")</H3>
+          <SELECT id='layout' name='layout'>
             #foreach($ld in $decorationFactory.getLayouts($rc))     
-            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            <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>
+          </SELECT>
+          <INPUT type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" >
+        </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">
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.theme")</H3>
+          <SELECT name='theme' onChange="$form$submit">
             #foreach($td in $decorationFactory.getPageDecorations($rc))
-            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
+            <OPTION value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
             #end
-          </select>   
-        </fieldset>
-<br/>
+          </SELECT>   
+        </DIV>
+<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=''>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.portlet.decorator")</H3>
+          <INPUT type="hidden" name="fragment" value="$f.id">
+          <INPUT type="hidden" name="move" value="">
+          <INPUT type="hidden" name="remove" value="">
+          <SELECT name="decorators">
+            <OPTION value=''>
         	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+            <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>
+          </SELECT>
+          <INPUT type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+        </DIV>
 #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>
 
-      </form>
+</DIV>
 
-    </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
 
@@ -453,10 +290,6 @@
   #set($columnFloat = $columnLayout.getColumnFloat($columnIndex))
 	#set($columnWidth = $columnLayout.getColumnWidth($columnIndex))
 	
-	<div id="column_${myFragment.getId()}_${columnIndex}" 
-	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
-	     style="float:${columnFloat}; width:${columnWidth};">
-	     
 	  #foreach($f in $column)  	     
       ## Set up coordinates for this fragment
       #set($coords = $columnLayout.getCoordinate($f))	  
@@ -465,59 +298,68 @@
       #set($row = $coords.y)
 			
       ## get the decorated Portlet content
-		  <div class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+<DIV>
 		  
 		    ## editing block
 		    #if($editing)
-		      <div class="portlet-edit-bar">
+<DIV>
             #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="">
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
               #if($f.type == "portlet")
                 #set($fragmentType="Portlet")
                 #if($allowChangePortletDecorator)
-                  <select id='decorator' name='decorator' onChange="$form$dcnt$submit">
-                    <option value=''>
+<SELECT name='decorator'>
+<OPTION value=''>
                     #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+<OPTION value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
                     #end
-                  </select>
+</SELECT>
+<INPUT type="submit">
                 #end
               #else
                 #set($fragmentType="Layout")
               #end              
+</FORM>			 
 			        ## 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>
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="move" value="3">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Left")">
+</FORM>
 			        #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>
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="move" value="1">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Up")">
+</FORM>
 			        #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>			 
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="remove" value="y">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.remove${fragmentType}")")">
+</FORM>
 			        ## 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>
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="move" value="2">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Down")">
+</FORM>
 			        #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>
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="move" value="4">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Right")">
+</FORM>
 			        #end
-            </form>			 
-		      </div>
+</DIV>
 		    #end
 		   
 		    ## Now get the real content
@@ -527,21 +369,12 @@
 		    #else		
 			    $f.renderedContent			
 		    #end
-		  </div>
+</DIV>
 		#end
-	</div>
 	#set ($columnIndex = $columnIndex + 1)  
 #end
-  
-</div>  
-  
-<br style="clear:both;"/>
-
+</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
   

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-html/maximized/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -24,10 +24,10 @@
 #end
 
   ## get the decorated Portlet content
-  <div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)" class="portal-layout-maxed">
+<DIV>
     $jetspeed.setCurrentFragment($f)    
     #parse($f.decoration.template)
-  </div>
+</DIV>
   
 #if ($rootFragment.decoration.footer)
   #parse($rootFragment.decoration.footer)

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout-help.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,67 +1,69 @@
-#*
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/1.0) 1.0//EN" "i-xhtml_4ja_10.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)
+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)

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/columns/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/1.0) 1.0//EN" "i-xhtml_4ja_10.dtd">
 #*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -25,184 +26,67 @@
 #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    
-   
+#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")
+#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
-  #defineLayoutObjects()
-   #set($layoutClass = "portal-layout")
+#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
 
-<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
+#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)
+#getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
 
-      #set($form="f${renderResponse.namespace}")
-      #set($formAction = "$renderResponse.createActionURL()")
-      #set($submit = ".submit()")
+#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>
-
+<div id="${namespace}PreferenceWindow">
+<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;">
+      <div id="${namespace}PageProperties">
 #if($allowChangePageName)
-        <fieldset>
-          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+        <div>
+          <div>$messages.getString("portal.page.editing.pageConfiguration")</div>
           <div class="page-content">
             <div>
               <label for="pagename">$messages.getString("portal.page.editing.page")</label>
@@ -221,37 +105,39 @@
               <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
             </div>
           </div>
-        </fieldset>
+        </div>
 #end
 <br/>
 #if($allowNavigatePage)
-        <fieldset>
-          <legend>$messages.getString("portal.page.position")</legend>
+        <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>
-        </fieldset>
+        </div>
 #end
 <br/>
 #if($allowDeletePage)
-        <fieldset>
-          <legend>$messages.getString("portal.page.delete")</legend>
+        <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;"/>
+            <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" />
           </div>
-        </fieldset>
+        </div>
+<br/>
 #end
       </div>
+<br/>
 #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 id="${namespace}AddPage">
+        <div>
+          <div>$messages.getString("portal.page.editing.pageConfiguration")</div>
           <div class="page-content">
             <div>
               <label for="pagename">$messages.getString("portal.page.editing.page")</label>
@@ -269,16 +155,17 @@
               <input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
             </div>
           </div>
-        </fieldset>
+        </div>
       </div>
+<br/>
 #end
 
 #* Folder Properties *#
 #if($allowChangeFolderName||$allowNavigateFolder||$allowDeleteFolder)
-      <div id="${namespace}FolderProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}FolderProperties">
 #if($allowChangeFolderName)
-        <fieldset>
-          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+        <div>
+          <div>$messages.getString("portal.folder.editing.folderConfiguration")</div>
           <div class="folder-content">
             <div>
               <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
@@ -296,37 +183,38 @@
               <input type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
             </div>
           </div>
-        </fieldset>
+        </div>
 #end
 <br/>
 #if($allowNavigateFolder)
-        <fieldset>
-          <legend>$messages.getString("portal.folder.position")</legend>
+        <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>
-        </fieldset>
+        </div>
 #end
 <br/>
 #if($allowDeleteFolder)
-        <fieldset>
-          <legend>$messages.getString("portal.folder.delete")</legend>
+        <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;"/>
+            <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")"/>
           </div>
-        </fieldset>
+        </div>
 #end
       </div>
+<br/>
 #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 id="${namespace}AddFolder">
+        <div>
+          <div>$messages.getString("portal.folder.editing.folderConfiguration")</div>
           <div class="folder-content">
             <div>
               <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
@@ -344,103 +232,83 @@
               <input type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")"/>
             </div>
           </div>
-        </fieldset>
+        </div>
       </div>
+<br/>
 #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>
+      <div id="${namespace}ChangeLayout">
+        <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
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName</option>
             #end
           </select>
           <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
-        </fieldset>
+        </div>
       </div>
+<br/>
 #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>
+      <div id="${namespace}AddLayout">
+        <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
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName</option>
             #end
           </select>
           <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
-        </fieldset>
+        </div>
       </div>
+<br/>
 #end    
-
 #* Change Theme *#
 #if ($allowChangePageTheme||$allowChangePortletDecorator)
-      <div id="${namespace}ChangeTheme" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}ChangeTheme">
 #if ($allowChangePageTheme)
-        <fieldset>
-          <legend>$messages.getString("portal.page.editing.theme")</legend>
+        <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
+            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td</option>
             #end
           </select>   
-        </fieldset>
+          <input type="submit" name="jsChangeTheme" />
+        </div>
 <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>
+        <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=''>
+            <option value=''></option>
         	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd</option>
         	    #end
           </select>
           <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
-        </fieldset>
+        </div>
 #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>
+</div>
+<br/>
 
 ## end edit mode
 #end
@@ -453,9 +321,7 @@
   #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};">
+	<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
@@ -472,51 +338,61 @@
 		      <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="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=''>
+                    <option value=''></option>
                     #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd</option>
                     #end
                   </select>
                 #end
               #else
                 #set($fragmentType="Layout")
               #end              
+            </form>			 
 			        ## 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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="3"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Left")"/>
+</form>			 
 			        #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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="1"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Up")"/>
+</form>			 
 			        #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>			 
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="remove" value="y"/>
+<input type="submit" value="$messages.getString("portal.page.editing.remove${fragmentType}")"/>
+</form>			 
 			        ## 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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="2"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Down")"/>
+</form>			 
 			        #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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="4"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Right")"/>
+</form>			 
 			        #end
-            </form>			 
 		      </div>
 		    #end
 		   
@@ -532,16 +408,9 @@
 	</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
-  

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/docomo-wap2/maximized/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/1.0) 1.0//EN" "i-xhtml_4ja_10.dtd">
 #*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout-help.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,67 +1,21 @@
-#*
+#*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#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)
+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.
+*#
+<HDML VERSION="3.0" MARKABLE="TRUE">
+<DISPLAY NAME="login" TITLE="Portal">
+<CENTER> Your device is not supported.<WRAP>
+</DISPLAY>
+</HDML>

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/columns/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,4 +1,3 @@
-<!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
@@ -15,533 +14,8 @@
 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
-  
+<HDML VERSION="3.0" MARKABLE="TRUE">
+<DISPLAY NAME="login" TITLE="Portal">
+<CENTER> Your device is not supported.<WRAP>
+</DISPLAY>
+</HDML>

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-hdml/maximized/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -14,21 +14,8 @@
 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
+<HDML VERSION="3.0" MARKABLE="TRUE">
+<DISPLAY NAME="login" TITLE="Portal">
+<CENTER> Your device is not supported.<WRAP>
+</DISPLAY>
+</HDML>

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/columns/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -124,16 +124,18 @@
           <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;"/>
+            <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" />
           </div>
         </div>
+<br/>
 #end
       </div>
+<br/>
 #end
 
 #* Add Page *#
 #if($allowAddPage)
-      <div id="${namespace}AddPage" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}AddPage">
         <div>
           <div>$messages.getString("portal.page.editing.pageConfiguration")</div>
           <div class="page-content">
@@ -155,11 +157,12 @@
           </div>
         </div>
       </div>
+<br/>
 #end
 
 #* Folder Properties *#
 #if($allowChangeFolderName||$allowNavigateFolder||$allowDeleteFolder)
-      <div id="${namespace}FolderProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}FolderProperties">
 #if($allowChangeFolderName)
         <div>
           <div>$messages.getString("portal.folder.editing.folderConfiguration")</div>
@@ -199,16 +202,17 @@
           <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;"/>
+            <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")"/>
           </div>
         </div>
 #end
       </div>
+<br/>
 #end
 
 #* Add Folder *#
 #if($allowAddFolder)
-      <div id="${namespace}AddFolder" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}AddFolder">
         <div>
           <div>$messages.getString("portal.folder.editing.folderConfiguration")</div>
           <div class="folder-content">
@@ -230,49 +234,52 @@
           </div>
         </div>
       </div>
+<br/>
 #end
 
 #* Change Layout *#
 #if($allowChangeLayout)
-      <div id="${namespace}ChangeLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}ChangeLayout">
         <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
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName</option>
             #end
           </select>
           <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
         </div>
       </div>
+<br/>
 #end    
 
 #* Add Layout *#
 #if($allowAddLayout)
-      <div id="${namespace}AddLayout" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}AddLayout">
         <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
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName</option>
             #end
           </select>
           <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
         </div>
       </div>
+<br/>
 #end    
-
 #* Change Theme *#
 #if ($allowChangePageTheme||$allowChangePortletDecorator)
-      <div id="${namespace}ChangeTheme" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}ChangeTheme">
 #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
+            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td</option>
             #end
           </select>   
+          <input type="submit" name="jsChangeTheme" />
         </div>
 <br/>
 #end
@@ -285,9 +292,9 @@
           <input type="hidden" name="move" value="">
           <input type="hidden" name="remove" value="">
           <select id="decorators" name="decorators">
-            <option value=''>
+            <option value=''></option>
         	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd</option>
         	    #end
           </select>
           <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
@@ -299,16 +306,9 @@
       </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>
+<br/>
 
 ## end edit mode
 #end
@@ -338,51 +338,61 @@
 		      <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="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=''>
+                    <option value=''></option>
                     #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd</option>
                     #end
                   </select>
                 #end
               #else
                 #set($fragmentType="Layout")
               #end              
+            </form>			 
 			        ## 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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="3"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Left")"/>
+</form>			 
 			        #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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="1"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Up")"/>
+</form>			 
 			        #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>			 
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="remove" value="y"/>
+<input type="submit" value="$messages.getString("portal.page.editing.remove${fragmentType}")"/>
+</form>			 
 			        ## 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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="2"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Down")"/>
+</form>			 
 			        #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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="4"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Right")"/>
+</form>			 
 			        #end
-            </form>			 
 		      </div>
 		    #end
 		   
@@ -398,15 +408,9 @@
 	</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
-  

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/kddi-wap2/maximized/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,3 +1,5 @@
+<?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

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout-help.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,67 +1,50 @@
-#*
+#*
 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)
+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>
+    <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>
+</DIV>
+
+<!-- End templates/layout/html/columns/layout-help.vm -->
+
+#parse($theme.pageLayoutDecoration.footer)

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/columns/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,8 +1,7 @@
-<!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.
+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
@@ -25,38 +24,19 @@
 #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    
-   
+#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 ($isRoot)#parse($myFragment.decoration.header)#set($layoutClass = "portal-nested-layout")
+#else#defineLayoutObjects()#set($layoutClass = "portal-layout")#end
+<DIV>
 #if($editing)
     #if($isRoot)
       #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
@@ -95,353 +75,210 @@
       #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'>
 
-      <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>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.pageConfiguration")</H3>
+            <DIV>
+              $messages.getString("portal.page.editing.page")
+              <INPUT name='jsPageName' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.page.editing.page.title")
+              <INPUT name='jsPageTitle' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.page.editing.page.shorttitle")
+              <INPUT name='jsPageShortTitle' type="text">
+            </DIV>
 <!-- TODO:Locale -->
-            <div>
-              <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
-            </div>
-          </div>
-        </fieldset>
+            <DIV>
+              <INPUT type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")">
+            </DIV>
+        </DIV>
 #end
-<br/>
+<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>
+        <DIV>
+          <H3>$messages.getString("portal.page.position")</H3>
+          <DIV>
+            $messages.getString("portal.page.editing.pagenavigation")
+            <INPUT type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" >
+            <INPUT type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" >
+          </DIV>
+        </DIV>
 #end
-<br/>
+<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>
+        <DIV>
+          <H3>$messages.getString("portal.page.delete")</H3>
+          <DIV>
+            $messages.getString("portal.page.editing.deleteThisPage")
+            <INPUT type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")">
+          </DIV>
+        </DIV>
 #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>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.pageConfiguration")</H3>
+          <DIV class="page-content">
+            <DIV>
+              $messages.getString("portal.page.editing.page")
+              <INPUT name='jsNewPageName' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.page.editing.page.title")
+              <INPUT name='jsNewPageTitle' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.page.editing.page.shorttitle")
+              <INPUT name='jsNewPageShortTitle' type="text">
+            </DIV>
+            <DIV>
+              <INPUT type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")">
+            </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)
-        <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>
+        <DIV>
+          <H3>$messages.getString("portal.folder.editing.folderConfiguration")</H3>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder")
+              <INPUT name='jsFolderName' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder.title")
+              <INPUT name='jsFolderTitle' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder.shorttitle")
+              <INPUT name='jsFolderShortTitle' type="text">
+            </DIV>
+            <DIV>
+              <INPUT type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
+            </DIV>
+        </DIV>
 #end
-<br/>
+<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>
+        <DIV>
+          <H3>$messages.getString("portal.folder.position")</H3>
+          <DIV>
+            $messages.getString("portal.folder.editing.foldernavigation")
+            <INPUT type="submit" name="jsMoveFolderLeft" value="$messages.getString("portal.folder.editing.moveFolderLeft")" >
+            <INPUT type="submit" name="jsMoveFolderRight" value="$messages.getString("portal.folder.editing.moveFolderRight")" >
+          </DIV>
+        </DIV>
 #end
-<br/>
+<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>
+        <DIV>
+          <H3>$messages.getString("portal.folder.delete")</H3>
+          <DIV>
+            $messages.getString("portal.folder.editing.deleteThisFolder")
+            <INPUT type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")">
+          </DIV>
+        </DIV>
 #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>
+        <DIV>
+          <H3>$messages.getString("portal.folder.editing.folderConfiguration")</H3>
+          <DIV class="folder-content">
+            <DIV>
+              $messages.getString("portal.folder.editing.folder")
+              <INPUT name='jsNewFolderName' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder.title")
+              <INPUT name='jsNewFolderTitle' type="text">
+            </DIV>
+            <DIV>
+              $messages.getString("portal.folder.editing.folder.shorttitle")
+              <INPUT name='jsNewFolderShortTitle' type="text">
+            </DIV>
+            <DIV>
+              <INPUT type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")">
+            </DIV>
+          </DIV>
+        </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'>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.layout")</H3>
+          <SELECT name='layout'>
             #foreach($ld in $decorationFactory.getLayouts($rc))     
-            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            <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>
+          </SELECT>
+          <INPUT type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" >
+        </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'>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.layout")</H3>
+          <SELECT id='layout' name='layout'>
             #foreach($ld in $decorationFactory.getLayouts($rc))     
-            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
+            <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>
+          </SELECT>
+          <INPUT type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" >
+        </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">
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.theme")</H3>
+          <SELECT name='theme' onChange="$form$submit">
             #foreach($td in $decorationFactory.getPageDecorations($rc))
-            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
+            <OPTION value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
             #end
-          </select>   
-        </fieldset>
-<br/>
+          </SELECT>   
+        </DIV>
+<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=''>
+        <DIV>
+          <H3>$messages.getString("portal.page.editing.portlet.decorator")</H3>
+          <INPUT type="hidden" name="fragment" value="$f.id">
+          <INPUT type="hidden" name="move" value="">
+          <INPUT type="hidden" name="remove" value="">
+          <SELECT name="decorators">
+            <OPTION value=''>
         	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+            <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>
+          </SELECT>
+          <INPUT type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+        </DIV>
 #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>
 
-      </form>
+</DIV>
 
-    </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
 
@@ -453,10 +290,6 @@
   #set($columnFloat = $columnLayout.getColumnFloat($columnIndex))
 	#set($columnWidth = $columnLayout.getColumnWidth($columnIndex))
 	
-	<div id="column_${myFragment.getId()}_${columnIndex}" 
-	     class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}" 
-	     style="float:${columnFloat}; width:${columnWidth};">
-	     
 	  #foreach($f in $column)  	     
       ## Set up coordinates for this fragment
       #set($coords = $columnLayout.getCoordinate($f))	  
@@ -465,59 +298,68 @@
       #set($row = $coords.y)
 			
       ## get the decorated Portlet content
-		  <div class="portal-layout-cell portal-layout-cell-${layoutType}-${row}-${col}" >
+<DIV>
 		  
 		    ## editing block
 		    #if($editing)
-		      <div class="portlet-edit-bar">
+<DIV>
             #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="">
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
               #if($f.type == "portlet")
                 #set($fragmentType="Portlet")
                 #if($allowChangePortletDecorator)
-                  <select id='decorator' name='decorator' onChange="$form$dcnt$submit">
-                    <option value=''>
+<SELECT name='decorator'>
+<OPTION value=''>
                     #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+<OPTION value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
                     #end
-                  </select>
+</SELECT>
+<INPUT type="submit">
                 #end
               #else
                 #set($fragmentType="Layout")
               #end              
+</FORM>			 
 			        ## 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>
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="move" value="3">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Left")">
+</FORM>
 			        #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>
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="move" value="1">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Up")">
+</FORM>
 			        #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>			 
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="remove" value="y">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.remove${fragmentType}")")">
+</FORM>
 			        ## 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>
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="move" value="2">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Down")">
+</FORM>
 			        #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>
+<FORM name="$form$dcnt" action="$formAction" method='post'>
+<INPUT type="hidden" name="fragment" value="$f.id">
+<INPUT type="hidden" name="move" value="4">
+<INPUT type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Right")">
+</FORM>
 			        #end
-            </form>			 
-		      </div>
+</DIV>
 		    #end
 		   
 		    ## Now get the real content
@@ -527,21 +369,12 @@
 		    #else		
 			    $f.renderedContent			
 		    #end
-		  </div>
+</DIV>
 		#end
-	</div>
 	#set ($columnIndex = $columnIndex + 1)  
 #end
-  
-</div>  
-  
-<br style="clear:both;"/>
-
+</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
   

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-html/maximized/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -24,10 +24,10 @@
 #end
 
   ## get the decorated Portlet content
-  <div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)" class="portal-layout-maxed">
+<DIV>
     $jetspeed.setCurrentFragment($f)    
     #parse($f.decoration.template)
-  </div>
+</DIV>
   
 #if ($rootFragment.decoration.footer)
   #parse($rootFragment.decoration.footer)

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout-help.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,67 +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)
+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)

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/columns/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?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
@@ -25,184 +26,67 @@
 #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    
-   
+#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")
+#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
-  #defineLayoutObjects()
-   #set($layoutClass = "portal-layout")
+#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
 
-<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
+#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)
+#getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
 
-      #set($form="f${renderResponse.namespace}")
-      #set($formAction = "$renderResponse.createActionURL()")
-      #set($submit = ".submit()")
+#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>
-
+<div id="${namespace}PreferenceWindow">
+<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;">
+      <div id="${namespace}PageProperties">
 #if($allowChangePageName)
-        <fieldset>
-          <legend>$messages.getString("portal.page.editing.pageConfiguration")</legend>
+        <div>
+          <div>$messages.getString("portal.page.editing.pageConfiguration")</div>
           <div class="page-content">
             <div>
               <label for="pagename">$messages.getString("portal.page.editing.page")</label>
@@ -221,37 +105,39 @@
               <input type="submit" name="jsChangePageName" value="$messages.getString("portal.page.editing.changepagename")"/>
             </div>
           </div>
-        </fieldset>
+        </div>
 #end
 <br/>
 #if($allowNavigatePage)
-        <fieldset>
-          <legend>$messages.getString("portal.page.position")</legend>
+        <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>
-        </fieldset>
+        </div>
 #end
 <br/>
 #if($allowDeletePage)
-        <fieldset>
-          <legend>$messages.getString("portal.page.delete")</legend>
+        <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;"/>
+            <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" />
           </div>
-        </fieldset>
+        </div>
+<br/>
 #end
       </div>
+<br/>
 #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 id="${namespace}AddPage">
+        <div>
+          <div>$messages.getString("portal.page.editing.pageConfiguration")</div>
           <div class="page-content">
             <div>
               <label for="pagename">$messages.getString("portal.page.editing.page")</label>
@@ -269,16 +155,17 @@
               <input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
             </div>
           </div>
-        </fieldset>
+        </div>
       </div>
+<br/>
 #end
 
 #* Folder Properties *#
 #if($allowChangeFolderName||$allowNavigateFolder||$allowDeleteFolder)
-      <div id="${namespace}FolderProperties" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}FolderProperties">
 #if($allowChangeFolderName)
-        <fieldset>
-          <legend>$messages.getString("portal.folder.editing.folderConfiguration")</legend>
+        <div>
+          <div>$messages.getString("portal.folder.editing.folderConfiguration")</div>
           <div class="folder-content">
             <div>
               <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
@@ -296,37 +183,38 @@
               <input type="submit" name="jsChangeFolderName" value="$messages.getString("portal.folder.editing.changefoldername")"/>
             </div>
           </div>
-        </fieldset>
+        </div>
 #end
 <br/>
 #if($allowNavigateFolder)
-        <fieldset>
-          <legend>$messages.getString("portal.folder.position")</legend>
+        <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>
-        </fieldset>
+        </div>
 #end
 <br/>
 #if($allowDeleteFolder)
-        <fieldset>
-          <legend>$messages.getString("portal.folder.delete")</legend>
+        <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;"/>
+            <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")"/>
           </div>
-        </fieldset>
+        </div>
 #end
       </div>
+<br/>
 #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 id="${namespace}AddFolder">
+        <div>
+          <div>$messages.getString("portal.folder.editing.folderConfiguration")</div>
           <div class="folder-content">
             <div>
               <label for="foldername">$messages.getString("portal.folder.editing.folder")</label>
@@ -344,103 +232,83 @@
               <input type="submit" name="jsSubmitFolder" value="$messages.getString("portal.folder.editing.addfolder")"/>
             </div>
           </div>
-        </fieldset>
+        </div>
       </div>
+<br/>
 #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>
+      <div id="${namespace}ChangeLayout">
+        <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
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName</option>
             #end
           </select>
           <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
-        </fieldset>
+        </div>
       </div>
+<br/>
 #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>
+      <div id="${namespace}AddLayout">
+        <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
+            <option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName</option>
             #end
           </select>
           <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
-        </fieldset>
+        </div>
       </div>
+<br/>
 #end    
-
 #* Change Theme *#
 #if ($allowChangePageTheme||$allowChangePortletDecorator)
-      <div id="${namespace}ChangeTheme" style="z-index:10020;width:450px;margin:5px;padding-left:5px;">
+      <div id="${namespace}ChangeTheme">
 #if ($allowChangePageTheme)
-        <fieldset>
-          <legend>$messages.getString("portal.page.editing.theme")</legend>
+        <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
+            <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td</option>
             #end
           </select>   
-        </fieldset>
+          <input type="submit" name="jsChangeTheme" />
+        </div>
 <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>
+        <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=''>
+            <option value=''></option>
         	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+            <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd</option>
         	    #end
           </select>
           <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
-        </fieldset>
+        </div>
 #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>
+</div>
+<br/>
 
 ## end edit mode
 #end
@@ -453,9 +321,7 @@
   #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};">
+	<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
@@ -472,51 +338,61 @@
 		      <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="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=''>
+                    <option value=''></option>
                     #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd
+                      <option value='$pd' #if ($pd == $f.Decorator) SELECTED #end>$pd</option>
                     #end
                   </select>
                 #end
               #else
                 #set($fragmentType="Layout")
               #end              
+            </form>			 
 			        ## 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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="3"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Left")"/>
+</form>			 
 			        #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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="1"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Up")"/>
+</form>			 
 			        #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>			 
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="remove" value="y"/>
+<input type="submit" value="$messages.getString("portal.page.editing.remove${fragmentType}")"/>
+</form>			 
 			        ## 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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="2"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Down")"/>
+</form>			 
 			        #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>
+<form name="$form$dcnt" action="$formAction" method='post'>
+<input type="hidden" name="fragment" value="$f.id"/>
+<input type="hidden" name="move" value="4"/>
+<input type="submit" value="$messages.getString("portal.page.editing.move${fragmentType}Right")"/>
+</form>			 
 			        #end
-            </form>			 
 		      </div>
 		    #end
 		   
@@ -532,16 +408,9 @@
 	</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
-  

Modified: 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:34:13 UTC (rev 165)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/softbank-wap2/maximized/layout.vm	2007-05-29 04:35:27 UTC (rev 166)
@@ -1,3 +1,5 @@
+<?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


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