javascript: Clean up some CSS in the main table

Remove some of the "span" tags in the main table and assign the CSS styles
to the "td" tags, also fix up some of the table columns a bit.

diff --git a/comingNext/index.html b/comingNext/index.html
index 3684b84ff951567c3d15de01e88c6dfc22d2d941..7fa1d5debdbff77cfd7f073d7a6fdccd99d9840e 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -472,24 +472,24 @@ function updateData()
                                        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="4"><span class="date">' + dateStr + '</span> ';\r
+                                                       entriesHtml += '<td colspan="2" class="date">' + dateStr + '</td><td colspan="2" class="description">';\r
                                                else\r
-                                                       entriesHtml += '<td><span class="weekDay">' + weekDay + '</span></td><td><span class="date">' + dateStr + '</span></td><td colspan="2">';\r
+                                                       entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2" class="description">';\r
                                        } else if (entry.Type == 'Meeting') {\r
                                                if (showCombinedDateTime) {\r
                                                        if (isToday(date))\r
-                                                               entriesHtml += '<td colspan="4"><span class="today">' + time + '</span> ';\r
+                                                               entriesHtml += '<td colspan="2" class="today">' + time + '</td><td colspan="2" class="description">';\r
                                                        else\r
-                                                               entriesHtml += '<td><span class="weekDay">' + weekDay + '</span></td><td><span class="date">' + dateStr + '</span></td><td colspan="2">';\r
+                                                               entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2" class="description">';\r
                                                } else {\r
                                                        if (isToday(date))\r
-                                                               entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> <span class="time">' + time + '</span> ';\r
+                                                               entriesHtml += '<td class="date">' + dateStr + '</td><td class="time">' + time + '</td><td colspan="2" class="description">';\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
+                                                               entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td>&nbsp;<span class="time">' + time + '</span></td><td colspan="2" class="description">';\r
                                                }\r
                                        }\r
                                }\r
-                               entriesHtml += '<span class="description">' + Summary + '</span></td></tr>';\r
+                               entriesHtml += Summary + '</td></tr>';\r
                        }\r
                }\r
                entriesHtml += '</table>';\r