svnno****@sourc*****
svnno****@sourc*****
2008年 11月 18日 (火) 15:08:26 JST
Revision: 1364
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1364
Author: shinsuke
Date: 2008-11-18 15:08:26 +0900 (Tue, 18 Nov 2008)
Log Message:
-----------
changed width, added links, fixed a bug.
Modified Paths:
--------------
addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/admin/PersonAction.java
addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/user/PersonAction.java
addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/confirm.jsp
addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/confirm.jsp
addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/confirm.jsp
addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/confirm.jsp
-------------- next part --------------
Modified: addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/admin/PersonAction.java
===================================================================
--- addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/admin/PersonAction.java 2008-11-18 05:48:03 UTC (rev 1363)
+++ addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/admin/PersonAction.java 2008-11-18 06:08:26 UTC (rev 1364)
@@ -255,6 +255,7 @@
}
personDxo.convertFromPersonToForm(person, personForm);
+ company = person.getCompany();
}
private Person createPerson() {
Modified: addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/user/PersonAction.java
===================================================================
--- addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/user/PersonAction.java 2008-11-18 05:48:03 UTC (rev 1363)
+++ addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/user/PersonAction.java 2008-11-18 06:08:26 UTC (rev 1364)
@@ -257,6 +257,7 @@
}
personDxo.convertFromPersonToForm(person, personForm);
+ company = person.getCompany();
}
private Person createPerson() {
Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/confirm.jsp
===================================================================
--- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/confirm.jsp 2008-11-18 05:48:03 UTC (rev 1363)
+++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/confirm.jsp 2008-11-18 06:08:26 UTC (rev 1364)
@@ -29,7 +29,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.name"/></th>
- <td style="width: 200px;">${f:h(name)}<html:hidden property="name"/></td>
+ <td style="width: 300px;">${f:h(name)}<html:hidden property="name"/></td>
</tr>
<tr>
<th><bean:message key="labels.name_desc"/></th>
Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/confirm.jsp
===================================================================
--- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/confirm.jsp 2008-11-18 05:48:03 UTC (rev 1363)
+++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/confirm.jsp 2008-11-18 06:08:26 UTC (rev 1364)
@@ -34,7 +34,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.f_name"/></th>
- <td style="width: 200px;">${f:h(familyName)}<html:hidden property="familyName"/></td>
+ <td style="width: 300px;">${f:h(familyName)}<html:hidden property="familyName"/></td>
</tr>
<tr>
<th><bean:message key="labels.f_name_desc"/></th>
@@ -87,7 +87,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.tel_h"/></th>
- <td style="width: 200px;">${f:h(homeTelephone)}<html:hidden property="homeTelephone"/></td>
+ <td style="width: 300px;">${f:h(homeTelephone)}<html:hidden property="homeTelephone"/></td>
</tr>
<tr>
<th><bean:message key="labels.tel_mh"/></th>
@@ -136,7 +136,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.postal_code"/></th>
- <td style="width: 200px;">${f:h(postalCode)}<html:hidden property="postalCode"/></td>
+ <td style="width: 300px;">${f:h(postalCode)}<html:hidden property="postalCode"/></td>
</tr>
<tr>
<th><bean:message key="labels.state"/></th>
@@ -168,7 +168,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.name"/></th>
- <td style="width: 200px;">${f:h(company.name)}</td>
+ <td style="width: 300px;">${f:h(company.name)}</td>
</tr>
<tr>
<th><bean:message key="labels.name_desc"/></th>
@@ -237,7 +237,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.custom1"/></th>
- <td style="width: 200px;">${f:h(customData1)}<html:hidden property="customData1"/></td>
+ <td style="width: 300px;">${f:h(customData1)}<html:hidden property="customData1"/></td>
</tr>
<tr>
<th><bean:message key="labels.custom2"/></th>
Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/confirm.jsp
===================================================================
--- addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/confirm.jsp 2008-11-18 05:48:03 UTC (rev 1363)
+++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/confirm.jsp 2008-11-18 06:08:26 UTC (rev 1364)
@@ -29,7 +29,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.name"/></th>
- <td style="width: 200px;">${f:h(name)}<html:hidden property="name"/></td>
+ <td style="width: 300px;">${f:h(name)}<html:hidden property="name"/></td>
</tr>
<tr>
<th><bean:message key="labels.name_desc"/></th>
@@ -77,7 +77,7 @@
</tr>
<tr>
<th><bean:message key="labels.url"/></th>
- <td>${f:h(url)}<html:hidden property="url"/></td>
+ <td><c:if test="${url!=''}"><a href="${f:h(url)}" target="_blank">${f:h(url)}</a></c:if><c:if test="${url==''}">${f:h(url)}</c:if><html:hidden property="url"/></td>
</tr>
<tr>
<th><bean:message key="labels.public"/></th>
Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/confirm.jsp
===================================================================
--- addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/confirm.jsp 2008-11-18 05:48:03 UTC (rev 1363)
+++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/confirm.jsp 2008-11-18 06:08:26 UTC (rev 1364)
@@ -34,7 +34,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.f_name"/></th>
- <td style="width: 200px;">${f:h(familyName)}<html:hidden property="familyName"/></td>
+ <td style="width: 300px;">${f:h(familyName)}<html:hidden property="familyName"/></td>
</tr>
<tr>
<th><bean:message key="labels.f_name_desc"/></th>
@@ -87,7 +87,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.tel_h"/></th>
- <td style="width: 200px;">${f:h(homeTelephone)}<html:hidden property="homeTelephone"/></td>
+ <td style="width: 300px;">${f:h(homeTelephone)}<html:hidden property="homeTelephone"/></td>
</tr>
<tr>
<th><bean:message key="labels.tel_mh"/></th>
@@ -95,11 +95,11 @@
</tr>
<tr>
<th><bean:message key="labels.mail_hp"/></th>
- <td>${f:h(homeEmailPC)}<html:hidden property="homeEmailPC"/></td>
+ <td><c:if test="${homeEmailPC!=''}"><a href="mailto:${f:h(homeEmailPC)}">${f:h(homeEmailPC)}</a></c:if><c:if test="${homeEmailPC==''}">${f:h(homeEmailPC)}</c:if><html:hidden property="homeEmailPC"/></td>
</tr>
<tr>
<th><bean:message key="labels.mail_hm"/></th>
- <td>${f:h(homeEmailMobile)}<html:hidden property="homeEmailMobile"/></td>
+ <td><c:if test="${homeEmailMobile!=''}"><a href="mailto:${f:h(homeEmailMobile)}">${f:h(homeEmailMobile)}</a></c:if><c:if test="${homeEmailMobile==''}">${f:h(homeEmailMobile)}</c:if><html:hidden property="homeEmailMobile"/></td>
</tr>
<tr>
<th><bean:message key="labels.fax_h"/></th>
@@ -115,11 +115,11 @@
</tr>
<tr>
<th><bean:message key="labels.mail_bp"/></th>
- <td>${f:h(businessEmailPC)}<html:hidden property="businessEmailPC"/></td>
+ <td><c:if test="${businessEmailPC!=''}"><a href="mailto:${f:h(businessEmailPC)}">${f:h(businessEmailPC)}</a></c:if><c:if test="${businessEmailPC==''}">${f:h(businessEmailPC)}</c:if><html:hidden property="businessEmailPC"/></td>
</tr>
<tr>
<th><bean:message key="labels.mail_bm"/></th>
- <td>${f:h(businessEmailMobile)}<html:hidden property="businessEmailMobile"/></td>
+ <td><c:if test="${businessEmailMobile!=''}"><a href="mailto:${f:h(businessEmailMobile)}">${f:h(businessEmailMobile)}</a></c:if><c:if test="${businessEmailMobile==''}">${f:h(businessEmailMobile)}</c:if><html:hidden property="businessEmailMobile"/></td>
</tr>
<tr>
<th><bean:message key="labels.fax_b"/></th>
@@ -136,7 +136,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.postal_code"/></th>
- <td style="width: 200px;">${f:h(postalCode)}<html:hidden property="postalCode"/></td>
+ <td style="width: 300px;">${f:h(postalCode)}<html:hidden property="postalCode"/></td>
</tr>
<tr>
<th><bean:message key="labels.state"/></th>
@@ -168,7 +168,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.name"/></th>
- <td style="width: 200px;">${f:h(company.name)}</td>
+ <td style="width: 300px;">${f:h(company.name)}</td>
</tr>
<tr>
<th><bean:message key="labels.name_desc"/></th>
@@ -216,7 +216,7 @@
</tr>
<tr>
<th><bean:message key="labels.url"/></th>
- <td>${f:h(company.url)}</td>
+ <td><c:if test="${company.url!=''}"><a href="${f:h(company.url)}" target="_blank">${f:h(company.url)}</a></c:if><c:if test="${company.url==''}">${f:h(company.url)}</c:if></td>
</tr>
<tr>
<th><bean:message key="labels.public"/></th>
@@ -237,7 +237,7 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.custom1"/></th>
- <td style="width: 200px;">${f:h(customData1)}<html:hidden property="customData1"/></td>
+ <td style="width: 300px;">${f:h(customData1)}<html:hidden property="customData1"/></td>
</tr>
<tr>
<th><bean:message key="labels.custom2"/></th>