svnno****@sourc*****
svnno****@sourc*****
2008年 12月 1日 (月) 09:48:54 JST
Revision: 1481
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1481
Author: shinsuke
Date: 2008-12-01 09:48:54 +0900 (Mon, 01 Dec 2008)
Log Message:
-----------
updated styles.
Modified Paths:
--------------
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/admin/LinkForm.java
bookmark/trunk/src/main/resources/application.properties
bookmark/trunk/src/main/resources/application_ja.properties
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp
-------------- next part --------------
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/admin/LinkForm.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/admin/LinkForm.java 2008-12-01 00:26:45 UTC (rev 1480)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/admin/LinkForm.java 2008-12-01 00:48:54 UTC (rev 1481)
@@ -27,10 +27,13 @@
@Maxbytelength(maxbytelength = 200)
public String memo;
+ @Required(target = "confirm,create,update,delete")
public String url;
+ @Required(target = "confirm,create,update,delete")
public String type;
+ @Required(target = "confirm,create,update,delete")
@IntegerType
public String sortOrder;
Modified: bookmark/trunk/src/main/resources/application.properties
===================================================================
--- bookmark/trunk/src/main/resources/application.properties 2008-12-01 00:26:45 UTC (rev 1480)
+++ bookmark/trunk/src/main/resources/application.properties 2008-12-01 00:48:54 UTC (rev 1481)
@@ -51,7 +51,7 @@
labels.category_list=Category List
labels.action=Action
labels.category_info=Category Infomation
-labels.category_name=Category Name
+labels.category_name=Name
labels.order=Sort Order
labels.move_up=Up
labels.move_down=Down
@@ -88,3 +88,8 @@
errors.could_not_find_link_for_moving_down=Could not find the link information for moving it down.
labels.default=Default
+
+labels.categoryId=Category ID
+labels.sortOrder=Sort Order
+labels.url=URL
+
Modified: bookmark/trunk/src/main/resources/application_ja.properties
===================================================================
--- bookmark/trunk/src/main/resources/application_ja.properties 2008-12-01 00:26:45 UTC (rev 1480)
+++ bookmark/trunk/src/main/resources/application_ja.properties 2008-12-01 00:48:54 UTC (rev 1481)
@@ -45,7 +45,7 @@
labels.category_list=\u30ab\u30c6\u30b4\u30ea\u4e00\u89a7
labels.action=\u30a2\u30af\u30b7\u30e7\u30f3
labels.category_info=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831
-labels.category_name=\u30ab\u30c6\u30b4\u30ea\u540d
+labels.category_name=\u540d\u524d
labels.order=\u9806\u756a
labels.move_up=\u4e0a\u3078
labels.move_down=\u4e0b\u3078
@@ -82,3 +82,7 @@
errors.could_not_find_link_for_moving_down=\u4e0b\u306b\u79fb\u52d5\u3059\u308b\u30ea\u30f3\u30af\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
labels.default=\u30c7\u30d5\u30a9\u30eb\u30c8
+
+labels.categoryId=\u30ab\u30c6\u30b4\u30ea ID
+labels.sortOrder=\u9806\u756a
+labels.url=URL
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2008-12-01 00:26:45 UTC (rev 1480)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2008-12-01 00:48:54 UTC (rev 1481)
@@ -31,15 +31,15 @@
<tbody>
<tr>
<th style="width: 100px;"><bean:message key="labels.category_name"/></th>
- <td><html:text property="name" size="40"/></td>
+ <td><html:text property="name" size="40" style="width:100%;"/></td>
</tr>
<tr>
<th style="width: 100px;"><bean:message key="labels.order"/></th>
- <td><html:text property="sortOrder" size="5"/></td>
+ <td><html:text property="sortOrder" size="5" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.memo"/></th>
- <td><html:textarea property="memo" cols="40" rows="5"/></td>
+ <td><html:textarea property="memo" cols="40" rows="5" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.shared"/></th>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/edit.jsp 2008-12-01 00:26:45 UTC (rev 1480)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/edit.jsp 2008-12-01 00:48:54 UTC (rev 1481)
@@ -33,15 +33,15 @@
<tbody>
<tr>
<th style="width: 80px;"><bean:message key="labels.name"/></th>
- <td><html:text property="name" size="20"/></td>
+ <td><html:text property="name" size="20" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.URL"/></th>
- <td><html:text property="url" size="50"/></td>
+ <td><html:text property="url" size="50" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.memo"/></th>
- <td><html:textarea property="memo" cols="50" rows="5"/></td>
+ <td><html:textarea property="memo" cols="50" rows="5" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.category_ID"/></th>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp 2008-12-01 00:26:45 UTC (rev 1480)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp 2008-12-01 00:48:54 UTC (rev 1481)
@@ -31,11 +31,11 @@
<tbody>
<tr>
<th style="width: 100px;"><bean:message key="labels.category_name"/></th>
- <td><html:text property="name" size="40"/></td>
+ <td><html:text property="name" size="40" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.memo"/></th>
- <td><html:textarea property="memo" cols="40" rows="5"/></td>
+ <td><html:textarea property="memo" cols="40" rows="5" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.shared"/></th>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp 2008-12-01 00:26:45 UTC (rev 1480)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp 2008-12-01 00:48:54 UTC (rev 1481)
@@ -33,7 +33,7 @@
<ul style="margin:0 0 0 3px;padding:0;">
<c:forEach var="c" varStatus="s" items="${categoryItems}">
<c:if test="${linkPager.categoryId==c.id}">
- <li style="list-style-type: none;font-weight: bold;margin:1px 0;">${f:h(c.name)}</li>
+ <li style="list-style-type: none;font-weight: bold;margin:1px 0;">»${f:h(c.name)}</li>
</c:if>
<c:if test="${linkPager.categoryId!=c.id}">
<li style="list-style-type: none;margin:1px 0;"><s:link href="select/${f:u(c.id)}" style="text-decoration: none;">${f:h(c.name)}</s:link></li>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp 2008-12-01 00:26:45 UTC (rev 1480)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp 2008-12-01 00:48:54 UTC (rev 1481)
@@ -33,7 +33,7 @@
<ul style="margin:0 0 0 3px;padding:0;">
<c:forEach var="c" varStatus="s" items="${categoryItems}">
<c:if test="${linkPager.categoryId==c.id}">
- <li style="list-style-type: none;font-weight: bold;margin:1px 0;">${f:h(c.name)}</li>
+ <li style="list-style-type: none;font-weight: bold;margin:1px 0;">»${f:h(c.name)}</li>
</c:if>
<c:if test="${linkPager.categoryId!=c.id}">
<li style="list-style-type: none;margin:1px 0;"><s:link href="select/${f:u(c.id)}" style="text-decoration: none;">${f:h(c.name)}</s:link></li>
@@ -58,15 +58,15 @@
<tbody>
<tr>
<th style="width: 80px;"><bean:message key="labels.name"/></th>
- <td><html:text property="name" size="20"/></td>
+ <td><html:text property="name" size="20" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.URL"/></th>
- <td><html:text property="url" size="50"/></td>
+ <td><html:text property="url" size="50" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.memo"/></th>
- <td><html:textarea property="memo" cols="50" rows="5"/></td>
+ <td><html:textarea property="memo" cols="50" rows="5" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.category"/></th>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp 2008-12-01 00:26:45 UTC (rev 1480)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp 2008-12-01 00:48:54 UTC (rev 1481)
@@ -33,7 +33,7 @@
<ul style="margin:0 0 0 3px;padding:0;">
<c:forEach var="c" varStatus="s" items="${categoryItems}">
<c:if test="${linkPager.categoryId==c.id}">
- <li style="list-style-type: none;font-weight: bold;margin:1px 0;">${f:h(c.name)}</li>
+ <li style="list-style-type: none;font-weight: bold;margin:1px 0;">»${f:h(c.name)}</li>
</c:if>
<c:if test="${linkPager.categoryId!=c.id}">
<li style="list-style-type: none;margin:1px 0;"><s:link href="select/${f:u(c.id)}" style="text-decoration: none;">${f:h(c.name)}</s:link></li>