- date = formatDate(date, entryDate);\r
- if( entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' ){\r
- entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ date +'</span></td><td colspan="2">';\r
- }else if( entry.Type == 'Meeting' || entry.Type == 'Reminder' ){\r
- entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ date +'</span></td><td width="1px"><span class="time">'+ time +'</span></td><td>';\r
+ var dateStr = formatDate(date, entryDate);\r
+ if( entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder' ){\r
+ // decide if we want to leave off the weekday\r
+ if (dateStr.search(/Today/) != -1)\r
+ entriesHtml += '<td colspan="4"><span class="date">'+ dateStr +'</span> ';\r
+ else\r
+ entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ dateStr +'</span></td><td colspan="2">';\r
+ }else if( entry.Type == 'Meeting' ){\r
+ if (showCombinedDateTime) {\r
+ if (now.getDate() == date.getDate() && now.getMonth() == date.getMonth())\r
+ entriesHtml += '<td colspan="4"><span class="today">'+ time +'</span> ';\r
+ else {\r
+ // decide if we want to leave off the weekday\r
+ if (dateStr.search(/Today/) != -1)\r
+ entriesHtml += '<td colspan="4"><span class="date">'+ dateStr +'</span> ';\r
+ else\r
+ entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ dateStr +'</span></td><td colspan="2">';\r
+ }\r
+ } else {\r
+ // decide if we want to leave off the weekday\r
+ if (dateStr.search(/Today/) != -1)\r
+ entriesHtml += '<td colspan="4"><span class="date">'+ dateStr +'</span> <span class="time">'+ time +'</span> ';\r
+ else\r
+ entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ dateStr +'</span></td><td width="1px"><span class="time">'+ time +'</span></td><td>';\r
+ }\r