fixed boken table columns, reintroduced some of the <span> tags, only remove weedDay...

Note that isToday(date) will not produce the same result as date.search(/Today/). If using isToday(), an additional check for showTodayAsText needs to be performed.

Some <span> tags were reintroduced because with only the date showing, there is a huge wast of space because of the table cells beeing 50% empty.

diff --git a/comingNext/index.html b/comingNext/index.html
index 7fa1d5debdbff77cfd7f073d7a6fdccd99d9840e..35d1632b4f20df93e4a23787c93ad773c2a3ece8 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -471,25 +471,25 @@ function updateData()
                                        var time = formatTime(date);\r
                                        var dateStr = formatDate(date, entryDate);\r
                                        if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {\r
-                                               if (isToday(date))\r
-                                                       entriesHtml += '<td colspan="2" class="date">' + dateStr + '</td><td colspan="2" class="description">';\r
+                                               if (isToday(date) && showTodayAsText) // show weekday if the date string is not text. looks odd otherwise\r
+                                                       entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';\r
                                                else\r
-                                                       entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2" class="description">';\r
+                                                       entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2">';\r
                                        } else if (entry.Type == 'Meeting') {\r
                                                if (showCombinedDateTime) {\r
                                                        if (isToday(date))\r
-                                                               entriesHtml += '<td colspan="2" class="today">' + time + '</td><td colspan="2" class="description">';\r
+                                                               entriesHtml += '<td colspan="4"><span class="today">' + time + '</span> ';\r
                                                        else\r
-                                                               entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2" class="description">';\r
+                                                               entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2">';\r
                                                } else {\r
-                                                       if (isToday(date))\r
-                                                               entriesHtml += '<td class="date">' + dateStr + '</td><td class="time">' + time + '</td><td colspan="2" class="description">';\r
+                                                       if (isToday(date) && showTodayAsText)\r
+                                                               entriesHtml += '<td colspan="4"><span class="today">' + dateStr + '</span> <span class="time">' + time + '</span> ';\r
                                                        else\r
-                                                               entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td>&nbsp;<span class="time">' + time + '</span></td><td colspan="2" class="description">';\r
+                                                               entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td width="1px" class="time">' + time + '</td><td>';\r
                                                }\r
                                        }\r
                                }\r
-                               entriesHtml += Summary + '</td></tr>';\r
+                               entriesHtml += '<span class="description">' + Summary + '</span></td></tr>';\r
                        }\r
                }\r
                entriesHtml += '</table>';\r