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 64eb8f8a..da3d0d32 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 @@ -135,7 +135,14 @@ var calendarAPI = function(){ } }) $("button#today_btn").click(function(){ - c.loadMonthView(); + switch (c.view){ + case "week": + c.loadWeekView(); + break; + case "month": + c.loadMonthView(); + break; + } }) } } @@ -231,13 +238,13 @@ var calendarAPI = function(){ $eventrow.html('
+ | Sun 9/11 | +Mon 9/12 | +Tue 9/13 | +Wed 9/14 | +Thu 9/15 | +Fri 9/16 | +Sat 9/17 | +
---|---|---|---|---|---|---|---|
+ |
+
+
+
|
+ + | ++ |
+
+
+
|
+ + | + | + |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ ||||||
+ 12am
+ 1am
+ 2am
+ 3am
+ 4am
+ 5am
+ 6am
+ 7am
+ 8am
+ 9am
+ 10am
+ 11am
+ 12am
+ 1pm
+ 2pm
+ 3pm
+ 4pm
+ 5pm
+ 6pm
+ 7pm
+ 8pm
+ 9pm
+ 10pm
+ 11pm
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
|
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+