svnno****@sourc*****
svnno****@sourc*****
2008年 11月 25日 (火) 17:38:34 JST
Revision: 1443 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1443 Author: shinsuke Date: 2008-11-25 17:38:33 +0900 (Tue, 25 Nov 2008) Log Message: ----------- checked on ie. Modified Paths: -------------- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityday.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilitymonth.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityweek.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/groupweek.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalday.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalmonth.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalweek.jsp -------------- next part -------------- Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityday.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityday.jsp 2008-11-25 08:14:11 UTC (rev 1442) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityday.jsp 2008-11-25 08:38:33 UTC (rev 1443) @@ -114,6 +114,7 @@ </table> </div> </div> +<div style="clear:both;height:20px;"></div> </body> </html> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilitymonth.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilitymonth.jsp 2008-11-25 08:14:11 UTC (rev 1442) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilitymonth.jsp 2008-11-25 08:38:33 UTC (rev 1443) @@ -107,6 +107,7 @@ </table> </div> </div> +<div style="clear:both;height:20px;"></div> </body> </html> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityweek.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityweek.jsp 2008-11-25 08:14:11 UTC (rev 1442) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityweek.jsp 2008-11-25 08:38:33 UTC (rev 1443) @@ -66,7 +66,7 @@ <tr> <th style="width:50px;text-align: center;">Time</th> <c:forEach var="day" varStatus="s" items="${weekDayItems}"> - <th style="width:80px;text-align: center;">${day.displayedDate}</th> + <th style="width:70px;text-align: center;font-size:xx-small;">${day.displayedDate}</th> </c:forEach> </tr> </thead> @@ -96,7 +96,7 @@ <ul style="margin:0;padding:0;"> <c:forEach var="eventInTimeItems" varStatus="s" items="${eventInDayItems}"> <c:forEach var="event" varStatus="s" items="${eventInTimeItems}"> - <li style="list-style-type:none;">${event.time}<br/> + <li style="list-style-type:none;"><span style="font-size:xx-small;">${event.time}</span><br/> <c:if test="${event.secret=='T'}">Private</c:if> <c:if test="${event.secret=='F'}"> <c:if test="${event.repeat=='true'}"><s:link href="/user/facility/repeatSchedule/confirmpage/4/${event.id}/selectfacilityweek/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if> @@ -113,6 +113,7 @@ </table> </div> </div> +<div style="clear:both;height:20px;"></div> </body> </html> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/groupweek.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/groupweek.jsp 2008-11-25 08:14:11 UTC (rev 1442) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/groupweek.jsp 2008-11-25 08:38:33 UTC (rev 1443) @@ -55,7 +55,8 @@ </table> </div> -<div class="form-table" style="margin-top:3px;margin-left:10px;float:left;"> +<div style="margin-top:3px;margin-left:10px;float:left;"> +<div class="form-table"> <s:form> <table> <tbody> @@ -74,13 +75,14 @@ </table> </s:form> </div> -<div class="list-table" style="margin-top:3px;margin-left:10px;float:left;"> + +<div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> <th style="width:50px;text-align: center;"> </th> <c:forEach var="day" varStatus="s" items="${weekDayItems}"> - <th style="width:80px;text-align: center;">${day.displayedDate}</th> + <th style="width:70px;text-align: center;font-size:xx-small;">${day.displayedDate}</th> </c:forEach> </tr> </thead> @@ -92,7 +94,7 @@ <td> <ul style="margin:0;padding:0;"> <c:forEach var="event" varStatus="s3" items="${eventInDayItems}"> - <li style="list-style-type:none;margin-top:2px;"><c:if test="${event.time!=''}">${event.time}<br/></c:if> + <li style="list-style-type:none;margin-top:2px;"><c:if test="${event.time!=''}"><span style="font-size:xx-small;">${event.time}</span><br/></c:if> <c:if test="${event.secret=='T'}">Private</c:if> <c:if test="${event.secret=='F'}"> <c:if test="${event.repeat=='true'}"><s:link href="/user/facility/repeatSchedule/confirmpage/4/${event.id}/selectgroupweek/0/${year}/${month}/${date}">${event.title}</s:link></c:if> @@ -110,5 +112,8 @@ </div> </div> +</div> +<div style="clear:both;height:20px;"></div> + </body> </html> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp 2008-11-25 08:14:11 UTC (rev 1442) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp 2008-11-25 08:38:33 UTC (rev 1443) @@ -59,7 +59,8 @@ </table> </div> -<div class="form-table" style="margin-top:3px;margin-left:10px;float:left;"> +<div style="margin-top:3px;margin-left:10px;float:left;"> +<div class="form-table"> <s:form> <table> <tbody> @@ -78,25 +79,26 @@ </table> </s:form> </div> -<div class="list-table" style="margin-top:3px;margin-left:10px;float:left;"> + +<div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> <th style="width:50px;text-align: center;"> </th> <c:forEach var="day" varStatus="s" items="${weekDayItems}"> - <th style="width:80px;text-align: center;">${day.displayedDate}</th> + <th style="width:70px;text-align: center;font-size:xx-small;">${day.displayedDate}</th> </c:forEach> </tr> </thead> <tbody> <c:forEach var="groupMemberMap" varStatus="s1" items="${groupMemberInWeekItems}"> <tr> - <th><div style="overflow: hidden;font-size:small;width: 50px;"><bean:message key="display.name" arg0="${f:h(groupMemberMap.userInfo.nameArg0)}" arg1="${f:h(groupMemberMap.userInfo.nameArg1)}" arg2="${f:h(groupMemberMap.userInfo.nameArg2)}"/></div></th> + <th><div style="overflow: hidden;font-size:xx-small;width: 50px;"><bean:message key="display.name" arg0="${f:h(groupMemberMap.userInfo.nameArg0)}" arg1="${f:h(groupMemberMap.userInfo.nameArg1)}" arg2="${f:h(groupMemberMap.userInfo.nameArg2)}"/></div></th> <c:forEach var="eventInDayItems" varStatus="s2" items="${groupMemberMap.eventInWeekItems}"> <td> <ul style="margin:0;padding:0;"> <c:forEach var="event" varStatus="s3" items="${eventInDayItems}"> - <li style="list-style-type:none;margin-top:2px;"><c:if test="${event.time!=''}">${event.time}<br/></c:if> + <li style="list-style-type:none;margin-top:2px;"><c:if test="${event.time!=''}"><span style="font-size:xx-small;">${event.time}</span><br/></c:if> <c:if test="${!s3.first&&event.secret=='T'}">Private</c:if> <c:if test="${s3.first||event.secret=='F'}"> <c:if test="${event.repeat=='true'}"><s:link href="/user/schedule/repeatSchedule/confirmpage/4/${event.id}/selectgroupweek/${year}/${month}/${date}">${event.title}</s:link></c:if> @@ -114,5 +116,8 @@ </div> </div> +</div> +<div style="clear:both;height:20px;"></div> + </body> </html> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalday.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalday.jsp 2008-11-25 08:14:11 UTC (rev 1442) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalday.jsp 2008-11-25 08:38:33 UTC (rev 1443) @@ -107,6 +107,7 @@ </table> </div> </div> +<div style="clear:both;height:20px;"></div> </body> </html> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalmonth.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalmonth.jsp 2008-11-25 08:14:11 UTC (rev 1442) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalmonth.jsp 2008-11-25 08:38:33 UTC (rev 1443) @@ -100,6 +100,7 @@ </table> </div> </div> +<div style="clear:both;height:20px;"></div> </body> </html> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalweek.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalweek.jsp 2008-11-25 08:14:11 UTC (rev 1442) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalweek.jsp 2008-11-25 08:38:33 UTC (rev 1443) @@ -65,7 +65,7 @@ <tr> <th style="width:50px;text-align: center;">Time</th> <c:forEach var="day" varStatus="s" items="${weekDayItems}"> - <th style="width:80px;text-align: center;">${day.displayedDate}</th> + <th style="width:70px;text-align: center;font-size:xx-small;">${day.displayedDate}</th> </c:forEach> </tr> </thead> @@ -92,7 +92,7 @@ <ul style="margin:0;padding:0;"> <c:forEach var="eventInTimeItems" varStatus="s" items="${eventInDayItems}"> <c:forEach var="event" varStatus="s" items="${eventInTimeItems}"> - <li style="list-style-type:none;">${event.time}<br/> + <li style="list-style-type:none;"><span style="font-size:xx-small;">${event.time}</span><br/> <c:if test="${event.repeat=='true'}"><s:link href="/user/schedule/repeatSchedule/confirmpage/4/${event.id}/selectpersonalweek/${year}/${month}/${date}">${event.title}</s:link></c:if> <c:if test="${event.repeat=='false'}"><s:link href="/user/schedule/onetimeSchedule/confirmpage/4/${event.id}/selectpersonalweek/${year}/${month}/${date}">${event.title}</s:link></c:if> </li> @@ -106,6 +106,7 @@ </table> </div> </div> +<div style="clear:both;height:20px;"></div> </body> </html>