diff --git a/app/assets/javascripts/calendar_widget.js b/app/assets/javascripts/calendar_widget.js
index d562db3..f49fd05 100644
--- a/app/assets/javascripts/calendar_widget.js
+++ b/app/assets/javascripts/calendar_widget.js
@@ -154,9 +154,9 @@ var CalendarModuleMonth1 = function(date,dom,subpart,url,index_flag){
date = new Date(date);
return getDateString(date, window.calendar_variable.date_format);
}
- var formate_datetime = function(date){
+ var format_datetime = function(date){
date = new Date(date);
- return [format_date(date),format_time(date)]
+ return getDateString(date, window.calendar_variable.datetime_format);
}
$(window).resize(function(){
var window_w = $(window).width()
@@ -193,20 +193,20 @@ var CalendarModuleMonth1 = function(date,dom,subpart,url,index_flag){
var time_string = ''
if(v.allDay) {
var end_time
- var start_time = formate_datetime(v.start)[0]
+ var start_time = format_date(v.start);
if(v.end)
- end_time = formate_datetime(v.end)[0]
+ end_time = format_date(v.end);
else
- end_time = start_time
+ end_time = start_time;
time_string = (start_time==end_time ? "
' +
@@ -222,17 +222,17 @@ var CalendarModuleMonth1 = function(date,dom,subpart,url,index_flag){
}else{
tp = $('
').attr('href',v.url_linked)
}
- var sd = formate_datetime(v.start),
- ed = formate_datetime(v.end),
+ var sd = [format_date(v.start), format_time(v.start)],
+ ed = [format_date(v.end), format_time(v.end)],
duration = '';
if(v.allDay){
if (sd[0]!=ed[0]){
- duration = sd[0]+'>'+ed[0] +'
'
+ duration = sd[0]+' > '+ed[0] +'
'
}
}else if (sd[0]==ed[0]){
duration = sd[1]+'>'+ed[1] +'
'
}else{
- duration = sd[0]+' '+sd[1]+'>'+ed[0]+' '+ed[1] +'
'
+ duration = sd[0]+' '+sd[1]+' > '+ed[0]+' '+ed[1] +'
'
}
tp.find('.event-info').html(duration+v.title+"
"+v.note+"
")
tp.find('.event-bullet-event').css('background',v.color)
@@ -409,8 +409,8 @@ var CalendarModuleMonth1 = function(date,dom,subpart,url,index_flag){
$.each(data.events,function(index,eve){
var sd = new Date(eve.start),
ed = new Date(eve.end),
- sd_date = new Date(formate_datetime(eve.start)[0]),
- ed_date = new Date(formate_datetime(eve.end)[0]),
+ sd_date = new Date(format_date(eve.start)),
+ ed_date = new Date(format_date(eve.end)),
timeDiff = ed_date.getTime() - sd_date.getTime(),
dayDiff = Math.round(timeDiff / (1000 * 3600 * 24));
if(eve.allDay && dayDiff < 1){
diff --git a/app/assets/javascripts/calendar_widget2.js b/app/assets/javascripts/calendar_widget2.js
index 9fb40f1..4823450 100644
--- a/app/assets/javascripts/calendar_widget2.js
+++ b/app/assets/javascripts/calendar_widget2.js
@@ -257,9 +257,9 @@ var CalendarModuleMonth2 = function(date,dom,subpart,url,index_flag){
duration = sd[0]+'>'+ed[0] +'
'
}
}else if (sd[0]==ed[0]){
- duration = sd[1]+'>'+ed[1] +'
'
+ duration = sd[1]+' > '+ed[1] +'
'
}else{
- duration = sd[0]+' '+sd[1]+'>'+ed[0]+' '+ed[1] +'
'
+ duration = sd[0]+' '+sd[1]+' > '+ed[0]+' '+ed[1] +'
'
}
tp.css('color',hexToRGB(v.color,0.45))
tp.find('.event-content').html(v.note || read_more_text)
@@ -549,8 +549,8 @@ var CalendarModuleMonth2 = function(date,dom,subpart,url,index_flag){
$.each(data.events,function(index,eve){
var sd = new Date(eve.start),
ed = new Date(eve.end),
- sd_date = new Date(format_datetime(eve.start)[0]),
- ed_date = new Date(format_datetime(eve.end)[0]),
+ sd_date = new Date(format_date(eve.start)),
+ ed_date = new Date(format_date(eve.end)),
timeDiff = ed_date.getTime() - sd_date.getTime(),
dayDiff = Math.round(timeDiff / (1000 * 3600 * 24));
if(eve.allDay && dayDiff < 1){
diff --git a/modules/calendar/index3.html.erb b/modules/calendar/index3.html.erb
index 3d6ca12..2ab0863 100644
--- a/modules/calendar/index3.html.erb
+++ b/modules/calendar/index3.html.erb
@@ -22,14 +22,8 @@