svnno****@sourc*****
svnno****@sourc*****
2008年 12月 4日 (木) 09:44:57 JST
Revision: 1513 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1513 Author: shinsuke Date: 2008-12-04 09:44:57 +0900 (Thu, 04 Dec 2008) Log Message: ----------- not displayed secret events. Modified Paths: -------------- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp -------------- next part -------------- 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-12-04 00:09:53 UTC (rev 1512) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp 2008-12-04 00:44:57 UTC (rev 1513) @@ -111,12 +111,12 @@ <tr> <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> + <td style="vertical-align: top;"> <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!=''}"><span style="font-size:xx-small;">${event.time}</span><br/></c:if> -<c:if test="${!s3.first&&event.secret=='T'}"><bean:message key="labels.private"/></c:if> -<c:if test="${s3.first||event.secret=='F'}"> + <li style="list-style-type:none;margin-top:2px;"><c:if test="${event.time!=null}"><span style="font-size:xx-small;">${event.time}</span><br/></c:if> +<c:if test="${!s1.first&&event.secret=='T'}"><bean:message key="labels.private"/></c:if> +<c:if test="${s1.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> <c:if test="${event.repeat=='false'}"><s:link href="/user/schedule/onetimeSchedule/confirmpage/4/${event.id}/selectgroupweek/${year}/${month}/${date}">${event.title}</s:link></c:if> </c:if>