svnno****@sourc*****
svnno****@sourc*****
2008年 11月 29日 (土) 23:15:22 JST
Revision: 1473
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1473
Author: shinsuke
Date: 2008-11-29 23:15:21 +0900 (Sat, 29 Nov 2008)
Log Message:
-----------
added css, i18ned title, added pull-down menu for access names.
Modified Paths:
--------------
board/trunk/src/main/java/jp/sf/pal/board/action/category/edit/AccessAction.java
board/trunk/src/main/java/jp/sf/pal/board/db/exentity/GroupInfo.java
board/trunk/src/main/java/jp/sf/pal/board/db/exentity/RoleInfo.java
board/trunk/src/main/java/jp/sf/pal/board/service/CategoryService.java
board/trunk/src/main/resources/application.properties
board/trunk/src/main/resources/application_ja.properties
board/trunk/src/main/webapp/WEB-INF/portlet.xml
board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/confirm.jsp
board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/edit.jsp
board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/error.jsp
board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/index.jsp
board/trunk/src/main/webapp/WEB-INF/view/category/edit/confirm.jsp
board/trunk/src/main/webapp/WEB-INF/view/category/edit/edit.jsp
board/trunk/src/main/webapp/WEB-INF/view/category/edit/error.jsp
board/trunk/src/main/webapp/WEB-INF/view/category/edit/index.jsp
board/trunk/src/main/webapp/WEB-INF/view/common/common.jsp
board/trunk/src/main/webapp/WEB-INF/view/config/index.jsp
board/trunk/src/main/webapp/WEB-INF/view/message/admin/confirm.jsp
board/trunk/src/main/webapp/WEB-INF/view/message/admin/edit.jsp
board/trunk/src/main/webapp/WEB-INF/view/message/admin/error.jsp
board/trunk/src/main/webapp/WEB-INF/view/message/admin/index.jsp
board/trunk/src/main/webapp/WEB-INF/view/message/view/confirm.jsp
board/trunk/src/main/webapp/WEB-INF/view/message/view/edit.jsp
board/trunk/src/main/webapp/WEB-INF/view/message/view/error.jsp
board/trunk/src/main/webapp/WEB-INF/view/message/view/index.jsp
Added Paths:
-----------
board/trunk/src/main/java/jp/sf/pal/board/db/exentity/AccessObject.java
board/trunk/src/main/java/jp/sf/pal/board/service/GroupInfoService.java
board/trunk/src/main/java/jp/sf/pal/board/service/RoleInfoService.java
board/trunk/src/main/resources/jp/
board/trunk/src/main/resources/jp/sf/
board/trunk/src/main/resources/jp/sf/pal/
board/trunk/src/main/resources/jp/sf/pal/board/
board/trunk/src/main/resources/jp/sf/pal/board/resources/
board/trunk/src/main/resources/jp/sf/pal/board/resources/BoardConfig.properties
board/trunk/src/main/resources/jp/sf/pal/board/resources/BoardConfig_ja.properties
board/trunk/src/main/resources/jp/sf/pal/board/resources/CategoryEdit.properties
board/trunk/src/main/resources/jp/sf/pal/board/resources/CategoryEdit_ja.properties
board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageEditor.properties
board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageEditor_ja.properties
board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageManager.properties
board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageManager_ja.properties
board/trunk/src/main/webapp/css/
board/trunk/src/main/webapp/css/pal-extension.css
-------------- next part --------------
Modified: board/trunk/src/main/java/jp/sf/pal/board/action/category/edit/AccessAction.java
===================================================================
--- board/trunk/src/main/java/jp/sf/pal/board/action/category/edit/AccessAction.java 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/java/jp/sf/pal/board/action/category/edit/AccessAction.java 2008-11-29 14:15:21 UTC (rev 1473)
@@ -1,17 +1,21 @@
package jp.sf.pal.board.action.category.edit;
+import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import jp.sf.pal.board.BoardConstants;
import jp.sf.pal.board.common.util.SAStrutsUtil;
+import jp.sf.pal.board.db.exentity.AccessObject;
import jp.sf.pal.board.db.exentity.CategoryAccess;
import jp.sf.pal.board.dxo.CategoryAccessDxo;
import jp.sf.pal.board.dxo.PagerDxo;
import jp.sf.pal.board.form.category.edit.AccessForm;
import jp.sf.pal.board.pager.CategoryAccessPager;
import jp.sf.pal.board.service.CategoryService;
+import jp.sf.pal.board.service.GroupInfoService;
+import jp.sf.pal.board.service.RoleInfoService;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -27,8 +31,6 @@
// for list
- public List<CategoryAccess> categoryAccessItems;
-
// for edit/confirm/delete
@ActionForm
@@ -36,6 +38,10 @@
private CategoryService categoryService;
+ private GroupInfoService groupInfoService;
+
+ private RoleInfoService roleInfoService;
+
private CategoryAccessPager categoryAccessPager;
private PagerDxo pagerDxo;
@@ -52,9 +58,6 @@
Integer categoryId = Integer.parseInt(accessForm.categoryId);
categoryAccessPager.setCategoryId(categoryId);
- // page navi
- categoryAccessItems = categoryService
- .getCategoryAccessList(categoryAccessPager);
return "index.jsp";
}
@@ -66,10 +69,8 @@
Integer categoryId = Integer.parseInt(accessForm.categoryId);
categoryAccessPager.setCategoryId(categoryId);
- // page navi
pagerDxo.convert(accessForm, categoryAccessPager);
- categoryAccessItems = categoryService
- .getCategoryAccessList(categoryAccessPager);
+
return "index.jsp";
}
@@ -83,9 +84,6 @@
categoryAccessPager.clear();
categoryAccessPager.setCategoryId(categoryId);
- // page navi
- categoryAccessItems = categoryService
- .getCategoryAccessList(categoryAccessPager);
return "index.jsp";
}
@@ -97,9 +95,6 @@
Integer categoryId = Integer.parseInt(accessForm.categoryId);
categoryAccessPager.setCategoryId(categoryId);
- // page navi
- categoryAccessItems = categoryService
- .getCategoryAccessList(categoryAccessPager);
// reset edit page
return "index.jsp";
}
@@ -208,8 +203,7 @@
@Execute(validator = false, input = "error.jsp")
public String delete() {
try {
- categoryService.disable(Integer.parseInt(accessForm.id), request
- .getRemoteUser());
+ categoryService.deleteCategoryAccess(Long.parseLong(accessForm.id));
SAStrutsUtil.addMessage(request, "success.delete_category_access");
return index();
@@ -258,6 +252,18 @@
}
+ public List<CategoryAccess> getCategoryAccessItems() {
+ // page navi
+ return categoryService.getCategoryAccessList(categoryAccessPager);
+ }
+
+ public List<AccessObject> getAllCategoryAccessItems() {
+ List<AccessObject> accessObjectItems = new ArrayList<AccessObject>();
+ accessObjectItems.addAll(roleInfoService.getRoleInfoList());
+ accessObjectItems.addAll(groupInfoService.getGroupInfoList());
+ return accessObjectItems;
+ }
+
public AccessForm getAccessForm() {
return accessForm;
}
@@ -305,4 +311,20 @@
public void setRequest(HttpServletRequest request) {
this.request = request;
}
+
+ public GroupInfoService getGroupInfoService() {
+ return groupInfoService;
+ }
+
+ public void setGroupInfoService(GroupInfoService groupInfoService) {
+ this.groupInfoService = groupInfoService;
+ }
+
+ public RoleInfoService getRoleInfoService() {
+ return roleInfoService;
+ }
+
+ public void setRoleInfoService(RoleInfoService roleInfoService) {
+ this.roleInfoService = roleInfoService;
+ }
}
Added: board/trunk/src/main/java/jp/sf/pal/board/db/exentity/AccessObject.java
===================================================================
--- board/trunk/src/main/java/jp/sf/pal/board/db/exentity/AccessObject.java (rev 0)
+++ board/trunk/src/main/java/jp/sf/pal/board/db/exentity/AccessObject.java 2008-11-29 14:15:21 UTC (rev 1473)
@@ -0,0 +1,10 @@
+package jp.sf.pal.board.db.exentity;
+
+public interface AccessObject {
+ public abstract String getLabel();
+
+ public abstract String getValue();
+
+ public abstract String getType();
+
+}
Property changes on: board/trunk/src/main/java/jp/sf/pal/board/db/exentity/AccessObject.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: board/trunk/src/main/java/jp/sf/pal/board/db/exentity/GroupInfo.java
===================================================================
--- board/trunk/src/main/java/jp/sf/pal/board/db/exentity/GroupInfo.java 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/java/jp/sf/pal/board/db/exentity/GroupInfo.java 2008-11-29 14:15:21 UTC (rev 1473)
@@ -1,5 +1,7 @@
package jp.sf.pal.board.db.exentity;
+import jp.sf.pal.board.BoardConstants;
+
/**
* The entity of GROUP_INFO.
* <p>
@@ -10,8 +12,24 @@
* @author DBFlute(AutoGenerator)
*/
@SuppressWarnings("unchecked")
-public class GroupInfo extends jp.sf.pal.board.db.bsentity.BsGroupInfo {
+public class GroupInfo extends jp.sf.pal.board.db.bsentity.BsGroupInfo
+ implements AccessObject {
/** Serial version UID. (Default) */
private static final long serialVersionUID = 1L;
+
+ public String getLabel() {
+ if (getName() != null) {
+ return getName();
+ }
+ return getGroupId();
+ }
+
+ public String getValue() {
+ return BoardConstants.GROUP_ACCESS_NAME_PREFIX + getGroupId();
+ }
+
+ public String getType() {
+ return "G";
+ }
}
Modified: board/trunk/src/main/java/jp/sf/pal/board/db/exentity/RoleInfo.java
===================================================================
--- board/trunk/src/main/java/jp/sf/pal/board/db/exentity/RoleInfo.java 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/java/jp/sf/pal/board/db/exentity/RoleInfo.java 2008-11-29 14:15:21 UTC (rev 1473)
@@ -1,5 +1,7 @@
package jp.sf.pal.board.db.exentity;
+import jp.sf.pal.board.BoardConstants;
+
/**
* The entity of ROLE_INFO.
* <p>
@@ -10,8 +12,24 @@
* @author DBFlute(AutoGenerator)
*/
@SuppressWarnings("unchecked")
-public class RoleInfo extends jp.sf.pal.board.db.bsentity.BsRoleInfo {
+public class RoleInfo extends jp.sf.pal.board.db.bsentity.BsRoleInfo implements
+ AccessObject {
/** Serial version UID. (Default) */
private static final long serialVersionUID = 1L;
+
+ public String getLabel() {
+ if (getName() != null) {
+ return getName();
+ }
+ return getRoleId();
+ }
+
+ public String getValue() {
+ return BoardConstants.ROLE_ACCESS_NAME_PREFIX + getRoleId();
+ }
+
+ public String getType() {
+ return "R";
+ }
}
Modified: board/trunk/src/main/java/jp/sf/pal/board/service/CategoryService.java
===================================================================
--- board/trunk/src/main/java/jp/sf/pal/board/service/CategoryService.java 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/java/jp/sf/pal/board/service/CategoryService.java 2008-11-29 14:15:21 UTC (rev 1473)
@@ -218,7 +218,7 @@
}
- public void delete(Long categoryAccessId) {
+ public void deleteCategoryAccess(Long categoryAccessId) {
// not delete
CategoryAccessCB cb = new CategoryAccessCB();
Added: board/trunk/src/main/java/jp/sf/pal/board/service/GroupInfoService.java
===================================================================
--- board/trunk/src/main/java/jp/sf/pal/board/service/GroupInfoService.java (rev 0)
+++ board/trunk/src/main/java/jp/sf/pal/board/service/GroupInfoService.java 2008-11-29 14:15:21 UTC (rev 1473)
@@ -0,0 +1,26 @@
+package jp.sf.pal.board.service;
+
+import java.util.List;
+
+import jp.sf.pal.board.db.cbean.GroupInfoCB;
+import jp.sf.pal.board.db.exbhv.GroupInfoBhv;
+import jp.sf.pal.board.db.exentity.GroupInfo;
+
+public class GroupInfoService {
+
+ private GroupInfoBhv groupInfoBhv;
+
+ public List<GroupInfo> getGroupInfoList() {
+ GroupInfoCB cb = new GroupInfoCB();
+ cb.query().setDeletedBy_IsNull();
+ return groupInfoBhv.selectList(cb);
+ }
+
+ public GroupInfoBhv getGroupInfoBhv() {
+ return groupInfoBhv;
+ }
+
+ public void setGroupInfoBhv(GroupInfoBhv groupInfoBhv) {
+ this.groupInfoBhv = groupInfoBhv;
+ }
+}
Property changes on: board/trunk/src/main/java/jp/sf/pal/board/service/GroupInfoService.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: board/trunk/src/main/java/jp/sf/pal/board/service/RoleInfoService.java
===================================================================
--- board/trunk/src/main/java/jp/sf/pal/board/service/RoleInfoService.java (rev 0)
+++ board/trunk/src/main/java/jp/sf/pal/board/service/RoleInfoService.java 2008-11-29 14:15:21 UTC (rev 1473)
@@ -0,0 +1,29 @@
+package jp.sf.pal.board.service;
+
+import java.io.Serializable;
+import java.util.List;
+
+import jp.sf.pal.board.db.cbean.RoleInfoCB;
+import jp.sf.pal.board.db.exbhv.RoleInfoBhv;
+import jp.sf.pal.board.db.exentity.RoleInfo;
+
+public class RoleInfoService implements Serializable {
+
+ private static final long serialVersionUID = -240319853554098456L;
+
+ private RoleInfoBhv roleInfoBhv;
+
+ public List<RoleInfo> getRoleInfoList() {
+ RoleInfoCB cb = new RoleInfoCB();
+ cb.query().setDeletedBy_IsNull();
+ return roleInfoBhv.selectList(cb);
+ }
+
+ public RoleInfoBhv getRoleInfoBhv() {
+ return roleInfoBhv;
+ }
+
+ public void setRoleInfoBhv(RoleInfoBhv roleInfoBhv) {
+ this.roleInfoBhv = roleInfoBhv;
+ }
+}
Property changes on: board/trunk/src/main/java/jp/sf/pal/board/service/RoleInfoService.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: board/trunk/src/main/resources/application.properties
===================================================================
--- board/trunk/src/main/resources/application.properties 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/resources/application.properties 2008-11-29 14:15:21 UTC (rev 1473)
@@ -134,3 +134,6 @@
errors.message_length_is_too_long=The message length is too long. (Max lenght: {0})
errors.reply_length_is_too_long=The reply length is too long. (Max lenght: {0})
errors.maxuploadsize=The size of the upload file can not be greater than {0} bytes.
+
+labels.role_prefix=Role:
+labels.group_prefix=Group:
Modified: board/trunk/src/main/resources/application_ja.properties
===================================================================
--- board/trunk/src/main/resources/application_ja.properties 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/resources/application_ja.properties 2008-11-29 14:15:21 UTC (rev 1473)
@@ -122,3 +122,6 @@
errors.failed_to_download_attachment=\u30d5\u30a1\u30a4\u30eb\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
errors.failed_to_download_attachment_because_of_null=\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u305f\u3081\u3001\u30d5\u30a1\u30a4\u30eb\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
errors.failed_to_delete_message_attachment=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+
+labels.role_prefix=\u30ed\u30fc\u30eb:
+labels.group_prefix=\u30b0\u30eb\u30fc\u30d7:
Added: board/trunk/src/main/resources/jp/sf/pal/board/resources/BoardConfig.properties
===================================================================
Property changes on: board/trunk/src/main/resources/jp/sf/pal/board/resources/BoardConfig.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: board/trunk/src/main/resources/jp/sf/pal/board/resources/BoardConfig_ja.properties
===================================================================
--- board/trunk/src/main/resources/jp/sf/pal/board/resources/BoardConfig_ja.properties (rev 0)
+++ board/trunk/src/main/resources/jp/sf/pal/board/resources/BoardConfig_ja.properties 2008-11-29 14:15:21 UTC (rev 1473)
@@ -0,0 +1,4 @@
+# portlet info
+javax.portlet.title=\u63b2\u793a\u677f\u8a2d\u5b9a
+javax.portlet.short-title=\u63b2\u793a\u677f\u8a2d\u5b9a
+javax.portlet.keywords=\u8a2d\u5b9a
Property changes on: board/trunk/src/main/resources/jp/sf/pal/board/resources/BoardConfig_ja.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: board/trunk/src/main/resources/jp/sf/pal/board/resources/CategoryEdit.properties
===================================================================
Property changes on: board/trunk/src/main/resources/jp/sf/pal/board/resources/CategoryEdit.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: board/trunk/src/main/resources/jp/sf/pal/board/resources/CategoryEdit_ja.properties
===================================================================
--- board/trunk/src/main/resources/jp/sf/pal/board/resources/CategoryEdit_ja.properties (rev 0)
+++ board/trunk/src/main/resources/jp/sf/pal/board/resources/CategoryEdit_ja.properties 2008-11-29 14:15:21 UTC (rev 1473)
@@ -0,0 +1,4 @@
+# portlet info
+javax.portlet.title=\u30ab\u30c6\u30b4\u30ea\u7ba1\u7406
+javax.portlet.short-title=\u30ab\u30c6\u30b4\u30ea\u7ba1\u7406
+javax.portlet.keywords=\u7ba1\u7406
Property changes on: board/trunk/src/main/resources/jp/sf/pal/board/resources/CategoryEdit_ja.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageEditor.properties
===================================================================
Property changes on: board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageEditor.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageEditor_ja.properties
===================================================================
--- board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageEditor_ja.properties (rev 0)
+++ board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageEditor_ja.properties 2008-11-29 14:15:21 UTC (rev 1473)
@@ -0,0 +1,4 @@
+# portlet info
+javax.portlet.title=\u63b2\u793a\u677f
+javax.portlet.short-title=\u63b2\u793a\u677f
+javax.portlet.keywords=\u63b2\u793a\u677f
Property changes on: board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageEditor_ja.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageManager.properties
===================================================================
Property changes on: board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageManager.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageManager_ja.properties
===================================================================
--- board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageManager_ja.properties (rev 0)
+++ board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageManager_ja.properties 2008-11-29 14:15:21 UTC (rev 1473)
@@ -0,0 +1,4 @@
+# portlet info
+javax.portlet.title=\u63b2\u793a\u677f\u7ba1\u7406
+javax.portlet.short-title=\u63b2\u793a\u677f\u7ba1\u7406
+javax.portlet.keywords=\u7ba1\u7406
Property changes on: board/trunk/src/main/resources/jp/sf/pal/board/resources/MessageManager_ja.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: board/trunk/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-11-29 14:15:21 UTC (rev 1473)
@@ -4,7 +4,7 @@
<description>Manage categories.</description>
<description xml:lang="ja">カテゴリーを管理します。</description>
<portlet-name>CategoryEdit</portlet-name>
- <display-name>Board: Category Editor</display-name>
+ <display-name>MB: Category Editor</display-name>
<display-name xml:lang="ja">掲示板: カテゴリエディター</display-name>
<portlet-class>org.seasar.struts.portlet.SAStrutsPortlet</portlet-class>
<init-param>
@@ -18,7 +18,7 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>ja</supported-locale>
-<!-- resource-bundle></resource-bundle -->
+ <resource-bundle>jp.sf.pal.board.resources.CategoryEdit</resource-bundle>
<portlet-info>
<title>Category Editor</title>
<short-title>Categories</short-title>
@@ -29,7 +29,7 @@
<description>Manage messages.</description>
<description xml:lang="ja">記事を管理します。</description>
<portlet-name>MessageManager</portlet-name>
- <display-name>Board: Message Manager</display-name>
+ <display-name>MB: Message Board Manager</display-name>
<display-name xml:lang="ja">掲示板: 記事管理</display-name>
<portlet-class>org.seasar.struts.portlet.SAStrutsPortlet</portlet-class>
<init-param>
@@ -43,10 +43,10 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>ja</supported-locale>
-<!-- resource-bundle></resource-bundle -->
+ <resource-bundle>jp.sf.pal.board.resources.MessageManager</resource-bundle>
<portlet-info>
- <title>Message Manager</title>
- <short-title>Messages</short-title>
+ <title>Message Board Manager</title>
+ <short-title>Message Board</short-title>
<keywords>Board,Message</keywords>
</portlet-info>
</portlet>
@@ -54,7 +54,7 @@
<description>Display/Edit messages.</description>
<description xml:lang="ja">記事を閲覧・編集します。</description>
<portlet-name>MessageEditor</portlet-name>
- <display-name>Board: Message Editor</display-name>
+ <display-name>MB: Message Board Editor</display-name>
<display-name xml:lang="ja">掲示板: 記事編集</display-name>
<portlet-class>org.seasar.struts.portlet.SAStrutsPortlet</portlet-class>
<init-param>
@@ -68,10 +68,10 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>ja</supported-locale>
-<!-- resource-bundle></resource-bundle -->
+ <resource-bundle>jp.sf.pal.board.resources.MessageEditor</resource-bundle>
<portlet-info>
- <title>Messages</title>
- <short-title>Messages</short-title>
+ <title>Message Board</title>
+ <short-title>Message Board</short-title>
<keywords>Board,Message</keywords>
</portlet-info>
</portlet>
@@ -79,7 +79,7 @@
<description>Edit configurations.</description>
<description xml:lang="ja">設定を編集します。</description>
<portlet-name>BoardConfig</portlet-name>
- <display-name>Board: Board Config</display-name>
+ <display-name>MB: Message Board Config</display-name>
<display-name xml:lang="ja">掲示板: 掲示板設定</display-name>
<portlet-class>org.seasar.struts.portlet.SAStrutsPortlet</portlet-class>
<init-param>
@@ -93,9 +93,9 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>ja</supported-locale>
-<!-- resource-bundle></resource-bundle -->
+ <resource-bundle>jp.sf.pal.board.resources.BoardConfig</resource-bundle>
<portlet-info>
- <title>Board Configuration</title>
+ <title>Message Board Config</title>
<short-title>Config</short-title>
<keywords>Board,URL</keywords>
</portlet-info>
Modified: board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/confirm.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/confirm.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/confirm.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,7 +5,22 @@
<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="board-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>
@@ -17,7 +32,12 @@
<tbody>
<tr>
<th style="width: 100px;"><bean:message key="labels.access_config_name"/></th>
- <td>${f:h(name)}<html:hidden property="name"/></td>
+ <td>
+<c:forEach var="c" varStatus="s" items="${allCategoryAccessItems}">
+<c:if test="${name == c.value}"><c:if test="${c.type=='R'}"><bean:message key="labels.role_prefix"/></c:if><c:if test="${c.type=='G'}"><bean:message key="labels.group_prefix"/></c:if>${f:h(c.label)} (${c.value})</c:if>
+</c:forEach>
+<html:hidden property="name"/>
+ </td>
</tr>
<tr>
<th><bean:message key="labels.permission"/></th>
Modified: board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/edit.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/edit.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/edit.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,7 +5,22 @@
<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="board-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>
@@ -17,7 +32,13 @@
<tbody>
<tr>
<th style="width: 100px;"><bean:message key="labels.access_config_name"/></th>
- <td><html:text property="name" size="40"/></td>
+ <td>
+ <html:select property="name">
+ <c:forEach var="c" varStatus="s" items="${allCategoryAccessItems}">
+ <html:option value="${c.value}"><c:if test="${c.type=='R'}"><bean:message key="labels.role_prefix"/></c:if><c:if test="${c.type=='G'}"><bean:message key="labels.group_prefix"/></c:if> ${f:h(c.label)} (${c.value})</html:option>
+ </c:forEach>
+ </html:select>
+ </td>
</tr>
<tr>
<th><bean:message key="labels.permission"/></th>
Modified: board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/error.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/error.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/error.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -4,8 +4,25 @@
<title></title>
</head>
<body>
+<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="board-portlet" style="padding:3px;">
<html:errors/>
<br>
<s:link href="/category/edit/index"><bean:message key="labels.back"/></s:link>
+</div>
</body>
</html>
Modified: board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/index.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/index.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/category/edit/access/index.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,7 +5,22 @@
<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="board-portlet" style="padding:3px;">
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
<div class="list-table">
Modified: board/trunk/src/main/webapp/WEB-INF/view/category/edit/confirm.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/category/edit/confirm.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/category/edit/confirm.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,7 +5,22 @@
<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="board-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>
Modified: board/trunk/src/main/webapp/WEB-INF/view/category/edit/edit.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/category/edit/edit.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/category/edit/edit.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,7 +5,22 @@
<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="board-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>
Modified: board/trunk/src/main/webapp/WEB-INF/view/category/edit/error.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/category/edit/error.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/category/edit/error.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -4,8 +4,25 @@
<title></title>
</head>
<body>
+<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="board-portlet" style="padding:3px;">
<html:errors/>
<br>
<s:link href="index"><bean:message key="labels.back"/></s:link>
+</div>
</body>
</html>
Modified: board/trunk/src/main/webapp/WEB-INF/view/category/edit/index.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/category/edit/index.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/category/edit/index.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,7 +5,22 @@
<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="board-portlet" style="padding:3px;">
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
<div class="list-table">
Modified: board/trunk/src/main/webapp/WEB-INF/view/common/common.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/common/common.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/common/common.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -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: board/trunk/src/main/webapp/WEB-INF/view/config/index.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,7 +5,22 @@
<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="board-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>
Modified: board/trunk/src/main/webapp/WEB-INF/view/message/admin/confirm.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/message/admin/confirm.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/message/admin/confirm.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,22 +5,41 @@
<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="board-portlet" style="padding:3px;">
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div style="float: left; width: 150px;" class="portlet-menu">
- <div style="padding:3px;">
- <div class="portlet-menu-caption"><bean:message key="labels.category"/></div>
- <ul>
- <c:forEach var="c" varStatus="s" items="${categoryItems}">
- <c:if test="${messagePager.categoryId==c.id}">
- <li class="portlet-menu-item-selected">»${f:h(c.name)}</li>
- </c:if>
- <c:if test="${messagePager.categoryId!=c.id}">
- <li class="portlet-menu-item"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li>
- </c:if>
- </c:forEach>
- </ul>
- </div>
+<div style="float: left; width: 150px;" class="form-table">
+<table style="width: 145px;">
+ <tbody>
+ <tr>
+ <th><bean:message key="labels.category"/></th>
+ </tr>
+ <tr>
+ <td>
+ <ul style="margin:0 0 0 3px;padding:0;">
+ <c:forEach var="c" varStatus="s" items="${categoryItems}">
+ <c:if test="${messagePager.categoryId==c.id}"><li style="list-style-type: none;font-weight: bold;margin:1px 0;">»${f:h(c.name)}</li></c:if>
+ <c:if test="${messagePager.categoryId!=c.id}"><li style="list-style-type: none;margin:1px 0;"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li></c:if>
+ </c:forEach>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+</table>
</div>
<div style="float: left;margin-left:10px;">
Modified: board/trunk/src/main/webapp/WEB-INF/view/message/admin/edit.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/message/admin/edit.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/message/admin/edit.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,22 +5,41 @@
<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="board-portlet" style="padding:3px;">
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div style="float: left; width: 150px;" class="portlet-menu">
- <div style="padding:3px;">
- <div class="portlet-menu-caption"><bean:message key="labels.category"/></div>
- <ul>
- <c:forEach var="c" varStatus="s" items="${categoryItems}">
- <c:if test="${messagePager.categoryId==c.id}">
- <li class="portlet-menu-item-selected">»${f:h(c.name)}</li>
- </c:if>
- <c:if test="${messagePager.categoryId!=c.id}">
- <li class="portlet-menu-item"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li>
- </c:if>
- </c:forEach>
- </ul>
- </div>
+<div style="float: left; width: 150px;" class="form-table">
+<table style="width: 145px;">
+ <tbody>
+ <tr>
+ <th><bean:message key="labels.category"/></th>
+ </tr>
+ <tr>
+ <td>
+ <ul style="margin:0 0 0 3px;padding:0;">
+ <c:forEach var="c" varStatus="s" items="${categoryItems}">
+ <c:if test="${messagePager.categoryId==c.id}"><li style="list-style-type: none;font-weight: bold;margin:1px 0;">»${f:h(c.name)}</li></c:if>
+ <c:if test="${messagePager.categoryId!=c.id}"><li style="list-style-type: none;margin:1px 0;"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li></c:if>
+ </c:forEach>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+</table>
</div>
<div style="float: left;margin-left:10px;">
Modified: board/trunk/src/main/webapp/WEB-INF/view/message/admin/error.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/message/admin/error.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/message/admin/error.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -4,8 +4,25 @@
<title></title>
</head>
<body>
+<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="board-portlet" style="padding:3px;">
<html:errors/>
<br>
<s:link href="index"><bean:message key="labels.back"/></s:link>
+</div>
</body>
</html>
Modified: board/trunk/src/main/webapp/WEB-INF/view/message/admin/index.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/message/admin/index.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/message/admin/index.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,22 +5,41 @@
<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="board-portlet" style="padding:3px;">
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div style="float: left; width: 150px;" class="portlet-menu">
- <div style="padding:3px;">
- <div class="portlet-menu-caption"><bean:message key="labels.category"/></div>
- <ul>
- <c:forEach var="c" varStatus="s" items="${categoryItems}">
- <c:if test="${messagePager.categoryId==c.id}">
- <li class="portlet-menu-item-selected">»${f:h(c.name)}</li>
- </c:if>
- <c:if test="${messagePager.categoryId!=c.id}">
- <li class="portlet-menu-item"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li>
- </c:if>
- </c:forEach>
- </ul>
- </div>
+<div style="float: left; width: 150px;" class="form-table">
+<table style="width: 145px;">
+ <tbody>
+ <tr>
+ <th><bean:message key="labels.category"/></th>
+ </tr>
+ <tr>
+ <td>
+ <ul style="margin:0 0 0 3px;padding:0;">
+ <c:forEach var="c" varStatus="s" items="${categoryItems}">
+ <c:if test="${messagePager.categoryId==c.id}"><li style="list-style-type: none;font-weight: bold;margin:1px 0;">»${f:h(c.name)}</li></c:if>
+ <c:if test="${messagePager.categoryId!=c.id}"><li style="list-style-type: none;margin:1px 0;"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li></c:if>
+ </c:forEach>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+</table>
</div>
<div style="float: left;margin-left:10px;" class="list-table">
Modified: board/trunk/src/main/webapp/WEB-INF/view/message/view/confirm.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/message/view/confirm.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/message/view/confirm.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,22 +5,41 @@
<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="board-portlet" style="padding:3px;">
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div style="float: left; width: 150px;" class="portlet-menu">
- <div style="padding:3px;">
- <div class="portlet-menu-caption"><bean:message key="labels.category"/></div>
- <ul>
- <c:forEach var="c" varStatus="s" items="${categoryItems}">
- <c:if test="${messagePager.categoryId==c.id}">
- <li class="portlet-menu-item-selected">»${f:h(c.name)}</li>
- </c:if>
- <c:if test="${messagePager.categoryId!=c.id}">
- <li class="portlet-menu-item"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li>
- </c:if>
- </c:forEach>
- </ul>
- </div>
+<div style="float: left; width: 150px;" class="form-table">
+<table style="width: 145px;">
+ <tbody>
+ <tr>
+ <th><bean:message key="labels.category"/></th>
+ </tr>
+ <tr>
+ <td>
+ <ul style="margin:0 0 0 3px;padding:0;">
+ <c:forEach var="c" varStatus="s" items="${categoryItems}">
+ <c:if test="${messagePager.categoryId==c.id}"><li style="list-style-type: none;font-weight: bold;margin:1px 0;">»${f:h(c.name)}</li></c:if>
+ <c:if test="${messagePager.categoryId!=c.id}"><li style="list-style-type: none;margin:1px 0;"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li></c:if>
+ </c:forEach>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+</table>
</div>
<div style="float: left;margin-left:10px;">
Modified: board/trunk/src/main/webapp/WEB-INF/view/message/view/edit.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/message/view/edit.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/message/view/edit.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,22 +5,41 @@
<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="board-portlet" style="padding:3px;">
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div style="float: left; width: 150px;" class="portlet-menu">
- <div style="padding:3px;">
- <div class="portlet-menu-caption"><bean:message key="labels.category"/></div>
- <ul>
- <c:forEach var="c" varStatus="s" items="${categoryItems}">
- <c:if test="${messagePager.categoryId==c.id}">
- <li class="portlet-menu-item-selected">»${f:h(c.name)}</li>
- </c:if>
- <c:if test="${messagePager.categoryId!=c.id}">
- <li class="portlet-menu-item"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li>
- </c:if>
- </c:forEach>
- </ul>
- </div>
+<div style="float: left; width: 150px;" class="form-table">
+<table style="width: 145px;">
+ <tbody>
+ <tr>
+ <th><bean:message key="labels.category"/></th>
+ </tr>
+ <tr>
+ <td>
+ <ul style="margin:0 0 0 3px;padding:0;">
+ <c:forEach var="c" varStatus="s" items="${categoryItems}">
+ <c:if test="${messagePager.categoryId==c.id}"><li style="list-style-type: none;font-weight: bold;margin:1px 0;">»${f:h(c.name)}</li></c:if>
+ <c:if test="${messagePager.categoryId!=c.id}"><li style="list-style-type: none;margin:1px 0;"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li></c:if>
+ </c:forEach>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+</table>
</div>
<div style="float: left;margin-left:10px;">
Modified: board/trunk/src/main/webapp/WEB-INF/view/message/view/error.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/message/view/error.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/message/view/error.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -4,8 +4,25 @@
<title></title>
</head>
<body>
+<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="board-portlet" style="padding:3px;">
<html:errors/>
<br>
<s:link href="index"><bean:message key="labels.back"/></s:link>
+</div>
</body>
</html>
Modified: board/trunk/src/main/webapp/WEB-INF/view/message/view/index.jsp
===================================================================
--- board/trunk/src/main/webapp/WEB-INF/view/message/view/index.jsp 2008-11-28 23:38:27 UTC (rev 1472)
+++ board/trunk/src/main/webapp/WEB-INF/view/message/view/index.jsp 2008-11-29 14:15:21 UTC (rev 1473)
@@ -5,22 +5,41 @@
<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="board-portlet" style="padding:3px;">
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div style="float: left; width: 150px;" class="portlet-menu">
- <div style="padding:3px;">
- <div class="portlet-menu-caption"><bean:message key="labels.category"/></div>
- <ul>
- <c:forEach var="c" varStatus="s" items="${categoryItems}">
- <c:if test="${messagePager.categoryId==c.id}">
- <li class="portlet-menu-item-selected">»${f:h(c.name)}</li>
- </c:if>
- <c:if test="${messagePager.categoryId!=c.id}">
- <li class="portlet-menu-item"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li>
- </c:if>
- </c:forEach>
- </ul>
- </div>
+<div style="float: left; width: 150px;" class="form-table">
+<table style="width: 145px;">
+ <tbody>
+ <tr>
+ <th><bean:message key="labels.category"/></th>
+ </tr>
+ <tr>
+ <td>
+ <ul style="margin:0 0 0 3px;padding:0;">
+ <c:forEach var="c" varStatus="s" items="${categoryItems}">
+ <c:if test="${messagePager.categoryId==c.id}"><li style="list-style-type: none;font-weight: bold;margin:1px 0;">»${f:h(c.name)}</li></c:if>
+ <c:if test="${messagePager.categoryId!=c.id}"><li style="list-style-type: none;margin:1px 0;"><s:link href="select/${f:u(c.id)}">${f:h(c.name)}</s:link></li></c:if>
+ </c:forEach>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+</table>
</div>
<div style="float: left;margin-left:10px;" class="list-table">
Added: board/trunk/src/main/webapp/css/pal-extension.css
===================================================================
--- board/trunk/src/main/webapp/css/pal-extension.css (rev 0)
+++ board/trunk/src/main/webapp/css/pal-extension.css 2008-11-29 14:15:21 UTC (rev 1473)
@@ -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 */
+/* ---------------- */
+.board-portlet .form-table table {
+border-top: 1px solid #cccccc;
+border-left: 1px solid #cccccc;
+border-collapse:collapse;
+}
+
+.board-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;
+}
+
+.board-portlet .form-table thead {
+margin:0;
+padding:0;
+}
+
+.board-portlet .form-table tbody {
+margin:0;
+padding:0;
+}
+
+.board-portlet .form-table tfoot {
+margin:0;
+padding:0;
+}
+
+.board-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;
+}
+
+.board-portlet .form-table td {
+border-right: 1px solid #cccccc;
+border-bottom: 1px solid #cccccc;
+padding:3px;
+empty-cells: show;
+}
+
+.board-portlet .form-table tfoot tr td {
+padding:10px;
+text-align: center;
+empty-cells: show;
+}
+
+/* ---------------- */
+/* List Table */
+/* ---------------- */
+.board-portlet .list-table table {
+border-top: 1px solid #cccccc;
+border-left: 1px solid #cccccc;
+border-collapse:collapse;
+}
+
+.board-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;
+}
+
+.board-portlet .list-table thead {
+margin:0;
+padding:0;
+}
+
+.board-portlet .list-table tbody {
+margin:0;
+padding:0;
+}
+
+.board-portlet .list-table tfoot {
+margin:0;
+padding:0;
+}
+
+.board-portlet .list-table .row1 {
+background-color: #ffffff;
+}
+
+.board-portlet .list-table .row2 {
+background-color: #fffff8;
+}
+
+.board-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;
+}
+
+.board-portlet .list-table td {
+border-right: 1px solid #cccccc;
+border-bottom: 1px solid #cccccc;
+padding:3px;
+empty-cells: show;
+}
+
+
+/* ---------------- */
+/* Tab */
+/* ---------------- */
+.board-portlet .tab-nav div {
+height:25px;
+line-height:23px;
+margin:0;
+padding:0;
+width:100%;
+}
+
+.board-portlet .tab-nav ul {
+margin:0;
+padding:0;
+width:100%;
+}
+
+.board-portlet .tab-nav ul li {
+float:left;
+height:25px;
+line-height:23px;
+list-style-image:none;
+list-style-position:outside;
+list-style-type:none;
+}
+
+.board-portlet .tab-nav ul li a:visited {
+color:#0000EE;
+}
+
+.board-portlet .tab-nav ul li.first {
+border-bottom:1px solid #A9A9A9;
+width:10px;
+}
+
+.board-portlet .tab-nav ul li.last-spacer {
+border-bottom:1px solid #A9A9A9;
+width:5px;
+margin-right:-5px;
+}
+
+.board-portlet .tab-nav ul li.last {
+border-bottom:1px solid #A9A9A9;
+float:none;
+padding-right:10px;
+text-align:right;
+}
+
+.board-portlet .tab-nav ul li.selected {
+border-color:#A9A9A9 #A9A9A9 #FFFFFF;
+border-style:solid;
+border-width:1px;
+display:block;
+margin:-1px;
+_margin-top: 0px;
+}
+
+.board-portlet .tab-nav ul li.selected span {
+display:inline;
+padding:0 10px;
+white-space:pre;
+}
+
+.board-portlet .tab-nav ul li.selectable {
+background-color:#DCDCDC;
+border:1px solid #A9A9A9;
+display:block;
+height:24px;
+}
+
+.board-portlet .tab-nav ul li.selectable {
+display:inline;
+padding:0 10px;
+white-space:pre;
+}
+
+.board-portlet .tab-nav ul li.spacer {
+border-bottom:1px solid #A9A9A9;
+width:5px;
+}
+
Property changes on: board/trunk/src/main/webapp/css/pal-extension.css
___________________________________________________________________
Name: svn:eol-style
+ native