Portal Application Laboratory

[pal-cvs 2962] [706] many bug fixes for user management, site editor, change password, and permission editor.

svnno****@sourc***** svnno****@sourc*****
2007年 11月 19日 (月) 18:02:20 JST

• 前の記事 [pal-cvs 2961] [705] fixed page navigation.
• 次の記事 [pal-cvs 2963] [707] added max length validator.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 706
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=706
Author:   shinsuke
Date:     2007-11-19 18:02:17 +0900 (Mon, 19 Nov 2007)

Log Message:
-----------
many bug fixes for user management, site editor, change password, and permission editor.

Modified Paths:
--------------
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java
    pal-admin/trunk/src/main/resources/appMessages.properties
    pal-admin/trunk/src/main/resources/appMessages_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties
    pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
    pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html
    pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html
    pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html
    pal-admin/trunk/src/main/webapp/view/group/groupList.html
    pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html
    pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html
    pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html
    pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html
    pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html
    pal-admin/trunk/src/main/webapp/view/role/roleList.html
    pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
    pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html
    pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html
    pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html
    pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html
    pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html
    pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html
    pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html
    pal-admin/trunk/src/main/webapp/view/user/userConfirm.html
    pal-admin/trunk/src/main/webapp/view/user/userList.html

Added Paths:
-----------
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ChangePassword.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ChangePassword_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ForgottenPassword.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ForgottenPassword_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PermissionEditor.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PermissionEditor_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistration.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistrationUpdate.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistrationUpdate_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistration_ja.properties

Removed Paths:
-------------
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties


-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -78,8 +78,10 @@
     public static final String NEXT_PAGE_NUMBER = "nextPageNumber";
 
     //TODO move to portlet.xml file
-    public static final int DEFAULT_PAGER_LIMIT_SIZE = 25;
+    public static final int DEFAULT_PAGER_LIMIT_SIZE = 2;
 
+    //    public static final int DEFAULT_PAGER_LIMIT_SIZE = 25;
+
     public static final String DEFAULT_USER_TEMPLATE_FOLDER_NAME = "_template";
 
     public static final String DEFAULT_USER_TEMPLATE_FOLDER = Folder.USER_FOLDER

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -286,7 +286,7 @@
                     fb.toString(), pager.getAuthenticationProviderName()));
 
             int startAtIndex = pager.getOffset() + 1;
-            int endAtIndex = startAtIndex + pager.getLimit();
+            int endAtIndex = startAtIndex + pager.getLimit() - 1;
             fb.append(", startAtIndex=").append(startAtIndex).append(
                     ", endAtIndex=").append(endAtIndex);
 

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -19,13 +19,16 @@
 import jp.sf.pal.admin.web.AbstractCrudPage;
 
 import org.seasar.teeda.extension.annotation.validator.Required;
+import org.seasar.teeda.extension.util.LabelHelper;
 
-public class AbstractGroupPage extends AbstractCrudPage {
+public abstract class AbstractGroupPage extends AbstractCrudPage {
 
     private String name;
 
     private GroupManagementService groupManagementService;
 
+    private LabelHelper labelHelper;
+
     public AbstractGroupPage() {
         super();
     }
@@ -54,4 +57,18 @@
         this.groupManagementService = groupManagementService;
     }
 
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
 }
\ No newline at end of file

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -22,6 +22,8 @@
 import jp.sf.pal.common.util.FacesMessageUtil;
 
 import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class GroupConfirmPage extends AbstractGroupPage implements Serializable {
 
@@ -84,4 +86,26 @@
 
     }
 
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.group.AbstractGroupPage#setName(java.lang.String)
+     */
+    @Override
+    @Required
+    @Length(maximum = 255)
+    public void setName(String groupName) {
+        super.setName(groupName);
+    }
+
+    public String getJumpGroupListValue() {
+        return getLabelHelper().getLabelValue("backToGroupList");
+    }
+
+    public String getDoFinishValue() {
+        if (getCrudType() == CrudType.CREATE) {
+            return getLabelHelper().getLabelValue("create");
+        } else if (getCrudType() == CrudType.DELETE) {
+            return getLabelHelper().getLabelValue("delete");
+        }
+        throw new IllegalStateException("Invalid state.");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -17,6 +17,9 @@
 
 import java.io.Serializable;
 
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
+
 import jp.sf.pal.common.util.FacesMessageUtil;
 
 public class GroupEditPage extends AbstractGroupPage implements Serializable {
@@ -38,4 +41,21 @@
         return null;
     }
 
+    public String getJumpGroupListValue() {
+        return getLabelHelper().getLabelValue("backToGroupList");
+    }
+
+    public String getGoGroupConfirmValue() {
+        return getLabelHelper().getLabelValue("confirm");
+    }
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.group.AbstractGroupPage#setName(java.lang.String)
+     */
+    @Override
+    @Required
+    @Length(maximum = 255)
+    public void setName(String groupName) {
+        super.setName(groupName);
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -23,6 +23,7 @@
 
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.validator.Equal;
+import org.seasar.teeda.extension.annotation.validator.Length;
 import org.seasar.teeda.extension.annotation.validator.Required;
 import org.seasar.teeda.extension.util.LabelHelper;
 
@@ -40,9 +41,11 @@
             .getLogger(PasswordEditPage.class);
 
     @Required
+    @Length(maximum = 255)
     private String currentPassword;
 
     @Required
+    @Length(maximum = 255)
     private String newPassword;
 
     @Required

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -15,6 +15,9 @@
  */
 package jp.sf.pal.admin.web.permission;
 
+import org.seasar.teeda.extension.util.LabelHelper;
+
+import jp.sf.pal.admin.service.PermissionManagementService;
 import jp.sf.pal.admin.web.AbstractCrudPage;
 
 public abstract class AbstractPermissionPage extends AbstractCrudPage {
@@ -28,6 +31,10 @@
 
     private String[] roleArray;
 
+    private PermissionManagementService permissionManagementService;
+
+    private LabelHelper labelHelper;
+
     public String getName() {
         return name;
     }
@@ -91,4 +98,33 @@
     public void setRoleArray(String[] roleArray) {
         this.roleArray = roleArray;
     }
+
+    /**
+     * @return the permissionManagementService
+     */
+    public PermissionManagementService getPermissionManagementService() {
+        return permissionManagementService;
+    }
+
+    /**
+     * @param permissionManagementService the permissionManagementService to set
+     */
+    public void setPermissionManagementService(
+            PermissionManagementService permissionManagementService) {
+        this.permissionManagementService = permissionManagementService;
+    }
+
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -18,12 +18,13 @@
 import java.io.Serializable;
 
 import jp.sf.pal.admin.PALAdminException;
-import jp.sf.pal.admin.service.PermissionManagementService;
 import jp.sf.pal.admin.web.CrudType;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
 import org.apache.commons.lang.StringUtils;
 import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class FolderPermissionConfirmPage extends AbstractPermissionPage
         implements Serializable {
@@ -41,8 +42,6 @@
 
     private String oldActions;
 
-    private PermissionManagementService permissionManagementService;
-
     public Class<?> initialize() {
         return null;
     }
@@ -134,18 +133,46 @@
         this.oldActions = oldActions;
     }
 
-    /**
-     * @return the permissionManagementService
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[])
      */
-    public PermissionManagementService getPermissionManagementService() {
-        return permissionManagementService;
+    @Override
+    @Required
+    public void setActionArray(String[] actionArray) {
+        super.setActionArray(actionArray);
     }
 
-    /**
-     * @param permissionManagementService the permissionManagementService to set
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setName(java.lang.String)
      */
-    public void setPermissionManagementService(
-            PermissionManagementService permissionManagementService) {
-        this.permissionManagementService = permissionManagementService;
+    @Override
+    @Required
+    @Length(maximum = 255)
+    public void setName(String name) {
+        super.setName(name);
     }
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setRoleArray(java.lang.String[])
+     */
+    @Override
+    @Required
+    public void setRoleArray(String[] roleArray) {
+        super.setRoleArray(roleArray);
+    }
+
+    public String getDoFinishValue() {
+        if (isCreate()) {
+            return getLabelHelper().getLabelValue("create");
+        } else if (isUpdate()) {
+            return getLabelHelper().getLabelValue("update");
+        } else if (isDelete()) {
+            return getLabelHelper().getLabelValue("delete");
+        }
+        throw new IllegalStateException("Invalid state.");
+    }
+
+    public String getDoBackValue() {
+        return getLabelHelper().getLabelValue("back");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -19,13 +19,13 @@
 import java.util.List;
 import java.util.Map;
 
-import org.seasar.framework.log.Logger;
-import org.seasar.teeda.extension.annotation.validator.Required;
-
 import jp.sf.pal.admin.PALAdminException;
-import jp.sf.pal.admin.service.PermissionManagementService;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
+
 public class FolderPermissionEditPage extends AbstractPermissionPage implements
         Serializable {
 
@@ -44,8 +44,6 @@
 
     private List<Map<String, String>> roleArrayItems;
 
-    private PermissionManagementService permissionManagementService;
-
     public Class<?> doConfirm() {
         return FolderPermissionConfirmPage.class;
     }
@@ -84,28 +82,12 @@
         this.roleArrayItems = rolesItems;
     }
 
-    /**
-     * @return the permissionManagementService
-     */
-    public PermissionManagementService getPermissionManagementService() {
-        return permissionManagementService;
-    }
-
-    /**
-     * @param permissionManagementService the permissionManagementService to set
-     */
-    public void setPermissionManagementService(
-            PermissionManagementService permissionManagementService) {
-        this.permissionManagementService = permissionManagementService;
-    }
-
     /* (non-Javadoc)
      * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[])
      */
     @Override
     @Required
     public void setActionArray(String[] actionArray) {
-        // TODO Auto-generated method stub
         super.setActionArray(actionArray);
     }
 
@@ -114,8 +96,8 @@
      */
     @Override
     @Required
+    @Length(maximum = 255)
     public void setName(String name) {
-        // TODO Auto-generated method stub
         super.setName(name);
     }
 
@@ -125,7 +107,14 @@
     @Override
     @Required
     public void setRoleArray(String[] roleArray) {
-        // TODO Auto-generated method stub
         super.setRoleArray(roleArray);
     }
+
+    public String getJumpFolderPermissionListValue() {
+        return getLabelHelper().getLabelValue("backToFolderPermissionList");
+    }
+
+    public String getDoConfirmValue() {
+        return getLabelHelper().getLabelValue("confirm");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -17,14 +17,15 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang.StringUtils;
-import org.seasar.framework.log.Logger;
-
 import jp.sf.pal.admin.PALAdminException;
-import jp.sf.pal.admin.service.PermissionManagementService;
 import jp.sf.pal.admin.web.CrudType;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.apache.commons.lang.StringUtils;
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
+
 public class PagePermissionConfirmPage extends AbstractPermissionPage implements
         Serializable {
 
@@ -41,8 +42,6 @@
 
     private String oldActions;
 
-    private PermissionManagementService permissionManagementService;
-
     public Class<?> initialize() {
         return null;
     }
@@ -134,18 +133,47 @@
         this.oldActions = oldActions;
     }
 
-    /**
-     * @return the permissionManagementService
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[])
      */
-    public PermissionManagementService getPermissionManagementService() {
-        return permissionManagementService;
+    @Override
+    @Required
+    public void setActionArray(String[] actionArray) {
+        // TODO Auto-generated method stub
+        super.setActionArray(actionArray);
     }
 
-    /**
-     * @param permissionManagementService the permissionManagementService to set
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setName(java.lang.String)
      */
-    public void setPermissionManagementService(
-            PermissionManagementService permissionManagementService) {
-        this.permissionManagementService = permissionManagementService;
+    @Override
+    @Required
+    @Length(maximum = 255)
+    public void setName(String name) {
+        super.setName(name);
     }
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setRoleArray(java.lang.String[])
+     */
+    @Override
+    @Required
+    public void setRoleArray(String[] roleArray) {
+        super.setRoleArray(roleArray);
+    }
+
+    public String getDoFinishValue() {
+        if (isCreate()) {
+            return getLabelHelper().getLabelValue("create");
+        } else if (isUpdate()) {
+            return getLabelHelper().getLabelValue("update");
+        } else if (isDelete()) {
+            return getLabelHelper().getLabelValue("delete");
+        }
+        throw new IllegalStateException("Invalid state.");
+    }
+
+    public String getDoBackValue() {
+        return getLabelHelper().getLabelValue("back");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -19,13 +19,13 @@
 import java.util.List;
 import java.util.Map;
 
-import org.seasar.framework.log.Logger;
-import org.seasar.teeda.extension.annotation.validator.Required;
-
 import jp.sf.pal.admin.PALAdminException;
-import jp.sf.pal.admin.service.PermissionManagementService;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
+
 public class PagePermissionEditPage extends AbstractPermissionPage implements
         Serializable {
 
@@ -44,8 +44,6 @@
 
     private List<Map<String, String>> roleArrayItems;
 
-    private PermissionManagementService permissionManagementService;
-
     public Class<?> doConfirm() {
         return PagePermissionConfirmPage.class;
     }
@@ -83,21 +81,6 @@
         this.roleArrayItems = rolesItems;
     }
 
-    /**
-     * @return the permissionManagementService
-     */
-    public PermissionManagementService getPermissionManagementService() {
-        return permissionManagementService;
-    }
-
-    /**
-     * @param permissionManagementService the permissionManagementService to set
-     */
-    public void setPermissionManagementService(
-            PermissionManagementService permissionManagementService) {
-        this.permissionManagementService = permissionManagementService;
-    }
-
     /* (non-Javadoc)
      * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[])
      */
@@ -113,8 +96,8 @@
      */
     @Override
     @Required
+    @Length(maximum = 255)
     public void setName(String name) {
-        // TODO Auto-generated method stub
         super.setName(name);
     }
 
@@ -124,7 +107,14 @@
     @Override
     @Required
     public void setRoleArray(String[] roleArray) {
-        // TODO Auto-generated method stub
         super.setRoleArray(roleArray);
     }
+
+    public String getJumpPagePermissionListValue() {
+        return getLabelHelper().getLabelValue("backToPagePermissionList");
+    }
+
+    public String getDoConfirmValue() {
+        return getLabelHelper().getLabelValue("confirm");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -17,14 +17,15 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang.StringUtils;
-import org.seasar.framework.log.Logger;
-
 import jp.sf.pal.admin.PALAdminException;
-import jp.sf.pal.admin.service.PermissionManagementService;
 import jp.sf.pal.admin.web.CrudType;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.apache.commons.lang.StringUtils;
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
+
 public class PortletPermissionConfirmPage extends AbstractPermissionPage
         implements Serializable {
 
@@ -41,8 +42,6 @@
 
     private String oldActions;
 
-    private PermissionManagementService permissionManagementService;
-
     public Class<?> initialize() {
         return null;
     }
@@ -134,18 +133,46 @@
         this.oldActions = oldActions;
     }
 
-    /**
-     * @return the permissionManagementService
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[])
      */
-    public PermissionManagementService getPermissionManagementService() {
-        return permissionManagementService;
+    @Override
+    @Required
+    public void setActionArray(String[] actionArray) {
+        super.setActionArray(actionArray);
     }
 
-    /**
-     * @param permissionManagementService the permissionManagementService to set
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setName(java.lang.String)
      */
-    public void setPermissionManagementService(
-            PermissionManagementService permissionManagementService) {
-        this.permissionManagementService = permissionManagementService;
+    @Override
+    @Required
+    @Length(maximum = 255)
+    public void setName(String name) {
+        super.setName(name);
     }
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setRoleArray(java.lang.String[])
+     */
+    @Override
+    @Required
+    public void setRoleArray(String[] roleArray) {
+        super.setRoleArray(roleArray);
+    }
+
+    public String getDoFinishValue() {
+        if (isCreate()) {
+            return getLabelHelper().getLabelValue("create");
+        } else if (isUpdate()) {
+            return getLabelHelper().getLabelValue("update");
+        } else if (isDelete()) {
+            return getLabelHelper().getLabelValue("delete");
+        }
+        throw new IllegalStateException("Invalid state.");
+    }
+
+    public String getDoBackValue() {
+        return getLabelHelper().getLabelValue("back");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -19,13 +19,13 @@
 import java.util.List;
 import java.util.Map;
 
-import org.seasar.framework.log.Logger;
-import org.seasar.teeda.extension.annotation.validator.Required;
-
 import jp.sf.pal.admin.PALAdminException;
-import jp.sf.pal.admin.service.PermissionManagementService;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
+
 public class PortletPermissionEditPage extends AbstractPermissionPage implements
         Serializable {
 
@@ -44,8 +44,6 @@
 
     private List<Map<String, String>> roleArrayItems;
 
-    private PermissionManagementService permissionManagementService;
-
     public Class<?> doConfirm() {
         return PortletPermissionConfirmPage.class;
     }
@@ -84,28 +82,12 @@
         this.roleArrayItems = rolesItems;
     }
 
-    /**
-     * @return the permissionManagementService
-     */
-    public PermissionManagementService getPermissionManagementService() {
-        return permissionManagementService;
-    }
-
-    /**
-     * @param permissionManagementService the permissionManagementService to set
-     */
-    public void setPermissionManagementService(
-            PermissionManagementService permissionManagementService) {
-        this.permissionManagementService = permissionManagementService;
-    }
-
     /* (non-Javadoc)
      * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[])
      */
     @Override
     @Required
     public void setActionArray(String[] actionArray) {
-        // TODO Auto-generated method stub
         super.setActionArray(actionArray);
     }
 
@@ -114,8 +96,8 @@
      */
     @Override
     @Required
+    @Length(maximum = 255)
     public void setName(String name) {
-        // TODO Auto-generated method stub
         super.setName(name);
     }
 
@@ -125,8 +107,15 @@
     @Override
     @Required
     public void setRoleArray(String[] roleArray) {
-        // TODO Auto-generated method stub
         super.setRoleArray(roleArray);
     }
 
+    public String getJumpPortletPermissionListValue() {
+        return getLabelHelper().getLabelValue("backToPortletPermissionList");
+    }
+
+    public String getDoConfirmValue() {
+        return getLabelHelper().getLabelValue("confirm");
+    }
+
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -19,13 +19,16 @@
 import jp.sf.pal.admin.web.AbstractCrudPage;
 
 import org.seasar.teeda.extension.annotation.validator.Required;
+import org.seasar.teeda.extension.util.LabelHelper;
 
-public class AbstractRolePage extends AbstractCrudPage {
+public abstract class AbstractRolePage extends AbstractCrudPage {
 
     private String name;
 
     private RoleManagementService roleManagementService;
 
+    private LabelHelper labelHelper;
+
     public AbstractRolePage() {
         super();
     }
@@ -54,4 +57,18 @@
         this.roleManagementService = roleManagementService;
     }
 
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
 }
\ No newline at end of file

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -22,6 +22,8 @@
 import jp.sf.pal.common.util.FacesMessageUtil;
 
 import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class RoleConfirmPage extends AbstractRolePage implements Serializable {
     /**
@@ -81,7 +83,30 @@
     public boolean isComeFromList() {
         return getCrudType() == CrudType.READ
                 || getCrudType() == CrudType.DELETE;
+    }
 
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.role.AbstractRolePage#setName(java.lang.String)
+     */
+    //  @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ＠ _]+")
+    @Override
+    @Required
+    @Length(maximum = 255)
+    public void setName(String roleName) {
+        super.setName(roleName);
     }
 
+    public String getJumpRoleListValue() {
+        return getLabelHelper().getLabelValue("backToRoleList");
+    }
+
+    public String getDoFinishValue() {
+        if (getCrudType() == CrudType.CREATE) {
+            return getLabelHelper().getLabelValue("create");
+        } else if (getCrudType() == CrudType.DELETE) {
+            return getLabelHelper().getLabelValue("delete");
+        }
+        throw new IllegalStateException("Invalid state.");
+    }
+
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -17,6 +17,10 @@
 
 import java.io.Serializable;
 
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.RegularExpression;
+import org.seasar.teeda.extension.annotation.validator.Required;
+
 import jp.sf.pal.common.util.FacesMessageUtil;
 
 public class RoleEditPage extends AbstractRolePage implements Serializable {
@@ -38,4 +42,22 @@
         return null;
     }
 
+    public String getJumpRoleListValue() {
+        return getLabelHelper().getLabelValue("backToRoleList");
+    }
+
+    public String getGoRoleConfirmValue() {
+        return getLabelHelper().getLabelValue("confirm");
+    }
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.role.AbstractRolePage#setName(java.lang.String)
+     */
+    //  @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ＠ _]+")
+    @Override
+    @Required
+    @Length(maximum = 255)
+    public void setName(String roleName) {
+        super.setName(roleName);
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -26,6 +26,8 @@
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.RegularExpression;
 import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class FolderAddFolderAndPageEditorPage extends AbstractSiteEditorPage
@@ -53,10 +55,16 @@
 
     private boolean folderOrPageHidden;
 
+    @Required
+    @Length(maximum = 255)
+    @RegularExpression(pattern = "[\\w\\.-]+")
     private String folderOrPageName;
 
+    @Length(maximum = 255)
     private String folderOrPageShortTitle;
 
+    @Required
+    @Length(maximum = 1000)
     private String folderOrPageTitle;
 
     @Required

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -26,6 +26,8 @@
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class FolderInfoEditorPage extends AbstractSiteEditorPage implements
         Serializable {
@@ -51,8 +53,11 @@
 
     private boolean folderHidden;
 
+    @Length(maximum = 255)
     private String folderShortTitle;
 
+    @Required
+    @Length(maximum = 1000)
     private String folderTitle;
 
     private String portletDecorator;

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -23,9 +23,12 @@
 import jp.sf.pal.common.CommonException;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+import org.seasar.teeda.extension.annotation.validator.Length;
 import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class LayoutPreferenceEditorPage extends AbstractSiteEditorPage
@@ -42,6 +45,8 @@
     private static final Logger logger = Logger
             .getLogger(LayoutPreferenceEditorPage.class);
 
+    private static final int MAX_LENGTH_OF_STRING = 30;
+
     private int propertyIndex;
 
     private List<Map<String, Object>> propertyItems;
@@ -51,6 +56,7 @@
     private String propertyValue;
 
     @Required
+    @Length(maximum = 255)
     private String newPreferenceName;
 
     private String newPreferenceValue;
@@ -172,6 +178,10 @@
         return propertyName;
     }
 
+    public String getPreferenceNameForView() {
+        return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING);
+    }
+
     /**
      * @param propertyName the propertyName to set
      */
@@ -186,6 +196,11 @@
         return propertyValue;
     }
 
+    public String getPreferenceValueForView() {
+        return StringUtils.abbreviate(StringEscapeUtils
+                .unescapeXml(propertyValue), MAX_LENGTH_OF_STRING);
+    }
+
     /**
      * @param propertyValue the propertyValue to set
      */
@@ -234,4 +249,8 @@
     public void setAction(String action) {
         this.action = action;
     }
+
+    public String getdoAddValue() {
+        return getLabelHelper().getLabelValue("add");
+    }
 }
\ No newline at end of file

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -23,9 +23,11 @@
 import jp.sf.pal.common.CommonException;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.apache.commons.lang.StringUtils;
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+import org.seasar.teeda.extension.annotation.validator.Length;
 import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class LayoutPropertyEditorPage extends AbstractSiteEditorPage implements
@@ -42,6 +44,8 @@
     private static final Logger logger = Logger
             .getLogger(LayoutPropertyEditorPage.class);
 
+    private static final int MAX_LENGTH_OF_STRING = 30;
+
     private int propertyIndex;
 
     private List<Map<String, Object>> propertyItems;
@@ -51,6 +55,7 @@
     private String propertyValue;
 
     @Required
+    @Length(maximum = 255)
     private String newPropertyName;
 
     private String newPropertyValue;
@@ -172,6 +177,10 @@
         return propertyName;
     }
 
+    public String getPropertyNameForView() {
+        return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING);
+    }
+
     /**
      * @param propertyName the propertyName to set
      */
@@ -186,6 +195,10 @@
         return propertyValue;
     }
 
+    public String getPropertyValueForView() {
+        return StringUtils.abbreviate(propertyValue, MAX_LENGTH_OF_STRING);
+    }
+
     /**
      * @param propertyValue the propertyValue to set
      */
@@ -234,4 +247,8 @@
     public void setAction(String action) {
         this.action = action;
     }
+
+    public String getdoAddValue() {
+        return getLabelHelper().getLabelValue("add");
+    }
 }
\ No newline at end of file

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -26,6 +26,7 @@
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+import org.seasar.teeda.extension.annotation.validator.Length;
 import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class PageInfoEditorPage extends AbstractSiteEditorPage implements
@@ -42,8 +43,11 @@
     private static final Logger logger = Logger
             .getLogger(PageInfoEditorPage.class);
 
+    @Required
+    @Length(maximum = 1000)
     private String pageTitle;
 
+    @Length(maximum = 255)
     private String pageShortTitle;
 
     private List<Map<String, String>> pageDecoratorItems;

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -23,9 +23,12 @@
 import jp.sf.pal.common.CommonException;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+import org.seasar.teeda.extension.annotation.validator.Length;
 import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class PortletPreferenceEditorPage extends AbstractSiteEditorPage
@@ -42,6 +45,8 @@
     private static final Logger logger = Logger
             .getLogger(PortletPreferenceEditorPage.class);
 
+    private static final int MAX_LENGTH_OF_STRING = 30;
+
     private int propertyIndex;
 
     private List<Map<String, Object>> propertyItems;
@@ -51,6 +56,7 @@
     private String propertyValue;
 
     @Required
+    @Length(maximum = 255)
     private String newPreferenceName;
 
     private String newPreferenceValue;
@@ -172,6 +178,10 @@
         return propertyName;
     }
 
+    public String getPreferenceNameForView() {
+        return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING);
+    }
+
     /**
      * @param propertyName the propertyName to set
      */
@@ -186,6 +196,11 @@
         return propertyValue;
     }
 
+    public String getPreferenceValueForView() {
+        return StringUtils.abbreviate(StringEscapeUtils
+                .unescapeXml(propertyValue), MAX_LENGTH_OF_STRING);
+    }
+
     /**
      * @param propertyValue the propertyValue to set
      */
@@ -234,4 +249,8 @@
     public void setAction(String action) {
         this.action = action;
     }
+
+    public String getdoAddValue() {
+        return getLabelHelper().getLabelValue("add");
+    }
 }
\ No newline at end of file

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -23,9 +23,11 @@
 import jp.sf.pal.common.CommonException;
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.apache.commons.lang.StringUtils;
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+import org.seasar.teeda.extension.annotation.validator.Length;
 import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class PortletPropertyEditorPage extends AbstractSiteEditorPage implements
@@ -42,6 +44,8 @@
     private static final Logger logger = Logger
             .getLogger(PortletPropertyEditorPage.class);
 
+    private static final int MAX_LENGTH_OF_STRING = 30;
+
     private int propertyIndex;
 
     private List<Map<String, Object>> propertyItems;
@@ -51,6 +55,7 @@
     private String propertyValue;
 
     @Required
+    @Length(maximum = 255)
     private String newPropertyName;
 
     private String newPropertyValue;
@@ -172,6 +177,10 @@
         return propertyName;
     }
 
+    public String getPropertyNameForView() {
+        return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING);
+    }
+
     /**
      * @param propertyName the propertyName to set
      */
@@ -186,6 +195,10 @@
         return propertyValue;
     }
 
+    public String getPropertyValueForView() {
+        return StringUtils.abbreviate(propertyValue, MAX_LENGTH_OF_STRING);
+    }
+
     /**
      * @param propertyValue the propertyValue to set
      */
@@ -234,4 +247,8 @@
     public void setAction(String action) {
         this.action = action;
     }
+
+    public String getdoAddValue() {
+        return getLabelHelper().getLabelValue("add");
+    }
 }
\ No newline at end of file

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -15,10 +15,12 @@
  */
 package jp.sf.pal.admin.web.user;
 
+import org.seasar.teeda.extension.util.LabelHelper;
+
 import jp.sf.pal.admin.service.UserManagementService;
 import jp.sf.pal.admin.web.AbstractCrudPage;
 
-public class AbstractUserAttributePage extends AbstractCrudPage {
+public abstract class AbstractUserAttributePage extends AbstractCrudPage {
 
     private String name;
 
@@ -28,6 +30,8 @@
 
     private UserManagementService userManagementService;
 
+    private LabelHelper labelHelper;
+
     public String getName() {
         return name;
     }
@@ -73,4 +77,18 @@
         this.userManagementService = userManagementService;
     }
 
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -19,8 +19,9 @@
 import jp.sf.pal.admin.web.AbstractCrudPage;
 
 import org.seasar.teeda.extension.annotation.validator.Required;
+import org.seasar.teeda.extension.util.LabelHelper;
 
-public class AbstractUserPage extends AbstractCrudPage {
+public abstract class AbstractUserPage extends AbstractCrudPage {
 
     private String name;
 
@@ -32,6 +33,8 @@
 
     private UserManagementService userManagementService;
 
+    private LabelHelper labelHelper;
+
     public AbstractUserPage() {
         super();
     }
@@ -104,4 +107,18 @@
         this.userManagementService = userManagementService;
     }
 
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
 }
\ No newline at end of file

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -24,6 +24,8 @@
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class UserAttributeConfirmPage extends AbstractUserAttributePage
         implements Serializable {
@@ -74,39 +76,39 @@
             try {
                 getUserManagementService().insert(this);
                 FacesMessageUtil.addInfoMessage("added.new.userattribute",
-                        new Object[] { getName() });
+                        new Object[] { getKey() });
             } catch (PALAdminException e) {
                 FacesMessageUtil.addErrorMessage(
                         "failed.to.add.new.userattribute",
-                        new Object[] { getName() });
-                logger.error(
-                        "Failed to add a new user attribute: " + getName(), e);
+                        new Object[] { getKey() });
+                logger.error("Failed to add a new user attribute: " + getKey(),
+                        e);
             }
             break;
         case CrudType.UPDATE:
             try {
                 getUserManagementService().update(this);
                 FacesMessageUtil.addInfoMessage("updated.new.userattribute",
-                        new Object[] { getName() });
+                        new Object[] { getKey() });
             } catch (PALAdminException e) {
                 FacesMessageUtil.addErrorMessage(
-                        "failed.to.add.new.userattribute",
-                        new Object[] { getName() });
-                logger.error(
-                        "Failed to add a new user attribute: " + getName(), e);
+                        "failed.to.update.new.userattribute",
+                        new Object[] { getKey() });
+                logger.error("Failed to update a new user attribute: " + getKey(),
+                        e);
             }
             break;
         case CrudType.DELETE:
             try {
                 getUserManagementService().delete(this);
                 FacesMessageUtil.addInfoMessage("deleted.userattribute",
-                        new Object[] { getName() });
+                        new Object[] { getKey() });
             } catch (PALAdminException e) {
                 FacesMessageUtil.addErrorMessage(
                         "failed.to.delete.userattribute",
-                        new Object[] { getName() });
+                        new Object[] { getKey() });
                 logger.error("Failed to delete a new user attribute: "
-                        + getName(), e);
+                        + getKey(), e);
             }
             break;
         default:
@@ -121,4 +123,37 @@
 
     }
 
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setKey(java.lang.String)
+     */
+    @Override
+    @Required
+    @Length(maximum = 255)
+    public void setKey(String key) {
+        super.setKey(key);
+    }
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setValue(java.lang.String)
+     */
+    @Override
+    @Length(maximum = 255)
+    public void setValue(String value) {
+        super.setValue(value);
+    }
+
+    public String getJumpUserAttributeListValue() {
+        return getLabelHelper().getLabelValue("back");
+    }
+
+    public String getDoUpdateValue() {
+        if (getCrudType() == CrudType.CREATE) {
+            return getLabelHelper().getLabelValue("create");
+        } else if (getCrudType() == CrudType.UPDATE) {
+            return getLabelHelper().getLabelValue("update");
+        } else if (getCrudType() == CrudType.DELETE) {
+            return getLabelHelper().getLabelValue("delete");
+        }
+        throw new IllegalStateException("Invalid state.");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -22,6 +22,8 @@
 import jp.sf.pal.common.util.FacesMessageUtil;
 
 import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class UserAttributeEditPage extends AbstractUserAttributePage implements
         Serializable {
@@ -63,8 +65,35 @@
         return null;
     }
 
-    public Class<?> doBack() {
-        setCrudType(CrudType.READ);
-        return UserAttributeListPage.class;
+    //    public Class<?> doBack() {
+    //        setCrudType(CrudType.READ);
+    //        return UserAttributeListPage.class;
+    //    }
+
+    public String getJumpUserAttributeListValue() {
+        return getLabelHelper().getLabelValue("back");
     }
+
+    public String getGoUserAttributeConfirmValue() {
+        return getLabelHelper().getLabelValue("confirm");
+    }
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setKey(java.lang.String)
+     */
+    @Override
+    @Required
+    @Length(maximum = 255)
+    public void setKey(String key) {
+        super.setKey(key);
+    }
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setValue(java.lang.String)
+     */
+    @Override
+    @Length(maximum = 255)
+    public void setValue(String value) {
+        super.setValue(value);
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -27,6 +27,7 @@
 
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
+import org.seasar.teeda.extension.util.LabelHelper;
 
 public class UserAttributeListPage extends AbstractPagerPage implements
         Serializable {
@@ -42,6 +43,8 @@
     private static final Logger logger = Logger
             .getLogger(UserAttributeListPage.class);
 
+    private LabelHelper labelHelper;
+
     private String name;
 
     private String key;
@@ -139,4 +142,21 @@
         return null;
     }
 
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
+    public String getDoCreateValue() {
+        return getLabelHelper().getLabelValue("create");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -26,7 +26,6 @@
 
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
-import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
 
 public class UserConfirmPage extends AbstractUserPage implements Serializable {
     /**
@@ -50,8 +49,7 @@
         return null;
     }
 
-    @TakeOver(type = TakeOverType.NEVER)
-    public Class<?> doFinish() {
+    public Class<?> doFinishCreate() {
         switch (getCrudType()) {
         case CrudType.CREATE:
             addUser();
@@ -64,6 +62,13 @@
         default:
             break;
         }
+
+        // clear
+        // TODO needed?
+        setName(null);
+        setRoleName(null);
+        setUpdateRequired(false);
+
         return UserListPage.class;
     }
 
@@ -114,4 +119,18 @@
 
     }
 
+    public String getJumpUserListValue() {
+        return getLabelHelper().getLabelValue("backToUserList");
+    }
+
+    public String getDoCreateValue() {
+        return getLabelHelper().getLabelValue("backToEdit");
+    }
+
+    public String getDoFinishCreateValue() {
+        if (getCrudType() == CrudType.DELETE) {
+            return getLabelHelper().getLabelValue("delete");
+        }
+        return getLabelHelper().getLabelValue("create");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -24,6 +24,9 @@
 
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.validator.Equal;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.RegularExpression;
+import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class UserCreatePage extends AbstractUserPage implements Serializable {
     /**
@@ -34,8 +37,32 @@
     private List<Map<String, String>> roleNameItems;
 
     @Equal(targetId = "password")
+    @Required
+    @Length(maximum = 255)
     private String passwordConfirm;
 
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.user.AbstractUserPage#setName(java.lang.String)
+     */
+    @Override
+    @Required
+    @Length(maximum = 255)
+    @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ＠ _]+")
+    public void setName(String userName) {
+        super.setName(userName);
+    }
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.admin.web.user.AbstractUserPage#setPassword(java.lang.String)
+     */
+    @Override
+    @Required
+    @Length(maximum = 255)
+    @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\\p{Punct}]+")
+    public void setPassword(String password) {
+        super.setPassword(password);
+    }
+
     /**
      * @return the roleItems
      */
@@ -85,4 +112,12 @@
     public void setPasswordConfirm(String passwordConfrim) {
         this.passwordConfirm = passwordConfrim;
     }
+
+    public String getJumpUserListValue() {
+        return getLabelHelper().getLabelValue("backToUserList");
+    }
+
+    public String getDoConfirmValue() {
+        return getLabelHelper().getLabelValue("confirm");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -27,6 +27,7 @@
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.validator.Equal;
 import org.seasar.teeda.extension.annotation.validator.Required;
+import org.seasar.teeda.extension.util.LabelHelper;
 
 public class UserEditPage extends AbstractCrudPage implements Serializable {
     /**
@@ -38,7 +39,7 @@
      * Logger for this class
      */
     private static final Logger logger = Logger.getLogger(UserEditPage.class);
-
+private LabelHelper labelHelper;
     private List<Map<String, String>> expiresItems;
 
     private int expiresIndex;
@@ -221,4 +222,25 @@
     public void setPasswordConfirm(String passwordConfrim) {
         this.passwordConfirm = passwordConfrim;
     }
+    public String getJumpUserListValue(){
+return getLabelHelper().getLabelValue("backToUserList");
+    }
+    
+    public String getDoUpdateValue(){
+        return getLabelHelper().getLabelValue("update");
+    }
+
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -27,6 +27,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.util.LabelHelper;
 
 public class UserGroupEditPage extends AbstractCrudPage implements Serializable {
     /**
@@ -40,6 +41,8 @@
     private static final Logger logger = Logger
             .getLogger(UserGroupEditPage.class);
 
+    private LabelHelper labelHelper;
+
     private String name;
 
     private List<Map<String, String>> newGroupItems;
@@ -188,6 +191,11 @@
     }
 
     public Class<?> doRemoveGroup() {
+        if (getGroups() == null || getGroups().length == 0) {
+            FacesMessageUtil.addWarnMessage("need.to.select.groups");
+            return null;
+        }
+
         try {
             getUserManagementService().removeGroupsFromUser(this);
             FacesMessageUtil.addInfoMessage("removed.groups.from.user",
@@ -212,4 +220,30 @@
         }
         return false;
     }
+
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
+    public String getDoAddGroupValue() {
+        return getLabelHelper().getLabelValue("add");
+    }
+
+    public String getJumpUserListValue() {
+        return getLabelHelper().getLabelValue("backToUserList");
+    }
+
+    public String getDoRemoveGroupValue() {
+        return getLabelHelper().getLabelValue("remove");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -244,4 +244,12 @@
     public void setLabelHelper(LabelHelper labelHelper) {
         this.labelHelper = labelHelper;
     }
+
+    public String getDoSearchValue() {
+        return getLabelHelper().getLabelValue("search");
+    }
+
+    public String getDoResetSearchValue() {
+        return getLabelHelper().getLabelValue("reset");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -29,7 +29,10 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.util.LabelHelper;
 
+import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
+
 public class UserProfilingRuleEditPage extends AbstractCrudPage implements
         Serializable {
     /**
@@ -43,6 +46,8 @@
     private static final Logger logger = Logger
             .getLogger(UserProfilingRuleEditPage.class);
 
+    private LabelHelper labelHelper;
+
     private String name;
 
     private List<Map<String, String>> newProfilingRuleNameItems;
@@ -225,6 +230,11 @@
     }
 
     public Class<?> doRemoveProfilingRule() {
+        if (getPrincipalRules() == null || getPrincipalRules().length == 0) {
+            FacesMessageUtil.addWarnMessage("need.to.select.profiling.rules");
+            return null;
+        }
+
         try {
             getUserManagementService().removePrincipalRulesFromUser(this);
             FacesMessageUtil
@@ -267,4 +277,29 @@
         return false;
     }
 
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
+    public String getDoAddProfilingRuleValue() {
+        return getLabelHelper().getLabelValue("add");
+    }
+
+    public String getDoRemoveProfilingRuleValue() {
+        return getLabelHelper().getLabelValue("remove");
+    }
+
+    public String getJumpUserListValue() {
+        return getLabelHelper().getLabelValue("backToUserList");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java	2007-11-19 09:02:17 UTC (rev 706)
@@ -27,6 +27,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.util.LabelHelper;
 
 public class UserRoleEditPage extends AbstractCrudPage implements Serializable {
     /**
@@ -40,6 +41,8 @@
     private static final Logger logger = Logger
             .getLogger(UserGroupEditPage.class);
 
+    private LabelHelper labelHelper;
+
     private String name;
 
     private List<Map<String, String>> newRoleItems;
@@ -179,6 +182,11 @@
     }
 
     public String doRemoveRole() {
+        if (getRoles() == null || getRoles().length == 0) {
+            FacesMessageUtil.addWarnMessage("need.to.select.roles");
+            return null;
+        }
+
         try {
             getUserManagementService().removeRolesFromUser(this);
             FacesMessageUtil.addInfoMessage("removed.roles.from.user",
@@ -204,4 +212,29 @@
         return false;
     }
 
+    /**
+     * @return the labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper the labelHelper to set
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
+    public String getDoAddRoleValue() {
+        return getLabelHelper().getLabelValue("add");
+    }
+
+    public String getJumpUserListValue() {
+        return getLabelHelper().getLabelValue("backToUserList");
+    }
+
+    public String getDoRemoveRoleValue() {
+        return getLabelHelper().getLabelValue("remove");
+    }
 }

Modified: pal-admin/trunk/src/main/resources/appMessages.properties
===================================================================
--- pal-admin/trunk/src/main/resources/appMessages.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/appMessages.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -20,8 +20,9 @@
 failed.to.delete.group=Failed to delete the Group({0}).
 
 added.new.userattribute=Added a new User Attribute({0}).
-updated.new.userattribute=Updated a new User Attribute({0}).
+updated.new.userattribute=Updated a User Attribute({0}).
 failed.to.add.new.userattribute=Failed to add a new User Attribute({0}).
+failed.to.update.new.userattribute=Failed to update a User Attribute({0}).
 deleted.userattribute=Delete the User Attribute({0}).
 failed.to.delete.userattribute=Failed to delete the User Attribute({0}).
 
@@ -245,3 +246,8 @@
 invalid.current.password=Invalid password. Please check a current password.
 invalid.new.password=Invalid new password. Please check a new password.
 password.already.used=The password is already used.
+
+need.to.select.groups=Please select groups to remove them.
+need.to.select.roles=Please select roles to remove them.
+need.to.select.profiling.rules=Please select profiling rules to remove them.
+

Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/appMessages_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/appMessages_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -16,12 +16,13 @@
 
 added.new.group=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
 failed.to.add.new.group=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-deleted.group=\u30b0\u30eb\u30fc\u30d7{0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+deleted.group=\u30b0\u30eb\u30fc\u30d7({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
 failed.to.delete.group=\u30b0\u30eb\u30fc\u30d7{0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 
 added.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
-updated.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
+updated.new.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
 failed.to.add.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+failed.to.update.new.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 deleted.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
 failed.to.delete.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 
@@ -199,4 +200,54 @@
 could.not.remove.user=\u30e6\u30fc\u30b6\u30fc\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 invalid.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002
 
+could.not.find.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+added.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
+could.not.add.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+deleted.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+could.not.delete.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
+could.not.find.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+added.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
+could.not.add.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+deleted.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+could.not.delete.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+
+could.not.find.target.action=\u5bfe\u8c61\u306e\u64cd\u4f5c\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+
+could.not.find.portlet.permissions=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.find.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.add.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.update.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.delete.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+added.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
+updated.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
+deleted.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+
+could.not.find.folder.permissions=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.find.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.add.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.update.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.delete.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+added.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
+updated.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
+deleted.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+
+could.not.find.page.permissions=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.find.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.add.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.update.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.delete.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+added.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
+updated.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
+deleted.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+
+could.not.change.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+changed.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3057\u307e\u3057\u305f\u3002
+invalid.current.password=\u4e0d\u6b63\u306a\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002
+invalid.new.password=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e0d\u6b63\u3067\u3059\u3002\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002
+password.already.used=\u305d\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u65e2\u306b\u5229\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002
+
+need.to.select.groups=\u524a\u9664\u3059\u308b\u30b0\u30eb\u30fc\u30d7\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+need.to.select.roles=\u524a\u9664\u3059\u308b\u30ed\u30fc\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+need.to.select.profiling.rules=\u524a\u9664\u3059\u308b\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ChangePassword.properties (from rev 659, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties)
===================================================================

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ChangePassword_ja.properties (from rev 659, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties)

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ForgottenPassword.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword.properties)

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ForgottenPassword_ja.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties)

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PermissionEditor.properties (from rev 658, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor.properties)

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PermissionEditor_ja.properties (from rev 658, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties)

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties (from rev 501, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal.properties)

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties (from rev 501, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties)

Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor.properties
===================================================================


Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -0,0 +1,4 @@
+# portlet info
+javax.portlet.title=\u30b5\u30a4\u30c8\u30a8\u30c7\u30a3\u30bf\u30fc
+javax.portlet.short-title=\u30b5\u30a4\u30c8\u30a8\u30c7\u30a3\u30bf\u30fc
+javax.portlet.keywords=\u30b5\u30a4\u30c8


Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement.properties
===================================================================


Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -0,0 +1,4 @@
+# portlet info
+javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u7ba1\u7406
+javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u7ba1\u7406
+javax.portlet.keywords=\u30e6\u30fc\u30b6\u30fc,\u7ba1\u7406


Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistration.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration.properties)

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistrationUpdate.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate.properties)

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistrationUpdate_ja.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties)

Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistration_ja.properties (from rev 240, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties)

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -2,6 +2,19 @@
 groupName=Group Name
 groupList=Group List
 groupInformation=Group Information
+listTab=List
+newTab=New
+editTab=Edit
+groupAction=Action
 
 # groupList
 groupList.delete=Delete
+
+# groupEdit
+groupEdit.backToGroupList=Back To Group List
+groupEdit.confirm=Confirm
+
+# groupConfirm
+groupConfirm.backToGroupList=Back To Group List
+groupConfirm.create=Create
+groupConfirm.delete=Delete

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -1,7 +1,20 @@
 # Common
 groupName=\u30b0\u30eb\u30fc\u30d7\u540d
-groupList=\u30b0\u30eb\u30fc\u30d7\u306e\u4e00\u89a7
+groupList=\u30b0\u30eb\u30fc\u30d7\u4e00\u89a7
 groupInformation=\u30b0\u30eb\u30fc\u30d7\u60c5\u5831
+listTab=\u4e00\u89a7
+newTab=\u65b0\u898f
+editTab=\u7de8\u96c6
+groupAction=\u30a2\u30af\u30b7\u30e7\u30f3
 
 # groupList
 groupList.delete=\u524a\u9664
+
+# groupEdit
+groupEdit.backToGroupList=\u30b0\u30eb\u30fc\u30d7\u4e00\u89a7\u306b\u623b\u308b
+groupEdit.confirm=\u78ba\u8a8d
+
+# groupConfirm
+groupConfirm.backToGroupList=\u30b0\u30eb\u30fc\u30d7\u4e00\u89a7\u306b\u623b\u308b
+groupConfirm.create=\u767b\u9332
+groupConfirm.delete=\u524a\u9664
\ No newline at end of file

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -5,8 +5,12 @@
 portletsTab=Portlets
 deployerTab=Deployer
 
-previousPage=<<Previous
+previousPage=Previous
+nextPage=Next
+previousPageAtHeader=Previous
+nextPageAtHeader=Next
+previousPageAtFooter=Previous
+nextPageAtFooter=Next
 found= found.
-nextPage=Next>>
 action=Action:
 filter=Filter:

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -5,8 +5,12 @@
 portletsTab=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
 deployerTab=\u30c7\u30d7\u30ed\u30a4\u30e4\u30fc
 
-previousPage=<<\u623b\u308b
+previousPage=\u524d\u3078
+nextPage=\u6b21\u3078
+previousPageAtHeader=\u524d\u3078
+nextPageAtHeader=\u6b21\u3078
+previousPageAtFooter=\u524d\u3078
+nextPageAtFooter=\u6b21\u3078
 found= \u4ef6\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
-nextPage=\u6b21\u3078>>
 action=\u30a2\u30af\u30b7\u30e7\u30f3:
 filter=\u30d5\u30a3\u30eb\u30bf\u30fc:

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -1,5 +0,0 @@
-# portlet info
-javax.portlet.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4
-javax.portlet.short-title=\u30d1\u30b9\u30ef\u30fc\u30c9
-javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9
-

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -1,5 +0,0 @@
-# portlet info
-javax.portlet.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4
-javax.portlet.short-title=\u30d1\u30b9\u30ef\u30fc\u30c9
-javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9
-

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor.properties
===================================================================

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -1,5 +0,0 @@
-# portlet info
-javax.portlet.title=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u30a8\u30c7\u30a3\u30bf\u30fc
-javax.portlet.short-title=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
-javax.portlet.keywords=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
-

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -18,3 +18,16 @@
 
 delete=Delete
 edit=Edit
+
+backToPortletPermissionList=Back To Permission List
+backToFolderPermissionList=Back To Permission List
+backToPagePermissionList=Back To Permission List
+confirm=Confirm
+create=Create
+update=Update
+back=Back
+
+name=Resource Name
+actionArrayItems=Actions
+roleArrayItems=Roles
+

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -18,3 +18,15 @@
 
 delete=\u524a\u9664
 edit=\u7de8\u96c6
+
+backToPortletPermissionList=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u4e00\u89a7\u306b\u623b\u308b
+backToFolderPermissionList=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u4e00\u89a7\u306b\u623b\u308b
+backToPagePermissionList=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u4e00\u89a7\u306b\u623b\u308b
+confirm=\u78ba\u8a8d
+create=\u767b\u9332
+update=\u66f4\u65b0
+back=\u623b\u308b
+
+name=\u30ea\u30bd\u30fc\u30b9\u540d
+actionArrayItems=\u30a2\u30af\u30b7\u30e7\u30f3
+roleArrayItems=\u30ed\u30fc\u30eb

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword.properties
===================================================================

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -1,5 +0,0 @@
-# portlet info
-javax.portlet.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c
-javax.portlet.short-title=\u518d\u767a\u884c
-javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u767b\u9332,\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7,\u65b0\u898f\u30e6\u30fc\u30b6\u30fc
-

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration.properties
===================================================================

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate.properties
===================================================================

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -1,5 +0,0 @@
-# portlet info
-javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0
-javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0
-javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u66f4\u65b0,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831
-

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -1,5 +0,0 @@
-# portlet info
-javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332
-javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332
-javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u767b\u9332,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831
-

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -2,6 +2,20 @@
 roleName=Role Name
 roleList=Role List
 roleInformation=Role Information
+listTab=List
+newTab=New
+editTab=Edit
+roleAction=Action
 
 # roleList
 roleList.delete=Delete
+
+# roleEdit
+roleEdit.backToRoleList=Back To Role List
+roleEdit.confirm=Confirm
+
+# roleConfirm
+roleConfirm.backToRoleList=Back To Role List
+roleConfirm.create=Create
+roleConfirm.delete=Delete
+

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -1,7 +1,21 @@
 # Common
 roleName=\u30ed\u30fc\u30eb\u540d
-roleList=\u30ed\u30fc\u30eb\u306e\u4e00\u89a7
+roleList=\u30ed\u30fc\u30eb\u4e00\u89a7
 roleInformation=\u30ed\u30fc\u30eb\u60c5\u5831
+listTab=\u4e00\u89a7
+newTab=\u65b0\u898f
+editTab=\u7de8\u96c6
+roleAction=\u30a2\u30af\u30b7\u30e7\u30f3
 
 # roleList
 roleList.delete=\u524a\u9664
+
+# roleEdit
+roleEdit.backToRoleList=\u30ed\u30fc\u30eb\u4e00\u89a7\u306b\u623b\u308b
+roleEdit.confirm=\u78ba\u8a8d
+
+# roleConfirm
+roleConfirm.backToRoleList=\u30ed\u30fc\u30eb\u4e00\u89a7\u306b\u623b\u308b
+roleConfirm.create=\u767b\u9332
+roleConfirm.delete=\u524a\u9664
+

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -5,100 +5,101 @@
 orderTab=Order
 propertyTab=Property
 preferenceTab=Preference
-path=Path:
+path=Path
 finish=Finish
 
 securityConstraintType=Definition
 securityConstraintsRefType=Reference
 
-pageInfoEditor.pageTitle=Title:
-pageInfoEditor.pageShortTitle=Short Title:
-pageInfoEditor.pageDecorator=Page Decorator:
-pageInfoEditor.portletDecorator=Portlet Decorator:
-pageInfoEditor.desktopTheme=Desktop Theme:
-pageInfoEditor.pageHidden=Hide This Page?:
+pageInfoEditor.pageTitle=Title
+pageInfoEditor.pageShortTitle=Short Title
+pageInfoEditor.pageDecorator=Page Decorator
+pageInfoEditor.portletDecorator=Portlet Decorator
+pageInfoEditor.desktopTheme=Desktop Theme
+pageInfoEditor.pageHidden=Hide This Page?
 pageInfoEditor.jumpToThisPage=Jump To This Page
 pageInfoEditor.update=Update
 pageInfoEditor.delete=Delete
 
-folderInfoEditor.folderTitle=Title:
-folderInfoEditor.folderShortTitle=Short Title:
-folderInfoEditor.pageDecorator=Page Decorator:
-folderInfoEditor.portletDecorator=Portlet Decorator:
-folderInfoEditor.desktopTheme=Desktop Theme:
-folderInfoEditor.folderHidden=Hide This Folder?:
+folderInfoEditor.folderTitle=Title
+folderInfoEditor.folderShortTitle=Short Title
+folderInfoEditor.pageDecorator=Page Decorator
+folderInfoEditor.portletDecorator=Portlet Decorator
+folderInfoEditor.desktopTheme=Desktop Theme
+folderInfoEditor.folderHidden=Hide This Folder?
 folderInfoEditor.update=Update
 folderInfoEditor.delete=Delete
 
-layoutInfoEditor.fragmentId=ID:
-layoutInfoEditor.layoutName=Layout:
-layoutInfoEditor.decorator=Decorator:
-layoutInfoEditor.desktopTheme=Desktop Theme:
+layoutInfoEditor.fragmentId=ID
+layoutInfoEditor.layoutName=Layout
+layoutInfoEditor.decorator=Decorator
+layoutInfoEditor.desktopTheme=Desktop Theme
 layoutInfoEditor.update=Update
 layoutInfoEditor.delete=Delete
 
-portletInfoEditor.fragmentId=ID:
-portletInfoEditor.portletName=Portlet:
-portletInfoEditor.decorator=Decorator:
-portletInfoEditor.desktopTheme=Desktop Theme:
+portletInfoEditor.fragmentId=ID
+portletInfoEditor.portletName=Portlet
+portletInfoEditor.decorator=Decorator
+portletInfoEditor.desktopTheme=Desktop Theme
 portletInfoEditor.update=Update
 portletInfoEditor.delete=Delete
 
-layoutAddPortletEditor.layoutName=Layout:
-layoutAddPortletEditor.portletName=Portlet:
+layoutAddPortletEditor.layoutName=Layout
+layoutAddPortletEditor.portletName=Portlet
 layoutAddPortletEditor.addLayout=Add Layout
 layoutAddPortletEditor.addPortlet=Add Portlet
 
-folderAddFolderAndPageEditor.folderOrPageName=Name:
-folderAddFolderAndPageEditor.folderOrPageTitle=Title:
-folderAddFolderAndPageEditor.folderOrPageShortTitle=Short Title:
-folderAddFolderAndPageEditor.layoutName=Layout:
-folderAddFolderAndPageEditor.pageDecorator=Page Decorator:
-folderAddFolderAndPageEditor.portletDecorator=Portlet Decorator:
-folderAddFolderAndPageEditor.desktopTheme=Desktop Theme:
-folderAddFolderAndPageEditor.folderOrPageHidden=Hide This Folder/Page?:
+folderAddFolderAndPageEditor.folderOrPageName=Name
+folderAddFolderAndPageEditor.folderOrPageTitle=Title
+folderAddFolderAndPageEditor.folderOrPageShortTitle=Short Title
+folderAddFolderAndPageEditor.layoutName=Layout
+folderAddFolderAndPageEditor.pageDecorator=Page Decorator
+folderAddFolderAndPageEditor.portletDecorator=Portlet Decorator
+folderAddFolderAndPageEditor.desktopTheme=Desktop Theme
+folderAddFolderAndPageEditor.folderOrPageHidden=Hide This Folder/Page?
 folderAddFolderAndPageEditor.addFolder=Add Folder
 folderAddFolderAndPageEditor.addPage=Add Page
+folderAddFolderAndPageEditor.alnumonly=(a-zA-Z0-9_-. only)
 
 pageSecurityEditor.securityConstraint= Security Constraint
 pageSecurityEditor.type= Type
 pageSecurityEditor.permission= Permission
 pageSecurityEditor.action=Action
 pageSecurityEditor.delete=Delete
-pageSecurityEditor.users=Users:
-pageSecurityEditor.groups=Groups:
-pageSecurityEditor.roles=Roles:
-pageSecurityEditor.permissions=Permissions:
-pageSecurityEditor.securityConstraintsRef=Constraint Ref:
+pageSecurityEditor.users=Users
+pageSecurityEditor.groups=Groups
+pageSecurityEditor.roles=Roles
+pageSecurityEditor.permissions=Permissions
+pageSecurityEditor.securityConstraintsRef=Constraint Ref
 
 folderSecurityEditor.securityConstraint= Security Constraint
 folderSecurityEditor.type= Type
 folderSecurityEditor.permission= Permission
 folderSecurityEditor.action=Action
 folderSecurityEditor.delete=Delete
-folderSecurityEditor.users=Users:
-folderSecurityEditor.groups=Groups:
-folderSecurityEditor.roles=Roles:
-folderSecurityEditor.permissions=Permissions:
-folderSecurityEditor.securityConstraintsRef=Constraint Ref:
+folderSecurityEditor.users=Users
+folderSecurityEditor.groups=Groups
+folderSecurityEditor.roles=Roles
+folderSecurityEditor.permissions=Permissions
+folderSecurityEditor.securityConstraintsRef=Constraint Ref
 folderSecurityEditor.addConstraint=Add Constraint
 folderSecurityEditor.addConstraintRef=Add Constraint Ref
 
-folderOrderEditor.changeOrderTitle=Order Change:
+folderOrderEditor.changeOrderTitle=Order Change
 folderOrderEditor.down=Down
 folderOrderEditor.up=Up
 folderOrderEditor.add=Add
 folderOrderEditor.delete=Delete
-folderOrderEditor.documentName=Document Name:
+folderOrderEditor.documentName=Document Name
 
 folderMetadataEditor.name=Name
 folderMetadataEditor.locale=Locale
 folderMetadataEditor.value=Value
 folderMetadataEditor.action=Action
 folderMetadataEditor.delete=Delete
-folderMetadataEditor.newMetadataLocale=Locale:
-folderMetadataEditor.newMetadataName=Name:
-folderMetadataEditor.newMetadataValue=Value:
+folderMetadataEditor.newMetadataLocale=Locale
+folderMetadataEditor.newMetadataName=Name
+folderMetadataEditor.newMetadataValue=Value
 folderMetadataEditor.add=Add
 
 pageMetadataEditor.name=Name
@@ -106,40 +107,40 @@
 pageMetadataEditor.value=Value
 pageMetadataEditor.action=Action
 pageMetadataEditor.delete=Delete
-pageMetadataEditor.newMetadataLocale=Locale:
-pageMetadataEditor.newMetadataName=Name:
-pageMetadataEditor.newMetadataValue=Value:
+pageMetadataEditor.newMetadataLocale=Locale
+pageMetadataEditor.newMetadataName=Name
+pageMetadataEditor.newMetadataValue=Value
 pageMetadataEditor.add=Add
 
 layoutPropertyEditor.name=Name
 layoutPropertyEditor.value=Value
 layoutPropertyEditor.action=Action
 layoutPropertyEditor.delete=Delete
-layoutPropertyEditor.newPropertyName=Name:
-layoutPropertyEditor.newPropertyValue=Value:
+layoutPropertyEditor.newPropertyName=Name
+layoutPropertyEditor.newPropertyValue=Value
 layoutPropertyEditor.add=Add
 
 portletPropertyEditor.name=Name
 portletPropertyEditor.value=Value
 portletPropertyEditor.action=Action
 portletPropertyEditor.delete=Delete
-portletPropertyEditor.newPropertyName=Name:
-portletPropertyEditor.newPropertyValue=Value:
+portletPropertyEditor.newPropertyName=Name
+portletPropertyEditor.newPropertyValue=Value
 portletPropertyEditor.add=Add
 
 layoutPreferenceEditor.name=Name
 layoutPreferenceEditor.value=Value
 layoutPreferenceEditor.action=Action
 layoutPreferenceEditor.delete=Delete
-layoutPreferenceEditor.newPreferenceName=Name:
-layoutPreferenceEditor.newPreferenceValue=Value:
+layoutPreferenceEditor.newPreferenceName=Name
+layoutPreferenceEditor.newPreferenceValue=Value
 layoutPreferenceEditor.add=Add
 
 portletPreferenceEditor.name=Name
 portletPreferenceEditor.value=Value
 portletPreferenceEditor.action=Action
 portletPreferenceEditor.delete=Delete
-portletPreferenceEditor.newPreferenceName=Name:
-portletPreferenceEditor.newPreferenceValue=Value:
+portletPreferenceEditor.newPreferenceName=Name
+portletPreferenceEditor.newPreferenceValue=Value
 portletPreferenceEditor.add=Add
 

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -5,71 +5,72 @@
 orderTab=\u9806\u5e8f
 propertyTab=\u30d7\u30ed\u30d1\u30c6\u30a3
 preferenceTab=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9
-path=\u30d1\u30b9:
+path=\u30d1\u30b9
 finish=\u5b8c\u4e86
 
 securityConstraintType=\u5b9a\u7fa9
 securityConstraintsRefType=\u53c2\u7167
 
-pageInfoEditor.pageTitle=\u30bf\u30a4\u30c8\u30eb:
-pageInfoEditor.pageShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb:
-pageInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf::
-pageInfoEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf:
-pageInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de:
-pageInfoEditor.pageHidden=\u30da\u30fc\u30b8\u3092\u975e\u8868\u793a:
+pageInfoEditor.pageTitle=\u30bf\u30a4\u30c8\u30eb
+pageInfoEditor.pageShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb
+pageInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf
+pageInfoEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf
+pageInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de
+pageInfoEditor.pageHidden=\u30da\u30fc\u30b8\u3092\u975e\u8868\u793a
 pageInfoEditor.jumpToThisPage=\u3053\u306e\u30da\u30fc\u30b8\u306b\u79fb\u52d5
 pageInfoEditor.update=\u66f4\u65b0
 pageInfoEditor.delete=\u524a\u9664
 
-folderInfoEditor.folderTitle=\u30bf\u30a4\u30c8\u30eb:
-folderInfoEditor.folderShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb:
-folderInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf:
-folderInfoEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf:
-folderInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de:
-folderInfoEditor.folderHidden=\u30d5\u30a9\u30eb\u30c0\u3092\u975e\u8868\u793a:
+folderInfoEditor.folderTitle=\u30bf\u30a4\u30c8\u30eb
+folderInfoEditor.folderShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb
+folderInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf
+folderInfoEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf
+folderInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de
+folderInfoEditor.folderHidden=\u30d5\u30a9\u30eb\u30c0\u3092\u975e\u8868\u793a
 folderInfoEditor.update=\u66f4\u65b0
 folderInfoEditor.delete=\u524a\u9664
 
-layoutInfoEditor.fragmentId=ID:
-layoutInfoEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8:
-layoutInfoEditor.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf:
-layoutInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de:
+layoutInfoEditor.fragmentId=ID
+layoutInfoEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8
+layoutInfoEditor.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf
+layoutInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de
 layoutInfoEditor.update=\u66f4\u65b0
 layoutInfoEditor.delete=\u524a\u9664
 
-portletInfoEditor.fragmentId=ID:
-portletInfoEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8:
-portletInfoEditor.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf:
-portletInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de:
+portletInfoEditor.fragmentId=ID
+portletInfoEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
+portletInfoEditor.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf
+portletInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de
 portletInfoEditor.update=\u66f4\u65b0
 portletInfoEditor.delete=\u524a\u9664
 
-layoutAddPortletEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8:
-layoutAddPortletEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8:
+layoutAddPortletEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8
+layoutAddPortletEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
 layoutAddPortletEditor.addLayout=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u8ffd\u52a0
 layoutAddPortletEditor.addPortlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u8ffd\u52a0
 
-folderAddFolderAndPageEditor.folderOrPageName=\u540d\u524d:
-folderAddFolderAndPageEditor.folderOrPageTitle=\u30bf\u30a4\u30c8\u30eb:
-folderAddFolderAndPageEditor.folderOrPageShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb:
-folderAddFolderAndPageEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8:
-folderAddFolderAndPageEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf:
-folderAddFolderAndPageEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf:
-folderAddFolderAndPageEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de:
-folderAddFolderAndPageEditor.folderOrPageHidden=\u30d5\u30a9\u30eb\u30c0/\u30da\u30fc\u30b8\u3092\u975e\u8868\u793a:
+folderAddFolderAndPageEditor.folderOrPageName=\u540d\u524d
+folderAddFolderAndPageEditor.folderOrPageTitle=\u30bf\u30a4\u30c8\u30eb
+folderAddFolderAndPageEditor.folderOrPageShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb
+folderAddFolderAndPageEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8
+folderAddFolderAndPageEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf
+folderAddFolderAndPageEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf
+folderAddFolderAndPageEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de
+folderAddFolderAndPageEditor.folderOrPageHidden=\u30d5\u30a9\u30eb\u30c0/\u30da\u30fc\u30b8\u3092\u975e\u8868\u793a
 folderAddFolderAndPageEditor.addFolder=\u30d5\u30a9\u30eb\u30c0\u306e\u8ffd\u52a0
 folderAddFolderAndPageEditor.addPage=\u30da\u30fc\u30b8\u306e\u8ffd\u52a0
+folderAddFolderAndPageEditor.alnumonly=(a-zA-Z0-9_-. \u306e\u307f)
 
 pageSecurityEditor.securityConstraint=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u9650
 pageSecurityEditor.type= \u7a2e\u985e
 pageSecurityEditor.permission= \u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
 pageSecurityEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3
 pageSecurityEditor.delete=\u524a\u9664
-pageSecurityEditor.users=\u30e6\u30fc\u30b6\u30fc:
-pageSecurityEditor.groups=\u30b0\u30eb\u30fc\u30d7:
-pageSecurityEditor.roles=\u30ed\u30fc\u30eb:
-pageSecurityEditor.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3:
-pageSecurityEditor.securityConstraintsRef=\u5236\u9650\u53c2\u7167:
+pageSecurityEditor.users=\u30e6\u30fc\u30b6\u30fc
+pageSecurityEditor.groups=\u30b0\u30eb\u30fc\u30d7
+pageSecurityEditor.roles=\u30ed\u30fc\u30eb
+pageSecurityEditor.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
+pageSecurityEditor.securityConstraintsRef=\u5236\u9650\u53c2\u7167
 pageSecurityEditor.addConstraint=\u5236\u9650\u306e\u8ffd\u52a0
 pageSecurityEditor.addConstraintRef=\u5236\u9650\u53c2\u7167\u306e\u8ffd\u52a0
 
@@ -78,29 +79,29 @@
 folderSecurityEditor.permission= \u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
 folderSecurityEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3
 folderSecurityEditor.delete=\u524a\u9664
-folderSecurityEditor.users=\u30e6\u30fc\u30b6\u30fc:
-folderSecurityEditor.groups=\u30b0\u30eb\u30fc\u30d7:
-folderSecurityEditor.roles=\u30ed\u30fc\u30eb:
-folderSecurityEditor.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3:
-folderSecurityEditor.securityConstraintsRef=\u5236\u9650\u53c2\u7167:
+folderSecurityEditor.users=\u30e6\u30fc\u30b6\u30fc
+folderSecurityEditor.groups=\u30b0\u30eb\u30fc\u30d7
+folderSecurityEditor.roles=\u30ed\u30fc\u30eb
+folderSecurityEditor.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
+folderSecurityEditor.securityConstraintsRef=\u5236\u9650\u53c2\u7167
 folderSecurityEditor.addConstraint=\u5236\u9650\u306e\u8ffd\u52a0
 folderSecurityEditor.addConstraintRef=\u5236\u9650\u53c2\u7167\u306e\u8ffd\u52a0
 
-folderOrderEditor.changeOrderTitle=\u9806\u5e8f\u306e\u5909\u66f4:
+folderOrderEditor.changeOrderTitle=\u9806\u5e8f\u306e\u5909\u66f4
 folderOrderEditor.down=\u4e0b\u3078
 folderOrderEditor.up=\u4e0a\u3078
 folderOrderEditor.add=\u8ffd\u52a0
 folderOrderEditor.delete=\u524a\u9664
-folderOrderEditor.documentName=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u540d:
+folderOrderEditor.documentName=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u540d
 
 folderMetadataEditor.name=\u540d\u524d
 folderMetadataEditor.locale=\u30ed\u30b1\u30fc\u30eb
 folderMetadataEditor.value=\u5024
 folderMetadataEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3
 folderMetadataEditor.delete=\u524a\u9664
-folderMetadataEditor.newMetadataLocale=\u30ed\u30b1\u30fc\u30eb:
-folderMetadataEditor.newMetadataName=\u540d\u524d:
-folderMetadataEditor.newMetadataValue=\u5024:
+folderMetadataEditor.newMetadataLocale=\u30ed\u30b1\u30fc\u30eb
+folderMetadataEditor.newMetadataName=\u540d\u524d
+folderMetadataEditor.newMetadataValue=\u5024
 folderMetadataEditor.add=\u8ffd\u52a0
 
 pageMetadataEditor.name=\u540d\u524d
@@ -108,40 +109,40 @@
 pageMetadataEditor.value=\u5024
 pageMetadataEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3
 pageMetadataEditor.delete=\u524a\u9664
-pageMetadataEditor.newMetadataLocale=\u30ed\u30b1\u30fc\u30eb:
-pageMetadataEditor.newMetadataName=\u540d\u524d:
-pageMetadataEditor.newMetadataValue=\u5024:
+pageMetadataEditor.newMetadataLocale=\u30ed\u30b1\u30fc\u30eb
+pageMetadataEditor.newMetadataName=\u540d\u524d
+pageMetadataEditor.newMetadataValue=\u5024
 pageMetadataEditor.add=\u8ffd\u52a0
 
 layoutPropertyEditor.name=\u540d\u524d
 layoutPropertyEditor.value=\u5024
 layoutPropertyEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3
 layoutPropertyEditor.delete=\u524a\u9664
-layoutPropertyEditor.newPropertyName=\u540d\u524d:
-layoutPropertyEditor.newPropertyValue=\u5024:
+layoutPropertyEditor.newPropertyName=\u540d\u524d
+layoutPropertyEditor.newPropertyValue=\u5024
 layoutPropertyEditor.add=\u8ffd\u52a0
 
 portletPropertyEditor.name=\u540d\u524d
 portletPropertyEditor.value=\u5024
 portletPropertyEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3
 portletPropertyEditor.delete=\u524a\u9664
-portletPropertyEditor.newPropertyName=\u540d\u524d:
-portletPropertyEditor.newPropertyValue=\u5024:
+portletPropertyEditor.newPropertyName=\u540d\u524d
+portletPropertyEditor.newPropertyValue=\u5024
 portletPropertyEditor.add=\u8ffd\u52a0
 
 layoutPreferenceEditor.name=\u540d\u524d
 layoutPreferenceEditor.value=\u5024
 layoutPreferenceEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3
 layoutPreferenceEditor.delete=\u524a\u9664
-layoutPreferenceEditor.newPreferenceName=\u540d\u524d:
-layoutPreferenceEditor.newPreferenceValue=\u5024:
+layoutPreferenceEditor.newPreferenceName=\u540d\u524d
+layoutPreferenceEditor.newPreferenceValue=\u5024
 layoutPreferenceEditor.add=\u8ffd\u52a0
 
 portletPreferenceEditor.name=\u540d\u524d
 portletPreferenceEditor.value=\u5024
 portletPreferenceEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3
 portletPreferenceEditor.delete=\u524a\u9664
-portletPreferenceEditor.newPreferenceName=\u540d\u524d:
-portletPreferenceEditor.newPreferenceValue=\u5024:
+portletPreferenceEditor.newPreferenceName=\u540d\u524d
+portletPreferenceEditor.newPreferenceValue=\u5024
 portletPreferenceEditor.add=\u8ffd\u52a0
 

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -25,7 +25,15 @@
 userList.active=Active
 userList.enabled=Enabled
 userList.disabled=Disabled
+userList.search=Search
+userList.reset=Reset
 
+# userCreate
+userCreate.name=User Name
+userCreate.passwordConfirm=Re-type Password
+userCreate.backToUserList=Back To User List
+userCreate.confirm=Confirm
+
 # userEdit
 userEdit.changePassword=Change Password on Next Login
 userEdit.userEnabled=User Enabled
@@ -36,31 +44,58 @@
 userEdit.Expired=Expired
 userEdit.Extend=Extend
 userEdit.ExtendUnlimited=Extend Unlimited
+userEdit.backToUserList=Back To User List
+userEdit.update=Update
 
+# userConfirm
+userConfirm.backToUserList=Back To User List
+userConfirm.backToEdit=Back To Edit Page
+userConfirm.delete=Delete
+userConfirm.create=Create
+
 # userGroupEdit
 userGroupEdit.newGroup=New Group
 userGroupEdit.group=Group
 userGroupEdit.notFound=Not found.
+userGroupEdit.add=Add
+userGroupEdit.backToUserList=Back To User List
+userGroupEdit.remove=Remove
 
 # userRoleEdit
 userRoleEdit.newRole=New Role
 userRoleEdit.role=Role
 userRoleEdit.notFound=Not found.
+userRoleEdit.add=Add
+userRoleEdit.backToUserList=Back To User List
+userRoleEdit.remove=Remove
 
 # userProfilingRuleEdit
 userProfilingRuleEdit.newProfilingRule=New Profiling Rule
 userProfilingRuleEdit.profilingrule=Profiling Rule
 userProfilingRuleEdit.notFound=Not found.
+userProfilingRuleEdit.add=Add
+userProfilingRuleEdit.backToUserList=Back To User List
+userProfilingRuleEdit.remove=Remove
 
 # userAttributeList
 userAttributeList.userAttributeKey=Key
 userAttributeList.userAttributeValue=Value
+userAttributeList.userAttributeAction=Action
+userAttributeList.create=Create
 
 # userAttributeEdit
 userAttributeEdit.userAttributeKey=Key
 userAttributeEdit.userAttributeValue=Value
+userAttributeEdit.back=Back
+userAttributeEdit.confirm=Confirm
+userAttributeEdit.key=Key
+userAttributeEdit.value=Value
 
 # userAttributeConfirm
 userAttributeConfirm.userAttributeKey=Key
 userAttributeConfirm.userAttributeValue=Value
+userAttributeConfirm.back=Back
+userAttributeConfirm.create=Create
+userAttributeConfirm.update=Update
+userAttributeConfirm.delete=Delete
 

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -5,9 +5,9 @@
 changePassword=\u521d\u671f\u30ed\u30b0\u30a4\u30f3\u6642\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4
 defaultRole=\u30c7\u30d5\u30a9\u30eb\u30c8\u30ed\u30fc\u30eb
 profilingRule=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb
-userList=\u30e6\u30fc\u30b6\u30fc\u306e\u4e00\u89a7
-userInformation=\u30e6\u30fc\u30b6\u30fc\u306e\u60c5\u5831
-userAttributeList=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027\u306e\u4e00\u89a7
+userList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7
+userInformation=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831
+userAttributeList=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027\u4e00\u89a7
 basicTab=\u57fa\u672c\u60c5\u5831
 profilingRuleTab=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb
 userAttributeTab=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027
@@ -25,7 +25,15 @@
 userList.active=\u6709\u52b9
 userList.enabled=\u6709\u52b9
 userList.disabled=\u7121\u52b9
+userList.search=\u691c\u7d22
+userList.reset=\u30ea\u30bb\u30c3\u30c8
 
+# userCreate
+userCreate.name=\u30e6\u30fc\u30b6\u30fc\u540d
+userCreate.passwordConfirm=\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d\u7528)
+userCreate.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b
+userCreate.confirm=\u78ba\u8a8d
+
 # userEdit
 userEdit.changePassword=\u6b21\u56de\u30ed\u30b0\u30a4\u30f3\u6642\u306b\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4
 userEdit.userEnabled=\u5229\u7528\u53ef\u80fd\u72b6\u614b
@@ -36,31 +44,58 @@
 userEdit.Expired=\u671f\u9650\u5207\u308c
 userEdit.Extend=\u5ef6\u9577
 userEdit.ExtendUnlimited=\u7121\u5236\u9650\u306b\u5ef6\u9577
+userEdit.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b
+userEdit.update=\u66f4\u65b0
 
+# userConfirm
+userConfirm.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b
+userConfirm.backToEdit=\u7de8\u96c6\u306b\u623b\u308b
+userConfirm.delete=\u524a\u9664
+userConfirm.create=\u767b\u9332
+
 # userGroupEdit
 userGroupEdit.newGroup=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7
 userGroupEdit.group=\u30b0\u30eb\u30fc\u30d7
 userGroupEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
+userGroupEdit.add=\u8ffd\u52a0
+userGroupEdit.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b
+userGroupEdit.remove=\u524a\u9664
 
 # userRoleEdit
 userRoleEdit.newRole=\u65b0\u898f\u30ed\u30fc\u30eb
 userRoleEdit.role=\u30ed\u30fc\u30eb
 userRoleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
+userRoleEdit.add=\u8ffd\u52a0
+userRoleEdit.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b
+userRoleEdit.remove=\u524a\u9664
 
 # userProfilingRuleEdit
 userProfilingRuleEdit.newProfilingRule=\u65b0\u898f\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb
 userProfilingRuleEdit.profilingrule=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb
 userProfilingRuleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
+userProfilingRuleEdit.add=\u8ffd\u52a0
+userProfilingRuleEdit.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b
+userProfilingRuleEdit.remove=\u524a\u9664
 
 # userAttributeList
 userAttributeList.userAttributeKey=\u30ad\u30fc
 userAttributeList.userAttributeValue=\u5024
+userAttributeList.userAttributeAction=\u30a2\u30af\u30b7\u30e7\u30f3
+userAttributeList.create=\u4f5c\u6210
 
 # userAttributeEdit
 userAttributeEdit.userAttributeKey=\u30ad\u30fc
 userAttributeEdit.userAttributeValue=\u5024
+userAttributeEdit.back=\u623b\u308b
+userAttributeEdit.confirm=\u78ba\u8a8d
+userAttributeEdit.key=\u30ad\u30fc
+userAttributeEdit.value=\u5024
 
 # userAttributeConfirm
 userAttributeConfirm.userAttributeKey=\u30ad\u30fc
 userAttributeConfirm.userAttributeValue=\u5024
+userAttributeConfirm.back=\u623b\u308b
+userAttributeConfirm.create=\u767b\u9332
+userAttributeConfirm.update=\u66f4\u65b0
+userAttributeConfirm.delete=\u524a\u9664
 

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal.properties
===================================================================

Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties	2007-11-19 09:02:17 UTC (rev 706)
@@ -1,5 +0,0 @@
-# portlet info
-javax.portlet.title=\u9000\u4f1a\u7533\u8acb
-javax.portlet.short-title=\u9000\u4f1a
-javax.portlet.keywords=\u9000\u4f1a,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831
-

Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml	2007-11-19 09:02:17 UTC (rev 706)
@@ -45,7 +45,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <!-- resource-bundle></resource-bundle -->
+    <resource-bundle>jp.sf.pal.admin.resources.UserManagement</resource-bundle>
     <portlet-info>
       <title>User Management</title>
       <short-title>Management</short-title>
@@ -155,7 +155,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.registration.UserRegistration</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.UserRegistration</resource-bundle>
     <portlet-info>
       <title>User Registration</title>
       <short-title>Registration</short-title>
@@ -202,7 +202,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.registration.ForgottenPassword</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.ForgottenPassword</resource-bundle>
     <portlet-info>
       <title>Forgotten Password</title>
       <short-title>Forgotten Password</short-title>
@@ -275,7 +275,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.registration.UserRegistration</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.UserRegistration</resource-bundle>
     <portlet-info>
       <title>User Registration</title>
       <short-title>Registration</short-title>
@@ -322,7 +322,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.registration.ForgottenPassword</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.ForgottenPassword</resource-bundle>
     <portlet-info>
       <title>Forgotten Password</title>
       <short-title>Forgotten Password</short-title>
@@ -355,7 +355,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.registration.UserRegistrationUpdate</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.UserRegistrationUpdate</resource-bundle>
     <portlet-info>
       <title>Update User Information</title>
       <short-title>Information Update</short-title>
@@ -388,7 +388,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.site.SiteEditor</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.SiteEditor</resource-bundle>
     <portlet-info>
       <title>Site Editor</title>
       <short-title>Editor</short-title>
@@ -461,7 +461,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.registration.UserRegistration</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.UserRegistration</resource-bundle>
     <portlet-info>
       <title>User Registration</title>
       <short-title>Registration</short-title>
@@ -494,7 +494,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.registration.UserRegistrationUpdate</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.UserRegistrationUpdate</resource-bundle>
     <portlet-info>
       <title>Update User Information</title>
       <short-title>Information Update</short-title>
@@ -535,7 +535,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.withdraw.PublicPortalWithdrawal</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.PublicPortalWithdrawal</resource-bundle>
     <portlet-info>
       <title>Withdrawal</title>
       <short-title>Withdrawal</short-title>
@@ -568,7 +568,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.permission.PermissionEditor</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.PermissionEditor</resource-bundle>
     <portlet-info>
       <title>Permission Editor</title>
       <short-title>Permission</short-title>
@@ -601,7 +601,7 @@
     </supports>
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
-    <resource-bundle>jp.sf.pal.admin.web.password.ChangePassword</resource-bundle>
+    <resource-bundle>jp.sf.pal.admin.resources.ChangePassword</resource-bundle>
     <portlet-info>
       <title>Change Password</title>
       <short-title>Password</short-title>

Modified: pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -53,11 +53,11 @@
     <div>
         <a id="goPreviousPage-header" href="remotePortletList.html?previousPageNumber=1"
             te:rendered="#{deployer_remotePortletListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-header">&lt;&lt;Previous</span>
+            <span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span>
         </a>
         <a id="goNextPage-header" href="remotePortletList.html?nextPageNumber=2"
             te:rendered="#{deployer_remotePortletListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-header">Next&gt;&gt;</span>
+            <span id="nextPageAtHeaderLabel">Next&gt;&gt;</span>
         </a>
     </div>
 
@@ -94,11 +94,11 @@
     <div>
         <a id="goPreviousPage-footer" href="remotePortletList.html?previousPageNumber=1"
             te:rendered="#{deployer_remotePortletListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-footer">&lt;&lt;Previous</span>
+            <span id="previousPageAtFooterLabel">&lt;&lt;Previous</span>
         </a>
         <a id="goNextPage-footer" href="remotePortletList.html?nextPageNumber=2"
             te:rendered="#{deployer_remotePortletListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-footer">Next&gt;&gt;</span>
+            <span id="nextPageAtFooterLabel">Next&gt;&gt;</span>
         </a>
     </div>
 </div>

Modified: pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -48,11 +48,11 @@
     <div>
         <a id="goPreviousPage-header" href="remoteRepositoryList.html?previousPageNumber=1"
             te:rendered="#{deployer_remoteRepositoryListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-header">&lt;&lt;Previous</span>
+            <span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span>
         </a>
         <a id="goNextPage-header" href="remoteRepositoryList.html?nextPageNumber=2"
             te:rendered="#{deployer_remoteRepositoryListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-header">Next&gt;&gt;</span>
+            <span id="nextPageAtHeaderLabel">Next&gt;&gt;</span>
         </a>
     </div>
 
@@ -94,11 +94,11 @@
     <div>
         <a id="goPreviousPage-footer" href="remoteRepositoryList.html?previousPageNumber=1"
             te:rendered="#{deployer_remoteRepositoryListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-footer">&lt;&lt;Previous</span>
+            <span id="previousPageAtFooterLabel">&lt;&lt;Previous</span>
         </a>
         <a id="goNextPage-footer" href="remoteRepositoryList.html?nextPageNumber=2"
             te:rendered="#{deployer_remoteRepositoryListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-footer">Next&gt;&gt;</span>
+            <span id="nextPageAtFooterLabel">Next&gt;&gt;</span>
         </a>
     </div>
 </div>

Modified: pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -44,10 +44,8 @@
     </table>
     
     <div>
-      <div id="isComeFromList" style="display:inline;">
-	    <input type="button" id="jumpGroupList" value="Back" 
+      <input type="button" id="jumpGroupList" value="Back" 
 		    onclick="location.href='groupList.html'" class="portlet-form-button"/>
-      </div>
       <div id="isNotRead" style="display:inline;">
         <input type="button" id="doFinish" value="Finish" onclick="location.href='groupList.html'" class="portlet-form-button"/>
       </div>

Modified: pal-admin/trunk/src/main/webapp/view/group/groupList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/group/groupList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/group/groupList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -43,19 +43,19 @@
     <div>
         <a id="goPreviousPage-header" href="groupList.html?previousPageNumber=1"
             te:rendered="#{group_groupListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-header">&lt;&lt;Previous</span>
+            <span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span>
         </a>
         <a id="goNextPage-header" href="groupList.html?nextPageNumber=2"
             te:rendered="#{group_groupListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-header">Next&gt;&gt;</span>
+            <span id="nextPageAtHeaderLabel">Next&gt;&gt;</span>
         </a>
     </div>
 
     <table>
-	    <thead class="portlet-section-subheader">
+	    <thead>
 		    <tr>
-			    <th><label id="groupNameLabel">Group Name</label></th>
-			    <th><br/></th>
+			    <th width="100" class="portlet-section-subheader"><label id="groupNameLabel">Group Name</label></th>
+			    <th class="portlet-section-subheader"><label id="groupActionLabel">Group Name</label></th>
 		    </tr>
 	    </thead>
 	    <tbody id="groupItems">
@@ -71,11 +71,11 @@
     <div>
         <a id="goPreviousPage-footer" href="groupList.html?previousPageNumber=1"
             te:rendered="#{group_groupListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-footer">&lt;&lt;Previous</span>
+            <span id="previousPageAtFooterLabel">&lt;&lt;Previous</span>
         </a>
         <a id="goNextPage-footer" href="groupList.html?nextPageNumber=2"
             te:rendered="#{group_groupListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-footer">Next&gt;&gt;</span>
+            <span id="nextPageAtFooterLabel">Next&gt;&gt;</span>
         </a>
     </div>
     </div>

Modified: pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -37,10 +37,10 @@
           </div>
           <div>
             <span id="isPreviousPage-header">
-              <a id="goPreviousPage-header" href="userList.html?previousPageNumber=1"><span id="previousPageLabel-header">&lt;&lt;Previous</span></a>
+              <a id="goPreviousPage-header" href="userList.html?previousPageNumber=1"><span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span></a>
             </span>
             <span id="isNextPage-header">
-              <a id="goNextPage-header" href="userList.html?nextPageNumber=2"><span id="nextPageLabel-header">Next&gt;&gt;</span></a>
+              <a id="goNextPage-header" href="userList.html?nextPageNumber=2"><span id="nextPageAtHeaderLabel">Next&gt;&gt;</span></a>
             </span>
           </div>
           <table>
@@ -80,10 +80,10 @@
           </table>
           <div>
             <span id="isPreviousPage-footer">
-              <a id="goPreviousPage-footer" href="userList.html?previousPageNumber=1"><span id="previousPageLabel-footer">&lt;&lt;Previous</span></a>
+              <a id="goPreviousPage-footer" href="userList.html?previousPageNumber=1"><span id="previousPageAtFooterLabel">&lt;&lt;Previous</span></a>
             </span>
             <span id="isNextPage-footer">
-              <a id="goNextPage-footer" href="userList.html?nextPageNumber=2"><span id="nextPageLabel-footer">Next&gt;&gt;</span></a>
+              <a id="goNextPage-footer" href="userList.html?nextPageNumber=2"><span id="nextPageAtFooterLabel">Next&gt;&gt;</span></a>
             </span>
           </div>
         </div>

Modified: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -37,10 +37,10 @@
           </div>
           <div>
             <span id="isPreviousPage-header">
-              <a id="goPreviousPage-header" href="userList.html?previousPageNumber=1"><span id="previousPageLabel-header">&lt;&lt;Previous</span></a>
+              <a id="goPreviousPage-header" href="userList.html?previousPageNumber=1"><span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span></a>
             </span>
             <span id="isNextPage-header">
-              <a id="goNextPage-header" href="userList.html?nextPageNumber=2"><span id="nextPageLabel-header">Next&gt;&gt;</span></a>
+              <a id="goNextPage-header" href="userList.html?nextPageNumber=2"><span id="nextPageAtHeaderLabel">Next&gt;&gt;</span></a>
             </span>
           </div>
           <table>
@@ -80,10 +80,10 @@
           </table>
           <div>
             <span id="isPreviousPage-footer">
-              <a id="goPreviousPage-footer" href="userList.html?previousPageNumber=1"><span id="previousPageLabel-footer">&lt;&lt;Previous</span></a>
+              <a id="goPreviousPage-footer" href="userList.html?previousPageNumber=1"><span id="previousPageAtFooterLabel">&lt;&lt;Previous</span></a>
             </span>
             <span id="isNextPage-footer">
-              <a id="goNextPage-footer" href="userList.html?nextPageNumber=2"><span id="nextPageLabel-footer">Next&gt;&gt;</span></a>
+              <a id="goNextPage-footer" href="userList.html?nextPageNumber=2"><span id="nextPageAtFooterLabel">Next&gt;&gt;</span></a>
             </span>
           </div>
         </div>

Modified: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -37,10 +37,10 @@
           </div>
           <div>
             <span id="isPreviousPage-header">
-              <a id="goPreviousPage-header" href="userList.html?previousPageNumber=1"><span id="previousPageLabel-header">&lt;&lt;Previous</span></a>
+              <a id="goPreviousPage-header" href="userList.html?previousPageNumber=1"><span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span></a>
             </span>
             <span id="isNextPage-header">
-              <a id="goNextPage-header" href="userList.html?nextPageNumber=2"><span id="nextPageLabel-header">Next&gt;&gt;</span></a>
+              <a id="goNextPage-header" href="userList.html?nextPageNumber=2"><span id="nextPageAtHeaderLabel">Next&gt;&gt;</span></a>
             </span>
           </div>
           <table>
@@ -80,10 +80,10 @@
           </table>
           <div>
             <span id="isPreviousPage-footer">
-              <a id="goPreviousPage-footer" href="userList.html?previousPageNumber=1"><span id="previousPageLabel-footer">&lt;&lt;Previous</span></a>
+              <a id="goPreviousPage-footer" href="userList.html?previousPageNumber=1"><span id="previousPageAtFooterLabel">&lt;&lt;Previous</span></a>
             </span>
             <span id="isNextPage-footer">
-              <a id="goNextPage-footer" href="userList.html?nextPageNumber=2"><span id="nextPageLabel-footer">Next&gt;&gt;</span></a>
+              <a id="goNextPage-footer" href="userList.html?nextPageNumber=2"><span id="nextPageAtFooterLabel">Next&gt;&gt;</span></a>
             </span>
           </div>
         </div>

Modified: pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -40,11 +40,11 @@
     <div>
         <a id="goPreviousPage-header" href="portletList.html?previousPageNumber=1"
             te:rendered="#{portletmanager_portletListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-header">&lt;&lt;Previous</span>
+            <span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span>
         </a>
         <a id="goNextPage-header" href="portletList.html?nextPageNumber=2"
             te:rendered="#{portletmanager_portletListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-header">Next&gt;&gt;</span>
+            <span id="nextPageAtHeaderLabel">Next&gt;&gt;</span>
         </a>
     </div>
 
@@ -107,11 +107,11 @@
     <div>
         <a id="goPreviousPage-footer" href="portletList.html?previousPageNumber=1"
             te:rendered="#{portletmanager_portletListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-footer">&lt;&lt;Previous</span>
+            <span id="previousPageAtFooterLabel">&lt;&lt;Previous</span>
         </a>
         <a id="goNextPage-footer" href="portletList.html?nextPageNumber=2"
             te:rendered="#{portletmanager_portletListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-footer">Next&gt;&gt;</span>
+            <span id="nextPageAtFooterLabel">Next&gt;&gt;</span>
         </a>
     </div>
 </div>

Modified: pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -44,10 +44,8 @@
     </table>
     
     <div>
-      <div id="isComeFromList" style="display:inline;">
-	    <input type="button" id="jumpRoleList" value="Back" 
+      <input type="button" id="jumpRoleList" value="Back" 
 		    onclick="location.href='roleList.html'" class="portlet-form-button"/>
-      </div>
       <div id="isNotRead" style="display:inline;">
         <input type="button" id="doFinish" value="Finish" onclick="location.href='roleList.html'" class="portlet-form-button"/>
       </div>

Modified: pal-admin/trunk/src/main/webapp/view/role/roleList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/role/roleList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/role/roleList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -42,25 +42,21 @@
 
     <div>
         <a id="goPreviousPage-header" href="roleList.html?previousPageNumber=1"
-            te:rendered="#{role_roleListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-header">&lt;&lt;Previous</span>
-        </a>
+            te:rendered="#{role_roleListPage.previousPageNumber!=null}"><span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span></a>
         <a id="goNextPage-header" href="roleList.html?nextPageNumber=2"
-            te:rendered="#{role_roleListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-header">Next&gt;&gt;</span>
-        </a>
+            te:rendered="#{role_roleListPage.nextPageNumber!=null}"><span id="nextPageAtHeaderLabel">Next&gt;&gt;</span></a>
     </div>
 
     <table>
-	    <thead class="portlet-section-subheader">
+	    <thead>
 		    <tr>
-			    <th><label id="roleNameLabel">Role Name</label></th>
-			    <th><br/></th>
+			    <th width="100" class="portlet-section-subheader"><label id="roleNameLabel">Role Name</label></th>
+			    <th class="portlet-section-subheader"><label id="roleActionLabel">Role Name</label></th>
 		    </tr>
 	    </thead>
 	    <tbody id="roleItems">
 		    <tr>
-			    <td class="portlet-section-body"><span id="name">role</span></td>
+			    <td width="100" class="portlet-section-body"><span id="name">role</span></td>
 			    <td class="portlet-section-alternate">
 			    <a id="goRoleConfirm-delete" href="roleConfirm.html?fixed_crudType=3&name=name"><span id="deleteLabel">Delete</span></a>
 			    </td>
@@ -70,13 +66,9 @@
 
     <div>
         <a id="goPreviousPage-footer" href="roleList.html?previousPageNumber=1"
-            te:rendered="#{role_roleListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-footer">&lt;&lt;Previous</span>
-        </a>
+            te:rendered="#{role_roleListPage.previousPageNumber!=null}"><span id="previousPageAtFooterLabel">&lt;&lt;Previous</span></a>
         <a id="goNextPage-footer" href="roleList.html?nextPageNumber=2"
-            te:rendered="#{role_roleListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-footer">Next&gt;&gt;</span>
-        </a>
+            te:rendered="#{role_roleListPage.nextPageNumber!=null}"><span id="nextPageAtFooterLabel">Next&gt;&gt;</span></a>
     </div>
     </div>
 </div>

Modified: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -59,7 +59,7 @@
         <div>
           <div style="clear:both;">
             <div style="width:120px;float: left;"><label id="folderOrPageNameLabel" for="folderOrPageName">Name:</label></div>
-            <input id="folderOrPageName" type="text" size="30"/><label>(a-zA-Z0-9 only)</label>
+            <input id="folderOrPageName" type="text" size="30"/><label id="alnumonly">(a-zA-Z0-9 only)</label>
           </div>
           <div style="clear:both;">
             <div style="width:120px;float: left;"><label id="folderOrPageTitleLabel" for="folderOrPageTitle">Title:</label></div>

Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -69,15 +69,15 @@
           <table>
             <thead>
               <tr>
-                <td style="width: 80px;"><label id="nameLabel"></label></td>
-                <td style="width: 300px;"><label id="valueLabel"></label></td>
+                <td style="width: 180px;"><label id="nameLabel"></label></td>
+                <td style="width: 180px;"><label id="valueLabel"></label></td>
                 <td style="width: 100px;"><label id="actionLabel"></label></td>
               </tr>
             </thead>
             <tbody id="preferenceItems">
               <tr>
-                <td><span id="preferenceName">N</span></td>
-                <td style="overflow: scroll;"><span id="preferenceValue">V</span></td>
+                <td><span id="preferenceNameForView">N</span></td>
+                <td><span id="preferenceValueForView">V</span></td>
                 <td>
                 <div id="isEditable-delete">
                   <a id="goPagePreferenceEditor-delete" href="layoutPreferenceEditor.html?mode=c&path=a&returnPath=b&preferenceName=c&fixed_action=delete">

Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -69,15 +69,15 @@
           <table>
             <thead>
               <tr>
-                <td style="width: 80px;"><label id="nameLabel"></label></td>
-                <td style="width: 300px;"><label id="valueLabel"></label></td>
+                <td style="width: 180px;"><label id="nameLabel"></label></td>
+                <td style="width: 180px;"><label id="valueLabel"></label></td>
                 <td style="width: 100px;"><label id="actionLabel"></label></td>
               </tr>
             </thead>
             <tbody id="propertyItems">
               <tr>
-                <td><span id="propertyName">N</span></td>
-                <td><span id="propertyValue">V</span></td>
+                <td><span id="propertyNameForView">N</span></td>
+                <td><span id="propertyValueForView">V</span></td>
                 <td>
                 <div id="isEditable-delete">
                   <a id="goPagePropertyEditor-delete" href="layoutPropertyEditor.html?mode=c&path=a&returnPath=b&propertyName=c&fixed_action=delete">

Modified: pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -66,15 +66,15 @@
           <table>
             <thead>
               <tr>
-                <td style="width: 80px;"><label id="nameLabel"></label></td>
-                <td style="width: 300px;"><label id="valueLabel"></label></td>
+                <td style="width: 180px;"><label id="nameLabel"></label></td>
+                <td style="width: 180px;"><label id="valueLabel"></label></td>
                 <td style="width: 100px;"><label id="actionLabel"></label></td>
               </tr>
             </thead>
             <tbody id="preferenceItems">
               <tr>
-                <td><span id="preferenceName">N</span></td>
-                <td style="overflow: scroll;"><span id="preferenceValue">V</span></td>
+                <td><span id="preferenceNameForView">N</span></td>
+                <td><span id="preferenceValueForView">V</span></td>
                 <td>
                 <div id="isEditable-delete">
                   <a id="goPagePreferenceEditor-delete" href="portletPreferenceEditor.html?mode=c&path=a&returnPath=b&preferenceName=c&fixed_action=delete">

Modified: pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -66,15 +66,15 @@
           <table>
             <thead>
               <tr>
-                <td style="width: 80px;"><label id="nameLabel"></label></td>
-                <td style="width: 300px;"><label id="valueLabel"></label></td>
+                <td style="width: 180px;"><label id="nameLabel"></label></td>
+                <td style="width: 180px;"><label id="valueLabel"></label></td>
                 <td style="width: 100px;"><label id="actionLabel"></label></td>
               </tr>
             </thead>
             <tbody id="propertyItems">
               <tr>
-                <td><span id="propertyName">N</span></td>
-                <td><span id="propertyValue">V</span></td>
+                <td><span id="propertyNameForView">N</span></td>
+                <td><span id="propertyValueForView">V</span></td>
                 <td>
                 <div id="isEditable-delete">
                   <a id="goPagePropertyEditor-delete" href="portletPropertyEditor.html?mode=c&path=a&returnPath=b&propertyName=c&fixed_action=delete">

Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -69,10 +69,8 @@
     <input type="hidden" id="name-hidden" />
     
     <div>
-      <div id="isComeFromList" style="display:inline;">
-	    <input type="button" id="jumpUserAttributeList" value="Back" 
+      <input type="button" id="jumpUserAttributeList" value="Back" 
 		    onclick="location.href='userAttributeList.html'" class="portlet-form-button"/>
-      </div>
       <div id="isNotRead" style="display:inline;">
         <input type="button" id="doUpdate" value="Finish" onclick="location.href='userAttributeList.html'" class="portlet-form-button"/>
       </div>

Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -72,7 +72,7 @@
     <input type="hidden" id="name-hidden"/>
     
     <div>
-      <input type="button" id="doBack" value="Back"
+      <input type="button" id="jumpUserAttributeList" value="Back"
 	    onclick="location.href='userAttributeList.html'" class="portlet-form-button"/>
       <div id="isNotRead" style="display:inline;">
         <input type="button" id="goUserAttributeConfirm" value="Confirm"

Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -67,21 +67,17 @@
 
     <div>
         <a id="goPreviousPage-header" href="userAttributeList.html?previousPageNumber=12&name=name"
-            te:rendered="#{user_userAttributeListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-header">&lt;&lt;Previous</span>
-        </a>
+            te:rendered="#{user_userAttributeListPage.previousPageNumber!=null}"><span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span></a>
         <a id="goNextPage-header" href="userAttributeList.html?nextPageNumber=22&name=name"
-            te:rendered="#{user_userAttributeListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-header">Next&gt;&gt;</span>
-        </a>
+            te:rendered="#{user_userAttributeListPage.nextPageNumber!=null}"><span id="nextPageAtHeaderLabel">Next&gt;&gt;</span></a>
     </div>
 
     <table>
-	    <thead class="portlet-section-subheader">
+	    <thead>
 		    <tr>
-			    <th><label id="userAttributeKeyLabel">Key</label></th>
-			    <th><label id="userAttributeValueLabel">Value</label></th>
-			    <th><br/></th>
+			    <th width="100" class="portlet-section-subheader"><label id="userAttributeKeyLabel">Key</label></th>
+			    <th width="200" class="portlet-section-subheader"><label id="userAttributeValueLabel">Value</label></th>
+			    <th width="100" class="portlet-section-subheader"><label id="userAttributeActionLabel">Value</label></th>
 		    </tr>
 	    </thead>
 	    <tbody id="userAttributeItems">
@@ -98,13 +94,9 @@
 
     <div>
         <a id="goPreviousPage-footer" href="userAttributeList.html?previousPageNumber=12&name=name"
-            te:rendered="#{user_userAttributeListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-footer">&lt;&lt;Previous</span>
-        </a>
+            te:rendered="#{user_userAttributeListPage.previousPageNumber!=null}"><span id="previousPageAtFooterLabel">&lt;&lt;Previous</span></a>
         <a id="goNextPage-footer" href="userAttributeList.html?nextPageNumber=2&name=name"
-            te:rendered="#{user_userAttributeListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-footer">Next&gt;&gt;</span>
-        </a>
+            te:rendered="#{user_userAttributeListPage.nextPageNumber!=null}"><span id="nextPageAtFooterLabel">Next&gt;&gt;</span></a>
     </div>
 </div>
 <!-- content: END -->

Modified: pal-admin/trunk/src/main/webapp/view/user/userConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userConfirm.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/user/userConfirm.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -80,7 +80,7 @@
 		    onclick="location.href='userCreate.html'" class="portlet-form-button"/>
       </div>
       <div id="isNotRead" style="display:inline;">
-        <input type="button" id="doFinish-create" value="Finish" onclick="location.href='userList.html'" class="portlet-form-button"/>
+        <input type="button" id="doFinishCreate" value="Finish" onclick="location.href='userList.html'" class="portlet-form-button"/>
       </div>
     </div>
 </div>

Modified: pal-admin/trunk/src/main/webapp/view/user/userList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userList.html	2007-11-13 07:40:43 UTC (rev 705)
+++ pal-admin/trunk/src/main/webapp/view/user/userList.html	2007-11-19 09:02:17 UTC (rev 706)
@@ -50,13 +50,9 @@
 
     <div>
         <a id="goPreviousPage-header" href="userList.html?previousPageNumber=1"
-            te:rendered="#{user_userListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-header">&lt;&lt;Previous</span>
-        </a>
+            te:rendered="#{user_userListPage.previousPageNumber!=null}"><span id="previousPageAtHeaderLabel">&lt;&lt;Previous</span></a>
         <a id="goNextPage-header" href="userList.html?nextPageNumber=2"
-            te:rendered="#{user_userListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-header">Next&gt;&gt;</span>
-        </a>
+            te:rendered="#{user_userListPage.nextPageNumber!=null}"><span id="nextPageAtHeaderLabel">Next&gt;&gt;</span></a>
     </div>
 
     <table>
@@ -85,13 +81,9 @@
 
     <div>
         <a id="goPreviousPage-footer" href="userList.html?previousPageNumber=1"
-            te:rendered="#{user_userListPage.previousPageNumber!=null}">
-            <span id="previousPageLabel-footer">&lt;&lt;Previous</span>
-        </a>
+            te:rendered="#{user_userListPage.previousPageNumber!=null}"><span id="previousPageAtFooterLabel">&lt;&lt;Previous</span></a>
         <a id="goNextPage-footer" href="userList.html?nextPageNumber=2"
-            te:rendered="#{user_userListPage.nextPageNumber!=null}">
-            <span id="nextPageLabel-footer">Next&gt;&gt;</span>
-        </a>
+            te:rendered="#{user_userListPage.nextPageNumber!=null}"><span id="nextPageAtFooterLabel">Next&gt;&gt;</span></a>
     </div>
     </div>
 </div>

• 前の記事 [pal-cvs 2961] [705] fixed page navigation.
• 次の記事 [pal-cvs 2963] [707] added max length validator.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]