svnno****@sourc*****
svnno****@sourc*****
2007年 7月 23日 (月) 16:13:18 JST
Revision: 355
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=355
Author: shinsuke
Date: 2007-07-23 16:13:17 +0900 (Mon, 23 Jul 2007)
Log Message:
-----------
integrated site editor portlet. sync up with jetspeed 2.1.2.
Modified Paths:
--------------
pal-portal/trunk/build.properties
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java
pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties
pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties
pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/jetspeed-services.xml
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Added Paths:
-----------
pal-portal/trunk/portal/resources/psml/default/system/customizer/site-editor.psml
-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/build.properties 2007-07-23 07:13:17 UTC (rev 355)
@@ -65,25 +65,26 @@
org.apache.jetspeed.portal.currentVersion=${portal.version}
# Jetspeed SVN revision
-jetspeed2.revision=553254
+jetspeed2.revision=555425
# Dependencies for Jetspeed
-jetspeed.version=2.2-dev_pal-${portal.version}
+jetspeed.version=2.1.2_pal-${portal.version}
pluto.version=1.0.1
portlet.api.version=1.0
servlet.api.version=2.3
myfaces.version=1.1.5
bridges.groupId=org.apache.portals.bridges
-portals.bridges.version=1.0.2-RC
-portals.bridges.common.version=1.0.2-RC
-portals.bridges.frameworks.version=1.0.2-RC
-portals.bridges.jsf.version=1.0.2-RC
-portals.bridges.perl.version=1.0.2-RC
-portals.bridges.php.version=1.0.2-RC
-portals.bridges.struts.version=1.2.7-1.0.2-RC
-portals.bridges.jpetstore.version=1.0.2-RC
-portals.bridges.velocity.version=1.0.2-RC
-portals.bridges.portletfilter.version=1.0.2-RC
+portals.bridges.version=1.0.3
+portals.bridges.common.version=1.0.3
+portals.bridges.frameworks.version=1.0.3
+portals.bridges.jsf.version=1.0.3
+portals.bridges.perl.version=1.0.3
+portals.bridges.php.version=1.0.3
+portals.bridges.struts.version=1.2.7-1.0.3
+portals.bridges.jpetstore.version=1.0.3
+portals.bridges.velocity.version=1.0.3
+portals.bridges.groovy.version=1.0.3
+portals.bridges.portletfilter.version=1.0.3
commons.logging.version=1.1
spring.version=2.0.5
spring.modules.version=2.0-rc2
@@ -91,6 +92,7 @@
hsql.version=1.8.0.2
+
jetspeed2.build.options=\
-Djetspeed.version="${jetspeed.version}" \
-Dpluto.version=${pluto.version} \
@@ -160,22 +162,16 @@
portal.patch.files=\
components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java,\
-components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java,\
-components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java,\
components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties,\
-components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java,\
-components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java,\
components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java,\
components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapUserSecurityHandler.java,\
components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java,\
components/security/src/java/org/apache/jetspeed/security/spi/impl/SecurityAccessImpl.java,\
applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java,\
applications/j2-admin/src/webapp/WEB-INF/portlet.xml,\
-applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm,\
-layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java,\
layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties,\
layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties,\
layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties,\
@@ -186,7 +182,6 @@
src/webapp/WEB-INF/jetspeed_macros.vm,\
src/webapp/WEB-INF/templates/login/html/login.jsp,\
src/webapp/WEB-INF/templates/layout/html/columns/layout.vm,\
-src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm,\
src/webapp/decorations/portlet/decorator.vm,\
project.properties,\
jetspeed-api/src/java/org/apache/jetspeed/security/spi/UserSecurityHandler.java,\
Modified: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java 2007-07-23 07:13:17 UTC (rev 355)
@@ -1,8 +1,8 @@
Index: components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java
===================================================================
---- components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java (リビジョン 539124)
+--- components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java (リビジョン 554520)
+++ components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java (作業コピー)
-@@ -37,13 +37,14 @@
+@@ -40,13 +40,14 @@
HttpServletResponse response) throws IOException, ServletException
{
HttpSession session = request.getSession();
Modified: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties
===================================================================
--- pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties 2007-07-23 07:13:17 UTC (rev 355)
@@ -1,23 +1,21 @@
Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties
===================================================================
---- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (リビジョン 539124)
+--- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (リビジョン 555425)
+++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (作業コピー)
-@@ -103,4 +103,18 @@
+@@ -13,6 +13,9 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
++portal.page.preference=Page Preference
++portal.layout.preference=Layout Preference
++
+ # Messages used by velocity templates and the JetspeedPowerTool
+ portal.help.title = Portal Online Help
+ portal.page.help.title = Portal Pages
+@@ -103,4 +106,4 @@
portal.folder.editing.deleteFolder=Delete
portal.folder.editing.confirmDeleteThisFolder=Do you want to delete this folder?
-+portal.preference.window.title=Preferences
-+portal.preference.pageproperties.title=Page Properties
-+portal.preference.addpage.title=Add Page
-+portal.preference.folderproperties.title=Folder Properties
-+portal.preference.addfolder.title=Add Folder
-+portal.preference.changelayout.title=Change Layout
-+portal.preference.addlayout.title=Add Layout
-+portal.preference.changetheme.title=Change Theme
-+portal.page.position=Page Position
-+portal.page.delete=Delete Page
-+portal.folder.position=Folder Position
-+portal.folder.delete=Delete Folder
-+portal.preference.window.close=Close
-+portal.preference.show.preference=Show Preference
-
+-portal.userfolder.config.title=Global User Folder Configuration
+\ ファイルの末尾に改行がありません
++portal.userfolder.config.title=Global User Folder Configuration
Modified: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties
===================================================================
--- pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties 2007-07-23 07:13:17 UTC (rev 355)
@@ -1,23 +1,14 @@
Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties
===================================================================
---- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (リビジョン 539124)
+--- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (リビジョン 555425)
+++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (作業コピー)
-@@ -103,4 +103,18 @@
- portal.folder.editing.deleteFolder=Delete
- portal.folder.editing.confirmDeleteThisFolder=Do you want to delete this folder?
+@@ -13,6 +13,9 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
-+portal.preference.window.title=Preferences
-+portal.preference.pageproperties.title=Page Properties
-+portal.preference.addpage.title=Add Page
-+portal.preference.folderproperties.title=Folder Properties
-+portal.preference.addfolder.title=Add Folder
-+portal.preference.changelayout.title=Change Layout
-+portal.preference.addlayout.title=Add Layout
-+portal.preference.changetheme.title=Change Theme
-+portal.page.position=Page Position
-+portal.page.delete=Delete Page
-+portal.folder.position=Folder Position
-+portal.folder.delete=Delete Folder
-+portal.preference.window.close=Close
-+portal.preference.show.preference=Show Preference
-
++portal.page.preference=Page Preference
++portal.layout.preference=Layout Preference
++
+ # Messages used by velocity templates and the JetspeedPowerTool
+ portal.help.title = Portal Online Help
+ portal.page.help.title = Portal Pages
Modified: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties
===================================================================
--- pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties 2007-07-23 07:13:17 UTC (rev 355)
@@ -1,22 +1,14 @@
Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties
===================================================================
---- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties (リビジョン 539124)
+--- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties (リビジョン 555425)
+++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties (作業コピー)
-@@ -103,3 +103,17 @@
- portal.folder.editing.deleteFolder=\u524a\u9664
- portal.folder.editing.confirmDeleteThisFolder=\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+@@ -13,6 +13,9 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
-+portal.preference.window.title=\u8a2d\u5b9a
-+portal.preference.pageproperties.title=\u30da\u30fc\u30b8\u30d7\u30ed\u30d1\u30c6\u30a3
-+portal.preference.addpage.title=\u30da\u30fc\u30b8\u306e\u8ffd\u52a0
-+portal.preference.folderproperties.title=\u30d5\u30a9\u30eb\u30c0\u30d7\u30ed\u30d1\u30c6\u30a3
-+portal.preference.addfolder.title=\u30d5\u30a9\u30eb\u30c0\u306e\u8ffd\u52a0
-+portal.preference.changelayout.title=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u5909\u66f4
-+portal.preference.addlayout.title=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u8ffd\u52a0
-+portal.preference.changetheme.title=\u30c6\u30fc\u30de\u306e\u5909\u66f4
-+portal.page.position=\u30da\u30fc\u30b8\u4f4d\u7f6e
-+portal.page.delete=\u30da\u30fc\u30b8\u306e\u524a\u9664
-+portal.folder.position=\u30d5\u30a9\u30eb\u30c0\u4f4d\u7f6e
-+portal.folder.delete=\u30d5\u30a9\u30eb\u30c0\u306e\u524a\u9664
-+portal.preference.window.close=\u9589\u3058\u308b
-+portal.preference.show.preference=\u8a2d\u5b9a\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u8868\u793a
++portal.page.preference=\u30da\u30fc\u30b8\u8a2d\u5b9a
++portal.layout.preference=\u30ec\u30a4\u30a2\u30a6\u30c8\u8a2d\u5b9a
++
+ # Messages used by velocity templates and the JetspeedPowerTool
+ portal.help.title = \u30dd\u30fc\u30bf\u30eb\u30aa\u30f3\u30e9\u30a4\u30f3\u30d8\u30eb\u30d7
+ portal.page.help.title = \u30dd\u30fc\u30bf\u30eb\u30da\u30fc\u30b8
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/jetspeed-services.xml
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/jetspeed-services.xml 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/jetspeed-services.xml 2007-07-23 07:13:17 UTC (rev 355)
@@ -1,16 +1,14 @@
Index: src/webapp/WEB-INF/assembly/jetspeed-services.xml
===================================================================
---- src/webapp/WEB-INF/assembly/jetspeed-services.xml (リビジョン 552638)
+--- src/webapp/WEB-INF/assembly/jetspeed-services.xml (リビジョン 554520)
+++ src/webapp/WEB-INF/assembly/jetspeed-services.xml (作業コピー)
-@@ -117,6 +117,11 @@
- <entry key="ImporterManager">
- <ref bean="importerCastorPageManager"/>
- </entry>
-+
-+ <!-- PAL -->
-+ <entry key="SecurityProvider">
-+ <ref bean="org.apache.jetspeed.security.SecurityProvider"/>
-+ </entry>
-
- <!-- first uncomment the below service bean in security-spi-atn.xml
- <entry key="PasswordEncodingService">
+@@ -23,6 +23,9 @@
+ class="org.apache.jetspeed.services.JetspeedPortletServices" >
+ <constructor-arg>
+ <map>
++ <entry key="SecurityProvider">
++ <ref bean="org.apache.jetspeed.security.SecurityProvider"/>
++ </entry>
+ <entry key="PortletRegistryComponent">
+ <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+ </entry>
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-07-23 07:13:17 UTC (rev 355)
@@ -1,8 +1,8 @@
Index: src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
---- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 553019)
+--- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 554520)
+++ src/webapp/WEB-INF/assembly/pipelines.xml (作業コピー)
-@@ -334,6 +334,7 @@
+@@ -361,6 +361,7 @@
<list>
<ref bean="capabilityValve"/>
<ref bean="localizationValve"/>
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml 2007-07-23 07:13:17 UTC (rev 355)
@@ -1,6 +1,6 @@
Index: src/webapp/WEB-INF/assembly/portal-url-generation.xml
===================================================================
---- src/webapp/WEB-INF/assembly/portal-url-generation.xml (リビジョン 519203)
+--- src/webapp/WEB-INF/assembly/portal-url-generation.xml (リビジョン 554520)
+++ src/webapp/WEB-INF/assembly/portal-url-generation.xml (作業コピー)
@@ -27,7 +27,7 @@
@@ -11,10 +11,3 @@
singleton="false"
>
<constructor-arg><ref bean="NavigationalStateCodec"/></constructor-arg>
-@@ -82,4 +82,4 @@
- <constructor-arg index='3'><value>DesktopPortalURL</value></constructor-arg>
- </bean>
-
--</beans>
-\ ファイルの末尾に改行がありません
-+</beans>
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm 2007-07-23 07:13:17 UTC (rev 355)
@@ -1,29 +1,13 @@
Index: src/webapp/WEB-INF/jetspeed_macros.vm
===================================================================
---- src/webapp/WEB-INF/jetspeed_macros.vm (リビジョン 539124)
+--- src/webapp/WEB-INF/jetspeed_macros.vm (リビジョン 558601)
+++ src/webapp/WEB-INF/jetspeed_macros.vm (作業コピー)
-@@ -134,13 +134,18 @@
- Dispalys the standard action bar for this page.
- *#
- #macro (PageActionBar)
-- #set($_actions = $layoutDecoration.actions)
-- <div id="portal-page-actions" >
-- #if($_actions.size() >0)
-- #foreach ($_action in $_actions)
+@@ -138,7 +138,7 @@
+ <div id="portal-page-actions" >
+ #if($_actions.size() >0)
+ #foreach ($_action in $_actions)
- <a href="${_action.Action}" title="${_action.Name}" class="action pageAction" ><img src="$request.contextPath/${_action.Link}" alt="${_action.Alt}" border="0" /></a>
-+ #set($_actions = $layoutDecoration.actions)
-+ <div id="portal-page-actions" >
-+ #if($_actions.size() >0)
-+ <a id="${namespace}PreferenceWindowLink" href="javascript:${namespace}ShowPreferenceWindow();" class="action pageAction" style="display:none;"><img src="$request.contextPath/decorations/images/edit.gif" alt="$messages.getString("portal.preference.show.preference")" border="0">$messages.getString("portal.preference.show.preference")</a>
-+ #if($allowAddPortlet)
-+#set ($chooser = "${jetspeed.basePath}/system/customizer/selector.psml?jspage=${profiledPage}&jslayoutid=$myFragment.id")
-+ <a href="$response.encodeURL($chooser)" class="action pageAction"><img src="#GetPageResource('images/select.gif')" border="0" title="$messages.getString("portal.page.editing.addportlet")"/>$messages.getString("portal.page.editing.addportlet")</a>
-+ #end
-+ #foreach ($_action in $_actions)
+ <a href="${_action.Action}" title="${_action.Name}" class="action pageAction" ><img src="$request.contextPath/${_action.Link}" alt="${_action.Alt}" border="0" />${_action.Name}</a>
#end
-- #end
-+ #end
+ #end
</div>
- #end
-
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-07-23 07:13:17 UTC (rev 355)
@@ -1,52 +1,46 @@
Index: src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
===================================================================
---- src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (リビジョン 539124)
+--- src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (リビジョン 555425)
+++ src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (作業コピー)
-@@ -23,6 +23,8 @@
- #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())
-@@ -37,6 +39,13 @@
- #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)
-@@ -46,17 +55,9 @@
- #set($layoutClass = "portal-layout")
- #end
-
--#set($layoutType =$portletConfig.getInitParameter("layoutType"))
--#set($columnLayout = $renderRequest.getAttribute("columnLayout"))
--#set($decorationFactory = $renderRequest.getAttribute("decorationFactory"))
--#set($rc = $renderRequest.getAttribute("org.apache.jetspeed.request.RequestContext"))
--#set($psrc = $rc.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
--#set($profiledPage = $psrc.Page.Path)
--
+@@ -56,237 +56,14 @@
<div id="$renderResponse.namespace" class="${layoutClass} ${layoutClass}-${layoutType}">
#if($editing)
- <div class="layout-edit-bar">
- #if($isRoot)
- #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
- #getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
-@@ -89,68 +90,316 @@
- #end
-
- #getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
+- #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)
+- #getBoolProperty($allowCustomizeAll $rootDecorator "allow.customize.all" false)
+- #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)
+- #set($allowCustomizeAll=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($allowAddPortlet $rootDecorator "allow.add.portlet" true)
- <fieldset>
- <div class="layout-edit-bar-left">
@@ -62,13 +56,32 @@
- #end
- </div>
- </fieldset>
-+
- #set($form="f${renderResponse.namespace}")
- #set($formAction = "$renderResponse.createActionURL()")
- #set($submit = ".submit()")
-
+- #set($form="f${renderResponse.namespace}")
+- #set($formAction = "$renderResponse.createActionURL()")
+- #set($submit = ".submit()")
+-
- <form name="$form" action="$formAction" method='post'>
+- #if($allowCustomizeAll)
- <fieldset>
+- <legend>$messages.getString("portal.userfolder.config.title")</legend>
+- <label for="user_pages_theme">$messages.getString("portal.page.editing.theme")</label>
+- <select id="user_pages_theme" name="user_pages_theme">
+- #foreach($td in $decorationFactory.getPageDecorations($rc))
+- <option value='$td'>$td
+- #end
+- </select>
+- <input type="submit" name="jsChangeUserPagesTheme" value='$messages.getString("portal.page.editing.changetheme")' />
+- <label for="user_portlets_deco">$messages.getString("portal.page.editing.portlet.decorator")</label>
+- <select id="user_portlets_deco" name="user_portlets_deco">
+- <option value=''>
+- #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+- <option value='$pd'>$pd
+- #end
+- </select>
+- <input type="submit" name="jsChangeUserPortletsDeco" value='$messages.getString("portal.page.editing.changethemeall")'/>
+- </fieldset>
+- #end
+- <fieldset>
- <div class="layout-edit-bar-left">
- #if($allowAddLayout||$allowChangeLayout)
- <div class="layout-title"><b>$messages.getString("portal.page.editing.layoutConfiguration")</b></div>
@@ -80,296 +93,24 @@
- <select id='theme' name='theme' onChange="$form$submit">
- #foreach($td in $decorationFactory.getPageDecorations($rc))
- <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
-+
-+#* 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
+- #end
- </select>
- </div>
- #end
- #if($allowAddLayout||$allowChangeLayout)
- <div>
- <label for="layout">$messages.getString("portal.page.editing.layout")</label>
-+ </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>
+- <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>
- #end
- #if ($allowChangeLayout)
- <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
- #end
- #if($allowAddLayout)
- <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
+- <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
- #end
- #if($allowAddLayout||$allowChangeLayout)
- </div>
@@ -378,46 +119,21 @@
- ####### Take all fragments and apply style
- #if($allowChangePortletDecorator)
- <div>
-+ </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="">
+- <input type="hidden" name="fragment" value="$f.id">
+- <input type="hidden" name="move" value="">
+- <input type="hidden" name="remove" value="">
- <label for="decorators">$messages.getString("portal.page.editing.portlet.decorator")</label>
- <select id="decorators" name="decorators">
- <option value=''>
- #foreach($pd in $decorationFactory.getPortletDecorations($rc))
-@@ -158,112 +407,41 @@
- #end
- </select>
- <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+- <select id="decorators" name="decorators">
+- <option value=''>
+- #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+- <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+- #end
+- </select>
+- <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
- </div>
- #end
- #if($allowAddLayout||$allowChangeLayout)
-+ </fieldset>
-+#end
- </div>
+- </div>
- #end
- </div>
- </fieldset>
@@ -515,41 +231,30 @@
- #if($allowAddFolder||$allowChangeFolderName||$allowDeleteFolder)
- </div>
- #end
-+#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>
- </fieldset>
- <br style="clear:both;">
- </form>
-+ <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>
++ #set ($pagePref = "${jetspeed.basePath}/system/customizer/site-editor.psml?path=${psrc.managedPage}&returnPath=${profiledPage}")
++ #set ($layoutPref = "${jetspeed.basePath}/system/customizer/site-editor.psml?path=${psrc.managedPage}::${myFragment.id}&returnPath=${profiledPage}")
++ <div style="text-align:right;" class="siteeditor">
++ #if ($isRoot)
++ <a href="$pagePref"><img src="#GetPageResource('images/page-preference.gif')" border="0"/>$messages.getString("portal.page.preference")</a>
++ #end
++ <a href="$layoutPref"><img src="#GetPageResource('images/layout-preference.gif')" border="0"/>$messages.getString("portal.layout.preference")</a>
</div>
-+
- ## end edit mode
+-## end edit mode
#end
+ #set ($dcnt = 0)
+@@ -313,6 +90,10 @@
+
+ ## editing block
+ #if($editing)
++#set($form="f${renderResponse.namespace}")
++#set($formAction = "$renderResponse.createActionURL()")
++#set($submit = ".submit()")
++#getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true)
+ <div class="portlet-edit-bar">
+ #set ($dcnt = $dcnt + 1)
+ <form name="$form$dcnt" action="$formAction" method='post'>
Added: pal-portal/trunk/portal/resources/psml/default/system/customizer/site-editor.psml
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/system/customizer/site-editor.psml 2007-07-23 07:09:55 UTC (rev 354)
+++ pal-portal/trunk/portal/resources/psml/default/system/customizer/site-editor.psml 2007-07-23 07:13:17 UTC (rev 355)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page id="/system/customizer/site-editor.psml" hidden="true">
+ <title>Site Editor</title>
+ <short-title>Editor</short-title>
+ <defaults layout-decorator="nextgen" portlet-decorator="nextgen"/>
+ <fragment id="P-113f1409cd4-10002" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="P-113f1411324-10003" type="portlet" name="pal-admin::SiteEditorPortlet"/>
+ </fragment>
+</page>