From 6b791539f550f7ddb72d84812feb7a94bed8be1c Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 14 Sep 2012 15:35:12 +0800 Subject: [PATCH] final calendar change... --- .../app/assets/stylesheets/calendar.css | 150 +++++++++---- .../calendar/back_end/cals/day_view.html.erb | 60 +++--- .../calendar/back_end/cals/index.html.erb | 6 +- .../back_end/cals/month_view.html.erb | 2 +- .../calendar/back_end/cals/week_view.html.erb | 199 +++++++++++++++++- 5 files changed, 344 insertions(+), 73 deletions(-) diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css index e7d3e35c2..e8bc4a963 100644 --- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css +++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css @@ -31,6 +31,59 @@ border-radius: 3px; cursor: pointer; padding: 1px 3px; + box-shadow: inset 0 0 1px black; + -webkit-box-shadow: inset 0 0 1px black; + -moz-box-shadow: inset 0 0 1px black; +} +.event_list .cell { + height: 38px; + border: solid 1px #ddd; + border-top: 0; +} +.event_list .divide { + height: 18px; + margin-bottom: 18px; + border-bottom: solid 1px #eee; +} +.event_list .day_time { + height: 30px; + border-bottom: solid 1px #ddd; + border-left: solid 1px #ddd; + text-align: right; + padding: 4px; +} +.event dl, .event dt, .event dd { + margin: 0; + padding: 0; +} +.event dl { + padding: 3px; +} +.event dt { + font-size: 11px; + font-weight: normal; + line-height: 12px; +} +#calendar_day .event_holder { + width: 100%; + height: 100%; + position: absolute; + top: 0; +} +.event_holder .inner { + position: relative; + margin: 0 16px 0 2px; +} +.event_holder .event { + padding: 0px; + position: absolute; + width: 100%; +} +.event_holder .event.half { + +} +.event_holder .event.over { + border: solid 1px #fff; } /* month view */ #calendar_month { @@ -97,6 +150,11 @@ color: #ccc; border-left: solid 1px #ddd; } +#calendar_month .event.single { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} /* agenda view */ #calendar_agenda { @@ -105,6 +163,11 @@ #calendar_agenda .table { margin-bottom: 0; } +#calendar_agenda .event { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} .event_time { font-family: Tahoma, sans-serif; } @@ -132,52 +195,61 @@ #calendar_day .event_list td { padding: 0; } -#calendar_day .event_list .day_time { - height: 30px; - border-bottom: solid 1px #ddd; - border-left: solid 1px #ddd; - text-align: right; - padding: 4px; -} -#calendar_day .event_list .cell { - height: 38px; - border: solid 1px #ddd; - border-top: 0; -} -#calendar_day .event_list .divide { - height: 18px; - margin-bottom: 18px; - border-bottom: solid 1px #eee; -} -#calendar_day .event_holder { - width: 100%; - height: 100%; - position: absolute; - top: 0; -} -#calendar_day .event_holder .event { - padding: 0px; - position: absolute; - width: 100%; -} -#calendar_day .event_holder .event.half { + +/* week view */ +#calendar_week { } -#calendar_day .event_holder .event.over { - outline: solid 1px #fff; +#calendar_week .cell_wrapper { + position: absolute; + width: 100%; } -#calendar_day .event dl, #calendar_day .event dt, #calendar_day .event dd { - margin: 0; +#calendar_week td { padding: 0; } -#calendar_day .event dl { - padding: 3px; +#calendar_week .table { + margin-bottom: 0; } -#calendar_day .event dt { - font-size: 11px; - font-weight: normal; - line-height: 12px; +#calendar_week .header { + margin-bottom: 12px; + border-top: 0; + table-layout: fixed; } +#calendar_week .header th { + text-align: center; + font-size: 12px; +} +#calendar_week .header td { + border: solid 1px #ddd; + background-color: #eee; +} +#calendar_week .week_day { + padding: 0 2px; + border: solid 1px #ddd; +} +#calendar_week .header .week_day { + padding: 1px 2px 10px 2px; +} +#calendar_week .event_list .event { + position: absolute; + width: 100%; + margin-bottom: 2px; +} +#calendar_week .cell_map { + margin-bottom: 18px; +} +#calendar_week .cell_map td { + border-top: 0; + border-bottom: 0; +} +#calendar_week .cell_map tr:first-child td { + border-top: solid 1px #ddd; +} +#calendar_week .event_holder .inner { + margin: 0 8px 0 0; +} + + /* calendars(category) */ diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb index 047be06f3..cdbc1c475 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb @@ -117,35 +117,37 @@
-
-
-
10:30am - 11:00am
-
template
-
-
-
-
-
10:30am - 11:00am
-
template
-
-
-
-
-
10:30am - template
-
-
-
-
-
-
10:30am - 11:00am
-
template
-
-
-
-
-
10:30am - 11:00am
-
template
-
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
10:30am - template
+
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb index 2dc897000..75758aa74 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb @@ -28,7 +28,7 @@
-
+
@@ -39,10 +39,10 @@
-
+

Semptember 2012

-
+
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb index bff812b0f..adf5f12e5 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb @@ -87,7 +87,7 @@ -
7pm - 9pm test event
+
7pm - 9pm test event
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb index 359237f13..c6136bddf 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb @@ -1 +1,198 @@ -week \ No newline at end of file +
+ + + + + + + + + + + + + + + + + + + + + +
Sun 9/11Mon 9/12Tue 9/13Wed 9/14Thu 9/15Fri 9/16Sat 9/17
+
+
+
10:30am - template
+
+
+
+ 		+ +
+
+
10:30am - template
+
+
+
+
+
+ + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
12am
+
1am
+
2am
+
3am
+
4am
+
5am
+
6am
+
7am
+
8am
+
9am
+
10am
+
11am
+
12am
+
1pm
+
2pm
+
3pm
+
4pm
+
5pm
+
6pm
+
7pm
+
8pm
+
9pm
+
10pm
+
11pm
+ 		+
+
+
+
+ 		+
+
+
+
+ 		+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+ 		+
+
+
+
+ 		+
+
+
+
+ 		+
+
+
+
+ 		+
+
+
+
+
+
+
\ No newline at end of file