svnno****@sourc*****
svnno****@sourc*****
2008年 12月 1日 (月) 10:45:47 JST
Revision: 1484
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1484
Author: shinsuke
Date: 2008-12-01 10:45:47 +0900 (Mon, 01 Dec 2008)
Log Message:
-----------
updated style and translation.
Modified Paths:
--------------
timecard/trunk/src/main/resources/application.properties
timecard/trunk/src/main/resources/application_ja.properties
timecard/trunk/src/main/webapp/WEB-INF/view/admin/employee/confirm.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/admin/employee/edit.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/confirm.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/edit.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/config/index.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/employee/confirm.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/employee/edit.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/manager/employee/edit.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/confirm.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/edit.jsp
-------------- next part --------------
Modified: timecard/trunk/src/main/resources/application.properties
===================================================================
--- timecard/trunk/src/main/resources/application.properties 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/resources/application.properties 2008-12-01 01:45:47 UTC (rev 1484)
@@ -170,3 +170,23 @@
# 0: year, 1: month
display.yearmonth_format={0}/{1}
+labels.amEndTime=End Time (AM)
+labels.amStartTime=Start Time (AM)
+labels.defaultManager=Default Manager
+labels.displayedMinutes=Selectable Minutes
+labels.manager=Manager
+labels.paidHolidays=Paid Holidays
+labels.pmEndTime=End Time (PM)
+labels.pmStartTime=Start Time (PM)
+labels.username=Username
+labels.breakTimeHr=Break Time
+labels.breakTimeMin=Break Time
+labels.endTimeHr=End Time
+labels.endTimeMin=End Time
+labels.isAvailable=Available
+labels.otjTimeHr=OTJ Time
+labels.otjTimeMin=OTJ Time
+labels.startTimeHr=Start Time
+labels.startTimeMin=Start Time
+labels.workingType=Working Type
+
Modified: timecard/trunk/src/main/resources/application_ja.properties
===================================================================
--- timecard/trunk/src/main/resources/application_ja.properties 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/resources/application_ja.properties 2008-12-01 01:45:47 UTC (rev 1484)
@@ -163,3 +163,23 @@
# 0: year, 1: month
display.yearmonth_format={0}\u5e74{1}\u6708
+labels.amEndTime=\u7d42\u4e86\u6642\u9593 (AM)
+labels.amStartTime=\u958b\u59cb\u6642\u9593 (AM)
+labels.defaultManager=\u30c7\u30d5\u30a9\u30eb\u30c8\u30de\u30cd\u30fc\u30b8\u30e3\u30fc
+labels.displayedMinutes=\u9078\u629e\u53ef\u80fd\u306a\u5206
+labels.manager=\u30de\u30cd\u30fc\u30b8\u30e3\u30fc
+labels.paidHolidays=\u6709\u7d66\u4f11\u6687\u65e5\u6570
+labels.pmEndTime=\u7d42\u4e86\u6642\u9593 (PM)
+labels.pmStartTime=\u958b\u59cb\u6642\u9593 (PM)
+labels.username=\u30e6\u30fc\u30b6\u30fc\u540d
+labels.breakTimeHr=\u4f11\u61a9\u6642\u9593
+labels.breakTimeMin=\u4f11\u61a9\u6642\u9593
+labels.endTimeHr=\u7d42\u4e86\u6642\u9593
+labels.endTimeMin=\u7d42\u4e86\u6642\u9593
+labels.isAvailable=\u6709\u52b9
+labels.otjTimeHr=\u52e4\u52d9\u5916\u6642\u9593
+labels.otjTimeMin=\u52e4\u52d9\u5916\u6642\u9593
+labels.startTimeHr=\u958b\u59cb\u6642\u9593
+labels.startTimeMin=\u958b\u59cb\u6642\u9593
+labels.workingType=\u52e4\u52d9\u72b6\u614b
+
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/admin/employee/confirm.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/admin/employee/confirm.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/admin/employee/confirm.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -41,7 +41,7 @@
</tr>
<tr>
<th><bean:message key="labels.days_of_paid_holiday"/></th>
- <td>${f:h(paidHolidays)}<html:hidden property="paidHolidays"/></td>
+ <td>${f:h(paidHolidays)}<html:hidden property="paidHolidays"/> <bean:message key="labels.days"/></td>
</tr>
<tr>
<th><bean:message key="labels.status"/></th>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/admin/employee/edit.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/admin/employee/edit.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/admin/employee/edit.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -33,11 +33,11 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.user_name"/></th>
- <td><html:text property="username" size="20"/></td>
+ <td><html:text property="username" size="20" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.manager_name"/></th>
- <td><html:text property="manager" size="20"/></td>
+ <td><html:text property="manager" size="20" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.days_of_paid_holiday"/></th>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/confirm.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/confirm.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/confirm.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -31,13 +31,22 @@
<html:hidden property="month"/>
<html:hidden property="date"/>
<html:hidden property="mode"/>
+ <html:hidden property="dayOfWeek"/>
<div class="form-table">
<table style="width: 580px;">
<caption><bean:message key="labels.confirm_timecard"/></caption>
<tbody>
<tr>
<th style="width: 80px;"><bean:message key="labels.date"/></th>
- <td>${f:h(month)}/${f:h(date)}</td><!-- TODO: i18n -->
+ <td>${f:h(month)}/${f:h(date)}<!-- TODO: i18n -->
+<c:if test="${dayOfWeek==0}"><bean:message key="labels.sunday"/></c:if>
+<c:if test="${dayOfWeek==1}"><bean:message key="labels.monday"/></c:if>
+<c:if test="${dayOfWeek==2}"><bean:message key="labels.tuesday"/></c:if>
+<c:if test="${dayOfWeek==3}"><bean:message key="labels.wednesday"/></c:if>
+<c:if test="${dayOfWeek==4}"><bean:message key="labels.thursday"/></c:if>
+<c:if test="${dayOfWeek==5}"><bean:message key="labels.friday"/></c:if>
+<c:if test="${dayOfWeek==6}"><bean:message key="labels.saturday"/></c:if>
+ </td>
</tr>
<tr>
<th style="width: 80px;"><bean:message key="labels.working_status"/></th>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/edit.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/edit.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/edit.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -30,6 +30,7 @@
<html:hidden property="month"/>
<html:hidden property="date"/>
<html:hidden property="mode"/>
+ <html:hidden property="dayOfWeek"/>
<div class="form-table">
<table style="width: 580px;">
<caption><bean:message key="labels.edit_timecard"/></caption>
@@ -157,7 +158,7 @@
</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>
</tbody>
<tfoot>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/config/index.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -45,7 +45,7 @@
</tr>
<tr>
<th><bean:message key="labels.minutes_to_display"/></th>
- <td><html:textarea property="displayedMinutes" cols="2" rows="5"/></td>
+ <td><html:textarea property="displayedMinutes" cols="2" rows="5" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.holiday_list"/></th>
@@ -55,7 +55,7 @@
</tr>
<tr>
<th><bean:message key="labels.default_manager"/></th>
- <td><html:text property="defaultManager" size="5"/></td>
+ <td><html:text property="defaultManager" size="5" style="width:100%;"/></td>
</tr>
</tbody>
<tfoot>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/employee/confirm.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/employee/confirm.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/employee/confirm.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -31,6 +31,7 @@
<html:hidden property="date"/>
<html:hidden property="mode"/>
<html:hidden property="status"/>
+ <html:hidden property="dayOfWeek"/>
<div class="form-table">
<table style="width: 580px;">
<caption><bean:message key="labels.confirm_timecard"/></caption>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/employee/edit.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/employee/edit.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/employee/edit.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -30,6 +30,7 @@
<html:hidden property="date"/>
<html:hidden property="mode"/>
<html:hidden property="status"/>
+ <html:hidden property="dayOfWeek"/>
<div class="form-table">
<table style="width: 580px;">
<caption><bean:message key="labels.edit_timecard"/></caption>
@@ -147,7 +148,7 @@
</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>
</tbody>
<tfoot>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/manager/employee/edit.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/manager/employee/edit.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/manager/employee/edit.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -33,15 +33,15 @@
<tbody>
<tr>
<th style="width: 150px;"><bean:message key="labels.user_name"/></th>
- <td><html:text property="username" size="20"/></td>
+ <td><html:text property="username" size="20" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.manager_name"/></th>
- <td><html:text property="manager" size="20"/></td>
+ <td><html:text property="manager" size="20" style="width:100%;"/></td>
</tr>
<tr>
<th><bean:message key="labels.days_of_paid_holiday"/></th>
- <td><html:text property="paidHolidays" size="2"/> <bean:message key="labels.days"/></td>
+ <td><html:text property="paidHolidays" size="2" style="width:100%;"/> <bean:message key="labels.days"/></td>
</tr>
<tr>
<th><bean:message key="labels.status"/></th>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/confirm.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/confirm.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/confirm.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -31,13 +31,22 @@
<html:hidden property="month"/>
<html:hidden property="date"/>
<html:hidden property="mode"/>
+ <html:hidden property="dayOfWeek"/>
<div class="form-table">
<table style="width: 580px;">
<caption><bean:message key="labels.confirm_timecard"/></caption>
<tbody>
<tr>
<th style="width: 80px;"><bean:message key="labels.date"/></th>
- <td>${f:h(month)}/${f:h(date)}</td><!-- TODO: i18n -->
+ <td>${f:h(month)}/${f:h(date)}<!-- TODO: i18n -->
+<c:if test="${dayOfWeek==0}"><bean:message key="labels.sunday"/></c:if>
+<c:if test="${dayOfWeek==1}"><bean:message key="labels.monday"/></c:if>
+<c:if test="${dayOfWeek==2}"><bean:message key="labels.tuesday"/></c:if>
+<c:if test="${dayOfWeek==3}"><bean:message key="labels.wednesday"/></c:if>
+<c:if test="${dayOfWeek==4}"><bean:message key="labels.thursday"/></c:if>
+<c:if test="${dayOfWeek==5}"><bean:message key="labels.friday"/></c:if>
+<c:if test="${dayOfWeek==6}"><bean:message key="labels.saturday"/></c:if>
+ </td>
</tr>
<tr>
<th style="width: 80px;"><bean:message key="labels.working_status"/></th>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/edit.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/edit.jsp 2008-12-01 01:28:12 UTC (rev 1483)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/edit.jsp 2008-12-01 01:45:47 UTC (rev 1484)
@@ -30,6 +30,7 @@
<html:hidden property="month"/>
<html:hidden property="date"/>
<html:hidden property="mode"/>
+ <html:hidden property="dayOfWeek"/>
<div class="form-table">
<table style="width: 580px;">
<caption><bean:message key="labels.edit_timecard"/></caption>
@@ -156,7 +157,7 @@
</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>
</tbody>
<tfoot>