svnno****@sourc*****
svnno****@sourc*****
2008年 11月 27日 (木) 17:50:12 JST
Revision: 1451 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1451 Author: shinsuke Date: 2008-11-27 17:50:12 +0900 (Thu, 27 Nov 2008) Log Message: ----------- added css, added last-spacer, fixed memory issue. Modified Paths: -------------- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/CalendarAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/CalendarAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/OnetimeScheduleAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityGroupService.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityService.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java scheduler/trunk/src/main/resources/application_ja.properties scheduler/trunk/src/main/webapp/WEB-INF/portlet.xml scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/error.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/error.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/index.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/error.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/index.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/error.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/index.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 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/facility/facility/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/index.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/userlist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/userlist.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 scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/error.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/userlist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/error.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/userlist.jsp Added Paths: ----------- scheduler/trunk/src/main/webapp/css/ scheduler/trunk/src/main/webapp/css/pal-extension.css -------------- next part -------------- Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/CalendarAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/CalendarAction.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/CalendarAction.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -69,10 +69,10 @@ int tMonth = CalendarUtil.getMonth(cal) + 1; int tDate = CalendarUtil.getDate(cal); int tDay = CalendarUtil.getDay(cal); - eventInDayItems = new ArrayList<List<Map<String, Object>>>(); - allDayEventInDayItems = new ArrayList<Map<String, Object>>(); + eventInDayItems = new ArrayList<List<Map<String, Object>>>(5); + allDayEventInDayItems = new ArrayList<Map<String, Object>>(5); for (int i = 0; i < 24; i++) { - eventInDayItems.add(new ArrayList<Map<String, Object>>()); + eventInDayItems.add(new ArrayList<Map<String, Object>>(5)); } Integer facilityId = Integer.parseInt(calendarForm.facilityId); @@ -118,7 +118,7 @@ events.add(SchedulerUtil.createEmptyEvent()); } } else { - Map<String, Object> emptyEvent = new HashMap<String, Object>(); + Map<String, Object> emptyEvent = new HashMap<String, Object>(1); emptyEvent.put("noEvent", "true"); events.add(emptyEvent); } @@ -135,7 +135,7 @@ eventInWeekItems = new ArrayList<List<List<Map<String, Object>>>>(7); allDayEventInWeekItems = new ArrayList<List<Map<String, Object>>>(7); Calendar cal = calendarForm.getTargetCalendar(); - weekDayItems = new ArrayList<Map<String, Object>>(); + weekDayItems = new ArrayList<Map<String, Object>>(7); Map<String, Integer> indexMap = new HashMap<String, Integer>(7); SimpleDateFormat sdf = new SimpleDateFormat("MM/dd(E)");// TODO i18n for (int i = 0; i < 7; i++) { @@ -145,7 +145,7 @@ int month = CalendarUtil.getMonth(cal) + 1; int date = CalendarUtil.getDate(cal); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<String, Object>(5); map.put("displayedDate", sdf.format(cal.getTime())); map.put("dayOfWeek", String.valueOf(CalendarUtil.getDay(cal))); map.put("date", String.valueOf(date)); @@ -159,11 +159,11 @@ List<List<Map<String, Object>>> eventInDayItems = new ArrayList<List<Map<String, Object>>>( 24); for (int j = 0; j < 24; j++) { - eventInDayItems.add(new ArrayList<Map<String, Object>>()); + eventInDayItems.add(new ArrayList<Map<String, Object>>(5)); } eventInWeekItems.add(eventInDayItems); - allDayEventInWeekItems.add(new ArrayList<Map<String, Object>>()); + allDayEventInWeekItems.add(new ArrayList<Map<String, Object>>(5)); } Integer facilityId = Integer.parseInt(calendarForm.facilityId); @@ -194,11 +194,11 @@ + calendarDay.get("month") + "-" + calendarDay.get("dayOfMonth"), count); calendarDay.put("allDayEventItems", - new ArrayList<Map<String, Object>>()); + new ArrayList<Map<String, Object>>(5)); List<List<Map<String, Object>>> eventInDayItems = new ArrayList<List<Map<String, Object>>>( 24); for (int j = 0; j < 24; j++) { - eventInDayItems.add(new ArrayList<Map<String, Object>>()); + eventInDayItems.add(new ArrayList<Map<String, Object>>(5)); } calendarDay.put("eventItems", eventInDayItems); count++; @@ -239,7 +239,7 @@ calendarDayItems = SchedulerUtil.createSideCalendar(cal); Calendar startCal = cal; - weekDayItems = new ArrayList<Map<String, Object>>(); + weekDayItems = new ArrayList<Map<String, Object>>(7); Map<String, Integer> indexMap = new HashMap<String, Integer>(7); SimpleDateFormat sdf = new SimpleDateFormat("MM/dd(E)");// TODO i18n for (int i = 0; i < 7; i++) { @@ -247,7 +247,7 @@ int month = CalendarUtil.getMonth(cal) + 1; int date = CalendarUtil.getDate(cal); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<String, Object>(5); map.put("displayedDate", sdf.format(cal.getTime())); map.put("dayOfWeek", String.valueOf(CalendarUtil.getDay(cal))); map.put("date", String.valueOf(date)); @@ -288,7 +288,7 @@ private Map<String, Object> createWeekScheduleMap(Facility facility, Map<String, Integer> indexMap, Calendar startCal, Calendar endCal) { - Map<String, Object> memberMap = new HashMap<String, Object>(); + Map<String, Object> memberMap = new HashMap<String, Object>(2); memberMap.put("facility", facility); @@ -300,11 +300,11 @@ List<List<Map<String, Object>>> eventInDayItems = new ArrayList<List<Map<String, Object>>>( 24); for (int j = 0; j < 24; j++) { - eventInDayItems.add(new ArrayList<Map<String, Object>>()); + eventInDayItems.add(new ArrayList<Map<String, Object>>(5)); } eventInWeekItems.add(eventInDayItems); - allDayEventInWeekItems.add(new ArrayList<Map<String, Object>>()); + allDayEventInWeekItems.add(new ArrayList<Map<String, Object>>(5)); } List<FacilityScheduleMapping> ssmList = onetimeScheduleService Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -599,7 +599,7 @@ public List<String> getYearItems() { int year = CalendarUtil.getYear(CalendarUtil.getToday()); - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(15); for (int i = year - 10; i < year + 5; i++) { items.add(String.valueOf(i)); } @@ -607,7 +607,7 @@ } public List<String> getMonthItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(12); for (int i = 1; i < 10; i++) { items.add("0" + String.valueOf(i)); } @@ -618,7 +618,7 @@ } public List<String> getDateItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(31); for (int i = 1; i < 10; i++) { items.add("0" + String.valueOf(i)); } @@ -629,7 +629,7 @@ } public List<Map<String, String>> getHourItems() { - List<Map<String, String>> items = new ArrayList<Map<String, String>>(); + List<Map<String, String>> items = new ArrayList<Map<String, String>>(24); for (int i = 0; i < 24; i++) { StringBuilder buf = new StringBuilder(); if (i < 10) { @@ -637,7 +637,7 @@ } buf.append(i); // TODO i18n - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<String, String>(2); map.put("label", buf.toString()); map.put("value", buf.toString()); items.add(map); @@ -646,7 +646,7 @@ } public List<String> getMinuteItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(60); for (int i = 0; i < 60; i += 5) { StringBuilder buf = new StringBuilder(); if (i < 10) { Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -594,7 +594,7 @@ public List<String> getYearItems() { int year = CalendarUtil.getYear(CalendarUtil.getToday()); - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(15); for (int i = year - 10; i < year + 5; i++) { items.add(String.valueOf(i)); } @@ -602,7 +602,7 @@ } public List<String> getMonthItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(12); for (int i = 1; i < 10; i++) { items.add("0" + String.valueOf(i)); } @@ -613,7 +613,7 @@ } public List<String> getDateItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(31); for (int i = 1; i < 10; i++) { items.add("0" + String.valueOf(i)); } @@ -624,7 +624,7 @@ } public List<Map<String, String>> getHourItems() { - List<Map<String, String>> items = new ArrayList<Map<String, String>>(); + List<Map<String, String>> items = new ArrayList<Map<String, String>>(24); for (int i = 0; i < 24; i++) { StringBuilder buf = new StringBuilder(); if (i < 10) { @@ -632,7 +632,7 @@ } buf.append(i); // TODO i18n - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<String, String>(2); map.put("label", buf.toString()); map.put("value", buf.toString()); items.add(map); @@ -641,7 +641,7 @@ } public List<String> getMinuteItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(60); for (int i = 0; i < 60; i += 5) { StringBuilder buf = new StringBuilder(); if (i < 10) { Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/CalendarAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/CalendarAction.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/CalendarAction.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -67,10 +67,10 @@ int tMonth = CalendarUtil.getMonth(cal) + 1; int tDate = CalendarUtil.getDate(cal); int tDay = CalendarUtil.getDay(cal); - eventInDayItems = new ArrayList<List<Map<String, Object>>>(); - allDayEventInDayItems = new ArrayList<Map<String, Object>>(); + eventInDayItems = new ArrayList<List<Map<String, Object>>>(5); + allDayEventInDayItems = new ArrayList<Map<String, Object>>(5); for (int i = 0; i < 24; i++) { - eventInDayItems.add(new ArrayList<Map<String, Object>>()); + eventInDayItems.add(new ArrayList<Map<String, Object>>(5)); } String userId = request.getRemoteUser(); @@ -115,7 +115,7 @@ events.add(SchedulerUtil.createEmptyEvent()); } } else { - Map<String, Object> emptyEvent = new HashMap<String, Object>(); + Map<String, Object> emptyEvent = new HashMap<String, Object>(1); emptyEvent.put("noEvent", "true"); events.add(emptyEvent); } @@ -133,7 +133,7 @@ allDayEventInWeekItems = new ArrayList<List<Map<String, Object>>>(7); Calendar cal = calendarForm.getTargetCalendar(); // calendarList.add(cal); - weekDayItems = new ArrayList<Map<String, Object>>(); + weekDayItems = new ArrayList<Map<String, Object>>(7); Map<String, Integer> indexMap = new HashMap<String, Integer>(7); SimpleDateFormat sdf = new SimpleDateFormat("MM/dd(E)");// TODO i18n for (int i = 0; i < 7; i++) { @@ -143,7 +143,7 @@ int month = CalendarUtil.getMonth(cal) + 1; int date = CalendarUtil.getDate(cal); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<String, Object>(5); map.put("displayedDate", sdf.format(cal.getTime())); map.put("dayOfWeek", String.valueOf(CalendarUtil.getDay(cal))); map.put("date", String.valueOf(date)); @@ -157,11 +157,11 @@ List<List<Map<String, Object>>> eventInDayItems = new ArrayList<List<Map<String, Object>>>( 24); for (int j = 0; j < 24; j++) { - eventInDayItems.add(new ArrayList<Map<String, Object>>()); + eventInDayItems.add(new ArrayList<Map<String, Object>>(5)); } eventInWeekItems.add(eventInDayItems); - allDayEventInWeekItems.add(new ArrayList<Map<String, Object>>()); + allDayEventInWeekItems.add(new ArrayList<Map<String, Object>>(5)); } String userId = request.getRemoteUser(); @@ -191,11 +191,11 @@ + calendarDay.get("month") + "-" + calendarDay.get("dayOfMonth"), count); calendarDay.put("allDayEventItems", - new ArrayList<Map<String, Object>>()); + new ArrayList<Map<String, Object>>(5)); List<List<Map<String, Object>>> eventInDayItems = new ArrayList<List<Map<String, Object>>>( 24); for (int j = 0; j < 24; j++) { - eventInDayItems.add(new ArrayList<Map<String, Object>>()); + eventInDayItems.add(new ArrayList<Map<String, Object>>(5)); } calendarDay.put("eventItems", eventInDayItems); count++; @@ -247,7 +247,7 @@ } Calendar startCal = cal; - weekDayItems = new ArrayList<Map<String, Object>>(); + weekDayItems = new ArrayList<Map<String, Object>>(7); Map<String, Integer> indexMap = new HashMap<String, Integer>(7); SimpleDateFormat sdf = new SimpleDateFormat("MM/dd(E)");// TODO i18n for (int i = 0; i < 7; i++) { @@ -255,7 +255,7 @@ int month = CalendarUtil.getMonth(cal) + 1; int date = CalendarUtil.getDate(cal); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<String, Object>(5); map.put("displayedDate", sdf.format(cal.getTime())); map.put("dayOfWeek", String.valueOf(CalendarUtil.getDay(cal))); map.put("date", String.valueOf(date)); @@ -307,7 +307,7 @@ private Map<String, Object> createWeekScheduleMap(UserInfo userInfo, Map<String, Integer> indexMap, Calendar startCal, Calendar endCal) { - Map<String, Object> memberMap = new HashMap<String, Object>(); + Map<String, Object> memberMap = new HashMap<String, Object>(2); memberMap.put("userInfo", userInfo); @@ -319,11 +319,11 @@ List<List<Map<String, Object>>> eventInDayItems = new ArrayList<List<Map<String, Object>>>( 24); for (int j = 0; j < 24; j++) { - eventInDayItems.add(new ArrayList<Map<String, Object>>()); + eventInDayItems.add(new ArrayList<Map<String, Object>>(5)); } eventInWeekItems.add(eventInDayItems); - allDayEventInWeekItems.add(new ArrayList<Map<String, Object>>()); + allDayEventInWeekItems.add(new ArrayList<Map<String, Object>>(5)); } List<EventScheduleMapping> ssmList = onetimeScheduleService Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/OnetimeScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/OnetimeScheduleAction.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/OnetimeScheduleAction.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -591,7 +591,7 @@ public List<String> getYearItems() { int year = CalendarUtil.getYear(CalendarUtil.getToday()); - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(15); for (int i = year - 10; i < year + 5; i++) { items.add(String.valueOf(i)); } @@ -599,7 +599,7 @@ } public List<String> getMonthItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(12); for (int i = 1; i < 10; i++) { items.add("0" + String.valueOf(i)); } @@ -610,7 +610,7 @@ } public List<String> getDateItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(31); for (int i = 1; i < 10; i++) { items.add("0" + String.valueOf(i)); } @@ -621,7 +621,7 @@ } public List<Map<String, String>> getHourItems() { - List<Map<String, String>> items = new ArrayList<Map<String, String>>(); + List<Map<String, String>> items = new ArrayList<Map<String, String>>(24); for (int i = 0; i < 24; i++) { StringBuilder buf = new StringBuilder(); if (i < 10) { @@ -629,7 +629,7 @@ } buf.append(i); // TODO i18n - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<String, String>(2); map.put("label", buf.toString()); map.put("value", buf.toString()); items.add(map); @@ -638,7 +638,7 @@ } public List<String> getMinuteItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(60); for (int i = 0; i < 60; i += 5) { StringBuilder buf = new StringBuilder(); if (i < 10) { Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -587,7 +587,7 @@ public List<String> getYearItems() { int year = CalendarUtil.getYear(CalendarUtil.getToday()); - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(15); for (int i = year - 10; i < year + 5; i++) { items.add(String.valueOf(i)); } @@ -595,7 +595,7 @@ } public List<String> getMonthItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(12); for (int i = 1; i < 10; i++) { items.add("0" + String.valueOf(i)); } @@ -606,7 +606,7 @@ } public List<String> getDateItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(31); for (int i = 1; i < 10; i++) { items.add("0" + String.valueOf(i)); } @@ -617,7 +617,7 @@ } public List<Map<String, String>> getHourItems() { - List<Map<String, String>> items = new ArrayList<Map<String, String>>(); + List<Map<String, String>> items = new ArrayList<Map<String, String>>(24); for (int i = 0; i < 24; i++) { StringBuilder buf = new StringBuilder(); if (i < 10) { @@ -625,7 +625,7 @@ } buf.append(i); // TODO i18n - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<String, String>(2); map.put("label", buf.toString()); map.put("value", buf.toString()); items.add(map); @@ -634,7 +634,7 @@ } public List<String> getMinuteItems() { - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<String>(60); for (int i = 0; i < 60; i += 5) { StringBuilder buf = new StringBuilder(); if (i < 10) { Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityGroupService.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityGroupService.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityGroupService.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -23,6 +23,8 @@ private PagerDxo pagerDxo; + private FacilityService facilityService; + public List<FacilityGroup> getFacilityGroupList( FacilityGroupPager facilityGroupPager) { @@ -111,6 +113,8 @@ } public void disable(Integer id, String name) { + facilityService.disableAll(id, name); + // not delete FacilityGroupCB cb = new FacilityGroupCB(); @@ -122,6 +126,7 @@ facilityGroup.setDeletedBy(name); facilityGroup.setDeletedTime(new Timestamp(new Date().getTime())); facilityGroupBhv.update(facilityGroup); + } public void moveUp(FacilityGroup facilityGroup) { @@ -182,4 +187,12 @@ this.pagerDxo = pagerDxo; } + public FacilityService getFacilityService() { + return facilityService; + } + + public void setFacilityService(FacilityService facilityService) { + this.facilityService = facilityService; + } + } Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityService.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityService.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityService.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -10,8 +10,10 @@ import jp.sf.pal.scheduler.common.util.PagingResultBeanWrapper; import jp.sf.pal.scheduler.db.allcommon.cbean.PagingResultBean; import jp.sf.pal.scheduler.db.cbean.FacilityCB; +import jp.sf.pal.scheduler.db.cbean.FacilityScheduleMappingCB; import jp.sf.pal.scheduler.db.exbhv.FacilityBhv; import jp.sf.pal.scheduler.db.exbhv.FacilityContentBhv; +import jp.sf.pal.scheduler.db.exbhv.FacilityScheduleMappingBhv; import jp.sf.pal.scheduler.db.exentity.Facility; import jp.sf.pal.scheduler.db.exentity.FacilityContent; import jp.sf.pal.scheduler.pager.FacilityPager; @@ -26,6 +28,8 @@ private transient FacilityContentBhv facilityContentBhv; + private transient FacilityScheduleMappingBhv facilityScheduleMappingBhv; + private PagerDxo pagerDxo; public List<Facility> getFacilityList(FacilityPager facilityPager) { @@ -144,6 +148,10 @@ } public void disable(Integer id, String name) { + FacilityScheduleMappingCB cb2 = new FacilityScheduleMappingCB(); + cb2.query().setFacilityId_Equal(id); + facilityScheduleMappingBhv.queryDelete(cb2); + // not delete FacilityCB cb = new FacilityCB(); @@ -157,6 +165,22 @@ facilityBhv.update(facility); } + public void disableAll(Integer groupId, String name) { + FacilityScheduleMappingCB cb2 = new FacilityScheduleMappingCB(); + cb2.query().queryFacility().setGroupId_Equal(groupId); + facilityScheduleMappingBhv.queryDelete(cb2); + + Facility facility = new Facility(); + facility.setDeletedBy(name); + facility.setDeletedTime(new Timestamp(new Date().getTime())); + + // not delete + FacilityCB cb = new FacilityCB(); + + cb.query().setGroupId_Equal(groupId); + facilityBhv.queryUpdate(facility, cb); + } + public void moveUp(Facility facility) { FacilityCB cb = new FacilityCB(); @@ -262,4 +286,13 @@ this.facilityContentBhv = facilityContentBhv; } + public FacilityScheduleMappingBhv getFacilityScheduleMappingBhv() { + return facilityScheduleMappingBhv; + } + + public void setFacilityScheduleMappingBhv( + FacilityScheduleMappingBhv facilityScheduleMappingBhv) { + this.facilityScheduleMappingBhv = facilityScheduleMappingBhv; + } + } Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -190,7 +190,7 @@ cb1.query().addOrderBy_RoleId_Asc(); List<RoleMapping> roleMappingList = roleMappingBhv.selectList(cb1); for (RoleMapping roleMapping : roleMappingList) { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<String, String>(2); map.put("value", SchedulerConstants.ROLE_PREFIX + roleMapping.getRoleId()); String name = roleMapping.getRoleInfo().getName(); @@ -209,7 +209,7 @@ cb2.query().addOrderBy_GroupId_Asc(); List<GroupMapping> groupMappingList = groupMappingBhv.selectList(cb2); for (GroupMapping groupMapping : groupMappingList) { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<String, String>(2); map.put("value", SchedulerConstants.GROUP_PREFIX + groupMapping.getGroupId()); String name = groupMapping.getGroupInfo().getName(); Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java 2008-11-27 08:50:12 UTC (rev 1451) @@ -130,7 +130,7 @@ public static Map<String, Object> createCalendarDayItem(Calendar cal, boolean thisMonth) { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<String, Object>(6); map.put("year", String.valueOf(CalendarUtil.getYear(cal))); map.put("month", String.valueOf(CalendarUtil.getMonth(cal) + 1)); map.put("dayOfMonth", String.valueOf(CalendarUtil.getDate(cal))); @@ -146,7 +146,7 @@ int month = CalendarUtil.getMonth(cal) + 1; int dayOfMonth = CalendarUtil.getDate(cal); int dayOfWeek = CalendarUtil.getDay(cal); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<String, Object>(6); map.put("year", String.valueOf(year)); map.put("month", String.valueOf(month)); map.put("dayOfMonth", String.valueOf(dayOfMonth)); @@ -169,7 +169,7 @@ } public static Map<String, Object> createEmptyEvent() { - Map<String, Object> emptyEvent = new HashMap<String, Object>(); + Map<String, Object> emptyEvent = new HashMap<String, Object>(4); emptyEvent.put("startEvent", "true"); emptyEvent.put("cols", "1"); emptyEvent.put("rows", "1"); @@ -251,7 +251,7 @@ public static Map<String, Object> createEvent(EventSchedule eventSchedule, boolean start, boolean end) { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<String, Object>(6); map.put("id", eventSchedule.getId().toString()); map.put("title", eventSchedule.getTitle()); map.put("secret", eventSchedule.getSecret()); Modified: scheduler/trunk/src/main/resources/application_ja.properties =================================================================== --- scheduler/trunk/src/main/resources/application_ja.properties 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/resources/application_ja.properties 2008-11-27 08:50:12 UTC (rev 1451) @@ -122,7 +122,7 @@ labels.remove=\u524a\u9664 labels.selected_facility_list=\u9078\u629e\u3055\u308c\u305f\u65bd\u8a2d\u306e\u30ea\u30b9\u30c8 -labels.ok=OK +labels.ok=\u4e86\u89e3 labels.id=ID labels.title=\u30bf\u30a4\u30c8\u30eb Modified: scheduler/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-11-27 08:50:12 UTC (rev 1451) @@ -85,6 +85,10 @@ <name>viewPage</name> <value>/user/schedule/calendar/</value> </init-param> + <init-param> + <name>maxCacheSize</name> + <value>3</value> + </init-param> <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> @@ -110,6 +114,10 @@ <name>viewPage</name> <value>/user/facility/facility/</value> </init-param> + <init-param> + <name>maxCacheSize</name> + <value>3</value> + </init-param> <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/confirm.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/confirm.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selected"><span><bean:message key="labels.facilities"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> @@ -40,7 +56,7 @@ <html:hidden property="groupId"/></td> </tr> <tr> - <th>Comment</th> + <th><bean:message key="labels.comment"/></th> <td>${f:br(f:h(content))}<html:hidden property="content"/></td> </tr> </tbody> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/edit.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/edit.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selected"><span><bean:message key="labels.facilities"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/error.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/error.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -4,7 +4,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -12,6 +27,7 @@ <li class="selected"><span><bean:message key="labels.facilities"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selected"><span><bean:message key="labels.facilities"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/confirm.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/confirm.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.facility_groups"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/edit.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/edit.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.facility_groups"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/error.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/error.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -4,7 +4,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -12,6 +27,7 @@ <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.facility_groups"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/index.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/index.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/index.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.facility_groups"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/error.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/error.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -4,7 +4,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -12,6 +27,7 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/index.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/index.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/index.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,7 +28,8 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> - <li class="last"></li> + <li class="last-spacer"></li> + <li class="last"></li> </ul> </div> <!-- tab: END --> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/error.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/error.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -4,7 +4,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -12,6 +27,7 @@ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/index.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/index.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/index.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/config/index.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div> <div class="form-table"> <s:form> 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-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityday.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="selectable"><s:link href="selectfacilityweek/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.week"/></s:link></li> <li class="spacer"></li> <li class="selectable"><s:link href="selectfacilitymonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> 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-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilitymonth.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="selectable"><s:link href="selectfacilityweek/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.week"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.month"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> 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-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityweek.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="selected"><span><bean:message key="labels.week"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="selectfacilitymonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> 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-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/groupweek.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selectable"><s:link href="/user/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facility"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.facility_groups"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> @@ -89,7 +105,7 @@ <tbody> <c:forEach var="facilityMap" varStatus="s1" items="${facilityInWeekItems}"> <tr> - <th><div style="overflow: hidden;font-size:small;width: 50px;">${f:h(facilityMap.facility.name)}</div></th> + <th><div style="overflow: hidden;font-size:xx-small;width: 50px;">${f:h(facilityMap.facility.name)}</div></th> <c:forEach var="eventInDayItems" varStatus="s2" items="${facilityMap.eventInWeekItems}"> <td> <ul style="margin:0;padding:0;"> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/confirm.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/confirm.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,7 +28,8 @@ <li class="selected"><span><bean:message key="labels.facilities"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li> - <li class="last"></li> + <li class="last-spacer"></li> + <li class="last"></li> </ul> </div> <!-- tab: END --> @@ -40,7 +56,7 @@ <html:hidden property="groupId"/></td> </tr> <tr> - <th>Comment</th> + <th><bean:message key="labels.comment"/></th> <td>${f:br(f:h(content))}<html:hidden property="content"/></td> </tr> </tbody> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/index.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/index.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/index.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -13,6 +28,7 @@ <li class="selected"><span><bean:message key="labels.facilities"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="/user/facility/calendar/movegroupweekthismonth" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/confirm.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/confirm.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -15,8 +30,9 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <c:if test="${mode==1}"> <li class="spacer"></li> - <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/edit.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/edit.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -15,8 +30,9 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <c:if test="${mode==1}"> <li class="spacer"></li> - <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -4,7 +4,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -14,8 +29,9 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <c:if test="${mode==1}"> <li class="spacer"></li> - <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -15,8 +30,9 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <c:if test="${mode==1}"> <li class="spacer"></li> - <li class="selectable"><s:link href="/facility/schedule/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="selectable"><s:link href="/facility/schedule/repeatSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> @@ -120,7 +136,7 @@ <tfoot> <tr> <td> -<input type="submit" name="setfacilities" value="<bean:message key="labels.OK"/>"/> +<input type="submit" name="setfacilities" value="<bean:message key="labels.ok"/>"/> </td> </tr> </tfoot> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/userlist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/userlist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/userlist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -15,8 +30,9 @@ <li class="selected"><span><bean:message key="labels.one_time"/></span></li> <c:if test="${mode==1}"> <li class="spacer"></li> - <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> + <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/confirm.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/confirm.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/edit.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/edit.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -4,7 +4,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -16,6 +31,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/userlist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/userlist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/userlist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> 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-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="selectable"><s:link href="selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.week_group"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> 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-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalday.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="selectable"><s:link href="selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li> <li class="spacer"></li> <li class="selectable"><s:link href="selectgroupweek/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.group_week"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> 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-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalmonth.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="selected"><span><bean:message key="labels.month"/></span></li> <li class="spacer"></li> <li class="selectable"><s:link href="selectgroupweek/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.group_week"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> 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-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalweek.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="selectable"><s:link href="selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li> <li class="spacer"></li> <li class="selectable"><s:link href="selectgroupweek/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.group_week"/></s:link></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/confirm.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/confirm.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="spacer"></li> <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/edit.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/edit.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="spacer"></li> <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/error.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/error.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -4,7 +4,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -16,6 +31,7 @@ <li class="spacer"></li> <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/facilitylist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/facilitylist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="spacer"></li> <li class="selectable"><s:link href="/facility/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/userlist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/userlist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/userlist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ <li class="spacer"></li> <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li> </c:if> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/confirm.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/confirm.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/edit.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/edit.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/error.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/error.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -4,7 +4,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -16,6 +31,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/userlist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/userlist.jsp 2008-11-27 07:45:50 UTC (rev 1450) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/userlist.jsp 2008-11-27 08:50:12 UTC (rev 1451) @@ -5,7 +5,22 @@ <title></title> </head> <body> -<div style="padding:3px;"> +<script type="text/javascript"> +<!-- +var cssFile="${f:url('/css/pal-extension.css')}"; +var isMSIE = /*@cc_on!@*/false; +if(isMSIE) { + document.createStyleSheet(cssFile); +} else { + var link = document.createElement("link"); + link.setAttribute("rel", "stylesheet"); + link.setAttribute("href", cssFile); + link.setAttribute("type", "text/css"); + document.getElementsByTagName('head')[0].appendChild(link); +} +// --> +</script> +<div class="scheduler-portlet" style="padding:3px;"> <!-- tab: BEGIN --> <div class="tab-nav"> <ul> @@ -17,6 +32,7 @@ </c:if> <li class="spacer"></li> <li class="selected"><span><bean:message key="labels.repeats"/></span></li> + <li class="last-spacer"></li> <li class="last"></li> </ul> </div> Added: scheduler/trunk/src/main/webapp/css/pal-extension.css =================================================================== --- scheduler/trunk/src/main/webapp/css/pal-extension.css (rev 0) +++ scheduler/trunk/src/main/webapp/css/pal-extension.css 2008-11-27 08:50:12 UTC (rev 1451) @@ -0,0 +1,216 @@ +/* +Copyright 2008 Portal Application Laboratory Project + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +/* ---------------- */ +/* Form Table */ +/* ---------------- */ +.scheduler-portlet .form-table table { +border-top: 1px solid #cccccc; +border-left: 1px solid #cccccc; +border-collapse:collapse; +} + +.scheduler-portlet .form-table caption { +border-top: 1px solid #cccccc; +border-left: 1px solid #cccccc; +border-right: 1px solid #cccccc; +background-color: #e8e8e8; +padding:5px; +margin:0; +font-weight: bold; +font-size:11pt; +color:#003366; +} + +.scheduler-portlet .form-table thead { +margin:0; +padding:0; +} + +.scheduler-portlet .form-table tbody { +margin:0; +padding:0; +} + +.scheduler-portlet .form-table tfoot { +margin:0; +padding:0; +} + +.scheduler-portlet .form-table th { +border-right: 1px solid #cccccc; +border-bottom: 1px solid #cccccc; +padding: 5px; +text-align: center; +background-color: #eeeeee; +empty-cells: show; +} + +.scheduler-portlet .form-table td { +border-right: 1px solid #cccccc; +border-bottom: 1px solid #cccccc; +padding:3px; +empty-cells: show; +} + +.scheduler-portlet .form-table tfoot tr td { +padding:10px; +text-align: center; +empty-cells: show; +} + +/* ---------------- */ +/* List Table */ +/* ---------------- */ +.scheduler-portlet .list-table table { +border-top: 1px solid #cccccc; +border-left: 1px solid #cccccc; +border-collapse:collapse; +} + +.scheduler-portlet .list-table caption { +border-top: 1px solid #cccccc; +border-left: 1px solid #cccccc; +border-right: 1px solid #cccccc; +background-color: #e8e8e8; +padding:5px; +margin:0; +font-weight: bold; +font-size:11pt; +color:#003366; +} + +.scheduler-portlet .list-table thead { +margin:0; +padding:0; +} + +.scheduler-portlet .list-table tbody { +margin:0; +padding:0; +} + +.scheduler-portlet .list-table tfoot { +margin:0; +padding:0; +} + +.scheduler-portlet .list-table .row1 { +background-color: #ffffff; +} + +.scheduler-portlet .list-table .row2 { +background-color: #fffff8; +} + +.scheduler-portlet .list-table th { +border-right: 1px solid #cccccc; +border-bottom: 1px solid #cccccc; +padding: 5px; +text-align: center; +background-color: #eeeeee; +empty-cells: show; +} + +.scheduler-portlet .list-table td { +border-right: 1px solid #cccccc; +border-bottom: 1px solid #cccccc; +padding:3px; +empty-cells: show; +} + + +/* ---------------- */ +/* Tab */ +/* ---------------- */ +.scheduler-portlet .tab-nav div { +height:25px; +line-height:23px; +margin:0; +padding:0; +width:100%; +} + +.scheduler-portlet .tab-nav ul { +margin:0; +padding:0; +width:100%; +} + +.scheduler-portlet .tab-nav ul li { +float:left; +height:25px; +line-height:23px; +list-style-image:none; +list-style-position:outside; +list-style-type:none; +} + +.scheduler-portlet .tab-nav ul li a:visited { +color:#0000EE; +} + +.scheduler-portlet .tab-nav ul li.first { +border-bottom:1px solid #A9A9A9; +width:10px; +} + +.scheduler-portlet .tab-nav ul li.last-spacer { +border-bottom:1px solid #A9A9A9; +width:5px; +margin-right:-5px; +} + +.scheduler-portlet .tab-nav ul li.last { +border-bottom:1px solid #A9A9A9; +float:none; +padding-right:10px; +text-align:right; +} + +.scheduler-portlet .tab-nav ul li.selected { +border-color:#A9A9A9 #A9A9A9 #FFFFFF; +border-style:solid; +border-width:1px; +display:block; +margin:-1px; +_margin-top: 0px; +} + +.scheduler-portlet .tab-nav ul li.selected span { +display:inline; +padding:0 10px; +white-space:pre; +} + +.scheduler-portlet .tab-nav ul li.selectable { +background-color:#DCDCDC; +border:1px solid #A9A9A9; +display:block; +height:24px; +} + +.scheduler-portlet .tab-nav ul li.selectable { +display:inline; +padding:0 10px; +white-space:pre; +} + +.scheduler-portlet .tab-nav ul li.spacer { +border-bottom:1px solid #A9A9A9; +width:5px; +} + Property changes on: scheduler/trunk/src/main/webapp/css/pal-extension.css ___________________________________________________________________ Name: svn:eol-style + native