Portal Application Laboratory

[pal-cvs 3752] [1487] added css, updated style, reviewed access control.

svnno****@sourc***** svnno****@sourc*****
2008年 12月 1日 (月) 17:10:58 JST

• 前の記事 [pal-cvs 3751] [1486] i18ned and updated translation.
• 次の記事 [pal-cvs 3753] [1488] updated ui.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 1487
          http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1487
Author:   shinsuke
Date:     2008-12-01 17:10:57 +0900 (Mon, 01 Dec 2008)

Log Message:
-----------
added css, updated style, reviewed access control.

Modified Paths:
--------------
    todolist/trunk/src/main/java/jp/sf/pal/todolist/action/admin/CategoryAction.java
    todolist/trunk/src/main/java/jp/sf/pal/todolist/action/user/TodoAction.java
    todolist/trunk/src/main/java/jp/sf/pal/todolist/db/exentity/UserInfo.java
    todolist/trunk/src/main/java/jp/sf/pal/todolist/service/CategoryService.java
    todolist/trunk/src/main/java/jp/sf/pal/todolist/service/TodoService.java
    todolist/trunk/src/main/resources/application.properties
    todolist/trunk/src/main/resources/application_ja.properties
    todolist/trunk/src/main/resources/jp/sf/pal/todolist/resources/TodoListEditor_ja.properties
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/confirm.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/edit.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/error.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/index.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/userInfo/error.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/admin/userInfo/index.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/common/common.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/config/index.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/confirm.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/edit.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/error.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/index.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/userInfo/error.jsp
    todolist/trunk/src/main/webapp/WEB-INF/view/user/userInfo/index.jsp

Added Paths:
-----------
    todolist/trunk/src/main/webapp/css/
    todolist/trunk/src/main/webapp/css/pal-extension.css


-------------- next part --------------
Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/action/admin/CategoryAction.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/action/admin/CategoryAction.java	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/action/admin/CategoryAction.java	2008-12-01 08:10:57 UTC (rev 1487)
@@ -272,7 +272,6 @@
         } else {
             String userId = request.getRemoteUser();
             todoCategory = new TodoCategory();
-            todoCategory.setUserId(userId);
             todoCategory.setUpdatedBy(userId);
             todoCategory.setCreatedBy(userId);
         }

Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/action/user/TodoAction.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/action/user/TodoAction.java	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/action/user/TodoAction.java	2008-12-01 08:10:57 UTC (rev 1487)
@@ -458,6 +458,10 @@
         return categoryService.getTodoCategoryList(userId);
     }
 
+    public String getUserId() {
+        return ToDoListUtil.getUserId(request);
+    }
+
     /**
      * @return the request
      */

Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/db/exentity/UserInfo.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/db/exentity/UserInfo.java	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/db/exentity/UserInfo.java	2008-12-01 08:10:57 UTC (rev 1487)
@@ -1,5 +1,7 @@
 package jp.sf.pal.todolist.db.exentity;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * The entity of USER_INFO.
  * <p>
@@ -14,4 +16,32 @@
 
     /** Serial version UID. (Default) */
     private static final long serialVersionUID = 1L;
+
+    public String getNameArg0() {
+        if (StringUtils.isEmpty(getGivenName())
+                && StringUtils.isEmpty(getFamilyName())) {
+            return getUserId();
+        }
+        return getGivenName() != null ? getGivenName() : "";
+    }
+
+    public String getNameArg1() {
+        return getFamilyName() != null ? getFamilyName() : "";
+    }
+
+    public String getNameArg2() {
+        if (StringUtils.isEmpty(getGivenName())
+                && StringUtils.isEmpty(getFamilyName())) {
+            return "";
+        }
+        return getMiddleName() != null ? getMiddleName() : "";
+    }
+
+    public String getNameArg3() {
+        return getGivenNameDesc() != null ? getGivenNameDesc() : "";
+    }
+
+    public String getNameArg4() {
+        return getFamilyNameDesc() != null ? getFamilyNameDesc() : "";
+    }
 }

Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/service/CategoryService.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/service/CategoryService.java	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/service/CategoryService.java	2008-12-01 08:10:57 UTC (rev 1487)
@@ -28,6 +28,8 @@
 
     private transient UserInfoBhv userInfoBhv;
 
+    private TodoService todoService;
+
     private void initUserInfo(String userId) {
         UserInfoCB cb = new UserInfoCB();
         cb.query().setUserId_Equal(userId);
@@ -56,6 +58,7 @@
         cb.fetchPage(categoryPager.getCurrentPageNumber());
 
         // setup
+        cb.setupSelect_UserInfo();
 
         cb.query().setDeletedBy_IsNull();
         if (userId != null) {
@@ -124,6 +127,8 @@
     }
 
     public void disable(Long id, String name) {
+        todoService.removeCategoryId(id);
+
         // not delete
         TodoCategoryCB cb = new TodoCategoryCB();
 
@@ -162,4 +167,12 @@
         this.userInfoBhv = userInfoBhv;
     }
 
+    public TodoService getTodoService() {
+        return todoService;
+    }
+
+    public void setTodoService(TodoService todoService) {
+        this.todoService = todoService;
+    }
+
 }

Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/service/TodoService.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/service/TodoService.java	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/service/TodoService.java	2008-12-01 08:10:57 UTC (rev 1487)
@@ -62,7 +62,8 @@
         cb.fetchPage(todoPager.getCurrentPageNumber());
 
         // setup
-        cb.setupSelect_Todo().withUserInfo();
+        cb.setupSelect_Todo().withUserInfo(); // TODO use specify*
+        cb.setupSelect_UserInfo(); // TODO use specify*
 
         cb.query().setDeletedBy_IsNull();
         if (userId != null) {
@@ -224,6 +225,19 @@
     }
 
     public void disable(Long id, String name) {
+        Timestamp now = new Timestamp(new Date().getTime());
+
+        // todomapping
+        TodoMappingCB cb2 = new TodoMappingCB();
+        cb2.query().setDeletedBy_IsNull();
+        cb2.query().setTodoId_Equal(id);
+
+        TodoMapping todoMapping = new TodoMapping();
+        todoMapping.setDeletedBy(name);
+        todoMapping.setDeletedTime(now);
+
+        todoMappingBhv.queryUpdate(todoMapping, cb2);
+
         // not delete
         TodoCB cb = new TodoCB();
 
@@ -233,18 +247,9 @@
         // TODO throw an exception
 
         todo.setDeletedBy(name);
-        todo.setDeletedTime(new Timestamp(new Date().getTime()));
+        todo.setDeletedTime(now);
         todoBhv.update(todo);
 
-        // todomapping
-        TodoMappingCB cb2 = new TodoMappingCB();
-        cb2.query().setDeletedBy_IsNull();
-        cb2.query().setTodoId_Equal(id);
-        for (TodoMapping todoMapping : todoMappingBhv.selectList(cb2)) {
-            todoMapping.setDeletedBy(name);
-            todoMapping.setDeletedTime(new Timestamp(new Date().getTime()));
-            todoMappingBhv.update(todoMapping);
-        }
     }
 
     public void disableMapping(Long id, String name) {
@@ -276,6 +281,16 @@
         }
     }
 
+    public void removeCategoryId(Long categoryId) {
+        TodoMappingCB cb = new TodoMappingCB();
+        cb.query().setCategoryId_Equal(categoryId);
+
+        TodoMapping todoMapping = new TodoMapping();
+        todoMapping.setCategoryId(null);
+
+        todoMappingBhv.queryUpdate(todoMapping, cb);
+    }
+
     public PagerDxo getPagerDxo() {
         return pagerDxo;
     }

Modified: todolist/trunk/src/main/resources/application.properties
===================================================================
--- todolist/trunk/src/main/resources/application.properties	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/resources/application.properties	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,6 +5,13 @@
 msg.header=<ul>
 msg.footer=</ul>
 
+# 0: Given name, 1: Family name, 2: Middle Name
+display.name={0} {2} {1}
+# 0: Given name, 1: Family name, 2: Middle Name, 3: Given name(Phonetic), 4: Family name(Phonetic)
+long.display.name={0} {2} {1}
+# 0: Given name(Phonetic), 1: Family name(Phonetic), 2: Middle Name
+phonetic.display.name={0} {2} {1}
+
 errors.invalid={0} is invalid.
 errors.maxlength={0} can not be greater than {1} characters.
 errors.minlength={0} can not be less than {1} characters.
@@ -56,58 +63,74 @@
 errors.failed_to_delete_todo_mapping=Failed to remove the user.
 errors.user_already_exists_in_task=The user already exists in this task.
 
-label.tab.category=Category
-label.tab.tasks=Tasks
-label.name=Name
-label.back=Back
-label.owner=Owners
-label.prev=Prev
-label.next=Next
-label.basic=Basic
-label.description=Description
-label.priority=Priority
-label.status=Status
-label.working=Working
-label.completed=Completed
-label.start_date=Start Date
-label.end_date=End Date
-label.personal=Personal
-label.category_id=Category ID
-label.assigned=Assigned
-label.title=Title
-label.remove=Remove
-label.created_by=Created By
-label.due_date=Due Date
-label.edit=Edit
-label.user_id=User ID
-label.email=Email
-label.add=Add
-label.category=Category
-label.configuration=Configuration
-label.guest_user_name=Guest User Name
-label.add_user_to_this_task=Add User to This Task
-label.all=ALL
-label.memo=memo
+labels.tab.category=Category
+labels.tab.tasks=Tasks
+labels.name=Name
+labels.back=Back
+labels.owner=Owners
+labels.prev=Prev
+labels.next=Next
+labels.basic=Basic
+labels.description=Description
+labels.priority=Priority
+labels.status=Status
+labels.working=Working
+labels.completed=Completed
+labels.start_date=Start Date
+labels.end_date=End Date
+labels.personal=Personal
+labels.category_id=Category ID
+labels.assigned=Assigned
+labels.title=Title
+labels.remove=Remove
+labels.created_by=Created By
+labels.due_date=Due Date
+labels.edit=Edit
+labels.user_id=User ID
+labels.email=Email
+labels.add=Add
+labels.category=Category
+labels.configuration=Configuration
+labels.guest_user_name=Guest User Name
+labels.add_user_to_this_task=Add User to This Task
+labels.all=ALL
+labels.memo=Memo
 
-label.blocker=Blocker
-label.critical=Critical
-label.major=Major
-label.minor=Minor
-label.trivial=Trivial
+labels.blocker=Blocker
+labels.critical=Critical
+labels.major=Major
+labels.minor=Minor
+labels.trivial=Trivial
 
-label.input.create=Create
-label.input.delete=Delete
-label.input.confirm=Confirm
-label.input.back=Back
-label.input.update=Update
-label.input.edit=Edit
-label.input.remove=Remove
-label.input.remove_from_me=Remove this task from me
+labels.input.create=Create
+labels.input.delete=Delete
+labels.input.confirm=Confirm
+labels.input.back=Back
+labels.input.update=Update
+labels.input.edit=Edit
+labels.input.remove=Remove
+labels.input.remove_from_me=Remove this task from me
 
-label.category.confirm.category_info=Confirmation of Category Info
-label.category.edit.category_info=Edit Category Info
-label.category.index.category=Create New Category
-label.todo.confirm.task_info=Confirmation of Task Info
-label.todo.edit.task_info=Edit Task Info
-label.todo.index.create_new_task=Create New Task
-label.userinfo.index.back_to_task_detail=Back to Task Detail
\ No newline at end of file
+labels.category.confirm.category_info=Confirmation of Category Info
+labels.category.edit.category_info=Edit Category Info
+labels.category.index.category=Create New Category
+labels.todo.confirm.task_info=Confirmation of Task Info
+labels.todo.edit.task_info=Edit Task Info
+labels.todo.index.create_new_task=Create New Task
+labels.userinfo.index.back_to_task_detail=Back to Task Detail
+
+labels.categoryId=Category ID
+labels.descriptionForTodo=Description
+labels.guestName=Guest Name
+labels.nameForTodo=Name
+labels.endDateDate=Due Date (Date)
+labels.endDateMonth=Due Date (Month)
+labels.endDateYear=Due Date (Year)
+labels.priorityForTodo=Priority
+labels.startDateDate=Start Date (Date)
+labels.startDateMonth=Start Date (Month)
+labels.startDateYear=Start Date (Year)
+
+labels.delete=Delete
+labels.new_category=Create Category
+labels.userId=User ID

Modified: todolist/trunk/src/main/resources/application_ja.properties
===================================================================
--- todolist/trunk/src/main/resources/application_ja.properties	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/resources/application_ja.properties	2008-12-01 08:10:57 UTC (rev 1487)
@@ -1,3 +1,10 @@
+# 0: Given name, 1: Family name, 2: Middle Name
+display.name={1} {0}
+# 0: Given name, 1: Family name, 2: Middle Name, 3: Given name(Phonetic), 4: Family name(Phonetic)
+long.display.name={1} {0} ({4} {3})
+# 0: Given name(Phonetic), 1: Family name(Phonetic), 2: Middle Name
+phonetic.display.name={1} {0}
+
 errors.invalid={0} \u306f\u7121\u52b9\u3067\u3059\u3002
 errors.maxlength={0} \u3092 {1} \u6587\u5b57\u3088\u308a\u591a\u304f\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002
 errors.minlength={0} \u3092 {1} \u6587\u5b57\u3088\u308a\u5c11\u306a\u304f\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002
@@ -49,58 +56,75 @@
 errors.failed_to_delete_todo_mapping=\u30e6\u30fc\u30b6\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 errors.user_already_exists_in_task=\u305d\u306e\u30e6\u30fc\u30b6\u306f\u3059\u3067\u306b\u3053\u306e\u30bf\u30b9\u30af\u306b\u5b58\u5728\u3057\u307e\u3059\u3002
 
-label.tab.category=\u30ab\u30c6\u30b4\u30ea
-label.tab.tasks=\u30bf\u30b9\u30af
-label.name=\u540d\u524d
-label.back=\u623b\u308b
-label.owner=\u30aa\u30fc\u30ca\u30fc
-label.prev=\u524d\u3078
-label.next=\u6b21\u3078
-label.basic=\u57fa\u672c
-label.description=\u8aac\u660e
-label.priority=\u512a\u5148\u5ea6
-label.status=\u72b6\u614b
-label.working=\u4f5c\u696d\u4e2d
-label.completed=\u7d42\u4e86
-label.start_date=\u958b\u59cb\u65e5
-label.end_date=\u7d42\u4e86\u65e5
-label.personal=\u500b\u4eba
-label.category_id=\u30ab\u30c6\u30b4\u30eaID
-label.assigned=\u5272\u308a\u5f53\u3066
-label.title=\u30bf\u30a4\u30c8\u30eb
-label.remove=\u524a\u9664
-label.created_by=\u4f5c\u6210\u8005
-label.due_date=\u671f\u65e5
-label.edit=\u7de8\u96c6
-label.user_id=\u30e6\u30fc\u30b6ID
-label.email=E\u30e1\u30fc\u30eb
-label.add=\u8ffd\u52a0
-label.category=\u30ab\u30c6\u30b4\u30ea
-label.configuration=\u8a2d\u5b9a
-label.guest_user_name=\u30b2\u30b9\u30c8\u30e6\u30fc\u30b6\u540d
-label.add_user_to_this_task=\u30e6\u30fc\u30b6\u3092\u3053\u306e\u30bf\u30b9\u30af\u306b\u8ffd\u52a0
-label.all=\u3059\u3079\u3066
-label.memo=\u30e1\u30e2
+labels.tab.category=\u30ab\u30c6\u30b4\u30ea
+labels.tab.tasks=\u30bf\u30b9\u30af
+labels.name=\u540d\u524d
+labels.back=\u623b\u308b
+labels.owner=\u6240\u6709\u8005
+labels.prev=\u524d\u3078
+labels.next=\u6b21\u3078
+labels.basic=\u57fa\u672c
+labels.description=\u8aac\u660e
+labels.priority=\u512a\u5148\u5ea6
+labels.status=\u72b6\u614b
+labels.working=\u4f5c\u696d\u4e2d
+labels.completed=\u7d42\u4e86
+labels.start_date=\u958b\u59cb\u65e5
+labels.end_date=\u7d42\u4e86\u65e5
+labels.personal=\u500b\u4eba
+labels.category_id=\u30ab\u30c6\u30b4\u30eaID
+labels.assigned=\u5272\u308a\u5f53\u3066
+labels.title=\u30bf\u30a4\u30c8\u30eb
+labels.remove=\u524a\u9664
+labels.created_by=\u4f5c\u6210\u8005
+labels.due_date=\u671f\u65e5
+labels.edit=\u7de8\u96c6
+labels.user_id=\u30e6\u30fc\u30b6ID
+labels.email=E\u30e1\u30fc\u30eb
+labels.add=\u8ffd\u52a0
+labels.category=\u30ab\u30c6\u30b4\u30ea
+labels.configuration=\u8a2d\u5b9a
+labels.guest_user_name=\u30b2\u30b9\u30c8\u30e6\u30fc\u30b6\u540d
+labels.add_user_to_this_task=\u30e6\u30fc\u30b6\u3092\u3053\u306e\u30bf\u30b9\u30af\u306b\u8ffd\u52a0
+labels.all=\u3059\u3079\u3066
+labels.memo=\u30e1\u30e2
 
-label.blocker=\u6700\u512a\u5148
-label.critical=\u512a\u5148
-label.major=\u666e\u901a
-label.minor=\u4f4e\u3044
-label.trivial=\u6700\u3082\u4f4e\u3044
+labels.blocker=\u6700\u512a\u5148
+labels.critical=\u512a\u5148
+labels.major=\u666e\u901a
+labels.minor=\u4f4e\u3044
+labels.trivial=\u6700\u3082\u4f4e\u3044
 
-label.input.create=\u4f5c\u6210
-label.input.delete=\u524a\u9664
-label.input.confirm=\u78ba\u8a8d
-label.input.back=\u623b\u308b
-label.input.update=\u66f4\u65b0
-label.input.edit=\u7de8\u96c6
-label.input.remove=\u79fb\u52d5
-label.input.remove_from_me=\u3053\u306e\u30bf\u30b9\u30af\u3092\u79fb\u52d5\u3059\u308b
+labels.input.create=\u4f5c\u6210
+labels.input.delete=\u524a\u9664
+labels.input.confirm=\u78ba\u8a8d
+labels.input.back=\u623b\u308b
+labels.input.update=\u66f4\u65b0
+labels.input.edit=\u7de8\u96c6
+labels.input.remove=\u524a\u9664
+labels.input.remove_from_me=\u81ea\u5206\u3092\u30bf\u30b9\u30af\u304b\u3089\u524a\u9664
 
-label.category.confirm.category_info=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u78ba\u5b9a
-label.category.edit.category_info=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u7de8\u96c6
-label.category.index.category=\u65b0\u3057\u3044\u30ab\u30c6\u30b4\u30ea\u306e\u4f5c\u6210
-label.todo.confirm.task_info=\u30bf\u30b9\u30af\u306e\u78ba\u5b9a
-label.todo.edit.task_info=\u30bf\u30b9\u30af\u306e\u7de8\u96c6
-label.todo.index.create_new_task=\u30bf\u30b9\u30af\u306e\u4f5c\u6210
-label.userinfo.index.back_to_task_detail=\u30bf\u30b9\u30af\u306e\u8a73\u7d30\u3078\u623b\u308b
\ No newline at end of file
+labels.category.confirm.category_info=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u78ba\u5b9a
+labels.category.edit.category_info=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u7de8\u96c6
+labels.category.index.category=\u65b0\u3057\u3044\u30ab\u30c6\u30b4\u30ea\u306e\u4f5c\u6210
+labels.todo.confirm.task_info=\u30bf\u30b9\u30af\u306e\u78ba\u5b9a
+labels.todo.edit.task_info=\u30bf\u30b9\u30af\u306e\u7de8\u96c6
+labels.todo.index.create_new_task=\u30bf\u30b9\u30af\u306e\u4f5c\u6210
+labels.userinfo.index.back_to_task_detail=\u30bf\u30b9\u30af\u306e\u8a73\u7d30\u3078\u623b\u308b
+
+labels.categoryId=\u30ab\u30c6\u30b4\u30ea ID
+labels.descriptionForTodo=\u8aac\u660e
+labels.guestName=\u30b2\u30b9\u30c8\u540d
+labels.nameForTodo=\u540d\u524d
+labels.endDateDate=\u671f\u65e5(\u65e5)
+labels.endDateMonth=\u671f\u65e5(\u6708)
+labels.endDateYear=\u671f\u65e5(\u5e74)
+labels.priorityForTodo=Priority
+labels.startDateDate=\u958b\u59cb\u65e5(\u65e5)
+labels.startDateMonth=\u958b\u59cb\u65e5(\u6708)
+labels.startDateYear=\u958b\u59cb\u65e5(\u5e74)
+
+labels.delete=\u524a\u9664
+labels.new_category=\u30ab\u30c6\u30b4\u30ea\u306e\u4f5c\u6210
+labels.userId=\u30e6\u30fc\u30b6\u30fc ID
+

Modified: todolist/trunk/src/main/resources/jp/sf/pal/todolist/resources/TodoListEditor_ja.properties
===================================================================
--- todolist/trunk/src/main/resources/jp/sf/pal/todolist/resources/TodoListEditor_ja.properties	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/resources/jp/sf/pal/todolist/resources/TodoListEditor_ja.properties	2008-12-01 08:10:57 UTC (rev 1487)
@@ -1,4 +1,4 @@
 # portlet info
-javax.portlet.title=ToDo\u30ea\u30b9\u30c8\u30a8\u30c7\u30a3\u30bf
-javax.portlet.short-title=ToDo\u30ea\u30b9\u30c8\u30a8\u30c7\u30a3\u30bf
-javax.portlet.keywords=ToDo\u30ea\u30b9\u30c8,\u30a8\u30c7\u30a3\u30bf,\u7de8\u96c6
\ No newline at end of file
+javax.portlet.title=ToDo\u30ea\u30b9\u30c8
+javax.portlet.short-title=ToDo\u30ea\u30b9\u30c8
+javax.portlet.keywords=ToDo\u30ea\u30b9\u30c8,\u7de8\u96c6
\ No newline at end of file

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selectable"><s:link href="/admin/todo/" style="text-decoration: none;"><bean:message key="label.tab.tasks"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/todo/" style="text-decoration: none;"><bean:message key="labels.tab.tasks"/></s:link></li>
     <li class="spacer"></li>
-    <li class="selected"><span><bean:message key="label.tab.category"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.category"/></span></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -25,32 +41,36 @@
 		<html:hidden property="mode"/>
 		<div class="form-table" style="margin-top:3px;">
 		<table>
-			<caption><bean:message key="label.category.confirm.category_info"/></caption>
+			<caption><bean:message key="labels.category.confirm.category_info"/></caption>
 			<tbody>
                 <tr>
-                    <th style="width: 120px;"><bean:message key="label.name"/></th>
+                    <th style="width: 120px;"><bean:message key="labels.name"/></th>
                     <td style="width: 200px;">${f:h(name)}<html:hidden property="name"/></td>
                 </tr>
+                <tr>
+                    <th><bean:message key="labels.userId"/></th>
+                    <td>${f:h(userId)}<html:hidden property="userId"/></td>
+                </tr>
 			</tbody>
 			<tfoot>
 				<tr>
 					<td colspan="2">
         <c:if test="${mode == 1}">
-            <input type="submit" name="create" value="<bean:message key="label.input.create"/>"/>
-            <input type="submit" name="editagain" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="create" value="<bean:message key="labels.input.create"/>"/>
+            <input type="submit" name="editagain" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 2}">
-            <input type="submit" name="update" value="<bean:message key="label.input.update"/>"/>
-            <input type="submit" name="editagain" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="update" value="<bean:message key="labels.input.update"/>"/>
+            <input type="submit" name="editagain" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 3}">
-            <input type="submit" name="delete" value="<bean:message key="label.input.delete"/>"/>
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="delete" value="<bean:message key="labels.input.delete"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 4}">
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
-            <input type="submit" name="editpagefromconfirm" value="<bean:message key="label.input.edit"/>"/>
-            <input type="submit" name="deletepagefromconfirm" value="<bean:message key="label.input.delete"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
+            <input type="submit" name="editpagefromconfirm" value="<bean:message key="labels.input.edit"/>"/>
+            <input type="submit" name="deletepagefromconfirm" value="<bean:message key="labels.input.delete"/>"/>
         </c:if>
 					</td>
 				</tr>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selectable"><s:link href="/admin/todo/" style="text-decoration: none;"><bean:message key="label.tab.tasks"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/todo/" style="text-decoration: none;"><bean:message key="labels.tab.tasks"/></s:link></li>
     <li class="spacer"></li>
-    <li class="selected"><span><bean:message key="label.tab.category"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.category"/></span></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -25,18 +41,22 @@
         <html:hidden property="mode"/>
         <div class="form-table" style="margin-top:3px;">
 		<table>
-            <caption><bean:message key="label.category.edit.category_info"/></caption>
+            <caption><bean:message key="labels.category.edit.category_info"/></caption>
             <tbody>
                 <tr>
-                    <th style="width: 120px;"><bean:message key="label.name"/></th>
-                    <td style="width: 200px;"><html:text property="name" size="20"/></td>
+                    <th style="width: 120px;"><bean:message key="labels.name"/></th>
+                    <td style="width: 200px;"><html:text property="name" size="20" style="width:100%;"/></td>
                 </tr>
+                <tr>
+                    <th><bean:message key="labels.userId"/></th>
+                    <td><html:text property="userId" size="20" style="width:100%;"/></td>
+                </tr>
             </tbody>
             <tfoot>
                 <tr>
                     <td colspan="2">
-        <input type="submit" name="confirm" value="<bean:message key="label.input.confirm"/>"/>
-        <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+        <input type="submit" name="confirm" value="<bean:message key="labels.input.confirm"/>"/>
+        <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
                     </td>
                 </tr>
             </tfoot>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -4,14 +4,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selectable"><s:link href="/admin/todo/" style="text-decoration: none;"><bean:message key="label.tab.tasks"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/todo/" style="text-decoration: none;"><bean:message key="labels.tab.tasks"/></s:link></li>
     <li class="spacer"></li>
-    <li class="selected"><span><bean:message key="label.tab.category"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.category"/></span></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -19,7 +35,7 @@
 
 <html:errors/>
 <br>
-<s:link href="index"><bean:message key="label.back"/></s:link>
+<s:link href="index"><bean:message key="labels.back"/></s:link>
 </div>
 </body>
 </html>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selectable"><s:link href="/admin/todo/" style="text-decoration: none;"><bean:message key="label.tab.tasks"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/todo/" style="text-decoration: none;"><bean:message key="labels.tab.tasks"/></s:link></li>
     <li class="spacer"></li>
-    <li class="selected"><span><bean:message key="label.tab.category"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.category"/></span></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -22,13 +38,13 @@
 
 <div class="list-table" style="margin-top:3px;">
 <div>
-<s:link href="createpage"><bean:message key="label.category"/></s:link>
+<s:link href="createpage"><bean:message key="labels.new_category"/></s:link>
 </div>
 <table border="1">
 	<thead>
 		<tr>
-			<th style="width:100px;text-align: center;"><bean:message key="label.name"/></th>
-			<th style="width:100px;text-align: center;"><bean:message key="label.owner"/></th>
+			<th style="width:100px;text-align: center;"><bean:message key="labels.name"/></th>
+			<th style="width:100px;text-align: center;"><bean:message key="labels.userId"/></th>
 			<th style="width:100px;text-align: center;">&nbsp;</th>
 		</tr>
 	</thead>
@@ -36,10 +52,10 @@
 		<c:forEach var="c" varStatus="s" items="${categoryItems}">
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
 			<td><s:link href="confirmpage/4/${f:u(c.id)}">${f:h(c.name)}</s:link></td>
-			<td style="text-align: center;">${f:h(c.userIdFromUserInfo)}</td>
+			<td style="text-align: center;"><bean:message key="display.name" arg0="${f:h(c.userInfo.nameArg0)}" arg1="${f:h(c.userInfo.nameArg1)}" arg2="${f:h(c.userInfo.nameArg2)}"/></td>
 			<td align="center">
-				<s:link href="editpage/2/${f:u(c.id)}">Edit</s:link>
-				<s:link href="deletepage/3/${f:u(c.id)}">Delete</s:link>
+				<s:link href="editpage/2/${f:u(c.id)}"><bean:message key="labels.edit"/></s:link>
+				<s:link href="deletepage/3/${f:u(c.id)}"><bean:message key="labels.delete"/></s:link>
 			</td>
 		</tr>
 		</c:forEach>
@@ -49,7 +65,7 @@
 <div style="width: 450px;text-align: center;">
 	<span>
 		<c:if test="${categoryPager.existPrePage}">
-		<s:link href="list/${categoryPager.currentPageNumber - 1}"><bean:message key="label.prev"/></s:link>
+		<s:link href="list/${categoryPager.currentPageNumber - 1}"><bean:message key="labels.prev"/></s:link>
 		</c:if>
 	</span>
 	<span>
@@ -66,7 +82,7 @@
 	</span>
 	<span>
 		<c:if test="${categoryPager.existNextPage}">
-		<s:link href="list/${categoryPager.currentPageNumber + 1}"><bean:message key="label.next"/></s:link>
+		<s:link href="list/${categoryPager.currentPageNumber + 1}"><bean:message key="labels.next"/></s:link>
 		</c:if>
 	</span>
 </div>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/confirm.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/confirm.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/confirm.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,29 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -26,7 +41,7 @@
 		<html:hidden property="mode"/>
 		<div class="form-table" style="margin-top:3px;">
 		<table>
-			<caption><bean:message key="label.todo.confirm.task_info"/></caption>
+			<caption><bean:message key="labels.todo.confirm.task_info"/></caption>
 			<tbody>
 				<tr>
 					<th style="width: 100px;"></th>
@@ -34,35 +49,35 @@
 		<table>
             <tbody>
                 <tr>
-                    <th style="width: 120px;"><bean:message key="label.basic"/></th>
-                    <td style="width: 200px;">${f:h(nameForTodo)}<html:hidden property="nameForTodo"/></td>
+                    <th style="width: 100px;"><bean:message key="labels.basic"/></th>
+                    <td style="width: 250px;">${f:h(nameForTodo)}<html:hidden property="nameForTodo"/></td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.description"/></th>
+                    <th><bean:message key="labels.description"/></th>
                     <td>${f:br(f:nbsp(f:h(descriptionForTodo)))}<html:hidden property="descriptionForTodo"/></td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.priority"/></th>
+                    <th><bean:message key="labels.priority"/></th>
                     <td>
-<c:if test="${priorityForTodo == '5'}"><bean:message key="label.blocker"/></c:if>
-<c:if test="${priorityForTodo == '4'}"><bean:message key="label.critical"/></c:if>
-<c:if test="${priorityForTodo == '3'}"><bean:message key="label.major"/></c:if>
-<c:if test="${priorityForTodo == '2'}"><bean:message key="label.minor"/></c:if>
-<c:if test="${priorityForTodo == '1'}"><bean:message key="label.trivial"/></c:if>
+<c:if test="${priorityForTodo == '5'}"><bean:message key="labels.blocker"/></c:if>
+<c:if test="${priorityForTodo == '4'}"><bean:message key="labels.critical"/></c:if>
+<c:if test="${priorityForTodo == '3'}"><bean:message key="labels.major"/></c:if>
+<c:if test="${priorityForTodo == '2'}"><bean:message key="labels.minor"/></c:if>
+<c:if test="${priorityForTodo == '1'}"><bean:message key="labels.trivial"/></c:if>
 <html:hidden property="priorityForTodo"/>
 
 					</td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.status"/></th>
+                    <th><bean:message key="labels.status"/></th>
                     <td>
-<c:if test="${statusForTodo == '1'}"><bean:message key="label.working"/></c:if>
-<c:if test="${statusForTodo == '10'}"><bean:message key="label.completed"/></c:if>
+<c:if test="${statusForTodo == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${statusForTodo == '10'}"><bean:message key="labels.completed"/></c:if>
 <html:hidden property="statusForTodo"/>
 					</td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.start_date"/></th>
+                    <th><bean:message key="labels.start_date"/></th>
                     <td>
 <c:forEach var="y" varStatus="s" items="${yearItems}">
 	<c:if test="${y == startDateYear}">${f:h(y)}</c:if>
@@ -85,7 +100,7 @@
                     </td>
 				</tr>
                 <tr>
-                    <th><bean:message key="label.end_date"/></th>
+                    <th><bean:message key="labels.end_date"/></th>
                     <td>
 <c:forEach var="y" varStatus="s" items="${yearItems}">
 	<c:if test="${y == endDateYear}">${f:h(y)}</c:if>
@@ -112,24 +127,24 @@
 				</tr>
 <c:if test="${mode!=1}">
 				<tr>
-					<th><bean:message key="label.personal"/></th>
+					<th><bean:message key="labels.personal"/></th>
                     <td>
 <table>
 	<tbody>
 		<tr>
-			<th><bean:message key="label.category_id"/></th>
+			<th><bean:message key="labels.category_id"/></th>
 			<td>${f:h(categoryId)}<html:hidden property="categoryId"/></td>
 		</tr>
 		<tr>
-			<th style="width: 120px;"><bean:message key="label.status"/></th>
-			<td style="width: 200px;">
-<c:if test="${status == '1'}"><bean:message key="label.working"/></c:if>
-<c:if test="${status == '10'}"><bean:message key="label.completed"/></c:if>
+			<th style="width: 100px;"><bean:message key="labels.status"/></th>
+			<td style="width: 250px;">
+<c:if test="${status == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${status == '10'}"><bean:message key="labels.completed"/></c:if>
 <html:hidden property="status"/>
 			</td>
 		</tr>
 		<tr>
-			<th><bean:message key="label.memo"/></th>
+			<th><bean:message key="labels.memo"/></th>
 			<td>${f:br(f:nbsp(f:h(memo)))}<html:hidden property="memo"/></td>
 		</tr>
 	</tbody>
@@ -138,20 +153,20 @@
 				</tr>
 <c:if test="${mode == 4}">
 				<tr>
-					<th><bean:message key="label.assigned"/></th>
+					<th><bean:message key="labels.assigned"/></th>
 					<td>
 <table>
 	<tbody>
 		<tr>
-			<th style="width: 140px;"><bean:message key="label.name"/></th>
-			<th style="width: 80px;"><bean:message key="label.status"/></th>
+			<th style="width: 150px;"><bean:message key="labels.name"/></th>
+			<th style="width: 100px;"><bean:message key="labels.status"/></th>
 		</tr>
 <c:forEach var="t" varStatus="s" items="${todoMappingItems}">
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
-			<td>${f:h(t.userIdFromUserInfo)}</td>
+			<td><bean:message key="display.name" arg0="${f:h(t.userInfo.nameArg0)}" arg1="${f:h(t.userInfo.nameArg1)}" arg2="${f:h(t.userInfo.nameArg2)}"/></td>
 			<td style="text-align: center;">
-<c:if test="${t.status == '1'}"><bean:message key="label.working"/>g</c:if>
-<c:if test="${t.status == '10'}"><bean:message key="label.completed"/></c:if>
+<c:if test="${t.status == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${t.status == '10'}"><bean:message key="labels.completed"/></c:if>
 			</td>
 		</tr>
 </c:forEach>
@@ -166,26 +181,25 @@
 				<tr>
 					<td colspan="2">
         <c:if test="${mode == 1}">
-            <input type="submit" name="create" value="<bean:message key="label.input.create"/>"/>
-            <input type="submit" name="editagain" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="create" value="<bean:message key="labels.input.create"/>"/>
+            <input type="submit" name="editagain" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 2}">
-            <input type="submit" name="update" value="<bean:message key="label.input.update"/>"/>
-            <input type="submit" name="editagain" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="update" value="<bean:message key="labels.input.update"/>"/>
+            <input type="submit" name="editagain" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 3}">
-            <input type="submit" name="delete" value="<bean:message key="label.input.delete"/>"/>
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="delete" value="<bean:message key="labels.input.delete"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 4}">
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
-            <input type="submit" name="editpagefromconfirm" value="<bean:message key="label.input.edit"/>"/>
-            <input type="submit" name="deletepagefromconfirm" value="<bean:message key="label.input.delete"/>"/>
-            <input type="submit" name="deletemappingpagefromconfirm" value="<bean:message key="label.input.remove_from_me"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
+            <input type="submit" name="editpagefromconfirm" value="<bean:message key="labels.input.edit"/>"/>
+            <input type="submit" name="deletepagefromconfirm" value="<bean:message key="labels.input.delete"/>"/>
         </c:if>
         <c:if test="${mode == 5}">
-            <input type="submit" name="deletemapping" value="<bean:message key="label.input.remove"/>"/>
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="deletemapping" value="<bean:message key="labels.input.remove"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
 					</td>
 				</tr>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/edit.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/edit.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/edit.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -26,43 +42,43 @@
         <html:hidden property="mode"/>
         <div class="form-table" style="margin-top:3px;">
 		<table>
-            <caption><bean:message key="label.todo.edit.task_info"/></caption>
+            <caption><bean:message key="labels.todo.edit.task_info"/></caption>
 			<tbody>
 				<tr>
-					<th style="width: 100px;"><bean:message key="label.basic"/></th>
+					<th style="width: 100px;"><bean:message key="labels.basic"/></th>
 					<td>
 		<table>
             <tbody>
                 <tr>
-                    <th style="width: 120px;"><bean:message key="label.title"/></th>
-                    <td style="width: 200px;"><html:text property="nameForTodo" size="20"/></td>
+                    <th style="width: 100px;"><bean:message key="labels.title"/></th>
+                    <td style="width: 250px;"><html:text property="nameForTodo" size="20" style="width:100%;"/></td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.description"/></th>
-                    <td><html:textarea property="descriptionForTodo" cols="20" rows="3"/></td>
+                    <th><bean:message key="labels.description"/></th>
+                    <td><html:textarea property="descriptionForTodo" cols="20" rows="3" style="width:100%;"/></td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.priority"/></th>
+                    <th><bean:message key="labels.priority"/></th>
                     <td>
 <html:select property="priorityForTodo">
-	<html:option value="5"><bean:message key="label.blocker"/></html:option>
-	<html:option value="4"><bean:message key="label.critical"/></html:option>
-	<html:option value="3"><bean:message key="label.major"/></html:option>
-	<html:option value="2"><bean:message key="label.minor"/></html:option>
-	<html:option value="1"><bean:message key="label.trivial"/></html:option>
+	<html:option value="5"><bean:message key="labels.blocker"/></html:option>
+	<html:option value="4"><bean:message key="labels.critical"/></html:option>
+	<html:option value="3"><bean:message key="labels.major"/></html:option>
+	<html:option value="2"><bean:message key="labels.minor"/></html:option>
+	<html:option value="1"><bean:message key="labels.trivial"/></html:option>
 </html:select>
 					</td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.status"/></th>
+                    <th><bean:message key="labels.status"/></th>
                     <td>
-<c:if test="${statusForTodo == '1'}"><bean:message key="label.working"/></c:if>
-<c:if test="${statusForTodo == '10'}"><bean:message key="label.completed"/></c:if>
+<c:if test="${statusForTodo == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${statusForTodo == '10'}"><bean:message key="labels.completed"/></c:if>
 <html:hidden property="statusForTodo"/>
 					</td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.start_date"/></th>
+                    <th><bean:message key="labels.start_date"/></th>
                     <td>
 <html:select property="startDateYear">
 <option value="">----</option>
@@ -87,7 +103,7 @@
                     </td>
 				</tr>
                 <tr>
-                    <th><bean:message key="label.end_date"/></th>
+                    <th><bean:message key="labels.end_date"/></th>
                     <td>
 <html:select property="endDateYear">
 <option value="">----</option>
@@ -117,55 +133,58 @@
 				</tr>
 <c:if test="${mode!=1}">
 				<tr>
-					<th><bean:message key="label.personal"/></th>
+					<th><bean:message key="labels.personal"/></th>
                     <td>
 <table>
 	<tbody>
 		<tr>
-			<th><bean:message key="label.category_id"/></th>
-			<td><html:text property="categoryId" size="20"/></td>
+			<th><bean:message key="labels.category_id"/></th>
+			<td><html:text property="categoryId" size="20" style="width:100%;"/></td>
 		</tr>
 		<tr>
-			<th style="width: 120px;"><bean:message key="label.status"/></th>
-			<td style="width: 200px;">
+			<th style="width: 100px;"><bean:message key="labels.status"/></th>
+			<td style="width: 250px;">
 <html:select property="status">
-	<html:option value="1"><bean:message key="label.working"/></html:option>
-	<html:option value="10"><bean:message key="label.completed"/></html:option>
+	<html:option value="1"><bean:message key="labels.working"/></html:option>
+	<html:option value="10"><bean:message key="labels.completed"/></html:option>
 </html:select>
 			</td>
 		</tr>
 		<tr>
-			<th><bean:message key="label.memo"/></th>
-			<td><html:textarea property="memo" cols="20" rows="3"/></td>
+			<th><bean:message key="labels.memo"/></th>
+			<td><html:textarea property="memo" cols="20" rows="3" style="width:100%;"/></td>
 		</tr>
 	</tbody>
 </table>
                     </td>
 				</tr>
 				<tr>
-					<th><bean:message key="label.assigned"/></th>
+					<th><bean:message key="labels.assigned"/></th>
 					<td>
 <table>
 	<tbody>
 		<tr>
-			<th style="width: 140px;"><bean:message key="label.name"/></th>
-			<th style="width: 80px;"><bean:message key="label.status"/></th>
-			<th style="width: 100px;">&nbsp;</th>
+			<th style="width: 150px;"><bean:message key="labels.name"/></th>
+			<th style="width: 100px;"><bean:message key="labels.status"/></th>
+			<th style="width: 80px;">&nbsp;</th>
 		</tr>
 <c:forEach var="t" varStatus="s" items="${todoMappingItems}">
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
-			<td>${f:h(t.userIdFromUserInfo)}</td>
+			<td><bean:message key="display.name" arg0="${f:h(t.userInfo.nameArg0)}" arg1="${f:h(t.userInfo.nameArg1)}" arg2="${f:h(t.userInfo.nameArg2)}"/></td>
 			<td style="text-align: center;">
-<c:if test="${t.status == '1'}"><bean:message key="label.working"/></c:if>
-<c:if test="${t.status == '10'}"><bean:message key="label.completed"/></c:if>
+<c:if test="${t.status == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${t.status == '10'}"><bean:message key="labels.completed"/></c:if>
 			</td>
-			<td style="text-align: center;"><s:link href="removemapping/${t.id}"><bean:message key="label.remove"/></s:link></td>
+			<td style="text-align: center;">
+				<c:if test="${t.userId!=createdBy}"><s:link href="removemapping/${t.id}"><bean:message key="labels.remove"/></s:link></c:if>
+				<c:if test="${t.userId==createdBy}">&nbsp;</c:if>
+			</td>
 		</tr>
 </c:forEach>
 	</tbody>
 </table>
 <div>
-<s:link href="/admin/userInfo/index/${f:u(idForTodo)}/${f:u(id)}"><bean:message key="label.add_user_to_this_task"/></s:link>
+<s:link href="/admin/userInfo/index/${f:u(idForTodo)}/${f:u(id)}"><bean:message key="labels.add_user_to_this_task"/></s:link>
 </div>
 					</td>
 				</tr>
@@ -174,8 +193,8 @@
             <tfoot>
                 <tr>
                     <td colspan="2">
-        <input type="submit" name="confirm" value="<bean:message key="label.input.confirm"/>"/>
-        <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+        <input type="submit" name="confirm" value="<bean:message key="labels.input.confirm"/>"/>
+        <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
                     </td>
                 </tr>
             </tfoot>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/error.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/error.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/error.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -4,14 +4,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.taskes"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.taskes"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -19,7 +35,7 @@
 
 <html:errors/>
 <br>
-<s:link href="index"><bean:message key="label.back"/></s:link>
+<s:link href="index"><bean:message key="labels.back"/></s:link>
 </div>
 </body>
 </html>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/index.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/index.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/todo/index.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -22,16 +38,16 @@
 
 <div class="list-table" style="margin-top:3px;">
 <div>
-<s:link href="createpage"><bean:message key="label.todo.index.create_new_task"/></s:link>
+<s:link href="createpage"><bean:message key="labels.todo.index.create_new_task"/></s:link>
 </div>
 <table border="1">
 	<thead>
 		<tr>
-			<th style="width:50px;text-align: center;"><bean:message key="label.priority"/></th>
-			<th style="width:200px;text-align: center;"><bean:message key="label.name"/></th>
-			<th style="width:100px;text-align: center;"><bean:message key="label.assigned"/></th>
-			<th style="width:100px;text-align: center;"><bean:message key="label.created_by"/></th>
-			<th style="width:100px;text-align: center;"><bean:message key="label.due_date"/></th>
+			<th style="width:50px;text-align: center;"><bean:message key="labels.priority"/></th>
+			<th style="width:200px;text-align: center;"><bean:message key="labels.name"/></th>
+			<th style="width:100px;text-align: center;"><bean:message key="labels.assigned"/></th>
+			<th style="width:100px;text-align: center;"><bean:message key="labels.created_by"/></th>
+			<th style="width:100px;text-align: center;"><bean:message key="labels.due_date"/></th>
 			<th style="width:100px;text-align: center;">&nbsp;</th>
 		</tr>
 	</thead>
@@ -39,22 +55,22 @@
 		<c:forEach var="t" varStatus="s" items="${todoMappingItems}">
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
 			<td style="text-align: center;">
-<c:if test="${t.todo.priority == '5'}"><bean:message key="label.blocker"/></c:if>
-<c:if test="${t.todo.priority == '4'}"><bean:message key="label.critical"/></c:if>
-<c:if test="${t.todo.priority == '3'}"><bean:message key="label.major"/></c:if>
-<c:if test="${t.todo.priority == '2'}"><bean:message key="label.minor"/></c:if>
-<c:if test="${t.todo.priority == '1'}"><bean:message key="label.trivial"/></c:if>
+<c:if test="${t.todo.priority == '5'}"><bean:message key="labels.blocker"/></c:if>
+<c:if test="${t.todo.priority == '4'}"><bean:message key="labels.critical"/></c:if>
+<c:if test="${t.todo.priority == '3'}"><bean:message key="labels.major"/></c:if>
+<c:if test="${t.todo.priority == '2'}"><bean:message key="labels.minor"/></c:if>
+<c:if test="${t.todo.priority == '1'}"><bean:message key="labels.trivial"/></c:if>
 			</td>
 			<td><s:link href="confirmpage/4/${f:u(t.id)}">${f:h(t.todo.name)}</s:link></td>
-			<td style="text-align: center;">${f:h(t.userIdFromUserInfo)}</td>
-			<td style="text-align: center;">${f:h(t.todo.createdByFromUserInfo)}</td>
+			<td style="text-align: center;"><bean:message key="display.name" arg0="${f:h(t.userInfo.nameArg0)}" arg1="${f:h(t.userInfo.nameArg1)}" arg2="${f:h(t.userInfo.nameArg2)}"/></td>
+			<td style="text-align: center;"><bean:message key="display.name" arg0="${f:h(t.todo.userInfo.nameArg0)}" arg1="${f:h(t.todo.userInfo.nameArg1)}" arg2="${f:h(t.todo.userInfo.nameArg2)}"/></td>
 			<td style="text-align: center;">
 <c:if test="${t.todo.endDate!=null}">
 <fmt:formatDate value="${t.todo.endDate}" pattern="yyyy/MM/dd"/>
 </c:if>
 			</td>
 			<td align="center">
-				<s:link href="editpage/2/${f:u(t.id)}"><bean:message key="label.edit"/></s:link>
+				<s:link href="editpage/2/${f:u(t.id)}"><bean:message key="labels.edit"/></s:link>
 <!-- 
 				<s:link href="deletepage/3/${f:u(t.id)}">Delete</s:link>
 				<s:link href="deletemappingpage/5/${f:u(t.id)}">Remove from me</s:link>
@@ -68,7 +84,7 @@
 <div style="width: 450px;text-align: center;">
 	<span>
 		<c:if test="${todoPager.existPrePage}">
-		<s:link href="list/${todoPager.currentPageNumber - 1}"><bean:message key="label.prev"/></s:link>
+		<s:link href="list/${todoPager.currentPageNumber - 1}"><bean:message key="labels.prev"/></s:link>
 		</c:if>
 	</span>
 	<span>
@@ -85,7 +101,7 @@
 	</span>
 	<span>
 		<c:if test="${todoPager.existNextPage}">
-		<s:link href="list/${todoPager.currentPageNumber + 1}"><bean:message key="label.next"/></s:link>
+		<s:link href="list/${todoPager.currentPageNumber + 1}"><bean:message key="labels.next"/></s:link>
 		</c:if>
 	</span>
 </div>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/userInfo/error.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/userInfo/error.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/userInfo/error.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -4,14 +4,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -19,7 +35,7 @@
 
 <html:errors/>
 <br>
-<s:link href="/user/userInfo/index/${f:u(todoId)}/${f:u(todoMappingId)}"><bean:message key="label.back"/></s:link>
+<s:link href="/admin/userInfo/index/${f:u(todoId)}/${f:u(todoMappingId)}"><bean:message key="labels.back"/></s:link>
 </div>
 </body>
 </html>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/admin/userInfo/index.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/admin/userInfo/index.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/admin/userInfo/index.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -22,14 +38,14 @@
 
 <div class="list-table" style="margin-top:3px;">
 <div>
-<s:link href="/user/todo/confirmpage/4/${f:u(todoMappingId)}"><bean:message key="label.userinfo.index.back_to_task_detail"/></s:link>
+<s:link href="/admin/todo/confirmpage/4/${f:u(todoMappingId)}"><bean:message key="labels.userinfo.index.back_to_task_detail"/></s:link>
 </div>
 <table>
 	<thead>
 		<tr>
-			<th style="width:100px;text-align: center;"><bean:message key="label.user_id"/></th>
-			<th style="width:150px;text-align: center;"><bean:message key="label.name"/></th>
-			<th style="width:200px;text-align: center;"><bean:message key="label.email"/></th>
+			<th style="width:100px;text-align: center;"><bean:message key="labels.user_id"/></th>
+			<th style="width:150px;text-align: center;"><bean:message key="labels.name"/></th>
+			<th style="width:200px;text-align: center;"><bean:message key="labels.email"/></th>
 			<th style="width:100px;text-align: center;">&nbsp;</th>
 		</tr>
 	</thead>
@@ -37,10 +53,10 @@
 		<c:forEach var="u" varStatus="s" items="${userInfoItems}">
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
 			<td>${f:h(u.userId)}</td>
-			<td>${f:h(u.familyName)} ${f:h(u.givenName)}</td>
+			<td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
 			<td>${f:h(u.email)}</td>
 			<td align="center">
-				<s:link href="adduser/${f:u(todoId)}/${f:u(todoMappingId)}/${f:u(u.userId)}"><bean:message key="label.add"/></s:link>
+				<s:link href="adduser/${f:u(todoId)}/${f:u(todoMappingId)}/${f:u(u.userId)}"><bean:message key="labels.add"/></s:link>
 			</td>
 		</tr>
 		</c:forEach>
@@ -50,7 +66,7 @@
 <div style="width: 450px;text-align: center;">
 	<span>
 		<c:if test="${userInfoPager.existPrePage}">
-		<s:link href="list/${f:u(todoId)}/${f:u(todoMappingId)}/${userInfoPager.currentPageNumber - 1}"><bean:message key="label.prev"/></s:link>
+		<s:link href="list/${f:u(todoId)}/${f:u(todoMappingId)}/${userInfoPager.currentPageNumber - 1}"><bean:message key="labels.prev"/></s:link>
 		</c:if>
 	</span>
 	<span>
@@ -67,7 +83,7 @@
 	</span>
 	<span>
 		<c:if test="${userInfoPager.existNextPage}">
-		<s:link href="list/${f:u(todoId)}/${f:u(todoMappingId)}/${userInfoPager.currentPageNumber + 1}"><bean:message key="label.next"/></s:link>
+		<s:link href="list/${f:u(todoId)}/${f:u(todoMappingId)}/${userInfoPager.currentPageNumber + 1}"><bean:message key="labels.next"/></s:link>
 		</c:if>
 	</span>
 </div>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/common/common.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/common/common.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/common/common.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -4,6 +4,5 @@
 <%@taglib prefix="html" uri="http://struts.apache.org/tags-html"%>  
 <%@taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%>  
 <%@taglib prefix="tiles" uri="http://jakarta.apache.org/struts/tags-tiles"%>
-<!-- %@taglib prefix="s" uri="http://sastruts.seasar.org"% -->
 <%@taglib prefix="f" uri="http://sastruts.seasar.org/functions"%>
 <%@taglib prefix="s" uri="http://sastruts.seasar.org/portlet"%>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/config/index.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/config/index.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/config/index.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,22 +5,37 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
 <div class="form-table">
 <s:form>
 <table>
-	<caption><bean:message key="label.configuration"/></caption>
+	<caption><bean:message key="labels.configuration"/></caption>
 	<tbody>
 		<tr>
-			<th><bean:message key="label.guest_user_name"/></th>
-			<td><html:text property="guestName" size="20"/></td>
+			<th><bean:message key="labels.guest_user_name"/></th>
+			<td><html:text property="guestName" size="20" style="width:100%;"/></td>
 		</tr>
 	</tbody>
 	<tfoot>
 		<tr>
 			<td colspan="2">
-<input type="submit" name="update" value="<bean:message key="label.input.update"/>"/>
+<input type="submit" name="update" value="<bean:message key="labels.input.update"/>"/>
 			</td>
 		</tr>
 	</tfoot>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selectable"><s:link href="/user/todo/" style="text-decoration: none;"><bean:message key="label.tab.tasks"/></s:link></li>
+    <li class="selectable"><s:link href="/user/todo/" style="text-decoration: none;"><bean:message key="labels.tab.tasks"/></s:link></li>
     <li class="spacer"></li>
-    <li class="selected"><span><bean:message key="label.tab.category"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.category"/></span></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -25,10 +41,10 @@
 		<html:hidden property="mode"/>
 		<div class="form-table" style="margin-top:3px;">
 		<table>
-			<caption><bean:message key="label.category.confirm.category_info"/></caption>
+			<caption><bean:message key="labels.category.confirm.category_info"/></caption>
 			<tbody>
                 <tr>
-                    <th style="width: 120px;"><bean:message key="label.name"/></th>
+                    <th style="width: 120px;"><bean:message key="labels.name"/></th>
                     <td style="width: 200px;">${f:h(name)}<html:hidden property="name"/></td>
                 </tr>
 			</tbody>
@@ -36,21 +52,21 @@
 				<tr>
 					<td colspan="2">
         <c:if test="${mode == 1}">
-            <input type="submit" name="create" value="<bean:message key="label.input.create"/>"/>
-            <input type="submit" name="editagain" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="create" value="<bean:message key="labels.input.create"/>"/>
+            <input type="submit" name="editagain" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 2}">
-            <input type="submit" name="update" value="<bean:message key="label.input.update"/>"/>
-            <input type="submit" name="editagain" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="update" value="<bean:message key="labels.input.update"/>"/>
+            <input type="submit" name="editagain" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 3}">
-            <input type="submit" name="delete" value="<bean:message key="label.input.delete"/>"/>
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="delete" value="<bean:message key="labels.input.delete"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 4}">
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
-            <input type="submit" name="editpagefromconfirm" value="<bean:message key="label.input.edit"/>"/>
-            <input type="submit" name="deletepagefromconfirm" value="<bean:message key="label.input.delete"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
+            <input type="submit" name="editpagefromconfirm" value="<bean:message key="labels.input.edit"/>"/>
+            <input type="submit" name="deletepagefromconfirm" value="<bean:message key="labels.input.delete"/>"/>
         </c:if>
 					</td>
 				</tr>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selectable"><s:link href="/user/todo/" style="text-decoration: none;"><bean:message key="label.tab.tasks"/></s:link></li>
+    <li class="selectable"><s:link href="/user/todo/" style="text-decoration: none;"><bean:message key="labels.tab.tasks"/></s:link></li>
     <li class="spacer"></li>
-    <li class="selected"><span><bean:message key="label.tab.category"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.category"/></span></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -25,18 +41,18 @@
         <html:hidden property="mode"/>
         <div class="form-table" style="margin-top:3px;">
 		<table>
-            <caption><bean:message key="label.category.edit.category_info"/></caption>
+            <caption><bean:message key="labels.category.edit.category_info"/></caption>
             <tbody>
                 <tr>
-                    <th style="width: 120px;"><bean:message key="label.name"/></th>
-                    <td style="width: 200px;"><html:text property="name" size="20"/></td>
+                    <th style="width: 120px;"><bean:message key="labels.name"/></th>
+                    <td style="width: 200px;"><html:text property="name" size="20" style="width:100%;"/></td>
                 </tr>
             </tbody>
             <tfoot>
                 <tr>
                     <td colspan="2">
-        <input type="submit" name="confirm" value="<bean:message key="label.input.confirm"/>"/>
-        <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+        <input type="submit" name="confirm" value="<bean:message key="labels.input.confirm"/>"/>
+        <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
                     </td>
                 </tr>
             </tfoot>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -4,14 +4,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selectable"><s:link href="/user/todo/" style="text-decoration: none;"><bean:message key="label.tab.tasks"/></s:link></li>
+    <li class="selectable"><s:link href="/user/todo/" style="text-decoration: none;"><bean:message key="labels.tab.tasks"/></s:link></li>
     <li class="spacer"></li>
-    <li class="selected"><span><bean:message key="label.tab.category"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.category"/></span></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -19,7 +35,7 @@
 
 <html:errors/>
 <br>
-<s:link href="index"><bean:message key="label.back"/></s:link>
+<s:link href="index"><bean:message key="labels.back"/></s:link>
 </div>
 </body>
 </html>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selectable"><s:link href="/user/todo/" style="text-decoration: none;"><bean:message key="label.tab.tasks"/></s:link></li>
+    <li class="selectable"><s:link href="/user/todo/" style="text-decoration: none;"><bean:message key="labels.tab.tasks"/></s:link></li>
     <li class="spacer"></li>
-    <li class="selected"><span><bean:message key="label.tab.category"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.category"/></span></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -22,12 +38,12 @@
 
 <div class="list-table" style="margin-top:3px;">
 <div>
-<s:link href="createpage"><bean:message key="label.category"/></s:link>
+<s:link href="createpage"><bean:message key="labels.new_category"/></s:link>
 </div>
 <table border="1">
 	<thead>
 		<tr>
-			<th style="width:100px;text-align: center;"><bean:message key="label.name"/></th>
+			<th style="width:150px;text-align: center;"><bean:message key="labels.name"/></th>
 			<th style="width:100px;text-align: center;">&nbsp;</th>
 		</tr>
 	</thead>
@@ -36,8 +52,8 @@
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
 			<td><s:link href="confirmpage/4/${f:u(c.id)}">${f:h(c.name)}</s:link></td>
 			<td align="center">
-				<s:link href="editpage/2/${f:u(c.id)}">Edit</s:link>
-				<s:link href="deletepage/3/${f:u(c.id)}">Delete</s:link>
+				<s:link href="editpage/2/${f:u(c.id)}"><bean:message key="labels.edit"/></s:link>
+				<s:link href="deletepage/3/${f:u(c.id)}"><bean:message key="labels.delete"/></s:link>
 			</td>
 		</tr>
 		</c:forEach>
@@ -47,7 +63,7 @@
 <div style="width: 450px;text-align: center;">
 	<span>
 		<c:if test="${categoryPager.existPrePage}">
-		<s:link href="list/${categoryPager.currentPageNumber - 1}"><bean:message key="label.prev"/></s:link>
+		<s:link href="list/${categoryPager.currentPageNumber - 1}"><bean:message key="labels.prev"/></s:link>
 		</c:if>
 	</span>
 	<span>
@@ -64,7 +80,7 @@
 	</span>
 	<span>
 		<c:if test="${categoryPager.existNextPage}">
-		<s:link href="list/${categoryPager.currentPageNumber + 1}"><bean:message key="label.next"/></s:link>
+		<s:link href="list/${categoryPager.currentPageNumber + 1}"><bean:message key="labels.next"/></s:link>
 		</c:if>
 	</span>
 </div>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/confirm.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/confirm.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/confirm.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -26,43 +42,43 @@
 		<html:hidden property="mode"/>
 		<div class="form-table" style="margin-top:3px;">
 		<table>
-			<caption><bean:message key="label.todo.confirm.task_info"/></caption>
+			<caption><bean:message key="labels.todo.confirm.task_info"/></caption>
 			<tbody>
 				<tr>
-					<th style="width: 100px;"><bean:message key="label.basic"/></th>
+					<th style="width: 100px;"><bean:message key="labels.basic"/></th>
 					<td>
 		<table>
             <tbody>
                 <tr>
-                    <th style="width: 120px;"><bean:message key="label.title"/></th>
-                    <td style="width: 200px;">${f:h(nameForTodo)}<html:hidden property="nameForTodo"/></td>
+                    <th style="width: 100px;"><bean:message key="labels.title"/></th>
+                    <td style="width: 250px;">${f:h(nameForTodo)}<html:hidden property="nameForTodo"/></td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.description"/></th>
+                    <th><bean:message key="labels.description"/></th>
                     <td>${f:br(f:nbsp(f:h(descriptionForTodo)))}<html:hidden property="descriptionForTodo"/></td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.priority"/></th>
+                    <th><bean:message key="labels.priority"/></th>
                     <td>
-<c:if test="${priorityForTodo == '5'}"><bean:message key="label.blocker"/></c:if>
-<c:if test="${priorityForTodo == '4'}"><bean:message key="label.critical"/></c:if>
-<c:if test="${priorityForTodo == '3'}"><bean:message key="label.major"/></c:if>
-<c:if test="${priorityForTodo == '2'}"><bean:message key="label.minor"/></c:if>
-<c:if test="${priorityForTodo == '1'}"><bean:message key="label.trivial"/></c:if>
+<c:if test="${priorityForTodo == '5'}"><bean:message key="labels.blocker"/></c:if>
+<c:if test="${priorityForTodo == '4'}"><bean:message key="labels.critical"/></c:if>
+<c:if test="${priorityForTodo == '3'}"><bean:message key="labels.major"/></c:if>
+<c:if test="${priorityForTodo == '2'}"><bean:message key="labels.minor"/></c:if>
+<c:if test="${priorityForTodo == '1'}"><bean:message key="labels.trivial"/></c:if>
 <html:hidden property="priorityForTodo"/>
 
 					</td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.status"/></th>
+                    <th><bean:message key="labels.status"/></th>
                     <td>
-<c:if test="${statusForTodo == '1'}"><bean:message key="label.working"/></c:if>
-<c:if test="${statusForTodo == '10'}"><bean:message key="label.completed"/></c:if>
+<c:if test="${statusForTodo == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${statusForTodo == '10'}"><bean:message key="labels.completed"/></c:if>
 <html:hidden property="statusForTodo"/>
 					</td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.start_date"/></th>
+                    <th><bean:message key="labels.start_date"/></th>
                     <td>
 <c:forEach var="y" varStatus="s" items="${yearItems}">
 	<c:if test="${y == startDateYear}">${f:h(y)}</c:if>
@@ -85,7 +101,7 @@
                     </td>
 				</tr>
                 <tr>
-                    <th><bean:message key="label.end_date"/></th>
+                    <th><bean:message key="labels.end_date"/></th>
                     <td>
 <c:forEach var="y" varStatus="s" items="${yearItems}">
 	<c:if test="${y == endDateYear}">${f:h(y)}</c:if>
@@ -112,12 +128,12 @@
 				</tr>
 <c:if test="${mode!=1}">
 				<tr>
-					<th><bean:message key="label.personal"/></th>
+					<th><bean:message key="labels.personal"/></th>
                     <td>
 <table>
 	<tbody>
 		<tr>
-			<th><bean:message key="label.category"/></th>
+			<th><bean:message key="labels.category"/></th>
 			<td>
 <c:forEach var="c" varStatus="s" items="${categoryItems}">
 	<c:if test="${c.id == categoryId}">${f:h(c.name)}</c:if>
@@ -127,15 +143,15 @@
 			</td>
 		</tr>
 		<tr>
-			<th style="width: 120px;"><bean:message key="label.status"/></th>
-			<td style="width: 200px;">
-<c:if test="${status == '1'}"><bean:message key="label.working"/></c:if>
-<c:if test="${status == '10'}"><bean:message key="label.completed"/></c:if>
+			<th style="width: 100px;"><bean:message key="labels.status"/></th>
+			<td style="width: 250px;">
+<c:if test="${status == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${status == '10'}"><bean:message key="labels.completed"/></c:if>
 <html:hidden property="status"/>
 			</td>
 		</tr>
 		<tr>
-			<th><bean:message key="label.memo"/></th>
+			<th><bean:message key="labels.memo"/></th>
 			<td>${f:br(f:nbsp(f:h(memo)))}<html:hidden property="memo"/></td>
 		</tr>
 	</tbody>
@@ -144,20 +160,20 @@
 				</tr>
 <c:if test="${mode == 4}">
 				<tr>
-					<th><bean:message key="label.assigned"/></th>
+					<th><bean:message key="labels.assigned"/></th>
 					<td>
 <table>
 	<tbody>
 		<tr>
-			<th style="width: 140px;"><bean:message key="label.name"/></th>
-			<th style="width: 80px;"><bean:message key="label.status"/></th>
+			<th style="width: 150px;"><bean:message key="labels.name"/></th>
+			<th style="width: 100px;"><bean:message key="labels.status"/></th>
 		</tr>
 <c:forEach var="t" varStatus="s" items="${todoMappingItems}">
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
-			<td>${f:h(t.userIdFromUserInfo)}</td>
+			<td><bean:message key="display.name" arg0="${f:h(t.userInfo.nameArg0)}" arg1="${f:h(t.userInfo.nameArg1)}" arg2="${f:h(t.userInfo.nameArg2)}"/></td>
 			<td style="text-align: center;">
-<c:if test="${t.status == '1'}"><bean:message key="label.working"/></c:if>
-<c:if test="${t.status == '10'}"><bean:message key="label.completed"/></c:if>
+<c:if test="${t.status == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${t.status == '10'}"><bean:message key="labels.completed"/></c:if>
 			</td>
 		</tr>
 </c:forEach>
@@ -172,26 +188,26 @@
 				<tr>
 					<td colspan="2">
         <c:if test="${mode == 1}">
-            <input type="submit" name="create" value="<bean:message key="label.input.create"/>"/>
-            <input type="submit" name="editagain" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="create" value="<bean:message key="labels.input.create"/>"/>
+            <input type="submit" name="editagain" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 2}">
-            <input type="submit" name="update" value="<bean:message key="label.input.update"/>"/>
-            <input type="submit" name="editagain" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="update" value="<bean:message key="labels.input.update"/>"/>
+            <input type="submit" name="editagain" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 3}">
-            <input type="submit" name="delete" value="<bean:message key="label.input.delete"/>"/>
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="delete" value="<bean:message key="labels.input.delete"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
         <c:if test="${mode == 4}">
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
-            <input type="submit" name="editpagefromconfirm" value="<bean:message key="label.input.edit"/>"/>
-            <input type="submit" name="deletepagefromconfirm" value="<bean:message key="label.input.delete"/>"/>
-            <input type="submit" name="deletemappingpagefromconfirm" value="<bean:message key="label.input.remove_from_me"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
+            <input type="submit" name="editpagefromconfirm" value="<bean:message key="labels.input.edit"/>"/>
+			<c:if test="${createdBy==userId}"><input type="submit" name="deletepagefromconfirm" value="<bean:message key="labels.input.delete"/>"/></c:if>
+            <c:if test="${createdBy!=userId}"><input type="submit" name="deletemappingpagefromconfirm" value="<bean:message key="labels.input.remove_from_me"/>"/></c:if>
         </c:if>
         <c:if test="${mode == 5}">
-            <input type="submit" name="deletemapping" value="<bean:message key="label.input.remove"/>"/>
-            <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+            <input type="submit" name="deletemapping" value="<bean:message key="labels.input.remove"/>"/>
+            <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
         </c:if>
 					</td>
 				</tr>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/edit.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/edit.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/edit.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -26,43 +42,43 @@
         <html:hidden property="mode"/>
         <div class="form-table" style="margin-top:3px;">
 		<table>
-            <caption><bean:message key="label.todo.edit.task_info"/></caption>
+            <caption><bean:message key="labels.todo.edit.task_info"/></caption>
 			<tbody>
 				<tr>
-					<th style="width: 100px;"><bean:message key="label.basic"/></th>
+					<th style="width: 100px;"><bean:message key="labels.basic"/></th>
 					<td>
 		<table>
             <tbody>
                 <tr>
-                    <th style="width: 120px;"><bean:message key="label.title"/></th>
-                    <td style="width: 200px;"><html:text property="nameForTodo" size="20"/></td>
+                    <th style="width: 100px;"><bean:message key="labels.title"/></th>
+                    <td style="width: 250px;"><html:text property="nameForTodo" size="20" style="width:100%;"/></td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.description"/></th>
-                    <td><html:textarea property="descriptionForTodo" cols="20" rows="3"/></td>
+                    <th><bean:message key="labels.description"/></th>
+                    <td><html:textarea property="descriptionForTodo" cols="20" rows="5" style="width:100%;"/></td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.priority"/></th>
+                    <th><bean:message key="labels.priority"/></th>
                     <td>
 <html:select property="priorityForTodo">
-	<html:option value="5"><bean:message key="label.blocker"/></html:option>
-	<html:option value="4"><bean:message key="label.critical"/></html:option>
-	<html:option value="3"><bean:message key="label.major"/></html:option>
-	<html:option value="2"><bean:message key="label.minor"/></html:option>
-	<html:option value="1"><bean:message key="label.trivial"/></html:option>
+	<html:option value="5"><bean:message key="labels.blocker"/></html:option>
+	<html:option value="4"><bean:message key="labels.critical"/></html:option>
+	<html:option value="3"><bean:message key="labels.major"/></html:option>
+	<html:option value="2"><bean:message key="labels.minor"/></html:option>
+	<html:option value="1"><bean:message key="labels.trivial"/></html:option>
 </html:select>
 					</td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.status"/></th>
+                    <th><bean:message key="labels.status"/></th>
                     <td>
-<c:if test="${statusForTodo == '1'}"><bean:message key="label.working"/></c:if>
-<c:if test="${statusForTodo == '10'}"><bean:message key="label.completed"/></c:if>
+<c:if test="${statusForTodo == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${statusForTodo == '10'}"><bean:message key="labels.completed"/></c:if>
 <html:hidden property="statusForTodo"/>
 					</td>
                 </tr>
                 <tr>
-                    <th><bean:message key="label.start_date"/></th>
+                    <th><bean:message key="labels.start_date"/></th>
                     <td>
 <html:select property="startDateYear">
 <option value="">----</option>
@@ -87,7 +103,7 @@
                     </td>
 				</tr>
                 <tr>
-                    <th><bean:message key="label.end_date"/></th>
+                    <th><bean:message key="labels.end_date"/></th>
                     <td>
 <html:select property="endDateYear">
 <option value="">----</option>
@@ -117,12 +133,12 @@
 				</tr>
 <c:if test="${mode!=1}">
 				<tr>
-					<th><bean:message key="label.personal"/></th>
+					<th><bean:message key="labels.personal"/></th>
                     <td>
 <table>
 	<tbody>
 		<tr>
-			<th><bean:message key="label.category"/></th>
+			<th><bean:message key="labels.category"/></th>
 			<td>
 <html:select property="categoryId">
 <option value="">----</option>
@@ -133,46 +149,49 @@
 			</td>
 		</tr>
 		<tr>
-			<th style="width: 120px;"><bean:message key="label.status"/></th>
-			<td style="width: 200px;">
+			<th style="width: 100px;"><bean:message key="labels.status"/></th>
+			<td style="width: 250px;">
 <html:select property="status">
-	<html:option value="1"><bean:message key="label.working"/></html:option>
-	<html:option value="10"><bean:message key="label.completed"/></html:option>
+	<html:option value="1"><bean:message key="labels.working"/></html:option>
+	<html:option value="10"><bean:message key="labels.completed"/></html:option>
 </html:select>
 			</td>
 		</tr>
 		<tr>
-			<th><bean:message key="label.memo"/></th>
-			<td><html:textarea property="memo" cols="20" rows="3"/></td>
+			<th><bean:message key="labels.memo"/></th>
+			<td><html:textarea property="memo" cols="20" rows="5" style="width:100%;"/></td>
 		</tr>
 	</tbody>
 </table>
                     </td>
 				</tr>
 				<tr>
-					<th><bean:message key="label.assigned"/></th>
+					<th><bean:message key="labels.assigned"/></th>
 					<td>
 <table>
 	<tbody>
 		<tr>
-			<th style="width: 140px;"><bean:message key="label.name"/></th>
-			<th style="width: 80px;"><bean:message key="label.status"/></th>
-			<th style="width: 100px;">&nbsp;</th>
+			<th style="width: 150px;"><bean:message key="labels.name"/></th>
+			<th style="width: 100px;"><bean:message key="labels.status"/></th>
+			<th style="width: 80px;">&nbsp;</th>
 		</tr>
 <c:forEach var="t" varStatus="s" items="${todoMappingItems}">
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
-			<td>${f:h(t.userIdFromUserInfo)}</td>
+			<td><bean:message key="display.name" arg0="${f:h(t.userInfo.nameArg0)}" arg1="${f:h(t.userInfo.nameArg1)}" arg2="${f:h(t.userInfo.nameArg2)}"/></td>
 			<td style="text-align: center;">
-<c:if test="${t.status == '1'}"><bean:message key="label.working"/></c:if>
-<c:if test="${t.status == '10'}"><bean:message key="label.completed"/></c:if>
+<c:if test="${t.status == '1'}"><bean:message key="labels.working"/></c:if>
+<c:if test="${t.status == '10'}"><bean:message key="labels.completed"/></c:if>
 			</td>
-			<td style="text-align: center;"><s:link href="removemapping/${t.id}"><bean:message key="label.remove"/></s:link></td>
+			<td style="text-align: center;">
+				<c:if test="${t.userId!=createdBy}"><s:link href="removemapping/${t.id}"><bean:message key="labels.remove"/></s:link></c:if>
+				<c:if test="${t.userId==createdBy}">&nbsp;</c:if>
+			</td>
 		</tr>
 </c:forEach>
 	</tbody>
 </table>
 <div>
-<s:link href="/user/userInfo/index/${f:u(idForTodo)}/${f:u(id)}"><bean:message key="label.add_user_to_this_task"/></s:link>
+<s:link href="/user/userInfo/index/${f:u(idForTodo)}/${f:u(id)}"><bean:message key="labels.add_user_to_this_task"/></s:link>
 </div>
 					</td>
 				</tr>
@@ -181,8 +200,8 @@
             <tfoot>
                 <tr>
                     <td colspan="2">
-        <input type="submit" name="confirm" value="<bean:message key="label.input.confirm"/>"/>
-        <input type="submit" name="back" value="<bean:message key="label.input.back"/>"/>
+        <input type="submit" name="confirm" value="<bean:message key="labels.input.confirm"/>"/>
+        <input type="submit" name="back" value="<bean:message key="labels.input.back"/>"/>
                     </td>
                 </tr>
             </tfoot>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/error.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/error.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/error.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -4,14 +4,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -19,7 +35,7 @@
 
 <html:errors/>
 <br>
-<s:link href="index"><bean:message key="label.back"/></s:link>
+<s:link href="index"><bean:message key="labels.back"/></s:link>
 </div>
 </body>
 </html>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/index.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/index.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/todo/index.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -24,14 +40,14 @@
 <table>
 	<thead>
 		<tr>
-			<th style="width: 100px;"><bean:message key="label.category"/></th>
+			<th style="width: 150px;"><bean:message key="labels.category"/></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
 			<td style="text-align: center;">
 <ul style="margin: 0;padding: 0;">
-	<li style="list-style-type: none;"><s:link href="allcategory"><bean:message key="label.all"/></s:link></li>
+	<li style="list-style-type: none;"><s:link href="allcategory"><bean:message key="labels.all"/></s:link></li>
 <c:forEach var="c" varStatus="s" items="${categoryItems}">
 	<li style="list-style-type: none;"><s:link href="selectcategory/${f:u(c.id)}">${f:h(c.name)}</s:link></li>
 </c:forEach>
@@ -44,15 +60,15 @@
 
 <div class="list-table" style="margin-top:3px;float: left;">
 <div>
-<s:link href="createpage"><bean:message key="label.todo.index.create_new_task"/></s:link>
+<s:link href="createpage"><bean:message key="labels.todo.index.create_new_task"/></s:link>
 </div>
 <table border="1">
 	<thead>
 		<tr>
-			<th style="width:50px;text-align: center;"><bean:message key="label.priority"/></th>
-			<th style="width:200px;text-align: center;"><bean:message key="label.name"/></th>
-			<th style="width:100px;text-align: center;"><bean:message key="label.created_by"/></th>
-			<th style="width:100px;text-align: center;"><bean:message key="label.due_date"/></th>
+			<th style="width:50px;text-align: center;"><bean:message key="labels.priority"/></th>
+			<th style="width:200px;text-align: center;"><bean:message key="labels.name"/></th>
+			<th style="width:100px;text-align: center;"><bean:message key="labels.created_by"/></th>
+			<th style="width:100px;text-align: center;"><bean:message key="labels.due_date"/></th>
 			<th style="width:100px;text-align: center;">&nbsp;</th>
 		</tr>
 	</thead>
@@ -60,21 +76,21 @@
 		<c:forEach var="t" varStatus="s" items="${todoMappingItems}">
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
 			<td style="text-align: center;">
-<c:if test="${t.todo.priority == '5'}"><bean:message key="label.blocker"/></c:if>
-<c:if test="${t.todo.priority == '4'}"><bean:message key="label.critical"/></c:if>
-<c:if test="${t.todo.priority == '3'}"><bean:message key="label.major"/></c:if>
-<c:if test="${t.todo.priority == '2'}"><bean:message key="label.minor"/></c:if>
-<c:if test="${t.todo.priority == '1'}"><bean:message key="label.trivial"/></c:if>
+<c:if test="${t.todo.priority == '5'}"><bean:message key="labels.blocker"/></c:if>
+<c:if test="${t.todo.priority == '4'}"><bean:message key="labels.critical"/></c:if>
+<c:if test="${t.todo.priority == '3'}"><bean:message key="labels.major"/></c:if>
+<c:if test="${t.todo.priority == '2'}"><bean:message key="labels.minor"/></c:if>
+<c:if test="${t.todo.priority == '1'}"><bean:message key="labels.trivial"/></c:if>
 			</td>
 			<td><s:link href="confirmpage/4/${f:u(t.id)}">${f:h(t.todo.name)}</s:link></td>
-			<td style="text-align: center;">${f:h(t.todo.createdByFromUserInfo)}</td>
+			<td style="text-align: center;"><bean:message key="display.name" arg0="${f:h(t.todo.userInfo.nameArg0)}" arg1="${f:h(t.todo.userInfo.nameArg1)}" arg2="${f:h(t.todo.userInfo.nameArg2)}"/></td>
 			<td style="text-align: center;">
 <c:if test="${t.todo.endDate!=null}">
 <fmt:formatDate value="${t.todo.endDate}" pattern="yyyy/MM/dd"/>
 </c:if>
 			</td>
 			<td align="center">
-				<s:link href="editpage/2/${f:u(t.id)}"><bean:message key="label.edit"/></s:link>
+				<s:link href="editpage/2/${f:u(t.id)}"><bean:message key="labels.edit"/></s:link>
 <!-- 
 				<s:link href="deletepage/3/${f:u(t.id)}">Delete</s:link>
 				<s:link href="deletemappingpage/5/${f:u(t.id)}">Remove from me</s:link>
@@ -88,7 +104,7 @@
 <div style="width: 450px;text-align: center;">
 	<span>
 		<c:if test="${todoPager.existPrePage}">
-		<s:link href="list/${todoPager.currentPageNumber - 1}"><bean:message key="label.prev"/></s:link>
+		<s:link href="list/${todoPager.currentPageNumber - 1}"><bean:message key="labels.prev"/></s:link>
 		</c:if>
 	</span>
 	<span>
@@ -105,7 +121,7 @@
 	</span>
 	<span>
 		<c:if test="${todoPager.existNextPage}">
-		<s:link href="list/${todoPager.currentPageNumber + 1}"><bean:message key="label.next"/></s:link>
+		<s:link href="list/${todoPager.currentPageNumber + 1}"><bean:message key="labels.next"/></s:link>
 		</c:if>
 	</span>
 </div>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/userInfo/error.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/userInfo/error.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/userInfo/error.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -4,14 +4,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -19,7 +35,7 @@
 
 <html:errors/>
 <br>
-<s:link href="/user/userInfo/index/${f:u(todoId)}/${f:u(todoMappingId)}"><bean:message key="label.back"/></s:link>
+<s:link href="/user/userInfo/index/${f:u(todoId)}/${f:u(todoMappingId)}"><bean:message key="labels.back"/></s:link>
 </div>
 </body>
 </html>

Modified: todolist/trunk/src/main/webapp/WEB-INF/view/user/userInfo/index.jsp
===================================================================
--- todolist/trunk/src/main/webapp/WEB-INF/view/user/userInfo/index.jsp	2008-12-01 02:23:57 UTC (rev 1486)
+++ todolist/trunk/src/main/webapp/WEB-INF/view/user/userInfo/index.jsp	2008-12-01 08:10:57 UTC (rev 1487)
@@ -5,14 +5,30 @@
 <title></title>
 </head>
 <body>
-<div style="padding:3px;">
+<script type="text/javascript">
+<!--
+var cssFile="${f:url('/css/pal-extension.css')}";
+var isMSIE = /*@cc_on!@*/false;
+if(isMSIE) {
+    document.createStyleSheet(cssFile);
+} else {
+    var link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("href", cssFile);
+    link.setAttribute("type", "text/css");
+    document.getElementsByTagName('head')[0].appendChild(link);
+}
+// -->
+</script>
+<div class="todolist-portlet" style="padding:3px;">
 <!-- tab: BEGIN -->
 <div class="tab-nav">
   <ul>
     <li class="first"></li>
-    <li class="selected"><span><bean:message key="label.tab.tasks"/></span></li>
+    <li class="selected"><span><bean:message key="labels.tab.tasks"/></span></li>
     <li class="spacer"></li>
-    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="label.tab.category"/></s:link></li>
+    <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab.category"/></s:link></li>
+    <li class="last-spacer"></li>
     <li class="last"></li>
   </ul>
 </div>
@@ -22,14 +38,14 @@
 
 <div class="list-table" style="margin-top:3px;">
 <div>
-<s:link href="/user/todo/confirmpage/4/${f:u(todoMappingId)}"><bean:message key="label.userinfo.index.back_to_task_detail"/></s:link>
+<s:link href="/user/todo/confirmpage/4/${f:u(todoMappingId)}"><bean:message key="labels.userinfo.index.back_to_task_detail"/></s:link>
 </div>
 <table>
 	<thead>
 		<tr>
-			<th style="width:100px;text-align: center;"><bean:message key="label.user_id"/></th>
-			<th style="width:150px;text-align: center;"><bean:message key="label.name"/></th>
-			<th style="width:200px;text-align: center;"><bean:message key="label.email"/></th>
+			<th style="width:100px;text-align: center;"><bean:message key="labels.user_id"/></th>
+			<th style="width:150px;text-align: center;"><bean:message key="labels.name"/></th>
+			<th style="width:200px;text-align: center;"><bean:message key="labels.email"/></th>
 			<th style="width:100px;text-align: center;">&nbsp;</th>
 		</tr>
 	</thead>
@@ -37,10 +53,10 @@
 		<c:forEach var="u" varStatus="s" items="${userInfoItems}">
 		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
 			<td>${f:h(u.userId)}</td>
-			<td>${f:h(u.familyName)} ${f:h(u.givenName)}</td>
+			<td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
 			<td>${f:h(u.email)}</td>
 			<td align="center">
-				<s:link href="adduser/${f:u(todoId)}/${f:u(todoMappingId)}/${f:u(u.userId)}"><bean:message key="label.add"/></s:link>
+				<s:link href="adduser/${f:u(todoId)}/${f:u(todoMappingId)}/${f:u(u.userId)}"><bean:message key="labels.add"/></s:link>
 			</td>
 		</tr>
 		</c:forEach>
@@ -50,7 +66,7 @@
 <div style="width: 450px;text-align: center;">
 	<span>
 		<c:if test="${userInfoPager.existPrePage}">
-		<s:link href="list/${f:u(todoId)}/${f:u(todoMappingId)}/${userInfoPager.currentPageNumber - 1}"><bean:message key="label.prev"/></s:link>
+		<s:link href="list/${f:u(todoId)}/${f:u(todoMappingId)}/${userInfoPager.currentPageNumber - 1}"><bean:message key="labels.prev"/></s:link>
 		</c:if>
 	</span>
 	<span>
@@ -67,7 +83,7 @@
 	</span>
 	<span>
 		<c:if test="${userInfoPager.existNextPage}">
-		<s:link href="list/${f:u(todoId)}/${f:u(todoMappingId)}/${userInfoPager.currentPageNumber + 1}"><bean:message key="label.next"/></s:link>
+		<s:link href="list/${f:u(todoId)}/${f:u(todoMappingId)}/${userInfoPager.currentPageNumber + 1}"><bean:message key="labels.next"/></s:link>
 		</c:if>
 	</span>
 </div>

Added: todolist/trunk/src/main/webapp/css/pal-extension.css
===================================================================
--- todolist/trunk/src/main/webapp/css/pal-extension.css	                        (rev 0)
+++ todolist/trunk/src/main/webapp/css/pal-extension.css	2008-12-01 08:10:57 UTC (rev 1487)
@@ -0,0 +1,216 @@
+/*
+Copyright 2008 Portal Application Laboratory Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/* ---------------- */
+/* Form Table       */
+/* ---------------- */
+.todolist-portlet .form-table table {
+border-top: 1px solid #cccccc;
+border-left: 1px solid #cccccc;
+border-collapse:collapse;
+}
+
+.todolist-portlet .form-table caption {
+border-top: 1px solid #cccccc;
+border-left: 1px solid #cccccc;
+border-right: 1px solid #cccccc;
+background-color: #e8e8e8;
+padding:5px;
+margin:0;
+font-weight: bold;
+font-size:11pt;
+color:#003366;
+}
+
+.todolist-portlet .form-table thead {
+margin:0;
+padding:0;
+}
+
+.todolist-portlet .form-table tbody {
+margin:0;
+padding:0;
+}
+
+.todolist-portlet .form-table tfoot {
+margin:0;
+padding:0;
+}
+
+.todolist-portlet .form-table th {
+border-right: 1px solid #cccccc;
+border-bottom: 1px solid #cccccc;
+padding: 5px;
+text-align: center;
+background-color: #eeeeee;
+empty-cells: show;
+}
+
+.todolist-portlet .form-table td {
+border-right: 1px solid #cccccc;
+border-bottom: 1px solid #cccccc;
+padding:3px;
+empty-cells: show;
+}
+
+.todolist-portlet .form-table tfoot tr td {
+padding:10px;
+text-align: center;
+empty-cells: show;
+}
+
+/* ---------------- */
+/* List Table       */
+/* ---------------- */
+.todolist-portlet .list-table table {
+border-top: 1px solid #cccccc;
+border-left: 1px solid #cccccc;
+border-collapse:collapse;
+}
+
+.todolist-portlet .list-table caption {
+border-top: 1px solid #cccccc;
+border-left: 1px solid #cccccc;
+border-right: 1px solid #cccccc;
+background-color: #e8e8e8;
+padding:5px;
+margin:0;
+font-weight: bold;
+font-size:11pt;
+color:#003366;
+}
+
+.todolist-portlet .list-table thead {
+margin:0;
+padding:0;
+}
+
+.todolist-portlet .list-table tbody {
+margin:0;
+padding:0;
+}
+
+.todolist-portlet .list-table tfoot {
+margin:0;
+padding:0;
+}
+
+.todolist-portlet .list-table .row1 {
+background-color: #ffffff;
+}
+
+.todolist-portlet .list-table .row2 {
+background-color: #fffff8;
+}
+
+.todolist-portlet .list-table th {
+border-right: 1px solid #cccccc;
+border-bottom: 1px solid #cccccc;
+padding: 5px;
+text-align: center;
+background-color: #eeeeee;
+empty-cells: show;
+}
+
+.todolist-portlet .list-table td {
+border-right: 1px solid #cccccc;
+border-bottom: 1px solid #cccccc;
+padding:3px;
+empty-cells: show;
+}
+
+
+/* ---------------- */
+/* Tab              */
+/* ---------------- */
+.todolist-portlet .tab-nav div {
+height:25px;
+line-height:23px;
+margin:0;
+padding:0;
+width:100%;
+}
+
+.todolist-portlet .tab-nav ul {
+margin:0;
+padding:0;
+width:100%;
+}
+
+.todolist-portlet .tab-nav ul li {
+float:left;
+height:25px;
+line-height:23px;
+list-style-image:none;
+list-style-position:outside;
+list-style-type:none;
+}
+
+.todolist-portlet .tab-nav ul li a:visited {
+color:#0000EE;
+}
+
+.todolist-portlet .tab-nav ul li.first {
+border-bottom:1px solid #A9A9A9;
+width:10px;
+}
+
+.todolist-portlet .tab-nav ul li.last-spacer {
+border-bottom:1px solid #A9A9A9;
+width:5px;
+margin-right:-5px;
+}
+
+.todolist-portlet .tab-nav ul li.last {
+border-bottom:1px solid #A9A9A9;
+float:none;
+padding-right:10px;
+text-align:right;
+}
+
+.todolist-portlet .tab-nav ul li.selected {
+border-color:#A9A9A9 #A9A9A9 #FFFFFF;
+border-style:solid;
+border-width:1px;
+display:block;
+margin:-1px;
+_margin-top: 0px;
+}
+
+.todolist-portlet .tab-nav ul li.selected span {
+display:inline;
+padding:0 10px;
+white-space:pre;
+}
+
+.todolist-portlet .tab-nav ul li.selectable {
+background-color:#DCDCDC;
+border:1px solid #A9A9A9;
+display:block;
+height:24px;
+}
+
+.todolist-portlet .tab-nav ul li.selectable {
+display:inline;
+padding:0 10px;
+white-space:pre;
+}
+
+.todolist-portlet .tab-nav ul li.spacer {
+border-bottom:1px solid #A9A9A9;
+width:5px;
+}
+


Property changes on: todolist/trunk/src/main/webapp/css/pal-extension.css
___________________________________________________________________
Name: svn:eol-style
   + native

• 前の記事 [pal-cvs 3751] [1486] i18ned and updated translation.
• 次の記事 [pal-cvs 3753] [1488] updated ui.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]