svnno****@sourc*****
svnno****@sourc*****
2007年 4月 14日 (土) 08:04:28 JST
Revision: 49
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=49
Author: shinsuke
Date: 2007-04-14 08:04:28 +0900 (Sat, 14 Apr 2007)
Log Message:
-----------
clean-up psml files
Modified Paths:
--------------
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/folder.metadata
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/folder.metadata
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/pam.psml
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/folder.metadata
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/user-mgt.psml
pal-portal/trunk/portal/resources/psml/default/_user/template/_mediatype/html/folder.metadata
Removed Paths:
-------------
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/Administrative/
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/palm.psml
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/rpad.psml
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/group-mgt.psml
pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/role-mgt.psml
-------------- next part --------------
Modified: pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/folder.metadata
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/folder.metadata 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/folder.metadata 2007-04-13 23:04:28 UTC (rev 49)
@@ -1,42 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<folder>
- <title>Root Folder</title>
+ <title>Root Folder</title>
<metadata name="title" xml:lang="fr">Répertoire racine</metadata>
<metadata name="title" xml:lang="ja">ルートフォルダ</metadata>
<metadata name="title" xml:lang="es">Carpeta raiz</metadata>
-<!--
- <document-order>Jetspeed2.link</document-order>
- <document-order>Jetspeed2Wiki.link</document-order>
- <document-order>apache_portals.link</document-order>
- <document-order>apache.link</document-order>
--->
+ <document-order>usermanagement</document-order>
+ <document-order>portalmanagement</document-order>
- <menu name="page-navigations">
- <separator>
- <text>Top Pages</text>
- <metadata name="text" xml:lang="fr">Page haut</metadata>
- <metadata name="text" xml:lang="ja">トップページ</metadata>
- <metadata name="text" xml:lang="es">Páginas más populares</metadata>
- </separator>
- <options>/Administrative</options>
-<!--
- <separator>
- <text>Profiled Pages</text>
- <metadata name="text" xml:lang="ja">プロファイルページ</metadata>
- <metadata name="text" xml:lang="es">Páginas del Perfil</metadata>
- </separator>
- <options regexp="true">/p[0-9][0-9][0-9].psml</options>
- <separator>
- <text>Non Java Pages</text>
- <metadata name="text" xml:lang="ja">Non-Javaページ</metadata>
- <metadata name="text" xml:lang="es">Ejemplos sin java</metadata>
- </separator>
- <options>/non-java</options>
--->
+ <menu name="navigations">
+ <separator>Folders</separator>
+ <options regexp="true">/*/</options>
</menu>
-
- <!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
+<!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
<menu name="site-navigations" regexp="true" options="/*/,/*.psml" depth="-1"/>
<menu name="additional-links" regexp="true" options="/*.link"/>
Modified: pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/folder.metadata
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/folder.metadata 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/folder.metadata 2007-04-13 23:04:28 UTC (rev 49)
@@ -3,12 +3,17 @@
<title >Portal Admin</title>
<metadata name="title" xml:lang="ja">ポータル管理</metadata>
- <document-order>palm.psml</document-order>
+ <document-order>pal-admin.psml</document-order>
<document-order>pam.psml</document-order>
- <document-order>rpad.psml</document-order>
<document-order>site.psml</document-order>
- <menu name="page-navigations"/>
+ <menu name="navigations">
+ <separator>Folders</separator>
+ <options regexp="true">/*/</options>
+ </menu>
+<!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
+ <menu name="site-navigations" regexp="true" options="/*/,/*.psml" depth="-1"/>
+ <menu name="additional-links" regexp="true" options="/*.link"/>
<security-constraints>
<security-constraints-ref>admin</security-constraints-ref>
Deleted: pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/palm.psml
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/palm.psml 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/palm.psml 2007-04-13 23:04:28 UTC (rev 49)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<page id="palm">
- <defaults
- skin="sky"
- layout-decorator="nextgen"
- portlet-decorator="nextgen"
- />
- <title>PALM</title>
- <metadata name="title" xml:lang="ja">ライフサイクル管理</metadata>
- <metadata name="title" xml:lang="es">Gestión dinámica de aplicaciones de Portlets</metadata>
- <metadata name="short-title" xml:lang="es">PALM</metadata>
- <metadata name="short-title" xml:lang="hu">PALM</metadata>
- <metadata name="title" xml:lang="hu">PALM</metadata>
- <metadata name="title" xml:lang="zh">Portlet应用生命周期管理</metadata>
-
- <fragment id="palm-layout" type="layout" name="jetspeed-layouts::VelocityOneColumn">
- <fragment id="palm-app" type="portlet" name="j2-admin::PortletApplicationLifecycleManager">
- <property name="row" value="0" layout="OneColumn"/>
- <property name="column" value="0" layout="OneColumn"/>
- </fragment>
- </fragment>
-</page>
Modified: pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/pam.psml
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/pam.psml 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/pam.psml 2007-04-13 23:04:28 UTC (rev 49)
@@ -18,7 +18,7 @@
portlet-decorator="nextgen"
/>
<title>Portlet Application Manager</title>
- <metadata name="title" xml:lang="ja">ポートレット管理</metadata>
+ <metadata name="title" xml:lang="ja">アプリケーション管理</metadata>
<metadata name="title" xml:lang="es">PAM (Gestor de aplicaciones de portlets</metadata>
<metadata name="short-title" xml:lang="es">PAM</metadata>
<metadata name="title" xml:lang="hu">Portlet alkalmazás beállítások</metadata>
Deleted: pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/rpad.psml
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/rpad.psml 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/portalmanagement/rpad.psml 2007-04-13 23:04:28 UTC (rev 49)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<page id="rpad"
- xmlns="http://portals.apache.org/jetspeed"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
- <defaults skin="blue" layout-decorator="nextgen" portlet-decorator="nextgen"/>
- <title>RPAD</title>
- <metadata name="short-title" xml:lang="es">RPAD</metadata>
-
- <fragment id="rpad-layout" type="layout" name="jetspeed-layouts::VelocityOneColumn">
- <fragment id="rpad-app" type="portlet" name="j2-admin::RPADPortlet">
- <property name="row" value="0" layout="OneColumn"/>
- <property name="column" value="0" layout="OneColumn"/>
- </fragment>
- </fragment>
-
-</page>
Modified: pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/folder.metadata
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/folder.metadata 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/folder.metadata 2007-04-13 23:04:28 UTC (rev 49)
@@ -4,11 +4,15 @@
<metadata name="title" xml:lang="ja">ユーザー管理</metadata>
<document-order>user-mgt.psml</document-order>
- <document-order>role-mgt.psml</document-order>
- <document-order>group-mgt.psml</document-order>
<document-order>profiler.psml</document-order>
- <menu name="page-navigations"/>
+ <menu name="navigations">
+ <separator>Folders</separator>
+ <options regexp="true">/*/</options>
+ </menu>
+<!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
+ <menu name="site-navigations" regexp="true" options="/*/,/*.psml" depth="-1"/>
+ <menu name="additional-links" regexp="true" options="/*.link"/>
<security-constraints>
<security-constraints-ref>admin</security-constraints-ref>
Deleted: pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/group-mgt.psml
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/group-mgt.psml 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/group-mgt.psml 2007-04-13 23:04:28 UTC (rev 49)
@@ -1,35 +0,0 @@
-<!--
-Copyright 2004 The Apache Software Foundation
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<page id="group-mgt">
- <defaults
- skin="sky"
- layout-decorator="nextgen"
- portlet-decorator="nextgen"
- />
- <title>Group Management</title>
- <metadata name="title" xml:lang="ja">グループ管理</metadata>
- <metadata name="short-title" xml:lang="es">Grupos</metadata>
- <metadata name="title" xml:lang="es">Gestión de Grupos</metadata>
- <metadata name="title" xml:lang="hu">Csoport beállítások</metadata>
- <metadata name="title" xml:lang="zh">用户组管理</metadata>
- <fragment id="gm-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns2575">
- <fragment id="gm-3" type="portlet" name="j2-admin::GroupBrowserPortlet">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="0" />
- </fragment>
- <fragment id="gm-4" type="portlet" name="j2-admin::GroupDetailsPortlet">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
- </fragment>
-</page>
Deleted: pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/role-mgt.psml
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/role-mgt.psml 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/role-mgt.psml 2007-04-13 23:04:28 UTC (rev 49)
@@ -1,36 +0,0 @@
-<!--
-Copyright 2004 The Apache Software Foundation
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<page id="role-mgt">
- <defaults
- skin="sky"
- layout-decorator="nextgen"
- portlet-decorator="nextgen"
- />
- <title>Role Management</title>
- <metadata name="title" xml:lang="ja">ロール管理</metadata>
- <metadata name="short-title" xml:lang="es">Roles</metadata>
- <metadata name="title" xml:lang="es">Gestión de roles</metadata>
- <metadata name="title" xml:lang="hu">Szerepkör beállítások</metadata>
- <metadata name="title" xml:lang="zh">角色管理</metadata>
-
- <fragment id="rm-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns2575">
- <fragment id="rm-3" type="portlet" name="j2-admin::RoleBrowserPortlet">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="0" />
- </fragment>
- <fragment id="rm-4" type="portlet" name="j2-admin::RoleDetailsPortlet">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
- </fragment>
-</page>
Modified: pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/user-mgt.psml
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/user-mgt.psml 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/admin/_mediatype/html/usermanagement/user-mgt.psml 2007-04-13 23:04:28 UTC (rev 49)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,15 +24,8 @@
<metadata name="title" xml:lang="hu">Felhasználók beállítása</metadata>
<metadata name="title" xml:lang="zh">用户管理</metadata>
- <fragment id="um-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
- <property layout="TwoColumns" name="sizes" value="33%,64%" />
- <fragment id="um-3" type="portlet" name="j2-admin::UserBrowserPortlet">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="0" />
- </fragment>
- <fragment id="um-4" type="portlet" name="j2-admin::UserDetailsPortlet">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
+ <fragment id="um-2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="um-1" type="portlet" name="pal-admin::UserManagement"/>
</fragment>
+
</page>
Modified: pal-portal/trunk/portal/resources/psml/default/_user/template/_mediatype/html/folder.metadata
===================================================================
--- pal-portal/trunk/portal/resources/psml/default/_user/template/_mediatype/html/folder.metadata 2007-04-13 23:03:41 UTC (rev 48)
+++ pal-portal/trunk/portal/resources/psml/default/_user/template/_mediatype/html/folder.metadata 2007-04-13 23:04:28 UTC (rev 49)
@@ -1,14 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<folder>
- <title>Portal</title>
+ <title>Portal</title>
<metadata name="title" xml:lang="ja">ポータル</metadata>
<document-order>default-page.psml</document-order>
- <menu name="page-navigations"/>
-
- <!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
- <!--menu name="site-navigations" regexp="true" options="/*/,/*.psml" depth="-1"/-->
+ <menu name="navigations">
+ <separator>Folders</separator>
+ <options regexp="true">/*/</options>
+<!--
+ <include>page-navigations</include>
+ <separator>Additional Links</separator>
+ <options regexp="true">/*.link</options>
+-->
+ </menu>
+<!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
+ <menu name="site-navigations" regexp="true" options="/*/,/*.psml" depth="-1"/>
<menu name="additional-links" regexp="true" options="/*.link"/>
<security-constraints>