From 98ef582e1720cb29260997b81a0e960d91edf0c6 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 17 Oct 2012 17:35:30 +0800 Subject: [PATCH] shit calendar update --- .../app/assets/javascripts/calendarAPI.js.erb | 2 +- .../app/assets/stylesheets/calendar.css | 28 ++- .../back_end/cals/agenda_view.html.erb | 210 ++++++++++-------- .../calendar/back_end/cals/day_view.html.erb | 210 +++++++++--------- .../calendar/back_end/cals/week_view.html.erb | 24 +- 5 files changed, 256 insertions(+), 218 deletions(-) diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb index da3d0d32..41c2fc12 100644 --- a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb +++ b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb @@ -163,7 +163,7 @@ var calendarAPI = function(){ if($('#calendar_month').length > 0){ var $c_table = $('#calendar_month'); var sum_h = 0; - var context_h = $('#main-sidebar').outerHeight(); + var context_h = $(window).height() - $('#orbit-bar').height(); $('#main-wrap > *').not('#orbit_calendar, .modal').each(function(){ sum_h += $(this).outerHeight(); }); 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 85b0390f..86df5516 100644 --- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css +++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css @@ -36,18 +36,21 @@ -webkit-box-shadow: inset 0 0 1px black; -moz-box-shadow: inset 0 0 1px black; } +.event_list_wrapper { + position: relative; +} .event_list .cell { - height: 38px; + height: 39px; border: solid 1px #ddd; border-top: 0; } .event_list .divide { - height: 18px; + height: 19px; margin-bottom: 18px; border-bottom: solid 1px #eee; } .event_list .day_time { - height: 30px; + height: 31px; border-bottom: solid 1px #ddd; border-left: solid 1px #ddd; text-align: right; @@ -189,7 +192,7 @@ } #calendar_day .all_day_event { background: #eee; - border: solid 1px #ddd + border: solid 1px #ddd; } #calendar_day .event_list .table { border-top: solid 1px #ddd; @@ -223,14 +226,14 @@ } #calendar_week .header td { border: solid 1px #ddd; - background-color: #eee; + /*background-color: #eee;*/ } #calendar_week .week_day { padding: 0 2px; border: solid 1px #ddd; } #calendar_week .header .week_day { - padding: 1px 2px 10px 2px; + padding: 2px 4px 0px 2px; } #calendar_week .event_list .event { position: absolute; @@ -250,7 +253,18 @@ #calendar_week .event_holder .inner { margin: 0 8px 0 0; } - +#calendar_week .all_day_event_holder { + position: relative; + width: 100%; + table-layout: fixed; +} +#calendar_week .all_day_event_holder td { + border: 0; + background-color: transparent; +} +#calendar_week .all_day_event { + background: #eee; +} diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb index a8577212..98d716c1 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb @@ -59,108 +59,128 @@ Sat 9/17 - - -
-
-
10:30am - template
-
-
+ +
+ + + + + + + + + + + +
+ + + + + + + + + + +
+
+
+
10:30am - template
+
+
+
+
+
+
+
10:30am - template
+
+
+
+
- - - - -
-
-
10:30am - template
-
-
-
- - - -
- + - 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 cdbc1c47..46fc0a16 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 @@ -43,110 +43,112 @@
10pm
11pm
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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/week_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb index f7400608..461c7b01 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 @@ -40,18 +40,20 @@
- + -
-
- <% @hours.each do |hour| %> -
-
-
-
-
-
- <% end %> +
+
+
+ <% @hours.each do |hour| %> +
+
+
+
+
+
+ <% end %> +